commits November 2010

commits@lists.open-mesh.org

1 participants
95 discussions

batman-adv; branch, master, updated. v2010.1.0-233-g5d4b5a4
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the master branch: commit 5d4b5a4d11afe5ce05e3e5aed0897b45b7cfc444 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Sun Nov 21 20:02:49 2010 +0000 batman-adv: Don't remove interface with spinlock held We call a lot of the netdevice code when holding if_list_lock which will spin the whole time. This is not necessary because we only want to protect the access to the list to be serialized. An extra queue can be used which hold all interfaces which should be removed and then use that queue without any locks for netdevice cleanup. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/hard-interface.c b/hard-interface.c index e22f0dd..bf98b90 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -469,9 +469,6 @@ static void hardif_remove_interface(struct batman_if *batman_if) return; batman_if->if_status = IF_TO_BE_REMOVED; - - /* caller must take if_list_lock */ - list_del_rcu(&batman_if->list); sysfs_del_hardif(&batman_if->hardif_obj); call_rcu(&batman_if->rcu, hardif_free_rcu); } @@ -479,13 +476,21 @@ static void hardif_remove_interface(struct batman_if *batman_if) void hardif_remove_interfaces(void) { struct batman_if *batman_if, *batman_if_tmp; + struct list_head if_list_queue; + + INIT_LIST_HEAD(&if_list_queue); - rtnl_lock(); spin_lock(&if_list_lock); list_for_each_entry_safe(batman_if, batman_if_tmp, &if_list, list) { - hardif_remove_interface(batman_if); + list_del_rcu(&batman_if->list); + list_add_tail(&batman_if->list, &if_list_queue); } spin_unlock(&if_list_lock); + + rtnl_lock(); + list_for_each_entry_safe(batman_if, batman_if_tmp, &if_list_queue, list) { + hardif_remove_interface(batman_if); + } rtnl_unlock(); } @@ -512,8 +517,10 @@ static int hard_if_event(struct notifier_block *this, break; case NETDEV_UNREGISTER: spin_lock(&if_list_lock); - hardif_remove_interface(batman_if); + list_del_rcu(&batman_if->list); spin_unlock(&if_list_lock); + + hardif_remove_interface(batman_if); break; case NETDEV_CHANGEMTU: if (batman_if->soft_iface) -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.1.0-56-g31bc69a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit 31bc69a2634dde7b1d72605ef387a938d1a0878a Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Sun Nov 21 16:42:14 2010 +0000 batman-adv: Update README for upcoming release Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/README b/README index ecef96d..fb5b9ff 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[state: 04-09-2010] +[state: 21-11-2010] BATMAN-ADV ---------- @@ -18,7 +18,7 @@ Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.21 - 2.6.36. Supporting +against and should work with Linux 2.6.21 - 2.6.37. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) @@ -83,7 +83,8 @@ All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ -# aggregated_ogms bonding orig_interval vis_mode +# aggregated_ogms bonding fragmentation orig_interval +# vis_mode There is a special folder for debugging informations: @@ -256,4 +257,3 @@ You can also contact the Authors: Marek Lindner <lindner_marek(a)yahoo.de> Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> - -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.1.0-232-g213d274
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the master branch: commit 213d2747114cf05e3f4c3d87670b02fbecb8473f Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Sun Nov 21 16:42:14 2010 +0000 batman-adv: Update README for upcoming release Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/README b/README index ecef96d..fb5b9ff 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[state: 04-09-2010] +[state: 21-11-2010] BATMAN-ADV ---------- @@ -18,7 +18,7 @@ Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.21 - 2.6.36. Supporting +against and should work with Linux 2.6.21 - 2.6.37. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) @@ -83,7 +83,8 @@ All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ -# aggregated_ogms bonding orig_interval vis_mode +# aggregated_ogms bonding fragmentation orig_interval +# vis_mode There is a special folder for debugging informations: @@ -256,4 +257,3 @@ You can also contact the Authors: Marek Lindner <lindner_marek(a)yahoo.de> Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> - -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.1.0-55-gc0fc188
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit c0fc1880b5f31e15d5158a131364856e3593b519 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Nov 21 17:26:34 2010 +0100 batman-adv: add dropped target in interface_rx The last merged patch referenced the "dropped" target, which was not present here. This patch adds it. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/soft-interface.c b/soft-interface.c index 01dfa19..eff0130 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -195,10 +195,9 @@ void interface_rx(struct net_device *soft_iface, struct bat_priv *priv = netdev_priv(soft_iface); /* check if enough space is available for pulling, and pull */ - if (!pskb_may_pull(skb, hdr_size)) { - kfree_skb(skb); - return; - } + if (!pskb_may_pull(skb, hdr_size)) + goto dropped; + skb_pull_rcsum(skb, hdr_size); /* skb_set_mac_header(skb, -sizeof(struct ethhdr));*/ @@ -219,6 +218,11 @@ void interface_rx(struct net_device *soft_iface, soft_iface->last_rx = jiffies; netif_rx(skb); + return; + +dropped: + kfree_skb(skb); + return; } #ifdef HAVE_NET_DEVICE_OPS -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.1.0-54-g6ba653a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit 6ba653a17b27b49f8c2120b4eb20eb3733f6bbb9 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Nov 21 15:18:23 2010 +0000 batman-adv: ensure that eth_type_trans gets linear memory eth_type_trans tries to pull data with the length of the ethernet header from the skb. We only ensured that enough data for the first ethernet header and the batman header is available in non-paged memory of the skb and not for the ethernet after the batman header. eth_type_trans would fail sometimes with drivers which don't ensure that all there data is perfectly linearised. Reported-by: Rafal Lesniak <esniak(a)eresi-project.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/soft-interface.c b/soft-interface.c index df0e468..01dfa19 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -203,6 +203,8 @@ void interface_rx(struct net_device *soft_iface, /* skb_set_mac_header(skb, -sizeof(struct ethhdr));*/ /* skb->dev & skb->pkt_type are set here */ + if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) + goto dropped; skb->protocol = eth_type_trans(skb, soft_iface); /* should not be neccesary anymore as we use skb_pull_rcsum() -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.1.0-231-g9d1e607
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the master branch: commit 9d1e607c1ca1c03a7a5b68adcb08ac35160c6a04 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Nov 21 15:18:23 2010 +0000 batman-adv: ensure that eth_type_trans gets linear memory eth_type_trans tries to pull data with the length of the ethernet header from the skb. We only ensured that enough data for the first ethernet header and the batman header is available in non-paged memory of the skb and not for the ethernet after the batman header. eth_type_trans would fail sometimes with drivers which don't ensure that all there data is perfectly linearised. Reported-by: Rafal Lesniak <esniak(a)eresi-project.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/soft-interface.c b/soft-interface.c index e93a99f..e89ede1 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -494,6 +494,8 @@ void interface_rx(struct net_device *soft_iface, } /* skb->dev & skb->pkt_type are set here */ + if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) + goto dropped; skb->protocol = eth_type_trans(skb, soft_iface); /* should not be neccesary anymore as we use skb_pull_rcsum() -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.1.0-230-g3573fc4
by postmaster＠open-mesh.org 17 Nov '10

17 Nov '10

The following commit has been merged in the master branch: commit c4b50ca91e09a737621c6e116b11a0e44d9e7d83 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Wed Nov 17 16:25:20 2010 +0000 batman-adv: Use kernel version min macro The kernel headers already provide different versions of a min/max macro which should be used by all modules according to Documentation/CodingStyle. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/hard-interface.c b/hard-interface.c index 5a1d631..e22f0dd 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -31,8 +31,6 @@ #include <linux/if_arp.h> -#define MIN(x, y) ((x) < (y) ? (x) : (y)) - /* protect update critical side of if_list - but not the content */ static DEFINE_SPINLOCK(if_list_lock); @@ -220,8 +218,8 @@ int hardif_min_mtu(struct net_device *soft_iface) if (batman_if->soft_iface != soft_iface) continue; - min_mtu = MIN(batman_if->net_dev->mtu - BAT_HEADER_LEN, - min_mtu); + min_mtu = min_t(int, batman_if->net_dev->mtu - BAT_HEADER_LEN, + min_mtu); } rcu_read_unlock(); out: -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.1.0-230-g3573fc4
by postmaster＠open-mesh.org 17 Nov '10

17 Nov '10

The following commit has been merged in the master branch: commit 3573fc4124bd2396d1e543d808caedada4b7e4f9 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Wed Nov 17 16:25:22 2010 +0000 batman-adv: Use kernel functions to identify broadcasts linux/etherdevice.h already provides functions to classify different ethernet addresses. These inlineable functions should be used instead of custom functions. The check for multicast together with multicast can also be replaced with a single test for multicast because for every ethernet address x following is always true: is_broadcast_ether_addr(x) => is_multicast_ether_addr(x) or when looking more at the implementation: (FF:FF:FF:FF:FF:FF == x) => [(01:00:00:00:00:00 & x) != 00:00:00:00:00:00] Reported-by: Tobias Klauser <tklauser(a)distanz.ch> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Cc: Tobias Klauser <tklauser(a)distanz.ch> diff --git a/main.c b/main.c index c91e635..b827f6a 100644 --- a/main.c +++ b/main.c @@ -172,16 +172,6 @@ int is_my_mac(uint8_t *addr) } -int is_bcast(uint8_t *addr) -{ - return (addr[0] == (uint8_t)0xff) && (addr[1] == (uint8_t)0xff); -} - -int is_mcast(uint8_t *addr) -{ - return *addr & 0x01; -} - module_init(batman_init); module_exit(batman_exit); diff --git a/main.h b/main.h index 519d3b0..a362433 100644 --- a/main.h +++ b/main.h @@ -112,6 +112,7 @@ #include <linux/mutex.h> /* mutex */ #include <linux/module.h> /* needed by all modules */ #include <linux/netdevice.h> /* netdevice */ +#include <linux/etherdevice.h> /* ethernet address classifaction */ #include <linux/if_ether.h> /* ethernet header */ #include <linux/poll.h> /* poll_table */ #include <linux/kthread.h> /* kernel threads */ @@ -141,8 +142,6 @@ void mesh_free(struct net_device *soft_iface); void inc_module_count(void); void dec_module_count(void); int is_my_mac(uint8_t *addr); -int is_bcast(uint8_t *addr); -int is_mcast(uint8_t *addr); #ifdef CONFIG_BATMAN_ADV_DEBUG int debug_log(struct bat_priv *bat_priv, char *fmt, ...); diff --git a/routing.c b/routing.c index 9f31167..d8b0c5a 100644 --- a/routing.c +++ b/routing.c @@ -770,11 +770,11 @@ int recv_bat_packet(struct sk_buff *skb, struct batman_if *batman_if) ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with broadcast indication but unicast recipient */ - if (!is_bcast(ethhdr->h_dest)) + if (!is_broadcast_ether_addr(ethhdr->h_dest)) return NET_RX_DROP; /* packet with broadcast sender address */ - if (is_bcast(ethhdr->h_source)) + if (is_broadcast_ether_addr(ethhdr->h_source)) return NET_RX_DROP; /* create a copy of the skb, if needed, to modify it. */ @@ -946,11 +946,11 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with unicast indication but broadcast recipient */ - if (is_bcast(ethhdr->h_dest)) + if (is_broadcast_ether_addr(ethhdr->h_dest)) return NET_RX_DROP; /* packet with broadcast sender address */ - if (is_bcast(ethhdr->h_source)) + if (is_broadcast_ether_addr(ethhdr->h_source)) return NET_RX_DROP; /* not for me */ @@ -1118,11 +1118,11 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size) ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with unicast indication but broadcast recipient */ - if (is_bcast(ethhdr->h_dest)) + if (is_broadcast_ether_addr(ethhdr->h_dest)) return -1; /* packet with broadcast sender address */ - if (is_bcast(ethhdr->h_source)) + if (is_broadcast_ether_addr(ethhdr->h_source)) return -1; /* not for me */ @@ -1282,11 +1282,11 @@ int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if) ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with broadcast indication but unicast recipient */ - if (!is_bcast(ethhdr->h_dest)) + if (!is_broadcast_ether_addr(ethhdr->h_dest)) return NET_RX_DROP; /* packet with broadcast sender address */ - if (is_bcast(ethhdr->h_source)) + if (is_broadcast_ether_addr(ethhdr->h_source)) return NET_RX_DROP; /* ignore broadcasts sent by myself */ diff --git a/soft-interface.c b/soft-interface.c index 1e55bdb..e93a99f 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -378,7 +378,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) /* TODO: check this for locks */ hna_local_add(soft_iface, ethhdr->h_source); - if (is_bcast(ethhdr->h_dest) || is_mcast(ethhdr->h_dest)) { + if (is_multicast_ether_addr(ethhdr->h_dest)) { ret = gw_is_target(bat_priv, skb); if (ret < 0) diff --git a/unicast.c b/unicast.c index 7b9385b..dc2e28b 100644 --- a/unicast.c +++ b/unicast.c @@ -283,7 +283,7 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) spin_lock_bh(&bat_priv->orig_hash_lock); /* get routing information */ - if (is_bcast(ethhdr->h_dest) || is_mcast(ethhdr->h_dest)) + if (is_multicast_ether_addr(ethhdr->h_dest)) orig_node = (struct orig_node *)gw_get_selected(bat_priv); else orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash, diff --git a/vis.c b/vis.c index 65676dc..957a086 100644 --- a/vis.c +++ b/vis.c @@ -472,7 +472,7 @@ void receive_client_update_packet(struct bat_priv *bat_priv, int are_target = 0; /* clients shall not broadcast. */ - if (is_bcast(vis_packet->target_orig)) + if (is_broadcast_ether_addr(vis_packet->target_orig)) return; /* Are we the target for this VIS packet? */ @@ -755,7 +755,7 @@ static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info) ETH_ALEN); packet->ttl--; - if (is_bcast(packet->target_orig)) + if (is_broadcast_ether_addr(packet->target_orig)) broadcast_vis_packet(bat_priv, info); else unicast_vis_packet(bat_priv, info); -- batman-adv

1 0

linux integration; annotated tag, v2.6.37-rc2, created. v2.6.37-rc2
by postmaster＠open-mesh.org 16 Nov '10

16 Nov '10

The annotated tag, v2.6.37-rc2 has been created at a1e4aaecda4a52e850e90d4f95ed2f59955ed057 (tag) tagging e53beacd23d9cb47590da6a7a7f6d417b941a994 (commit) replaces v2.6.37-rc1 tagged by Linus Torvalds on Mon Nov 15 18:31:12 2010 -0800 - Shortlog ------------------------------------------------------------ Linux 2.6.37-rc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAkzh7PcACgkQF3YsRnbiHLslmACfaWEWsMlf7v3lDFafp7G1LWba sjQAnRO5NyVLibUyDif2aF4tH4uKvTgr =zxhV -----END PGP SIGNATURE----- Chris Lang (1): Staging: batman-adv: fix interface alternating and bonding reggression Marek Lindner (1): Staging: batman-adv: suppress false warning when changing the mac address ----------------------------------------------------------------------- -- linux integration

1 0

batctl; branch, master, updated. v2010.1.0-73-gaf115c9
by postmaster＠open-mesh.org 07 Nov '10

07 Nov '10

The following commit has been merged in the master branch: commit af115c9acf44a5dfbed69ea7d8b06780887a3467 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Nov 7 12:57:01 2010 +0100 batctl: support new gateway sysfs API Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/main.c b/main.c index 9c1195b..850959a 100644 --- a/main.c +++ b/main.c @@ -166,8 +166,7 @@ int main(int argc, char **argv) } else if ((strcmp(argv[1], "gw_mode") == 0) || (strcmp(argv[1], "gw") == 0)) { - ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, - SYS_GW_MODE, gw_mode_usage, sysfs_param_server); + ret = handle_gw_setting(mesh_iface, argc - 1, argv + 1); } else if ((strcmp(argv[1], "gateways") == 0) || (strcmp(argv[1], "gwl") == 0)) { diff --git a/man/batctl.8 b/man/batctl.8 index 13822ef..ba2d32d 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -70,8 +70,8 @@ If no parameter is given the current log level settings are displayed otherwise .IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. .br -.IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBgw_class\fP]\fP" -If no parameter is given the current gateway mode is displayed otherwise the parameter is used to set the gateway mode. The second (optional) argument specifies the gateway class. Its function depends on whether the node is a server or a client. If the node is a server this parameter is used to inform other nodes in the network about this node's internet connection bandwidth. Just enter any number (optionally followed by "kbit" or "mbit") and the batman-adv module will guess your appropriate gateway class. Use "/" to separate the down\(hy and upload rates. You can omit the upload rate and the module will assume an upload of download / 5. +.IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBsel_class|bandwidth\fP]\fP" +If no parameter is given the current gateway mode is displayed otherwise the parameter is used to set the gateway mode. The second (optional) argument specifies the selection class (if 'client' was the first argument) or the gateway bandwidth (if 'server' was the first argument). If the node is a server this parameter is used to inform other nodes in the network about this node's internet connection bandwidth. Just enter any number (optionally followed by "kbit" or "mbit") and the batman-adv module will guess your appropriate gateway class. Use "/" to separate the down\(hy and upload rates. You can omit the upload rate and the module will assume an upload of download / 5. .RS 17 default: 2000 \-> gateway class 20 .RE diff --git a/sys.c b/sys.c index 79d9612..bb976c0 100644 --- a/sys.c +++ b/sys.c @@ -241,7 +241,7 @@ void bonding_usage(void) void gw_mode_usage(void) { - printf("Usage: batctl [options] gw_mode [mode]\n"); + printf("Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); printf("options:\n"); printf(" \t -h print this help\n"); } @@ -323,3 +323,118 @@ out: free(path_buff); return res; } + +int handle_gw_setting(char *mesh_iface, int argc, char **argv) +{ + int optchar, res = EXIT_FAILURE; + char *path_buff, gw_mode; + const char **ptr; + + while ((optchar = getopt(argc, argv, "h")) != -1) { + switch (optchar) { + case 'h': + gw_mode_usage(); + return EXIT_SUCCESS; + default: + gw_mode_usage(); + return EXIT_FAILURE; + } + } + + path_buff = malloc(PATH_BUFF_LEN); + snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + + if (argc == 1) { + res = read_file(path_buff, SYS_GW_MODE, SINGLE_READ | USE_READ_BUFF, 0, 0); + + if (res != EXIT_SUCCESS) + goto out; + + if (line_ptr[strlen(line_ptr) - 1] == '\n') + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (strcmp(line_ptr, "client") == 0) + gw_mode = GW_MODE_CLIENT; + else if (strcmp(line_ptr, "server") == 0) + gw_mode = GW_MODE_SERVER; + else + gw_mode = GW_MODE_OFF; + + free(line_ptr); + line_ptr = NULL; + + switch (gw_mode) { + case GW_MODE_CLIENT: + res = read_file(path_buff, SYS_GW_SEL, SINGLE_READ | USE_READ_BUFF, 0, 0); + break; + case GW_MODE_SERVER: + res = read_file(path_buff, SYS_GW_BW, SINGLE_READ | USE_READ_BUFF, 0, 0); + break; + default: + printf("off\n"); + goto out; + } + + if (res != EXIT_SUCCESS) + goto out; + + if (line_ptr[strlen(line_ptr) - 1] == '\n') + line_ptr[strlen(line_ptr) - 1] = '\0'; + + switch (gw_mode) { + case GW_MODE_CLIENT: + printf("client (selection class: %s)\n", line_ptr); + break; + case GW_MODE_SERVER: + printf("server (announced bw: %s)\n", line_ptr); + break; + default: + goto out; + } + + free(line_ptr); + line_ptr = NULL; + goto out; + } + + if (strcmp(argv[1], "client") == 0) + gw_mode = GW_MODE_CLIENT; + else if (strcmp(argv[1], "server") == 0) + gw_mode = GW_MODE_SERVER; + else if (strcmp(argv[1], "off") == 0) + gw_mode = GW_MODE_OFF; + else + goto opt_err; + + res = write_file(path_buff, SYS_GW_MODE, argv[1], NULL); + if (res != EXIT_SUCCESS) + goto out; + + if (argc == 2) + goto out; + + switch (gw_mode) { + case GW_MODE_CLIENT: + res = write_file(path_buff, SYS_GW_SEL, argv[2], NULL); + break; + case GW_MODE_SERVER: + res = write_file(path_buff, SYS_GW_BW, argv[2], NULL); + break; + default: + goto out; + } + +opt_err: + printf("Error - the supplied argument is invalid: %s\n", argv[1]); + printf("The following values are allowed:\n"); + + ptr = sysfs_param_server; + while (*ptr) { + printf(" * %s\n", *ptr); + ptr++; + } + +out: + free(path_buff); + return res; +} diff --git a/sys.h b/sys.h index 71362f1..066b8bd 100644 --- a/sys.h +++ b/sys.h @@ -26,6 +26,8 @@ #define SYS_AGGR "aggregated_ogms" #define SYS_BONDING "bonding" #define SYS_GW_MODE "gw_mode" +#define SYS_GW_SEL "gw_sel_class" +#define SYS_GW_BW "gw_bandwidth" #define SYS_VIS_MODE "vis_mode" #define SYS_ORIG_INTERVAL "orig_interval" #define SYS_IFACE_PATH "/sys/class/net" @@ -33,6 +35,12 @@ #define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" #define SYS_FRAG "fragmentation" +enum gw_modes { + GW_MODE_OFF, + GW_MODE_CLIENT, + GW_MODE_SERVER, +}; + extern const char *sysfs_param_enable[]; extern const char *sysfs_param_server[]; @@ -47,3 +55,4 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv); int handle_sys_setting(char *mesh_iface, int argc, char **argv, char *file_path, void setting_usage(void), const char *sysfs_param[]); +int handle_gw_setting(char *mesh_iface, int argc, char **argv); -- batctl

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2010