commits January 2017

commits@lists.open-mesh.org

1 participants
40 discussions

[batctl] master: batctl: Return type of error on netlink_get_info error (e87cc59)
by postmaster＠open-mesh.org 24 Jan '17

24 Jan '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit e87cc59e1178b4d04e44a23257bd30ad39b29b6c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 22 13:21:07 2017 +0100 batctl: Return type of error on netlink_get_info error It can happen that netlink_get_info will not return an algo string. This usually happens because BATADV_CMD_GET_MESH_INFO is not implemented in the kernel modules. But it is also possible that this happens because the user didn't have the correct rights to retrieve this type of information. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- e87cc59e1178b4d04e44a23257bd30ad39b29b6c netlink.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/netlink.c b/netlink.c index 9580aa3..7fb1ee1 100644 --- a/netlink.c +++ b/netlink.c @@ -1177,11 +1177,12 @@ int netlink_print_originators(char *mesh_iface, char *orig_iface, } /* only parse routing algorithm name */ + last_err = -EINVAL; info_header = netlink_get_info(ifindex, BATADV_CMD_GET_ORIGINATORS, NULL); free(info_header); if (strlen(algo_name_buf) == 0) - return -EOPNOTSUPP; + return last_err; if (!strcmp("BATMAN_IV", algo_name_buf)) header = " Originator last-seen (#/255) Nexthop [outgoingIF]\n"; @@ -1244,11 +1245,12 @@ int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opts, } /* only parse routing algorithm name */ + last_err = -EINVAL; info_header = netlink_get_info(ifindex, BATADV_CMD_GET_ORIGINATORS, NULL); free(info_header); if (strlen(algo_name_buf) == 0) - return -EOPNOTSUPP; + return last_err; if (!strcmp("BATMAN_IV", algo_name_buf)) header = " Router ( TQ) Next Hop [outgoingIf] Bandwidth\n";

1 0

[batctl] master: batctl: Move root privileges check in separate function (91b23ca)
by postmaster＠open-mesh.org 24 Jan '17

24 Jan '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 91b23ca89f652ae6d583b8c615644102ee8188ce Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 22 13:21:05 2017 +0100 batctl: Move root privileges check in separate function Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 91b23ca89f652ae6d583b8c615644102ee8188ce functions.c | 8 ++++++++ functions.h | 1 + main.c | 6 ++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/functions.c b/functions.c index f8bacda..c1aaf12 100644 --- a/functions.c +++ b/functions.c @@ -1138,3 +1138,11 @@ void get_random_bytes(void *buf, size_t buflen) get_random_bytes_fallback(buf, buflen); } + +void check_root_or_die(const char *cmd) +{ + if (getuid() || getgid()) { + fprintf(stderr, "Error - you must be root to run '%s' !\n", cmd); + exit(EXIT_FAILURE); + } +} diff --git a/functions.h b/functions.h index b085f9d..eca1406 100644 --- a/functions.h +++ b/functions.h @@ -54,6 +54,7 @@ int check_mesh_iface(char *mesh_iface); int check_mesh_iface_ownership(char *mesh_iface, char *hard_iface); void get_random_bytes(void *buf, size_t buflen); +void check_root_or_die(const char *cmd); int print_routing_algos(void); extern char *line_ptr; diff --git a/main.c b/main.c index 3f0b008..2fc9b75 100644 --- a/main.c +++ b/main.c @@ -136,10 +136,8 @@ int main(int argc, char **argv) /* TODO: remove this generic check here and move it into the individual functions */ /* check if user is root */ - if ((strncmp(argv[1], "bisect", strlen("bisect")) != 0) && ((getuid()) || (getgid()))) { - fprintf(stderr, "Error - you must be root to run '%s' !\n", argv[0]); - exit(EXIT_FAILURE); - } + if (strncmp(argv[1], "bisect", strlen("bisect")) != 0) + check_root_or_die(argv[0]); if ((strcmp(argv[1], "interface") == 0) || (strcmp(argv[1], "if") == 0)) {

1 0

[batman-adv] master: batman-adv: restructure cfg80211 compat code (3da7de5)
by postmaster＠open-mesh.org 24 Jan '17

24 Jan '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 3da7de5d6aa8f69d6d7daa62f3e6d3f7ebed5772 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Jan 24 01:00:30 2017 +0100 batman-adv: restructure cfg80211 compat code This commit restructures the compat code regarding cfg80211 to achieve the following: a) Allows to compile kernels < 3.16 with -Werror by replacing the "#warning" with a runtime warning through pr_warn_once(). b) Allows to run < 3.16 kernels without warnings if no cfg80211 based interface is used. c) Migrates cfg80211 compat code from compat.h to compat cfg80211.h to keep compat.h slim. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3da7de5d6aa8f69d6d7daa62f3e6d3f7ebed5772 compat-include/net/cfg80211.h | 21 ++++++++++++++++++++- compat.h | 21 --------------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h index 8dbbf0e..6e0eca3 100644 --- a/compat-include/net/cfg80211.h +++ b/compat-include/net/cfg80211.h @@ -4,9 +4,28 @@ #include <linux/version.h> #include_next <net/cfg80211.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + +static inline int cfg80211_get_station(struct net_device *dev, + const u8 *mac_addr, + struct station_info *sinfo) +{ + pr_warn_once("cfg80211 based throughput metric is only supported with Linux 3.16+\n"); + return -ENOENT; +} + +/* The following define substitutes the expected_throughput field with a random + * one existing in the station_info struct. It can be random because due to the + * function above it will never be used. Only needed to make the code compile + */ +#define expected_throughput filled + +#endif /* < KERNEL_VERSION(3, 16, 0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) -#if !IS_ENABLED(CONFIG_CFG80211) +#if !IS_ENABLED(CONFIG_CFG80211) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) #define cfg80211_get_station(dev, mac_addr, sinfo) \ batadv_cfg80211_get_station(dev, mac_addr, sinfo) diff --git a/compat.h b/compat.h index 5397629..e43c413 100644 --- a/compat.h +++ b/compat.h @@ -130,27 +130,6 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(3, 10, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) - -/* the expected behaviour of this function is to return 0 on success, therefore - * it is possible to define it as 1 so that batman-adv thinks like something - * went wrong. It will then decide what to do. - */ -#define cfg80211_get_station(_a, _b, _c) (1) -/* the following define substitute the expected_throughput field with a random - * one existing in the station_info struct. It can be random because due to the - * define above it will never be used. We need it only to make the code compile - */ -#define expected_throughput filled - -#ifdef CONFIG_BATMAN_ADV_BATMAN_V - -#warning cfg80211 based throughput metric is only supported with Linux 3.15+ - -#endif - -#endif /* < KERNEL_VERSION(3, 16, 0) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) /* wild hack for batadv_getlink_net only */

1 0

[batctl] master: batctl: ping: Use sig_atomic_t variable to stop ping (210e84e)
by postmaster＠open-mesh.org 24 Jan '17

24 Jan '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 210e84eb50637f8d1eee73b01c87ca886decc5a2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 22 13:07:48 2017 +0100 batctl: ping: Use sig_atomic_t variable to stop ping The variable used in the signal handlers of ping is currently only a char. It is shared with the main routine which checks if the ping should be stopped or not. But the standard defines that such a variable must be volatile sig_atomic_t or a lock-free atomic object. The volatile definition avoids that the compiler must not assume that this object can be cached. sig_atomic_t will make sure that this object is atomically accessible in asynchronous interrupts. Not using these types could result in an "unstoppable" ping. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 210e84eb50637f8d1eee73b01c87ca886decc5a2 ping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ping.c b/ping.c index 4fef663..7e5c6fc 100644 --- a/ping.c +++ b/ping.c @@ -45,7 +45,7 @@ #include "icmp_helper.h" -char is_aborted = 0; +static volatile sig_atomic_t is_aborted = 0; static void ping_usage(void)

1 0

[batctl] master: batctl: Simplify standard error messages with perror (fae430b)
by postmaster＠open-mesh.org 24 Jan '17

24 Jan '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit fae430b6c415402a333c20b39705409cc7901672 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 22 13:07:49 2017 +0100 batctl: Simplify standard error messages with perror The error string of errno can either be printed via fprintf + strerror or by simply using the helper function perror. Using the latter can simplify the code slightly by reducing the line length. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- fae430b6c415402a333c20b39705409cc7901672 bat-hosts.c | 2 +- icmp_helper.c | 7 ++++--- ioctl.c | 8 ++++---- tcpdump.c | 10 +++++----- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/bat-hosts.c b/bat-hosts.c index 015fbcb..b530243 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -128,7 +128,7 @@ static void parse_hosts_file(struct hashtable_t **hash, const char path[], int r if (!bat_host) { if (read_opt & USE_BAT_HOSTS) - fprintf(stderr, "Error - could not allocate memory: %s\n", strerror(errno)); + perror("Error - could not allocate memory"); goto out; } diff --git a/icmp_helper.c b/icmp_helper.c index fb461d5..0eea5c4 100644 --- a/icmp_helper.c +++ b/icmp_helper.c @@ -30,6 +30,7 @@ #include <netinet/ether.h> #include <stdbool.h> #include <stdint.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/ioctl.h> @@ -190,7 +191,7 @@ static int icmp_interface_add(const char *ifname, const uint8_t mac[ETH_ALEN]) iface->sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); if (iface->sock < 0) { - fprintf(stderr, "Error - can't create raw socket: %s\n", strerror(errno)); + perror("Error - can't create raw socket"); ret = -errno; goto free_iface; } @@ -201,7 +202,7 @@ static int icmp_interface_add(const char *ifname, const uint8_t mac[ETH_ALEN]) ret = ioctl(iface->sock, SIOCGIFINDEX, &req); if (ret < 0) { - fprintf(stderr, "Error - can't create raw socket (SIOCGIFINDEX): %s\n", strerror(errno)); + perror("Error - can't create raw socket (SIOCGIFINDEX)"); ret = -errno; goto close_sock; } @@ -214,7 +215,7 @@ static int icmp_interface_add(const char *ifname, const uint8_t mac[ETH_ALEN]) ret = bind(iface->sock, (struct sockaddr *)&sll, sizeof(struct sockaddr_ll)); if (ret < 0) { - fprintf(stderr, "Error - can't bind raw socket: %s\n", strerror(errno)); + perror("Error - can't bind raw socket"); ret = -errno; goto close_sock; } diff --git a/ioctl.c b/ioctl.c index b1db5e4..d95fc8d 100644 --- a/ioctl.c +++ b/ioctl.c @@ -48,7 +48,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (void *)&drvinfo; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - fprintf(stderr, "Error - can't open driver information: %s\n", strerror(errno)); + perror("Error - can't open driver information"); goto out; } @@ -72,7 +72,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (void *)strings; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - fprintf(stderr, "Error - can't get stats strings information: %s\n", strerror(errno)); + perror("Error - can't get stats strings information"); goto out; } @@ -81,7 +81,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (void *) stats; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - fprintf(stderr, "Error - can't get stats information: %s\n", strerror(errno)); + perror("Error - can't get stats information"); goto out; } @@ -110,7 +110,7 @@ int ioctl_statistics_get(char *mesh_iface) fd = socket(AF_INET, SOCK_DGRAM, 0); if (fd < 0) { - fprintf(stderr, "Error - can't open socket: %s\n", strerror(errno)); + perror("Error - can't open socket"); goto out; } diff --git a/tcpdump.c b/tcpdump.c index 92171a3..3000343 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1134,7 +1134,7 @@ static struct dump_if *create_dump_interface(char *iface) dump_if->raw_sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); if (dump_if->raw_sock < 0) { - fprintf(stderr, "Error - can't create raw socket: %s\n", strerror(errno)); + perror("Error - can't create raw socket"); goto free_dumpif; } @@ -1144,7 +1144,7 @@ static struct dump_if *create_dump_interface(char *iface) res = ioctl(dump_if->raw_sock, SIOCGIFHWADDR, &req); if (res < 0) { - fprintf(stderr, "Error - can't create raw socket (SIOCGIFHWADDR): %s\n", strerror(errno)); + perror("Error - can't create raw socket (SIOCGIFHWADDR)"); goto close_socket; } @@ -1166,7 +1166,7 @@ static struct dump_if *create_dump_interface(char *iface) res = ioctl(dump_if->raw_sock, SIOCGIFINDEX, &req); if (res < 0) { - fprintf(stderr, "Error - can't create raw socket (SIOCGIFINDEX): %s\n", strerror(errno)); + perror("Error - can't create raw socket (SIOCGIFINDEX)"); goto close_socket; } @@ -1176,7 +1176,7 @@ static struct dump_if *create_dump_interface(char *iface) res = bind(dump_if->raw_sock, (struct sockaddr *)&dump_if->addr, sizeof(struct sockaddr_ll)); if (res < 0) { - fprintf(stderr, "Error - can't bind raw socket: %s\n", strerror(errno)); + perror("Error - can't bind raw socket"); goto close_socket; } @@ -1290,7 +1290,7 @@ int tcpdump(int argc, char **argv) continue; if (res < 0) { - fprintf(stderr, "Error - can't select on raw socket: %s\n", strerror(errno)); + perror("Error - can't select on raw socket"); continue; }

1 0

[batctl] master: batctl: tcpdump: Free resources on SIG(TERM|INT) (9aab73f)
by postmaster＠open-mesh.org 24 Jan '17

24 Jan '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 9aab73fe209aa9c5fcfbb1ed029d7dd5bbed4325 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 22 13:07:47 2017 +0100 batctl: tcpdump: Free resources on SIG(TERM|INT) The cleanup code for dump interfaces and bathosts is only called on errors during the initialization of the dump interfaces. But it should also be used when the program exits normally. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 9aab73fe209aa9c5fcfbb1ed029d7dd5bbed4325 tcpdump.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tcpdump.c b/tcpdump.c index 586a2ca..92171a3 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -39,6 +39,7 @@ #include <netinet/icmp6.h> #include <netinet/if_ether.h> #include <net/ethernet.h> +#include <signal.h> #include <stddef.h> #include <stdint.h> #include <sys/select.h> @@ -1189,6 +1190,20 @@ free_dumpif: return NULL; } +static volatile sig_atomic_t is_aborted = 0; + +static void sig_handler(int sig) +{ + switch (sig) { + case SIGINT: + case SIGTERM: + is_aborted = 1; + break; + default: + break; + } +} + int tcpdump(int argc, char **argv) { struct timeval tv; @@ -1242,6 +1257,9 @@ int tcpdump(int argc, char **argv) bat_hosts_init(read_opt); + signal(SIGINT, sig_handler); + signal(SIGTERM, sig_handler); + /* init interfaces list */ INIT_LIST_HEAD(&dump_if_list); FD_ZERO(&wait_sockets); @@ -1259,7 +1277,7 @@ int tcpdump(int argc, char **argv) found_args++; } - while (1) { + while (!is_aborted) { memcpy(&tmp_wait_sockets, &wait_sockets, sizeof(fd_set));

1 0

[batctl] master: batctl: tcpdump: Reset socket state on initialization error (dfe9da9)
by postmaster＠open-mesh.org 24 Jan '17

24 Jan '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit dfe9da9a567bc754c17d89dac3324dc1d2c4950f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 22 13:07:46 2017 +0100 batctl: tcpdump: Reset socket state on initialization error The raw dump_if sockets for tcpdump are closed+freed when an error happens during initialization. But only fully initialized sockets were correctly cleaned up. The socket causing the error was not handled by the standard cleanup code. Moving the dump_if initialization code in a separate function makes it possible to also clean up the current dump_if without increasing the code complexity. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- dfe9da9a567bc754c17d89dac3324dc1d2c4950f tcpdump.c | 143 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 78 insertions(+), 65 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index c7e0cbc..586a2ca 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1113,9 +1113,84 @@ static void parse_wifi_hdr(unsigned char *packet_buff, ssize_t buff_len, int rea parse_eth_hdr(packet_buff, buff_len, read_opt, time_printed); } -int tcpdump(int argc, char **argv) +static struct dump_if *create_dump_interface(char *iface) { + struct dump_if *dump_if; struct ifreq req; + int res; + + dump_if = malloc(sizeof(struct dump_if)); + if (!dump_if) + return NULL; + + memset(dump_if, 0, sizeof(struct dump_if)); + + dump_if->dev = iface; + if (strlen(dump_if->dev) > IFNAMSIZ - 1) { + fprintf(stderr, "Error - interface name too long: %s\n", dump_if->dev); + goto free_dumpif; + } + + dump_if->raw_sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + if (dump_if->raw_sock < 0) { + fprintf(stderr, "Error - can't create raw socket: %s\n", strerror(errno)); + goto free_dumpif; + } + + memset(&req, 0, sizeof (struct ifreq)); + strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); + req.ifr_name[sizeof(req.ifr_name) - 1] = '\0'; + + res = ioctl(dump_if->raw_sock, SIOCGIFHWADDR, &req); + if (res < 0) { + fprintf(stderr, "Error - can't create raw socket (SIOCGIFHWADDR): %s\n", strerror(errno)); + goto close_socket; + } + + dump_if->hw_type = req.ifr_hwaddr.sa_family; + + switch (dump_if->hw_type) { + case ARPHRD_ETHER: + case ARPHRD_IEEE80211_PRISM: + case ARPHRD_IEEE80211_RADIOTAP: + break; + default: + fprintf(stderr, "Error - interface '%s' is of unknown type: %i\n", dump_if->dev, dump_if->hw_type); + goto close_socket; + } + + memset(&req, 0, sizeof (struct ifreq)); + strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); + req.ifr_name[sizeof(req.ifr_name) - 1] = '\0'; + + res = ioctl(dump_if->raw_sock, SIOCGIFINDEX, &req); + if (res < 0) { + fprintf(stderr, "Error - can't create raw socket (SIOCGIFINDEX): %s\n", strerror(errno)); + goto close_socket; + } + + dump_if->addr.sll_family = AF_PACKET; + dump_if->addr.sll_protocol = htons(ETH_P_ALL); + dump_if->addr.sll_ifindex = req.ifr_ifindex; + + res = bind(dump_if->raw_sock, (struct sockaddr *)&dump_if->addr, sizeof(struct sockaddr_ll)); + if (res < 0) { + fprintf(stderr, "Error - can't bind raw socket: %s\n", strerror(errno)); + goto close_socket; + } + + return dump_if; + +close_socket: + close(dump_if->raw_sock); +free_dumpif: + free(dump_if); + + return NULL; +} + +int tcpdump(int argc, char **argv) +{ struct timeval tv; struct dump_if *dump_if, *dump_if_tmp; struct list_head dump_if_list; @@ -1172,71 +1247,9 @@ int tcpdump(int argc, char **argv) FD_ZERO(&wait_sockets); while (argc > found_args) { - - dump_if = malloc(sizeof(struct dump_if)); - memset(dump_if, 0, sizeof(struct dump_if)); - dump_if->raw_sock = -1; - - dump_if->dev = argv[found_args]; - - if (strlen(dump_if->dev) > IFNAMSIZ - 1) { - fprintf(stderr, "Error - interface name too long: %s\n", dump_if->dev); - goto out; - } - - dump_if->raw_sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); - - if (dump_if->raw_sock < 0) { - fprintf(stderr, "Error - can't create raw socket: %s\n", strerror(errno)); - goto out; - } - - memset(&req, 0, sizeof (struct ifreq)); - strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); - req.ifr_name[sizeof(req.ifr_name) - 1] = '\0'; - - res = ioctl(dump_if->raw_sock, SIOCGIFHWADDR, &req); - if (res < 0) { - fprintf(stderr, "Error - can't create raw socket (SIOCGIFHWADDR): %s\n", strerror(errno)); - close(dump_if->raw_sock); - goto out; - } - - dump_if->hw_type = req.ifr_hwaddr.sa_family; - - switch (dump_if->hw_type) { - case ARPHRD_ETHER: - case ARPHRD_IEEE80211_PRISM: - case ARPHRD_IEEE80211_RADIOTAP: - break; - default: - fprintf(stderr, "Error - interface '%s' is of unknown type: %i\n", dump_if->dev, dump_if->hw_type); - goto out; - } - - memset(&req, 0, sizeof (struct ifreq)); - strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); - req.ifr_name[sizeof(req.ifr_name) - 1] = '\0'; - - res = ioctl(dump_if->raw_sock, SIOCGIFINDEX, &req); - - if (res < 0) { - fprintf(stderr, "Error - can't create raw socket (SIOCGIFINDEX): %s\n", strerror(errno)); - close(dump_if->raw_sock); + dump_if = create_dump_interface(argv[found_args]); + if (!dump_if) goto out; - } - - dump_if->addr.sll_family = AF_PACKET; - dump_if->addr.sll_protocol = htons(ETH_P_ALL); - dump_if->addr.sll_ifindex = req.ifr_ifindex; - - res = bind(dump_if->raw_sock, (struct sockaddr *)&dump_if->addr, sizeof(struct sockaddr_ll)); - - if (res < 0) { - fprintf(stderr, "Error - can't bind raw socket: %s\n", strerror(errno)); - close(dump_if->raw_sock); - goto out; - } if (dump_if->raw_sock > max_sock) max_sock = dump_if->raw_sock;

1 0

[batman-adv] master: batman-adv: compat: fix compile error for cfg80211_get_station on v3.15 (f79d36e)
by postmaster＠open-mesh.org 23 Jan '17

23 Jan '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f79d36ee3009086b733454a1d093bd2f58511df0 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sun Jan 22 21:40:42 2017 +0100 batman-adv: compat: fix compile error for cfg80211_get_station on v3.15 station_info::expected_throughput is present since 3.16, not 3.15, resulting in compile errors for 3.15. Fixing this by using the correct kernel version in compat.h. Fixes: 5c3245172c01 ("batman-adv: ELP - compute the metric based on the estimated throughput") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- f79d36ee3009086b733454a1d093bd2f58511df0 compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index 8628cf5..5397629 100644 --- a/compat.h +++ b/compat.h @@ -130,7 +130,7 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(3, 10, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) /* the expected behaviour of this function is to return 0 on success, therefore * it is possible to define it as 1 so that batman-adv thinks like something @@ -149,7 +149,7 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif -#endif /* < KERNEL_VERSION(3, 15, 0) */ +#endif /* < KERNEL_VERSION(3, 16, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)

1 0

[batman-adv] master: batman-adv: compat: add missing includes for compat skbuff.c (cc04c82)
by postmaster＠open-mesh.org 23 Jan '17

23 Jan '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit cc04c82f76d9d66b868441078af731990d16df06 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sun Jan 22 21:40:43 2017 +0100 batman-adv: compat: add missing includes for compat skbuff.c Compile issues were reported with some 3.2 kernel. Adding the missing includes to the compat skbuff.c file should fix those. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- cc04c82f76d9d66b868441078af731990d16df06 compat-sources/net/core/skbuff.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compat-sources/net/core/skbuff.c b/compat-sources/net/core/skbuff.c index 44d59dc..40c9e8b 100644 --- a/compat-sources/net/core/skbuff.c +++ b/compat-sources/net/core/skbuff.c @@ -32,8 +32,12 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/in6.h> #include <linux/ipv6.h> #include <linux/skbuff.h> +#include <linux/types.h> +#include <net/checksum.h> +#include <net/ip6_checksum.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)

1 0

[batman-adv] master: batman-adv: compat: fix warning in hard-interface.c for < 4.0 (7c21267)
by postmaster＠open-mesh.org 23 Jan '17

23 Jan '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 7c212678ca1f67de552b2dfc74e3ce8cfc55dd72 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sun Jan 22 21:40:41 2017 +0100 batman-adv: compat: fix warning in hard-interface.c for < 4.0 This fixes the following warning: hard-interface.c:104:39: warning: incorrect type in return expression (different base types) hard-interface.c:104:39: expected struct net * hard-interface.c:104:39: got bool Which allows compiling with -Werror again on kernels < 4.0. Fixes: bea804dbde21 ("batman-adv: Handle parent interfaces in a different netns") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7c212678ca1f67de552b2dfc74e3ce8cfc55dd72 compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index 8e23911..8628cf5 100644 --- a/compat.h +++ b/compat.h @@ -153,8 +153,8 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) -/* WARNING for batadv_getlink_net */ -#define get_link_net get_xstats_size || 1 || netdev->rtnl_link_ops->get_xstats_size +/* wild hack for batadv_getlink_net only */ +#define get_link_net get_xstats_size || 1 ? fallback_net : (struct net*)netdev->rtnl_link_ops->get_xstats_size #endif /* < KERNEL_VERSION(4, 0, 0) */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2017