B.A.T.M.A.N November 2013

b.a.t.m.a.n@lists.open-mesh.org

16 participants
49 discussions

[B.A.T.M.A.N.] [PATCHv4 0/2] debugfs files for the network wide multi interface optimization

by Simon Wunderlich

This patchset contains the remaining two debugfs patches for the network wide multi interface optimization. There are some small changes to the previous patchset as suggested by Marek: * omit the hardif directory and move hardif folders directly under $debugs/batman-adv, as there should be no conflict with the soft interfaces anyway * rename *multiif* functions to *hardif* * fix some outdated kerneldoc. Thanks for all the comments on this patchset, everyone! Simon Simon Wunderlich (2): batman-adv: add debugfs structure for information per interface batman-adv: add debugfs support to view multiif tables bat_iv_ogm.c | 12 ++++---- debugfs.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ debugfs.h | 2 ++ hard-interface.c | 9 ++++++ originator.c | 48 +++++++++++++++++++++++++++++- originator.h | 1 + types.h | 5 +++- 7 files changed, 156 insertions(+), 7 deletions(-) -- 1.7.10.4

9 years, 4 months

[B.A.T.M.A.N.] [PATCH] batman-adv: add compat code for kstrtou32

by Antonio Quartulli

kstrtou32() does not exist before 2.6.39. Convert it to strict_strtoul() in that case. Used-by: e29249b4483b91d7a590a16e9b5ffe9412ce7fde ("batman-adv: add isolation_mark sysfs attribute") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat.h b/compat.h index 01984b8..334dc5c 100644 --- a/compat.h +++ b/compat.h @@ -152,6 +152,8 @@ static inline int batadv_param_set_copystring(const char *val, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) +/* cast last argument of strict_strtoul() because we have a uint32_t */ +#define kstrtou32(cp, base, v) strict_strtoul(cp, base, (unsigned long *)v) #define kstrtoul strict_strtoul #define kstrtol strict_strtol -- 1.8.4.3

9 years, 4 months

[B.A.T.M.A.N.] [PATCHv3 0/8] add network wide multi interface optimization

by Simon Wunderlich

This patchset adds the network wide multi interface optimization as proposed in our wiki [1] for BATMAN IV. The main purpose is to do interface alternating and bonding by considering multi interface capabilities globally and not just for the (next) link, otherwise non-optimal links may be chosen. This patchset needs to change a lot of core data structures and routing, please review it carefully. A local development branch exists on the public git repo [2]. Changes from PATCHv2 (thanks Linus and Marek for suggestions) are: * fix many rcu,reference and kerneldoc issues * remove some TODOs which are fixed in the series * rename debugfs file hardif/$IF/originators_multiif -> hardif/$IF/originators * rebase on Antonios extended isolation patches * ... check for more in the changelog of the individual patches I've tested the patchset in my VMs to confirm that bonding and alternating works as expected. Patches should be checkpatch and sparse clean. As always, any comments are appreciated! Thanks, Simon [1] http://www.open-mesh.org/projects/batman-adv/wiki/network-wide-multi-link-o… [2] http://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/simon/network-w… Simon Wunderlich (8): batman-adv: remove bonding and interface alternating batman-adv: split tq information in neigh_node struct batman-adv: split out router from orig_node batman-adv: add WiFi penalty batman-adv: consider outgoing interface in OGM sending batman-adv: add bonding again batman-adv: add debugfs structure for information per interface batman-adv: add debugfs support to view multiif tables bat_iv_ogm.c | 871 +++++++++++++++++++++++++++++++---------------- compat.c | 8 - compat.h | 1 - debugfs.c | 94 +++++ debugfs.h | 3 + distributed-arp-table.c | 3 +- gateway_client.c | 86 ++++- hard-interface.c | 9 + hard-interface.h | 18 + icmp_socket.c | 3 +- main.h | 5 + network-coding.c | 9 +- originator.c | 529 +++++++++++++++++++++++++--- originator.h | 20 +- routing.c | 429 ++++++++--------------- routing.h | 12 +- send.c | 19 +- soft-interface.c | 2 +- translation-table.c | 6 +- types.h | 130 ++++--- 20 files changed, 1553 insertions(+), 704 deletions(-) -- 1.7.10.4

9 years, 4 months

[B.A.T.M.A.N.] [PATCH] batman-adv: improve README

by Antonio Quartulli

Add missing sysfs attributes in the proper section of the README Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- README | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README b/README index 89490be..58e4904 100644 --- a/README +++ b/README @@ -66,11 +66,10 @@ All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ -# aggregated_ogms gw_bandwidth log_level -# ap_isolation gw_mode orig_interval -# bonding gw_sel_class routing_algo -# bridge_loop_avoidance hop_penalty fragmentation - +#aggregated_ogms distributed_arp_table gw_sel_class orig_interval +#ap_isolation fragmentation hop_penalty routing_algo +#bonding gw_bandwidth isolation_mark vlan0 +#bridge_loop_avoidance gw_mode log_level There is a special folder for debugging information: -- 1.8.4.3

9 years, 4 months

[B.A.T.M.A.N.] Automatically starting adaptors at boot

by tjhowse

Hello Ladies and Gentlemen, This might be a question better suited to the OpenWRT list, but I figure it would've been solved better here. I've got a two-node mesh set up and working well. Config files are below. I have some minor woes though. Each time one of the nodes boots up I must: brctl addif br-lan bat0 ifconfig bat0 up ...before traffic starts to flow between clients connected to the wlan0 radios of each node. What's the best way of having this happen automatically? I assume there's a better way than having an init script run those commands at boot. Please note that I'm somewhat of a networking novice, so if anything below seems super dumb, please say so. Thanks, Travis. radio0 is 2.4GHz, for connecting to clients. radio1 is 5GHz, for the mesh interconnects. wireless: config wifi-device radio0 option type mac80211 option channel 11 option hwmode 11ng option path 'platform/ar934x_wmac' option htmode HT20 list ht_capab LDPC list ht_capab SHORT-GI-20 list ht_capab SHORT-GI-40 list ht_capab TX-STBC list ht_capab RX-STBC1 list ht_capab DSSS_CCK-40 # REMOVE THIS LINE TO ENABLE WIFI: # option disabled 1 config wifi-iface option device radio0 option channel 10 option network lan option mode ap option ssid HWMesh2-Clients-10 option encryption psk2 option key 3141592653 config wifi-device radio1 option type mac80211 option channel 36 option hwmode 11na option path 'pci0000:00/0000:00:00.0' option htmode HT20 list ht_capab LDPC list ht_capab SHORT-GI-20 list ht_capab SHORT-GI-40 list ht_capab TX-STBC list ht_capab RX-STBC1 list ht_capab DSSS_CCK-40 # REMOVE THIS LINE TO ENABLE WIFI: # option disabled 1 config wifi-iface wmesh option device radio1 option ifname adhoc0 option network mesh option mode adhoc option ssid HWMesh2-Backbone option encryption psk2 option key 3141592653 network: config interface 'loopback' option ifname 'lo' option proto 'static' option ipaddr '127.0.0.1' option netmask '255.0.0.0' config globals 'globals' option ula_prefix 'fd87:bd28:e37e::/48' config interface 'lan' option ifname 'eth0.1' #option ifname 'bat0' #option ifname 'wlan0' option type 'bridge' option proto 'static' option ipaddr '192.168.1.1' option netmask '255.255.255.0' option ip6assign '60' config interface 'wan' option ifname 'eth0.2' option proto 'dhcp' config interface 'wan6' option ifname '@wan' option proto 'dhcpv6' config switch option name 'switch0' option reset '1' option enable_vlan '1' config switch_vlan option device 'switch0' option vlan '1' option ports '0t 2 3 4 5' config switch_vlan option device 'switch0' option vlan '2' option ports '0t 1' config interface 'mesh' option ifname adhoc0 option mtu 1528 option proto batadv option mesh bat0 batman-adv: config 'mesh' 'bat0' option 'aggregated_ogms' option 'ap_isolation' option 'bonding' option 'fragmentation' option 'gw_bandwidth' option 'gw_mode' option 'gw_sel_class' option 'log_level' option 'orig_interval' option 'vis_mode' option 'bridge_loop_avoidance' option 'distributed_arp_table' option 'network_coding' option 'hop_penalty' # yet another batX instance # config 'mesh' 'bat5' # option 'interfaces' 'second_mesh'

9 years, 4 months

[B.A.T.M.A.N.] [PATCH] batman-adv: remove returns at the end of void functions

by Antonio Quartulli

Return at the end of void functions is not needed. Since most of the void functions in the code do not do so, make all the others consistent by removing the useless returns. Actually all the functions to be "fixed" are in network-coding.h only. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- network-coding.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/network-coding.h b/network-coding.h index 6b1a5d7..b16639f 100644 --- a/network-coding.h +++ b/network-coding.h @@ -59,7 +59,6 @@ static inline int batadv_nc_mesh_init(struct batadv_priv *bat_priv) static inline void batadv_nc_mesh_free(struct batadv_priv *bat_priv) { - return; } static inline void @@ -69,7 +68,6 @@ batadv_nc_update_nc_node(struct batadv_priv *bat_priv, struct batadv_ogm_packet *ogm_packet, int is_single_hop_neigh) { - return; } static inline void @@ -78,17 +76,14 @@ batadv_nc_purge_orig(struct batadv_priv *bat_priv, bool (*to_purge)(struct batadv_priv *, struct batadv_nc_node *)) { - return; } static inline void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv) { - return; } static inline void batadv_nc_init_orig(struct batadv_orig_node *orig_node) { - return; } static inline bool batadv_nc_skb_forward(struct sk_buff *skb, @@ -101,14 +96,12 @@ static inline void batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv, struct sk_buff *skb) { - return; } static inline void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv, struct sk_buff *skb) { - return; } static inline int batadv_nc_nodes_seq_print_text(struct seq_file *seq, -- 1.8.4.3

9 years, 4 months

[B.A.T.M.A.N.] [PATCHv3 0/5] Introducing the Extended-Isolation

by Antonio Quartulli

Hello list, this is the third version of this patchset. Kudos to Marek for his feedback :-) Changes from v2: - add sysfs documentation for the new isolation_mark attribute - revert order of show and store functions for isolation_mark (sysfs.c) - fix a couple of typ0s in sysfs.c kerneldoc - add missing kerneldoc for mark argument in tt_local_add() - improve the way 'mask' is initialised in store_isolation_mark() Changes from v1 are: - Introduction of patch 5/6: it adds an helper function to avoid code duplication - function is called batadv_vlan_ap_isola_get() and it is used to get the current AP isolation status on a given vlan - patch 1/6 has been changed to allow the user to enter a mark value without specifying any bitmask - 0xFFFFFFFF will be used as default - patch 6/6 has been changed so that broadcasts packets are marked on the receiver node only if AP isolation is enabled. In this way, if AP isolation is not ON packets are not altered at all neither on the sender nor on the receiver. - the patchset has been rebased on top of current master (dependency from the patch altering the table headers has been removed) Description: ========================= This feature is an extension of the already existing "AP isolation" which aims to generalise the latter. The idea is based on considering a particular subset of non-mesh clients as "ISOLATED" and then apply the same policy that batman-adv already applies for WiFi clients. To decide which client belongs to this subset batman-adv uses the skb->mark field which value can be altered by several components in the kernel (e.g. netfilter). When an skb hits the soft-interface (e.g. bat0) the skb->mark is compared to a preconfigured value and the source client is classified as "ISOLATED" only in case of match. The pre-configured mark (and its mask) is a user choice and can be set through a new sysfs interface that is added within this patchset. "ISOLATED" clients won't be able to talk to each other (batman-adv will drop any packet originated by an isolated client and directed to another isolated client) like it now happens for WiFi ones (when AP isolation is on). Moreover broadcast packets sent by ISOLATED clients are marked on the receiving node with the same mark that the user configured through the sysfs. In this way netfilter (or any other program) can make decisions about these packets on the receiver side (e.g. a rule could be "broadcast packets created by ISOLATED clients cannot be forwarded over any port of the bridge X") A draft of the documentation (with an example of how to use tc to mark/filter packets) is available here[1] and will be improved as soon as the feature is released. Cheers, [1] http://www.open-mesh.org/projects/batman-adv/wiki/Extended-isolation *** BLURB HERE *** Antonio Quartulli (6): batman-adv: add isolation_mark sysfs attribute batman-adv: mark a local client as isolated when needed batman-adv: print the new BATADV_TT_CLIENT_ISOLA flag batman-adv: extend the ap_isolation mechanism batman-adv: create helper function to get AP isolation status batman-adv: set the isolation mark in the skb if needed main.c | 26 +++++++++++++++++++ main.h | 3 +++ packet.h | 1 + soft-interface.c | 27 ++++++++++++++++---- sysfs-class-net-mesh | 8 ++++++ sysfs.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ translation-table.c | 72 +++++++++++++++++++++++++++++++++++++++------------- translation-table.h | 4 ++- types.h | 2 ++ 9 files changed, 191 insertions(+), 23 deletions(-) -- 1.8.4.3

9 years, 4 months

[B.A.T.M.A.N.] [PATCHv2 0/5] Introducing the Extended-Isolation

by Antonio Quartulli

Hello list, this is the second version of this patchset. Changes from v1 are: - Introduction of patch 5/6: it adds an helper function to avoid code duplication - function is called batadv_vlan_ap_isola_get() and it is used to get the current AP isolation status on a given vlan - patch 1/6 has been changed to allow the user to enter a mark value without specifying any bitmask - 0xFFFFFFFF will be used as default - patch 6/6 has been changed so that broadcasts packets are marked on the receiver node only if AP isolation is enabled. In this way, if AP isolation is not ON packets are not altered at all neither on the sender nor on the receiver. - the patchset has been rebased on top of current master (dependency from the patch altering the table headers has been removed) Description: ========================= This feature is an extension of the already existing "AP isolation" which aims to generalise the latter. The idea is based on considering a particular subset of non-mesh clients as "ISOLATED" and then apply the same policy that batman-adv already applies for WiFi clients. To decide which client belongs to this subset batman-adv uses the skb->mark field which value can be altered by several components in the kernel (e.g. netfilter). When an skb hits the soft-interface (e.g. bat0) the skb->mark is compared to a preconfigured value and the source client is classified as "ISOLATED" only in case of match. The pre-configured mark (and its mask) is a user choice and can be set through a new sysfs interface that is added within this patchset. "ISOLATED" clients won't be able to talk to each other (batman-adv will drop any packet originated by an isolated client and directed to another isolated client) like it now happens for WiFi ones (when AP isolation is on). Moreover broadcast packets sent by ISOLATED clients are marked on the receiving node with the same mark that the user configured through the sysfs. In this way netfilter (or any other program) can make decisions about these packets on the receiver side (e.g. a rule could be "broadcast packets created by ISOLATED clients cannot be forwarded over any port of the bridge X") A draft of the documentation (with an example of how to use tc to mark/filter packets) is available here[1] and will be improved as soon as the feature is released. Cheers, [1] http://www.open-mesh.org/projects/batman-adv/wiki/Extended-isolation Antonio Quartulli (6): batman-adv: add isolation_mark sysfs attribute batman-adv: mark a local client as isolated when needed batman-adv: print the new BATADV_TT_CLIENT_ISOLA flag batman-adv: extend the ap_isolation mechanism batman-adv: create helper function to get AP isolation status batman-adv: set the isolation mark in the skb if needed main.c | 26 ++++++++++++++++++++ main.h | 3 +++ packet.h | 1 + soft-interface.c | 27 +++++++++++++++++---- sysfs.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ translation-table.c | 70 ++++++++++++++++++++++++++++++++++++++++------------- translation-table.h | 4 ++- types.h | 2 ++ 8 files changed, 178 insertions(+), 23 deletions(-) -- 1.8.4.3

9 years, 4 months

[B.A.T.M.A.N.] Bad link quality if routers are connected by 2 interfaces

by Clemens John

Hi, in our Freifunk network we are experiencing some kind of strange behaviour if two routers can see each other by wire and wireless at the same time. Then the link quality in the originator table drops from normally >250 to somewhat around 130 or less on both interfaces. Because we have no idea why this happens but think this is kind of unwanted behaviour I´m asking here if we did something wrong or if we missed some configuration in this case. We are using B.A.T.M.A.N. adv 2013.4.0. Kind Regards Clemens John -- #Clemens John <clemens-john(a)gmx.de> #GnuPG: Identifier: 0xD92F6BA5 Fingerprint: 1D6D 3EC6 C80F C1D4 CE1F 1133 6607 476C 0DB6 96A3

9 years, 4 months

[B.A.T.M.A.N.] [PATCH] batman-adv: send every DHCP packet as bat-unicast

by Antonio Quartulli

From: Antonio Quartulli <antonio(a)open-mesh.com> In different situations it is possible that the DHCP server or client uses broadcast Ethernet frames to send messages to each other. The GW component in batman-adv takes care of using bat-unicast packets to bring broadcast DHCP Discover/Requests to the "best" server. On the way back the DHCP server usually sends unicasts, but upon client request it may decide to use broadcasts as well. This patch improves the GW component so that it now snoops and sends as unicast all the DHCP packets, no matter if they were generated by a DHCP server or client. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- distributed-arp-table.c | 4 +- gateway_client.c | 171 +++++++++++++++++++++--------------------------- gateway_client.h | 4 +- send.c | 16 ++++- send.h | 10 +-- soft-interface.c | 76 +++++++++++---------- types.h | 12 ++++ 7 files changed, 153 insertions(+), 140 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 209066f..ed4b97a 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1034,9 +1034,9 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, if (hdr_size == sizeof(struct batadv_unicast_4addr_packet)) err = batadv_send_skb_via_tt_4addr(bat_priv, skb_new, BATADV_P_DAT_CACHE_REPLY, - vid); + NULL, vid); else - err = batadv_send_skb_via_tt(bat_priv, skb_new, vid); + err = batadv_send_skb_via_tt(bat_priv, skb_new, NULL, vid); if (err != NET_XMIT_DROP) { batadv_inc_counter(bat_priv, BATADV_CNT_DAT_CACHED_REPLY_TX); diff --git a/gateway_client.c b/gateway_client.c index b5b0c6a..b6386c1 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -25,11 +25,17 @@ #include <linux/udp.h> #include <linux/if_vlan.h> -/* This is the offset of the options field in a dhcp packet starting at - * the beginning of the dhcp header +/* These are the offsets of the "hw type" and "hw address length" in the dhcp + * packet starting at the beginning of the dhcp header */ -#define BATADV_DHCP_OPTIONS_OFFSET 240 -#define BATADV_DHCP_REQUEST 3 +#define BATADV_DHCP_HTYPE_OFFSET 1 +#define BATADV_DHCP_HLEN_OFFSET 2 +/* Value of htype representing Ethernet */ +#define BATADV_DHCP_HTYPE_ETHERNET 0x01 +/* This is the offset of the "chaddr" field in the dhcp packet starting at the + * beginning of the dhcp header + */ +#define BATADV_DHCP_CHADDR_OFFSET 28 static void batadv_gw_node_free_ref(struct batadv_gw_node *gw_node) { @@ -593,80 +599,39 @@ out: return 0; } -/* this call might reallocate skb data */ -static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len) -{ - int ret = false; - unsigned char *p; - int pkt_len; - - if (skb_linearize(skb) < 0) - goto out; - - pkt_len = skb_headlen(skb); - - if (pkt_len < header_len + BATADV_DHCP_OPTIONS_OFFSET + 1) - goto out; - - p = skb->data + header_len + BATADV_DHCP_OPTIONS_OFFSET; - pkt_len -= header_len + BATADV_DHCP_OPTIONS_OFFSET + 1; - - /* Access the dhcp option lists. Each entry is made up by: - * - octet 1: option type - * - octet 2: option data len (only if type != 255 and 0) - * - octet 3: option data - */ - while (*p != 255 && !ret) { - /* p now points to the first octet: option type */ - if (*p == 53) { - /* type 53 is the message type option. - * Jump the len octet and go to the data octet - */ - if (pkt_len < 2) - goto out; - p += 2; - - /* check if the message type is what we need */ - if (*p == BATADV_DHCP_REQUEST) - ret = true; - break; - } else if (*p == 0) { - /* option type 0 (padding), just go forward */ - if (pkt_len < 1) - goto out; - pkt_len--; - p++; - } else { - /* This is any other option. So we get the length... */ - if (pkt_len < 1) - goto out; - pkt_len--; - p++; - - /* ...and then we jump over the data */ - if (pkt_len < 1 + (*p)) - goto out; - pkt_len -= 1 + (*p); - p += 1 + (*p); - } - } -out: - return ret; -} - -/* this call might reallocate skb data */ -bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) +/** + * batadv_gw_dhcp_recipient_get - check if a packet is a DHCP message + * @skb: the packet to check + * @header_len: a pointer to the batman-adv header size + * @chaddr: buffer where the client address will be stored. Valid + * only if the function returns BATADV_DHCP_TO_CLIENT + * + * Returns: + * - BATADV_DHCP_NO if the packet is not a dhcp message or if there was an error + * while parsing it + * - BATADV_DHCP_TO_SERVER if this is a message going to the DHCP server + * - BATADV_DHCP_TO_CLIENT if this is a message going to a DHCP client + * + * This function may re-allocate the data buffer of the skb passed as argument. + */ +enum batadv_dhcp_recipient +batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len, + uint8_t *chaddr) { + enum batadv_dhcp_recipient ret = BATADV_DHCP_NO; struct ethhdr *ethhdr; struct iphdr *iphdr; struct ipv6hdr *ipv6hdr; struct udphdr *udphdr; struct vlan_ethhdr *vhdr; + int chaddr_offset; __be16 proto; + uint8_t *p; /* check for ethernet header */ if (!pskb_may_pull(skb, *header_len + ETH_HLEN)) - return false; + return BATADV_DHCP_NO; + ethhdr = (struct ethhdr *)skb->data; proto = ethhdr->h_proto; *header_len += ETH_HLEN; @@ -674,7 +639,7 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) /* check for initial vlan header */ if (proto == htons(ETH_P_8021Q)) { if (!pskb_may_pull(skb, *header_len + VLAN_HLEN)) - return false; + return BATADV_DHCP_NO; vhdr = (struct vlan_ethhdr *)skb->data; proto = vhdr->h_vlan_encapsulated_proto; @@ -685,32 +650,34 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) switch (proto) { case htons(ETH_P_IP): if (!pskb_may_pull(skb, *header_len + sizeof(*iphdr))) - return false; + return BATADV_DHCP_NO; + iphdr = (struct iphdr *)(skb->data + *header_len); *header_len += iphdr->ihl * 4; /* check for udp header */ if (iphdr->protocol != IPPROTO_UDP) - return false; + return BATADV_DHCP_NO; break; case htons(ETH_P_IPV6): if (!pskb_may_pull(skb, *header_len + sizeof(*ipv6hdr))) - return false; + return BATADV_DHCP_NO; + ipv6hdr = (struct ipv6hdr *)(skb->data + *header_len); *header_len += sizeof(*ipv6hdr); /* check for udp header */ if (ipv6hdr->nexthdr != IPPROTO_UDP) - return false; + return BATADV_DHCP_NO; break; default: - return false; + return BATADV_DHCP_NO; } if (!pskb_may_pull(skb, *header_len + sizeof(*udphdr))) - return false; + return BATADV_DHCP_NO; /* skb->data might have been reallocated by pskb_may_pull() */ ethhdr = (struct ethhdr *)skb->data; @@ -721,17 +688,40 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) *header_len += sizeof(*udphdr); /* check for bootp port */ - if ((proto == htons(ETH_P_IP)) && - (udphdr->dest != htons(67))) - return false; + switch (proto) { + case htons(ETH_P_IP): + if (udphdr->dest == htons(67)) + ret = BATADV_DHCP_TO_SERVER; + else if (udphdr->source == htons(67)) + ret = BATADV_DHCP_TO_CLIENT; + break; + case htons(ETH_P_IPV6): + if (udphdr->dest == htons(547)) + ret = BATADV_DHCP_TO_SERVER; + else if (udphdr->source == htons(547)) + ret = BATADV_DHCP_TO_CLIENT; + break; + } - if ((proto == htons(ETH_P_IPV6)) && - (udphdr->dest != htons(547))) - return false; + chaddr_offset = *header_len + BATADV_DHCP_CHADDR_OFFSET; + /* store the client address if the message is going to a client */ + if (ret == BATADV_DHCP_TO_CLIENT && + pskb_may_pull(skb, chaddr_offset + ETH_ALEN)) { + /* check if the DHCP packet carries an Ethernet DHCP */ + p = skb->data + *header_len + BATADV_DHCP_HTYPE_OFFSET; + if (*p != BATADV_DHCP_HTYPE_ETHERNET) + return BATADV_DHCP_NO; + + /* check if the DHCP packet carries a valid Ethernet address */ + p = skb->data + *header_len + BATADV_DHCP_HLEN_OFFSET; + if (*p != ETH_ALEN) + return BATADV_DHCP_NO; + + memcpy(chaddr, skb->data + chaddr_offset, ETH_ALEN); + } - return true; + return ret; } - /** * batadv_gw_out_of_range - check if the dhcp request destination is the best gw * @bat_priv: the bat priv with all the soft interface information @@ -745,6 +735,7 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) * false otherwise. * * This call might reallocate skb data. + * Must be invoked only when the DHCP packet is going TO a DHCP SERVER. */ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, struct sk_buff *skb) @@ -752,19 +743,13 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, struct batadv_neigh_node *neigh_curr = NULL, *neigh_old = NULL; struct batadv_orig_node *orig_dst_node = NULL; struct batadv_gw_node *gw_node = NULL, *curr_gw = NULL; - struct ethhdr *ethhdr; - bool ret, out_of_range = false; - unsigned int header_len = 0; + struct ethhdr *ethhdr = (struct ethhdr *)skb->data; + bool out_of_range = false; uint8_t curr_tq_avg; unsigned short vid; vid = batadv_get_vid(skb, 0); - ret = batadv_gw_is_dhcp_target(skb, &header_len); - if (!ret) - goto out; - - ethhdr = (struct ethhdr *)skb->data; orig_dst_node = batadv_transtable_search(bat_priv, ethhdr->h_source, ethhdr->h_dest, vid); if (!orig_dst_node) @@ -774,10 +759,6 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, if (!gw_node->bandwidth_down == 0) goto out; - ret = batadv_is_type_dhcprequest(skb, header_len); - if (!ret) - goto out; - switch (atomic_read(&bat_priv->gw_mode)) { case BATADV_GW_MODE_SERVER: /* If we are a GW then we are our best GW. We can artificially diff --git a/gateway_client.h b/gateway_client.h index 5d28523..8fab195 100644 --- a/gateway_client.h +++ b/gateway_client.h @@ -29,7 +29,9 @@ void batadv_gw_node_delete(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node); void batadv_gw_node_purge(struct batadv_priv *bat_priv); int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset); -bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len); bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, struct sk_buff *skb); +enum batadv_dhcp_recipient +batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len, + uint8_t *chaddr); #endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */ diff --git a/send.c b/send.c index 49074e0..a42aea3 100644 --- a/send.c +++ b/send.c @@ -316,13 +316,23 @@ out: */ int batadv_send_skb_via_tt_generic(struct batadv_priv *bat_priv, struct sk_buff *skb, int packet_type, - int packet_subtype, unsigned short vid) + int packet_subtype, uint8_t *dst_hint, + unsigned short vid) { struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct batadv_orig_node *orig_node; + uint8_t *src, *dst; + + src = ethhdr->h_source; + dst = ethhdr->h_dest; + + /* if we got an hint! let's send the packet to this client (if any) */ + if (dst_hint) { + src = NULL; + dst = dst_hint; + } + orig_node = batadv_transtable_search(bat_priv, src, dst, vid); - orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source, - ethhdr->h_dest, vid); return batadv_send_skb_unicast(bat_priv, skb, packet_type, packet_subtype, orig_node, vid); } diff --git a/send.h b/send.h index be64c32..960015d 100644 --- a/send.h +++ b/send.h @@ -35,7 +35,8 @@ bool batadv_send_skb_prepare_unicast_4addr(struct batadv_priv *bat_priv, int packet_subtype); int batadv_send_skb_via_tt_generic(struct batadv_priv *bat_priv, struct sk_buff *skb, int packet_type, - int packet_subtype, unsigned short vid); + int packet_subtype, uint8_t *dst_hint, + unsigned short vid); int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb, unsigned short vid); @@ -52,11 +53,11 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb, * Returns NET_XMIT_DROP in case of error or NET_XMIT_SUCCESS otherwise. */ static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv, - struct sk_buff *skb, + struct sk_buff *skb, uint8_t *dst_hint, unsigned short vid) { return batadv_send_skb_via_tt_generic(bat_priv, skb, BATADV_UNICAST, 0, - vid); + dst_hint, vid); } /** @@ -76,11 +77,12 @@ static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv, static inline int batadv_send_skb_via_tt_4addr(struct batadv_priv *bat_priv, struct sk_buff *skb, int packet_subtype, + uint8_t *dst_hint, unsigned short vid) { return batadv_send_skb_via_tt_generic(bat_priv, skb, BATADV_UNICAST_4ADDR, - packet_subtype, vid); + packet_subtype, dst_hint, vid); } #endif /* _NET_BATMAN_ADV_SEND_H_ */ diff --git a/soft-interface.c b/soft-interface.c index 7e877d2..a3797c5 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -157,6 +157,8 @@ static int batadv_interface_tx(struct sk_buff *skb, 0x00, 0x00}; static const uint8_t ectp_addr[ETH_ALEN] = {0xCF, 0x00, 0x00, 0x00, 0x00, 0x00}; + enum batadv_dhcp_recipient dhcp_rcp = BATADV_DHCP_NO; + uint8_t *dst_hint = NULL, chaddr[ETH_ALEN]; struct vlan_ethhdr *vhdr; unsigned int header_len = 0; int data_len = skb->len, ret; @@ -164,6 +166,7 @@ static int batadv_interface_tx(struct sk_buff *skb, bool do_bcast = false, client_added; unsigned short vid; uint32_t seqno; + int gw_mode; if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dropped; @@ -210,36 +213,39 @@ static int batadv_interface_tx(struct sk_buff *skb, if (batadv_compare_eth(ethhdr->h_dest, ectp_addr)) goto dropped; + gw_mode = atomic_read(&bat_priv->gw_mode); if (is_multicast_ether_addr(ethhdr->h_dest)) { - do_bcast = true; - - switch (atomic_read(&bat_priv->gw_mode)) { - case BATADV_GW_MODE_SERVER: - /* gateway servers should not send dhcp - * requests into the mesh - */ - ret = batadv_gw_is_dhcp_target(skb, &header_len); - if (ret) - goto dropped; - break; - case BATADV_GW_MODE_CLIENT: - /* gateway clients should send dhcp requests - * via unicast to their gateway - */ - ret = batadv_gw_is_dhcp_target(skb, &header_len); - if (ret) - do_bcast = false; - break; - case BATADV_GW_MODE_OFF: - default: - break; + /* if gw mode is off, broadcast every packet */ + if (gw_mode == BATADV_GW_MODE_OFF) { + do_bcast = true; + goto send; } - /* reminder: ethhdr might have become unusable from here on - * (batadv_gw_is_dhcp_target() might have reallocated skb data) + dhcp_rcp = batadv_gw_dhcp_recipient_get(skb, &header_len, + chaddr); + /* skb->data may have been modified by + * batadv_gw_dhcp_recipient_get() */ + ethhdr = (struct ethhdr *)skb->data; + /* if gw_mode is on, broadcast any non-DHCP message. + * All the DHCP packets are going to be sent as unicast + */ + if (dhcp_rcp == BATADV_DHCP_NO) { + do_bcast = true; + goto send; + } + + if (dhcp_rcp == BATADV_DHCP_TO_CLIENT) + dst_hint = chaddr; + else if ((gw_mode == BATADV_GW_MODE_SERVER) && + (dhcp_rcp == BATADV_DHCP_TO_SERVER)) + /* gateways should not forward any DHCP message if + * directed to a DHCP server + */ + goto dropped; } +send: batadv_skb_set_priority(skb, 0); /* ethernet packet should be broadcasted */ @@ -285,22 +291,22 @@ static int batadv_interface_tx(struct sk_buff *skb, /* unicast packet */ } else { - if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_OFF) { + /* DHCP packets going to a server will use the GW feature */ + if (dhcp_rcp == BATADV_DHCP_TO_SERVER) { ret = batadv_gw_out_of_range(bat_priv, skb); if (ret) goto dropped; - } - - if (batadv_dat_snoop_outgoing_arp_request(bat_priv, skb)) - goto dropped; - - batadv_dat_snoop_outgoing_arp_reply(bat_priv, skb); - - if (is_multicast_ether_addr(ethhdr->h_dest)) ret = batadv_send_skb_via_gw(bat_priv, skb, vid); - else - ret = batadv_send_skb_via_tt(bat_priv, skb, vid); + } else { + if (batadv_dat_snoop_outgoing_arp_request(bat_priv, + skb)) + goto dropped; + batadv_dat_snoop_outgoing_arp_reply(bat_priv, skb); + + ret = batadv_send_skb_via_tt(bat_priv, skb, dst_hint, + vid); + } if (ret == NET_XMIT_DROP) goto dropped_freed; } diff --git a/types.h b/types.h index 42e941f..656ae65 100644 --- a/types.h +++ b/types.h @@ -31,6 +31,18 @@ #endif /* CONFIG_BATMAN_ADV_DAT */ /** + * enum batadv_dhcp_recipient - dhcp destination + * @BATADV_DHCP_NO: packet is not a dhcp message + * @BATADV_DHCP_TO_SERVER: dhcp message is directed to a server + * @BATADV_DHCP_TO_CLIENT: dhcp message is directed to a client + */ +enum batadv_dhcp_recipient { + BATADV_DHCP_NO = 0, + BATADV_DHCP_TO_SERVER, + BATADV_DHCP_TO_CLIENT, +}; + +/** * BATADV_TT_REMOTE_MASK - bitmask selecting the flags that are sent over the * wire only */ -- 1.8.4.2

9 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2013