commits June 2014

commits@lists.open-mesh.org

1 participants
39 discussions

[batctl] next: batctl: Initialize complete ping packet before write (7e53633)
by postmaster＠open-mesh.org 10 Jun '14

10 Jun '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 7e53633a2bef322fb23c42e7f272913c843d6b4a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 24 14:16:43 2014 +0200 batctl: Initialize complete ping packet before write The data structure for ping packets is not completely initialized by the userspace because the kernel sets the originator address of the packet. This is not only a bad practice but also irritate tools like valgrind. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 7e53633a2bef322fb23c42e7f272913c843d6b4a ping.c | 1 + traceroute.c | 1 + 2 files changed, 2 insertions(+) diff --git a/ping.c b/ping.c index 6642188..bdca222 100644 --- a/ping.c +++ b/ping.c @@ -176,6 +176,7 @@ int ping(char *mesh_iface, int argc, char **argv) packet_len = sizeof(struct batadv_icmp_packet); + memset(&icmp_packet_out, 0, sizeof(icmp_packet_out)); memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); icmp_packet_out.packet_type = BATADV_ICMP; icmp_packet_out.version = BATADV_COMPAT_VERSION; diff --git a/traceroute.c b/traceroute.c index 22b90f2..4ebfec2 100644 --- a/traceroute.c +++ b/traceroute.c @@ -133,6 +133,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) goto out; } + memset(&icmp_packet_out, 0, sizeof(icmp_packet_out)); memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); icmp_packet_out.version = BATADV_COMPAT_VERSION; icmp_packet_out.packet_type = BATADV_ICMP;

1 0

[batctl] next: batctl: Return success only with valid line_ptr in read_file (51b3e92)
by postmaster＠open-mesh.org 10 Jun '14

10 Jun '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 51b3e9286ad899523c511024816be7b004f62f0d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 24 14:16:42 2014 +0200 batctl: Return success only with valid line_ptr in read_file The read_file function is rather complex and cluttered with different functionality. One of it is to provide a line_ptr of a single line to the caller. The caller trusts the return code for a SUCCESS of this function and tries to access the line_ptr. But a failed getline may lead to an NULL-line_ptr. The caller tries to dereference this NULL pointer and causes an segfault. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 51b3e9286ad899523c511024816be7b004f62f0d functions.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functions.c b/functions.c index 84f0d14..251e616 100644 --- a/functions.c +++ b/functions.c @@ -320,7 +320,8 @@ written: goto open; } - res = EXIT_SUCCESS; + if (line_ptr) + res = EXIT_SUCCESS; out: if (fp)

1 0

[batctl] next: batctl: Use strncpy instead of strcpy for string copy (a9e88d8)
by postmaster＠open-mesh.org 10 Jun '14

10 Jun '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit a9e88d84a50b26dfe95c46703aed9934959c724d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 24 14:16:41 2014 +0200 batctl: Use strncpy instead of strcpy for string copy The data used in strcpy is partially provided by the user. This can be larger than the destination buffer and thus overwrite data after the actual string buffer. This can easily be avoided by using strncpy. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- a9e88d84a50b26dfe95c46703aed9934959c724d debugfs.c | 4 +++- ioctl.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debugfs.c b/debugfs.c index 8dd78b1..7b3a4b2 100644 --- a/debugfs.c +++ b/debugfs.c @@ -74,7 +74,9 @@ const char *debugfs_find_mountpoint(void) while (*ptr) { if (debugfs_valid_mountpoint(*ptr) == 0) { debugfs_found = 1; - strcpy(debugfs_mountpoint, *ptr); + strncpy(debugfs_mountpoint, *ptr, + sizeof(debugfs_mountpoint)); + debugfs_mountpoint[sizeof(debugfs_mountpoint) - 1] = '\0'; return debugfs_mountpoint; } ptr++; diff --git a/ioctl.c b/ioctl.c index 1f827e8..d3d182f 100644 --- a/ioctl.c +++ b/ioctl.c @@ -105,7 +105,8 @@ int ioctl_statistics_get(char *mesh_iface) int fd = -1, ret = EXIT_FAILURE; memset(&ifr, 0, sizeof(ifr)); - strcpy(ifr.ifr_name, mesh_iface); + strncpy(ifr.ifr_name, mesh_iface, sizeof(ifr.ifr_name)); + ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0'; fd = socket(AF_INET, SOCK_DGRAM, 0); if (fd < 0) {

1 0

[batctl] next: batctl: Force null termination of string after strncpy (4faf653)
by postmaster＠open-mesh.org 10 Jun '14

10 Jun '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 4faf653307789150f1d40383e95c85a086630378 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 24 14:16:40 2014 +0200 batctl: Force null termination of string after strncpy strncpy doesn't terminate the string with a '\0' character when the length of the destination memory location was shorter than the source string. Accessing it again with string related functions isn't safe after such a semi-failed copy and the caller has to handle it. The easiest way is to always set the last character in the destination buffer to '\0' after the strncpy was called. Also the length provided as argument of strncpy should not be the length of the source buffer but the maximum number of bytes in the destination buffer. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4faf653307789150f1d40383e95c85a086630378 bat-hosts.c | 6 ++++-- bisect_iv.c | 2 ++ debugfs.c | 1 + functions.c | 8 ++++---- tcpdump.c | 2 ++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bat-hosts.c b/bat-hosts.c index 30ff848..1d62bb8 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -108,7 +108,8 @@ static void parse_hosts_file(struct hashtable_t **hash, const char path[], int r if (read_opt & USE_BAT_HOSTS) fprintf(stderr, "Warning - mac already known (changing name from '%s' to '%s'): %s\n", bat_host->name, name, mac_str); - strncpy(bat_host->name, name, HOST_NAME_MAX_LEN - 1); + strncpy(bat_host->name, name, HOST_NAME_MAX_LEN); + bat_host->name[HOST_NAME_MAX_LEN - 1] = '\0'; continue; } @@ -132,7 +133,8 @@ static void parse_hosts_file(struct hashtable_t **hash, const char path[], int r } memcpy(&bat_host->mac_addr, mac_addr, sizeof(struct ether_addr)); - strncpy(bat_host->name, name, HOST_NAME_MAX_LEN - 1); + strncpy(bat_host->name, name, HOST_NAME_MAX_LEN); + bat_host->name[HOST_NAME_MAX_LEN - 1] = '\0'; hash_add(*hash, bat_host); diff --git a/bisect_iv.c b/bisect_iv.c index 0c25664..e51bfcb 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -91,6 +91,7 @@ static struct bat_node *node_get(char *name) } strncpy(bat_node->name, name, NAME_LEN); + bat_node->name[NAME_LEN - 1] = '\0'; INIT_LIST_HEAD_FIRST(bat_node->orig_event_list); INIT_LIST_HEAD_FIRST(bat_node->rt_table_list); memset(bat_node->loop_magic, 0, sizeof(bat_node->loop_magic)); @@ -1438,6 +1439,7 @@ static int get_orig_addr(char *orig_name, char *orig_addr) copy_name: strncpy(orig_addr, orig_name_tmp, NAME_LEN); + orig_addr[NAME_LEN - 1] = '\0'; return 1; err: diff --git a/debugfs.c b/debugfs.c index 8033f8b..8dd78b1 100644 --- a/debugfs.c +++ b/debugfs.c @@ -149,6 +149,7 @@ char *debugfs_mount(const char *mountpoint) /* save the mountpoint */ strncpy(debugfs_mountpoint, mountpoint, sizeof(debugfs_mountpoint)); + debugfs_mountpoint[sizeof(debugfs_mountpoint) - 1] = '\0'; debugfs_found = 1; return debugfs_mountpoint; diff --git a/functions.c b/functions.c index 0f96cb8..84f0d14 100644 --- a/functions.c +++ b/functions.c @@ -199,8 +199,8 @@ int read_file(const char *dir, const char *fname, int read_opt, if (read_opt & USE_BAT_HOSTS) bat_hosts_init(read_opt); - strncpy(full_path, dir, strlen(dir)); - full_path[strlen(dir)] = '\0'; + strncpy(full_path, dir, sizeof(full_path)); + full_path[sizeof(full_path) - 1] = '\0'; strncat(full_path, fname, sizeof(full_path) - strlen(full_path) - 1); open: @@ -339,8 +339,8 @@ int write_file(const char *dir, const char *fname, const char *arg1, char full_path[500]; ssize_t write_len; - strncpy(full_path, dir, strlen(dir)); - full_path[strlen(dir)] = '\0'; + strncpy(full_path, dir, sizeof(full_path)); + full_path[sizeof(full_path) - 1] = '\0'; strncat(full_path, fname, sizeof(full_path) - strlen(full_path) - 1); fd = open(full_path, O_WRONLY); diff --git a/tcpdump.c b/tcpdump.c index 10b18f2..e84617e 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -865,6 +865,7 @@ int tcpdump(int argc, char **argv) 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) { @@ -887,6 +888,7 @@ int tcpdump(int argc, char **argv) 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);

1 0

[batctl] next: batctl: Don't try to close negative file descriptors (2656408)
by postmaster＠open-mesh.org 10 Jun '14

10 Jun '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 26564087344976d8e3f5d587e01c04a8a0001aff Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 24 14:16:39 2014 +0200 batctl: Don't try to close negative file descriptors Valid file descriptors are defined as being >= 0. Error codes returned by the socket functions are defined as being < 0. This isn't checked correctly through out the code and instead 0 is used as "not valid" file descriptor. This can lead to functions like close being called with an error code as argument. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 26564087344976d8e3f5d587e01c04a8a0001aff functions.c | 4 ++-- ping.c | 4 ++-- tcpdump.c | 3 ++- traceroute.c | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/functions.c b/functions.c index b9ccaff..0f96cb8 100644 --- a/functions.c +++ b/functions.c @@ -335,7 +335,7 @@ out: int write_file(const char *dir, const char *fname, const char *arg1, const char *arg2) { - int fd = 0, res = EXIT_FAILURE; + int fd = -1, res = EXIT_FAILURE; char full_path[500]; ssize_t write_len; @@ -363,7 +363,7 @@ int write_file(const char *dir, const char *fname, const char *arg1, res = EXIT_SUCCESS; out: - if (fd) + if (fd >= 0) close(fd); return res; } diff --git a/ping.c b/ping.c index c52ad13..6642188 100644 --- a/ping.c +++ b/ping.c @@ -79,7 +79,7 @@ int ping(char *mesh_iface, int argc, char **argv) struct bat_host *bat_host, *rr_host; ssize_t read_len; fd_set read_socket; - int ret = EXIT_FAILURE, ping_fd = 0, res, optchar, found_args = 1; + int ret = EXIT_FAILURE, ping_fd = -1, res, optchar, found_args = 1; int loop_count = -1, loop_interval = 0, timeout = 1, rr = 0, i; unsigned int seq_counter = 0, packets_out = 0, packets_in = 0, packets_loss; char *dst_string, *mac_string, *rr_string; @@ -353,7 +353,7 @@ sleep: out: bat_hosts_free(); - if (ping_fd) + if (ping_fd >= 0) close(ping_fd); return ret; } diff --git a/tcpdump.c b/tcpdump.c index 94e2a84..10b18f2 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -846,6 +846,7 @@ int tcpdump(int argc, char **argv) dump_if = malloc(sizeof(struct dump_if)); memset(dump_if, 0, sizeof(struct dump_if)); + dump_if->raw_sock = -1; INIT_LIST_HEAD(&dump_if->list); dump_if->dev = argv[found_args]; @@ -971,7 +972,7 @@ int tcpdump(int argc, char **argv) out: list_for_each_entry_safe(dump_if, dump_if_tmp, &dump_if_list, list) { - if (dump_if->raw_sock) + if (dump_if->raw_sock >= 0) close(dump_if->raw_sock); list_del((struct list_head *)&dump_if_list, &dump_if->list, &dump_if_list); diff --git a/traceroute.c b/traceroute.c index ce78c5d..22b90f2 100644 --- a/traceroute.c +++ b/traceroute.c @@ -63,7 +63,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) fd_set read_socket; ssize_t read_len; char *dst_string, *mac_string, *return_mac, dst_reached = 0; - int ret = EXIT_FAILURE, res, trace_fd = 0, i; + int ret = EXIT_FAILURE, res, trace_fd = -1, i; int found_args = 1, optchar, seq_counter = 0, read_opt = USE_BAT_HOSTS; double time_delta[NUM_PACKETS]; char *debugfs_mnt; @@ -241,7 +241,7 @@ read_packet: out: bat_hosts_free(); - if (trace_fd) + if (trace_fd >= 0) close(trace_fd); return ret; }

1 0

[batman-adv] master: batman-adv: prefer kmalloc_array to kmalloc when possible (d979cae)
by postmaster＠open-mesh.org 10 Jun '14

10 Jun '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d979cae85e6b9285572d600e5e26652b3120f7d2 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sat May 24 06:43:47 2014 +0200 batman-adv: prefer kmalloc_array to kmalloc when possible Reported by checkpatch with the following warning: WARNING: Prefer kmalloc_array over kmalloc with multiply Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d979cae85e6b9285572d600e5e26652b3120f7d2 bat_iv_ogm.c | 13 +++++++------ distributed-arp-table.c | 3 ++- hash.c | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index f04224c..1e80539 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -108,14 +108,15 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, int max_if_num) { void *data_ptr; - size_t data_size, old_size; + size_t old_size; int ret = -ENOMEM; spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); - data_size = max_if_num * sizeof(unsigned long) * BATADV_NUM_WORDS; old_size = (max_if_num - 1) * sizeof(unsigned long) * BATADV_NUM_WORDS; - data_ptr = kmalloc(data_size, GFP_ATOMIC); + data_ptr = kmalloc_array(max_if_num, + BATADV_NUM_WORDS * sizeof(unsigned long), + GFP_ATOMIC); if (!data_ptr) goto unlock; @@ -123,7 +124,7 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, kfree(orig_node->bat_iv.bcast_own); orig_node->bat_iv.bcast_own = data_ptr; - data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); + data_ptr = kmalloc_array(max_if_num, sizeof(uint8_t), GFP_ATOMIC); if (!data_ptr) { kfree(orig_node->bat_iv.bcast_own); goto unlock; @@ -164,7 +165,7 @@ static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node, goto free_bcast_own; chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS; - data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); + data_ptr = kmalloc_array(max_if_num, chunk_size, GFP_ATOMIC); if (!data_ptr) goto unlock; @@ -183,7 +184,7 @@ free_bcast_own: if (max_if_num == 0) goto free_own_sum; - data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); + data_ptr = kmalloc_array(max_if_num, sizeof(uint8_t), GFP_ATOMIC); if (!data_ptr) { kfree(orig_node->bat_iv.bcast_own); goto unlock; diff --git a/distributed-arp-table.c b/distributed-arp-table.c index dcd99b2..b7406e0 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -537,7 +537,8 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) if (!bat_priv->orig_hash) return NULL; - res = kmalloc(BATADV_DAT_CANDIDATES_NUM * sizeof(*res), GFP_ATOMIC); + res = kmalloc_array(BATADV_DAT_CANDIDATES_NUM, sizeof(*res), + GFP_ATOMIC); if (!res) return NULL; diff --git a/hash.c b/hash.c index 63bdf7e..7c1c630 100644 --- a/hash.c +++ b/hash.c @@ -46,12 +46,12 @@ struct batadv_hashtable *batadv_hash_new(uint32_t size) if (!hash) return NULL; - hash->table = kmalloc(sizeof(*hash->table) * size, GFP_ATOMIC); + hash->table = kmalloc_array(size, sizeof(*hash->table), GFP_ATOMIC); if (!hash->table) goto free_hash; - hash->list_locks = kmalloc(sizeof(*hash->list_locks) * size, - GFP_ATOMIC); + hash->list_locks = kmalloc_array(size, sizeof(*hash->list_locks), + GFP_ATOMIC); if (!hash->list_locks) goto free_table;

1 0

[linux-merge]linux integration; annotated tag, v3.15, created. v3.15
by postmaster＠open-mesh.org 08 Jun '14

08 Jun '14

The annotated tag, v3.15 has been created at 8a4cee2f8086eee3cb0971e6ff46579e87d843eb (tag) tagging 1860e379875dfe7271c649058aeddffe5afd9d0d (commit) replaces v3.15-rc8 tagged by Linus Torvalds on Sun Jun 8 11:20:02 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.15 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTlKlSAAoJEHm+PkMAQRiGF5YH/Ak8QPJLI0mRvSDI9PuaVVfv XPnXrOIigcj/X0CL4WbzqWW2zQFAK6YtDDoNlzuRaRveFVx0TNp4YAI/YHCD4IVZ FzRXBEWpeGvTh5Ev0DYDyHMXyMqz5fJeIM3rCmOCUOlHJQxneIHGKIXwsMKpAPkX BxVdfEqt/Yq/CB5RFbvAyfFlXlnl8A5QDELEkaCk+1s3iXXST5qUKl8XwdgCvfKF Qq3yau12+Lmw89Klh74U9Hj5s/LXz5L8Gg66XM30hTsaK5/0AQ7oGx3kJvO3Uurs CO3vrt7EXJjeq2YLken4Wa7UpPoHOK33KY2E/ByhkJn4xTFwJmo68miLH0Edy9U= =4IWq -----END PGP SIGNATURE----- Marek Lindner (1): batman-adv: fix NULL pointer dereferences ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.15-rc8, created. v3.15-rc8
by postmaster＠open-mesh.org 02 Jun '14

02 Jun '14

The annotated tag, v3.15-rc8 has been created at 822729b4fa5db475925a364b454c0e701a2f74f1 (tag) tagging fad01e866afdbe01a1f3ec06a39c3a8b9e197014 (commit) replaces v3.15-rc7 tagged by Linus Torvalds on Sun Jun 1 19:12:36 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.15-rc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTi92UAAoJEHm+PkMAQRiGJYMH/RepVg0thE9XX/TyrFFGqmix pxDmFZ+wN3Sh8dJAOdwspQayYbC1fo7AASdnd4nU2S6HrpLZQg3TI09rfZApfAjJ 6XZWH7zgE+HBrGI7XkGA5aySMvcQYj1N0JmMgtz+yLKjRxfni8K4zsOmjEKR4qsR 7RflUxL6SzBsfsIdp+6EsSLzuYO6xOrC49Ixj9KI+BsrNkUXzNeeHnQyYXViiP8G FQxJ9vxTvXqc6Y5FsYF9mVI49aa3NpIPaTlYv8Rt2iBh/y65/5ScrrGIMsABdxZH l4FlyTzVKWNkE8A3PcuZEC9r/KtAdz146gTgBcbC+qer9/N0LEG79R9gQrB6ZKU= =Euj1 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: enable batadv_vlan protocol (26284d3)
by postmaster＠open-mesh.org 02 Jun '14

02 Jun '14

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 26284d39c413b2bad86815b1df90fd08fdf2530a Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Mon May 19 10:52:01 2014 +0200 batman-adv-devel: enable batadv_vlan protocol This protocol can be used to change VLAN-specific settings of a batman-adv soft-interface. At the moment only ap_isolation is available, but new ones can be easily added as soon as batman-adv get to support more. Interface configuration example: config interface 'bat0vlan1' option protocol 'batadv_vlan' option ifname 'bat0.1' option ap_isolation '1' Cc: Bastian Bittorf <bittorf(a)bluebottle.com> Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 26284d39c413b2bad86815b1df90fd08fdf2530a batman-adv-devel/Makefile | 1 + .../files/lib/netifd/proto/batadv_vlan.sh | 29 ++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index e8b0881..76f5861 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -78,6 +78,7 @@ define KernelPackage/batman-adv-devel/install $(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv $(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net $(INSTALL_BIN) ./files/lib/netifd/proto/batadv.sh $(1)/lib/netifd/proto + $(INSTALL_BIN) ./files/lib/netifd/proto/batadv_vlan.sh $(1)/lib/netifd/proto endef $(eval $(call KernelPackage,batman-adv-devel)) diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh b/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh new file mode 100644 index 0000000..85002c3 --- /dev/null +++ b/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +. /lib/functions.sh +. ../netifd-proto.sh +init_proto "$@" + +proto_batadv_vlan_init_config() { + proto_config_add_string "ap_isolation" +} + +proto_batadv_vlan_setup() { + local config="$1" + local iface="$2" + + # VLAN specific variables + local device="${iface%.*}" + local vid="${iface#*.}" + + # batadv_vlan options + local ap_isolation + + json_get_vars ap_isolation + + echo "$ap_isolation" > "/sys/class/net/${device}/mesh/vlan${vid}/ap_isolation" + proto_init_update "$iface" 1 + proto_send_update "$config" +} + +add_protocol batadv_vlan

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2014