batctl: Refresh patches
Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
Sven Eckelmann
parent
dca9b7e0ca
commit
3020feba9b
|
|
@ -1,6 +1,6 @@
|
|||
From: Philipp Psurek <philipp.psurek@gmail.com>
|
||||
Date: Tue, 13 Jun 2017 10:25:59 +0200
|
||||
Subject: [PATCH] batctl: change PATH_BUFF_LEN to maximal possible value
|
||||
Subject: batctl: change PATH_BUFF_LEN to maximal possible value
|
||||
|
||||
The output of
|
||||
|
||||
|
|
@ -14,10 +14,6 @@ Signed-off-by: Philipp Psurek <philipp.psurek@gmail.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/620226bf8cff30e6dd966c8fe922b2d4cddf843b
|
||||
---
|
||||
functions.c | 2 +-
|
||||
functions.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/functions.c b/functions.c
|
||||
index abd588209337dcfa04be9aadbf4ba39bb46771bb..676012bb56f9f8aa757b4805e27d904181ee2d27 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Philipp Psurek <philipp.psurek@gmail.com>
|
||||
Date: Tue, 13 Jun 2017 13:08:24 +0200
|
||||
Subject: [PATCH] batctl: suppress implicit-fallthrough compiler warning
|
||||
Subject: batctl: suppress implicit-fallthrough compiler warning
|
||||
|
||||
GCC 7.1.0 complains about an intended fallthrough.
|
||||
“__attribute__ ((fallthrough))” in this part of code would suppress this
|
||||
|
|
@ -22,9 +22,6 @@ Signed-off-by: Philipp Psurek <philipp.psurek@gmail.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/50ee3c45feeda6d8c04ee127097badf99f78a26e
|
||||
---
|
||||
tp_meter.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tp_meter.c b/tp_meter.c
|
||||
index f95b8391ff3426200697034f1087274ca9e5a9dd..ec0dc4802c638471ff3c38bd344e31c208b634a5 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:35 +0100
|
||||
Subject: [PATCH] batctl: Print dummy value when localtime failed
|
||||
Subject: batctl: Print dummy value when localtime failed
|
||||
|
||||
localtime can return NULL when the local time could not be calculated.
|
||||
Accessing this NULL pointer is not allowed.
|
||||
|
|
@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/09dd2dc0b4945c83bd07ad4bce64062239d901fb
|
||||
---
|
||||
tcpdump.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tcpdump.c b/tcpdump.c
|
||||
index 2125b66d0871c4a127425bfad0135a9f565cfb78..db9c46afecf3de94dbd4d9292df1fe0812fb8bfc 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:36 +0100
|
||||
Subject: [PATCH] batctl: Handle failure during hash_iterator allocation
|
||||
Subject: batctl: Handle failure during hash_iterator allocation
|
||||
|
||||
The iterator functions should not try to start the iteration when the
|
||||
iterator could not be allocated.
|
||||
|
|
@ -9,9 +9,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/aa316bf6d1b2cf0ab7189ed8620c17f5018d4d37
|
||||
---
|
||||
hash.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/hash.c b/hash.c
|
||||
index 08d47b5b8f812d718f9463c548d73fbffb49b1b3..c6f735c64b573928441b41936646d195bc0da4bb 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:37 +0100
|
||||
Subject: [PATCH] batctl: Handle allocation error for path_buff
|
||||
Subject: batctl: Handle allocation error for path_buff
|
||||
|
||||
Fixes: 5a1af99276b0 ("batctl: adapt batctl to new sysfs interface handling")
|
||||
Fixes: 306fcb4480c9 ("batctl: support for multiple mesh clouds")
|
||||
|
|
@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/3b52283a5f60d1c6ec11628d031e72f0a28a720f
|
||||
---
|
||||
sys.c | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/sys.c b/sys.c
|
||||
index b52434072b34b949c73de8346f8c2dce615423a4..3047b5f6eebf26290f2d8c4840d52bb1bddc3e3f 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:38 +0100
|
||||
Subject: [PATCH] batctl: Handle nlmsg_alloc errors
|
||||
Subject: batctl: Handle nlmsg_alloc errors
|
||||
|
||||
nlmsg_alloc may return NULL on errors. The processing has to be aborted
|
||||
when this happens.
|
||||
|
|
@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/27e9937635ffbfe33f7f3297aff911718b8deb56
|
||||
---
|
||||
netlink.c | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/netlink.c b/netlink.c
|
||||
index 5f4325b0bb6b4a41860a75bd0851e446c5af9a88..64afeedac46bf3eab14a1d89d7db4491fbef8d81 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:39 +0100
|
||||
Subject: [PATCH] batctl: Handle nl_socket_alloc errors
|
||||
Subject: batctl: Handle nl_socket_alloc errors
|
||||
|
||||
nl_socket_alloc may return NULL on errors. The processing has to be aborted
|
||||
when this happens.
|
||||
|
|
@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/bc6cd37e0d3ce08e3b89e3123ffa87dc55f24c09
|
||||
---
|
||||
netlink.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/netlink.c b/netlink.c
|
||||
index 64afeedac46bf3eab14a1d89d7db4491fbef8d81..107ca52a4866e25b7b04428d770a885ca4e826d2 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:40 +0100
|
||||
Subject: [PATCH] batctl: Handle nl_cb_alloc errors
|
||||
Subject: batctl: Handle nl_cb_alloc errors
|
||||
|
||||
nl_cb_alloc may return NULL on errors. The processing has to be aborted
|
||||
when this happens.
|
||||
|
|
@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/0a14f8800dac67d706827e9be7745e2319f5412c
|
||||
---
|
||||
netlink.c | 17 ++++++++++++++++-
|
||||
1 file changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/netlink.c b/netlink.c
|
||||
index 107ca52a4866e25b7b04428d770a885ca4e826d2..3eb66c9de30c21722bb1e348b055838ea14d18cf 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:41 +0100
|
||||
Subject: [PATCH] batctl: Free nl_sock on genl_ctrl_resolve error
|
||||
Subject: batctl: Free nl_sock on genl_ctrl_resolve error
|
||||
|
||||
genl_ctrl_resolve may return NULL on errors. The code must then free the
|
||||
socket which was used to start the genl_ctrl_resolve and stop the function
|
||||
|
|
@ -11,9 +11,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/cdac2f843c616caaa2a0d3847aeec84c200c62d6
|
||||
---
|
||||
netlink.c | 16 +++++++++++-----
|
||||
1 file changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/netlink.c b/netlink.c
|
||||
index 3eb66c9de30c21722bb1e348b055838ea14d18cf..ee58ce8bf16e224374940dddaff61f7b3c5aa4bb 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:42 +0100
|
||||
Subject: [PATCH] batctl: Free nl_sock when if_nametoindex failed
|
||||
Subject: batctl: Free nl_sock when if_nametoindex failed
|
||||
|
||||
The if_nametoindex can return an error. The code must then free the
|
||||
previously allocated nl_sock and stop the function with an error code.
|
||||
|
|
@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/4361841bf76ecd27dcfca6edc30c63b05854d415
|
||||
---
|
||||
netlink.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/netlink.c b/netlink.c
|
||||
index ee58ce8bf16e224374940dddaff61f7b3c5aa4bb..88a5c95c67989a812231aec7352eecfc4e38c70d 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:43 +0100
|
||||
Subject: [PATCH] batctl: tcpdump: Fix types for for TT v1
|
||||
Subject: batctl: tcpdump: Fix types for for TT v1
|
||||
|
||||
The num_entry and num_vlan variables are accessed (printed) as u16
|
||||
variables and not like integers. They should therefore also be stored like
|
||||
|
|
@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/15a1335cadacc7c3bb4723a30617d123a961a311
|
||||
---
|
||||
tcpdump.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tcpdump.c b/tcpdump.c
|
||||
index db9c46afecf3de94dbd4d9292df1fe0812fb8bfc..da5541ea9f5f9f9b6fd0838d2242daa22d41a28d 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Thu, 23 Nov 2017 15:04:44 +0100
|
||||
Subject: [PATCH] batctl: Simplify concatenation of pathnames
|
||||
Subject: batctl: Simplify concatenation of pathnames
|
||||
|
||||
The combination of strncpy and strncat is hard to read and it is rather
|
||||
easy to introduce some kind of problems when using that. The usage of
|
||||
|
|
@ -10,10 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/cfaec23c5f6f2cf649f3e0673b2e0c61bc01969f
|
||||
---
|
||||
bat-hosts.c | 4 +---
|
||||
functions.c | 8 ++------
|
||||
2 files changed, 3 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/bat-hosts.c b/bat-hosts.c
|
||||
index a4add34bbaf8c34f8357ba8d1583218fdaf4df93..66e8f05bd2277e5560be77a26b97245223fa72aa 100644
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From: Sven Eckelmann <sven@narfation.org>
|
||||
Date: Sat, 2 Dec 2017 08:45:59 +0100
|
||||
Subject: [PATCH] batctl: Handle allocation error in vlan_get_link_parse
|
||||
Subject: batctl: Handle allocation error in vlan_get_link_parse
|
||||
|
||||
The malloc could fail and return NULL. In this case, the processing of the
|
||||
current interface index has to be stopped to avoid writing to NULL (which
|
||||
|
|
@ -11,9 +11,6 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|||
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
||||
|
||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/2ea390ce9bdda39d3c15bd9470009f56f42d5ed9
|
||||
---
|
||||
functions.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/functions.c b/functions.c
|
||||
index 1c96e6241d01b83a136ff135bee8dd780629f7aa..f91f26f4045766474d5dc109d76e20afd91a7791 100644
|
||||
|
|
|
|||
Loading…
Reference in New Issue