B.A.T.M.A.N May 2013

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

16 participants
80 discussions

[B.A.T.M.A.N.] [PATCHv2 0/3] Fragmentation version 2
by Martin Hundebøll 15 May '13

15 May '13

These are the second revision of a few patches to remove the current fragmentation code and replace it with a new version that supports more packet types and more fragments per packet, thus allowing bigger payloads. The patches are based on current master and are meant for the next big bump in compat number. Revision 2 is changed according to Mareks review. Martin Hundebøll (3): batman-adv: Remove old fragmentation code batman-adv: Receive fragmented packets and merge batman-adv: Fragment and send skbs larger than mtu Makefile.kbuild | 2 +- distributed-arp-table.c | 11 +- fragmentation.c | 479 ++++++++++++++++++++++++++++++++++++++++++++++++ fragmentation.h | 50 +++++ hard-interface.c | 1 - main.c | 8 +- main.h | 9 + originator.c | 19 +- packet.h | 41 +++-- routing.c | 146 ++++++--------- routing.h | 4 +- send.c | 194 +++++++++++++++++++- send.h | 36 ++++ soft-interface.c | 15 +- types.h | 63 +++++-- unicast.c | 478 ----------------------------------------------- unicast.h | 92 ---------- 17 files changed, 930 insertions(+), 718 deletions(-) create mode 100644 fragmentation.c create mode 100644 fragmentation.h delete mode 100644 unicast.c delete mode 100644 unicast.h -- 1.8.2.3

2 6

[B.A.T.M.A.N.] [PATCH 0/9] Adding size relevant build options
by Sven Eckelmann 14 May '13

14 May '13

Hi, I was talking with Marek and Simon about build options which may be size relevant. The first change is to allow the linker to check for unused code sections. The second change is to let the compiler use get the whole source code instead of only one source file during the final compilation step (ok, it is originally the link step). These changes reduce the size on an amd64 (default Debian settings with -O2) by around 25%. The size reduction on MIPSel (default OpenWRT settings with -Os) were only by 6%-10%. Marek were still interested and asked me to submit the changes. Kind regards, Sven

3 18

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: simplify ICMP packet structures
by Antonio Quartulli 13 May '13

13 May '13

From: Antonio Quartulli <antonio(a)open-mesh.com> the icmp and the icmp_rr packets share the same initial fields since they use the same code to be processed and forwarded. Extract the common fields and put them into a separate struct so that future ICMP packets can be easily added without bloating the packet definition. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- This patches are based on top of "batman-adv: use __constant_htons when possible" Cheers, icmp_socket.c | 22 +++++++++++----------- main.c | 4 ++-- packet.h | 34 +++++++++++++++++++++++++--------- routing.c | 38 +++++++++++++++++++------------------- 4 files changed, 57 insertions(+), 41 deletions(-) diff --git a/icmp_socket.c b/icmp_socket.c index b27508b..f0f018a 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -191,25 +191,25 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, goto free_skb; } - if (icmp_packet->header.packet_type != BATADV_ICMP) { + if (icmp_packet->ih.header.packet_type != BATADV_ICMP) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n"); len = -EINVAL; goto free_skb; } - if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) { + if (icmp_packet->ih.msg_type != BATADV_ECHO_REQUEST) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n"); len = -EINVAL; goto free_skb; } - icmp_packet->uid = socket_client->index; + icmp_packet->ih.uid = socket_client->index; - if (icmp_packet->header.version != BATADV_COMPAT_VERSION) { - icmp_packet->msg_type = BATADV_PARAMETER_PROBLEM; - icmp_packet->header.version = BATADV_COMPAT_VERSION; + if (icmp_packet->ih.header.version != BATADV_COMPAT_VERSION) { + icmp_packet->ih.msg_type = BATADV_PARAMETER_PROBLEM; + icmp_packet->ih.header.version = BATADV_COMPAT_VERSION; batadv_socket_add_packet(socket_client, icmp_packet, packet_len); goto free_skb; @@ -218,7 +218,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dst_unreach; - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->ih.dst); if (!orig_node) goto dst_unreach; @@ -232,7 +232,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (neigh_node->if_incoming->if_status != BATADV_IF_ACTIVE) goto dst_unreach; - memcpy(icmp_packet->orig, + memcpy(icmp_packet->ih.orig, primary_if->net_dev->dev_addr, ETH_ALEN); if (packet_len == sizeof(struct batadv_icmp_packet_rr)) @@ -243,7 +243,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, goto out; dst_unreach: - icmp_packet->msg_type = BATADV_DESTINATION_UNREACHABLE; + icmp_packet->ih.msg_type = BATADV_DESTINATION_UNREACHABLE; batadv_socket_add_packet(socket_client, icmp_packet, packet_len); free_skb: kfree_skb(skb); @@ -317,7 +317,7 @@ static void batadv_socket_add_packet(struct batadv_socket_client *socket_client, /* while waiting for the lock the socket_client could have been * deleted */ - if (!batadv_socket_client_hash[icmp_packet->uid]) { + if (!batadv_socket_client_hash[icmp_packet->ih.uid]) { spin_unlock_bh(&socket_client->lock); kfree(socket_packet); return; @@ -346,7 +346,7 @@ void batadv_socket_receive_packet(struct batadv_icmp_packet_rr *icmp_packet, { struct batadv_socket_client *hash; - hash = batadv_socket_client_hash[icmp_packet->uid]; + hash = batadv_socket_client_hash[icmp_packet->ih.uid]; if (hash) batadv_socket_add_packet(hash, icmp_packet, icmp_len); } diff --git a/main.c b/main.c index af89c09..81d496a 100644 --- a/main.c +++ b/main.c @@ -344,8 +344,8 @@ static void batadv_recv_handler_init(void) BUILD_BUG_ON(offsetof(struct batadv_unicast_packet, dest) != 4); BUILD_BUG_ON(offsetof(struct batadv_unicast_frag_packet, dest) != 4); BUILD_BUG_ON(offsetof(struct batadv_unicast_tvlv_packet, dst) != 4); - BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, dst) != 4); - BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, dst) != 4); + BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, ih.dst) != 4); + BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, ih.dst) != 4); /* broadcast packet */ batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet; diff --git a/packet.h b/packet.h index 7d45890..6f98d02 100644 --- a/packet.h +++ b/packet.h @@ -192,28 +192,44 @@ struct batadv_ogm_packet { #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) -struct batadv_icmp_packet { +/** + * batadc_icmp_header - common ICMP header + * @header: common batman header + * @msg_type: ICMP packet type + * @dst: address of the destination node + * @orig: address of the source node + * @seqno: ICMP sequence number + * @uid: local ICMP socket identifier + */ +struct batadv_icmp_header { struct batadv_header header; uint8_t msg_type; /* see ICMP message types above */ uint8_t dst[ETH_ALEN]; uint8_t orig[ETH_ALEN]; __be16 seqno; uint8_t uid; +}; + +/** + * batadv_icmp_packet - ICMP packet + * @ih: common ICMP header + * @reserved: not used - useful for alignment + */ +struct batadv_icmp_packet { + struct batadv_icmp_header ih; uint8_t reserved; }; #define BATADV_RR_LEN 16 -/* icmp_packet_rr must start with all fields from imcp_packet - * as this is assumed by code that handles ICMP packets +/** + * batadv_icmp_packet_rr - ICMP RouteRecord packet + * @ih: common ICMP header + * @rr_cur: number of entries the rr array + * @rr: route record array */ struct batadv_icmp_packet_rr { - struct batadv_header header; - uint8_t msg_type; /* see ICMP message types above */ - uint8_t dst[ETH_ALEN]; - uint8_t orig[ETH_ALEN]; - __be16 seqno; - uint8_t uid; + struct batadv_icmp_header ih; uint8_t rr_cur; uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; }; diff --git a/routing.c b/routing.c index 7c372f1..b448442 100644 --- a/routing.c +++ b/routing.c @@ -258,7 +258,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; /* add data to device queue */ - if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) { + if (icmp_packet->ih.msg_type != BATADV_ECHO_REQUEST) { batadv_socket_receive_packet(icmp_packet, icmp_len); goto out; } @@ -269,7 +269,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, /* answer echo request (ping) */ /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->ih.orig); if (!orig_node) goto out; @@ -279,10 +279,10 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; - memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); - memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN); - icmp_packet->msg_type = BATADV_ECHO_REPLY; - icmp_packet->header.ttl = BATADV_TTL; + memcpy(icmp_packet->ih.dst, icmp_packet->ih.orig, ETH_ALEN); + memcpy(icmp_packet->ih.orig, primary_if->net_dev->dev_addr, ETH_ALEN); + icmp_packet->ih.msg_type = BATADV_ECHO_REPLY; + icmp_packet->ih.header.ttl = BATADV_TTL; if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP) ret = NET_RX_SUCCESS; @@ -306,9 +306,9 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet *)skb->data; /* send TTL exceeded if packet is an echo request (traceroute) */ - if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) { + if (icmp_packet->ih.msg_type != BATADV_ECHO_REQUEST) { pr_debug("Warning - can't forward icmp packet from %pM to %pM: ttl exceeded\n", - icmp_packet->orig, icmp_packet->dst); + icmp_packet->ih.orig, icmp_packet->ih.dst); goto out; } @@ -317,7 +317,7 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, goto out; /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->ih.orig); if (!orig_node) goto out; @@ -327,10 +327,10 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet *)skb->data; - memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); - memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN); - icmp_packet->msg_type = BATADV_TTL_EXCEEDED; - icmp_packet->header.ttl = BATADV_TTL; + memcpy(icmp_packet->ih.dst, icmp_packet->ih.orig, ETH_ALEN); + memcpy(icmp_packet->ih.orig, primary_if->net_dev->dev_addr, ETH_ALEN); + icmp_packet->ih.msg_type = BATADV_TTL_EXCEEDED; + icmp_packet->ih.header.ttl = BATADV_TTL; if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP) ret = NET_RX_SUCCESS; @@ -379,8 +379,8 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; /* add record route information if not full */ - if ((icmp_packet->msg_type == BATADV_ECHO_REPLY || - icmp_packet->msg_type == BATADV_ECHO_REQUEST) && + if ((icmp_packet->ih.msg_type == BATADV_ECHO_REPLY || + icmp_packet->ih.msg_type == BATADV_ECHO_REQUEST) && (hdr_size == sizeof(struct batadv_icmp_packet_rr)) && (icmp_packet->rr_cur < BATADV_RR_LEN)) { memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]), @@ -389,15 +389,15 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, } /* packet for me */ - if (batadv_is_my_mac(bat_priv, icmp_packet->dst)) + if (batadv_is_my_mac(bat_priv, icmp_packet->ih.dst)) return batadv_recv_my_icmp_packet(bat_priv, skb, hdr_size); /* TTL exceeded */ - if (icmp_packet->header.ttl < 2) + if (icmp_packet->ih.header.ttl < 2) return batadv_recv_icmp_ttl_exceeded(bat_priv, skb); /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->ih.dst); if (!orig_node) goto out; @@ -408,7 +408,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; /* decrement ttl */ - icmp_packet->header.ttl--; + icmp_packet->ih.header.ttl--; /* route it */ if (batadv_send_skb_to_orig(skb, orig_node, recv_if) != NET_XMIT_DROP) -- 1.8.1.5

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: use __constant_htons when possible
by Antonio Quartulli 12 May '13

12 May '13

When comparing a network ordered value with a constant, it is better to convert the constant at compile time by means of __constant_htons() instead of converting the value at runtime using ntohs(). This refactoring may slightly improve the code performance. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bridge_loop_avoidance.c | 12 ++++++------ gateway_client.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 124a743..b7df579 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -863,25 +863,25 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, struct arphdr *arphdr; uint8_t *hw_src, *hw_dst; struct batadv_bla_claim_dst *bla_dst; - uint16_t proto; + __be16 proto; int headlen; unsigned short vid = BATADV_NO_FLAGS; int ret; ethhdr = eth_hdr(skb); - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (ethhdr->h_proto == __constant_htons(ETH_P_8021Q)) { vhdr = vlan_eth_hdr(skb); vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK; vid |= BATADV_VLAN_HAS_TAG; - proto = ntohs(vhdr->h_vlan_encapsulated_proto); + proto = vhdr->h_vlan_encapsulated_proto; headlen = sizeof(*vhdr); } else { - proto = ntohs(ethhdr->h_proto); + proto = ethhdr->h_proto; headlen = ETH_HLEN; } - if (proto != ETH_P_ARP) + if (proto != __constant_htons(ETH_P_ARP)) return 0; /* not a claim frame */ /* this must be a ARP frame. check if it is a claim. */ @@ -1375,7 +1375,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, ethhdr = (struct ethhdr *)(((uint8_t *)skb->data) + hdr_size); - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (ethhdr->h_proto == __constant_htons(ETH_P_8021Q)) { if (!pskb_may_pull(skb, hdr_size + VLAN_ETH_HLEN)) return 0; diff --git a/gateway_client.c b/gateway_client.c index f59e58d..3cf92f8 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -682,11 +682,11 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) /* check for bootp port */ if ((proto == __constant_htons(ETH_P_IP)) && - (ntohs(udphdr->dest) != 67)) + (udphdr->dest != __constant_htons(67))) return false; if ((proto == __constant_htons(ETH_P_IPV6)) && - (ntohs(udphdr->dest) != 547)) + (udphdr->dest != __constant_htons(547))) return false; return true; -- 1.8.1.5

1 0

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: access h_vlan_encapsulated_proto properly
by Antonio Quartulli 12 May '13

12 May '13

On Sun, May 12, 2013 at 03:25:10PM +0800, Marek Lindner wrote: > > On Tuesday, May 07, 2013 19:54:02 Antonio Quartulli wrote: > > > In the gateway code in case of VLAN tagged frame the ethhdr > > > pointer is moved forward by 4 bytes so that the offset of > > > h_proto in struct ethhdr matches the real > > > h_vlan_encapsulated_proto address in the skb. > > > > > > This trick is correct but the code is not easy to understand > > > and may lead to bugs in case of re-use of ethhdr for other > > > purposes. > > > > > > Use a standalone protocol variable and assign it accordingly > > > to the header type > > > > How about adding the key word "refactoring" somewhere into the subject line or > > the commit message ? > oky > > > > > > > > @@ -626,23 +626,29 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, > > > unsigned int *header_len) struct iphdr *iphdr; > > > struct ipv6hdr *ipv6hdr; > > > struct udphdr *udphdr; > > > + uint16_t proto; > > > > > > /* check for ethernet header */ > > > if (!pskb_may_pull(skb, *header_len + ETH_HLEN)) > > > return false; > > > ethhdr = (struct ethhdr *)skb->data; > > > + proto = ntohs(ethhdr->h_proto); > > > *header_len += ETH_HLEN; > > > > > > /* check for initial vlan header */ > > > - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { > > > + if (proto == ETH_P_8021Q) { > > > + struct vlan_ethhdr *vhdr; > > > + > > > > While we are refactoring I suggest to not ntohs() the protocol every time but > > the protocol constants. The compiler will replace the constants with the > > appropriate number during the compilation, thus saving us from a runtime > > operation every time we check a packet. > > > oh right. I did not think about it. I guess I have to use __constant_htons instead of the plain hntons. cheers, -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara

1 0

[B.A.T.M.A.N.] [Bonus-PATCH 10/9] batman-adv-devel: Don't overwrite batctl's CFLAGS
by Sven Eckelmann 12 May '13

12 May '13

The batctl makefile has CFLAGS which change the behavior of the compiler. This includes important things like the C-dialect used or whether the compiler can ignore aliasing problems during the optimization step. The OpenWRT build environment should not overwrite these settings without a good reason. Most of these reasons can probably directly be fixed upstream. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- batman-adv-devel/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index cad95c6..fb2c24a 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -65,9 +65,6 @@ MAKE_BATMAN_ADV_ARGS += \ REVISION="$(PKG_BATMAN_SHORTREV)" all MAKE_BATCTL_ARGS += \ - CFLAGS="$(TARGET_CFLAGS)" \ - CCFLAGS="$(TARGET_CFLAGS)" \ - OFLAGS="$(TARGET_CFLAGS)" \ REVISION="$(PKG_BATCTL_SHORTREV)" \ CC="$(TARGET_CC)" \ NODEBUG=1 \ -- 1.8.2.1

2 3

[B.A.T.M.A.N.] [PATCHv2] batman-adv: don't use call_rcu if not needed
by Antonio Quartulli 12 May '13

12 May '13

batadv_tt_global_entry_free_ref uses call_rcu to schedule a function which will only free the global entry itself. For this reason call_rcu is useless and kfree_rcu can be used to simplify the code. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - removed one useless container_of in compat.c compat.c | 9 +++++++++ translation-table.c | 20 ++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/compat.c b/compat.c index 1f3a39d..da556a4 100644 --- a/compat.c +++ b/compat.c @@ -27,6 +27,15 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) +void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu) +{ + struct batadv_tt_global_entry *global; + + global = container_of(rcu, struct batadv_tt_global_entry, common.rcu); + + kfree(global); +} + void batadv_free_rcu_gw_node(struct rcu_head *rcu) { struct batadv_gw_node *gw_node; diff --git a/translation-table.c b/translation-table.c index df6b5cd..44e7789 100644 --- a/translation-table.c +++ b/translation-table.c @@ -117,25 +117,17 @@ batadv_tt_local_entry_free_ref(struct batadv_tt_local_entry *tt_local_entry) kfree_rcu(tt_local_entry, common.rcu); } -static void batadv_tt_global_entry_free_rcu(struct rcu_head *rcu) -{ - struct batadv_tt_common_entry *tt_common_entry; - struct batadv_tt_global_entry *tt_global_entry; - - tt_common_entry = container_of(rcu, struct batadv_tt_common_entry, rcu); - tt_global_entry = container_of(tt_common_entry, - struct batadv_tt_global_entry, common); - - kfree(tt_global_entry); -} - +/** + * batadv_tt_global_entry_free_ref - decrement the refcounter for a + * tt_global_entry and possibly free it + * @tt_global_entry: the object to free + */ static void batadv_tt_global_entry_free_ref(struct batadv_tt_global_entry *tt_global_entry) { if (atomic_dec_and_test(&tt_global_entry->common.refcount)) { batadv_tt_global_del_orig_list(tt_global_entry); - call_rcu(&tt_global_entry->common.rcu, - batadv_tt_global_entry_free_rcu); + kfree_rcu(tt_global_entry, common.rcu); } } -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: access h_vlan_encapsulated_proto properly
by Antonio Quartulli 12 May '13

12 May '13

In the gateway code in case of VLAN tagged frame the ethhdr pointer is moved forward by 4 bytes so that the offset of h_proto in struct ethhdr matches the real h_vlan_encapsulated_proto address in the skb. This trick is correct but the code is not easy to understand and may lead to bugs in case of re-use of ethhdr for other purposes. Use a standalone protocol variable and assign it accordingly to the header type Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- gateway_client.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gateway_client.c b/gateway_client.c index 973f02d..8ea13e1 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -626,23 +626,29 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) struct iphdr *iphdr; struct ipv6hdr *ipv6hdr; struct udphdr *udphdr; + uint16_t proto; /* check for ethernet header */ if (!pskb_may_pull(skb, *header_len + ETH_HLEN)) return false; ethhdr = (struct ethhdr *)skb->data; + proto = ntohs(ethhdr->h_proto); *header_len += ETH_HLEN; /* check for initial vlan header */ - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (proto == ETH_P_8021Q) { + struct vlan_ethhdr *vhdr; + if (!pskb_may_pull(skb, *header_len + VLAN_HLEN)) return false; - ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN); + + vhdr = (struct vlan_ethhdr *)skb->data; + proto = ntohs(vhdr->h_vlan_encapsulated_proto); *header_len += VLAN_HLEN; } /* check for ip header */ - switch (ntohs(ethhdr->h_proto)) { + switch (proto) { case ETH_P_IP: if (!pskb_may_pull(skb, *header_len + sizeof(*iphdr))) return false; @@ -675,11 +681,11 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) *header_len += sizeof(*udphdr); /* check for bootp port */ - if ((ntohs(ethhdr->h_proto) == ETH_P_IP) && + if ((proto == ETH_P_IP) && (ntohs(udphdr->dest) != 67)) return false; - if ((ntohs(ethhdr->h_proto) == ETH_P_IPV6) && + if ((proto == ETH_P_IPV6) && (ntohs(udphdr->dest) != 547)) return false; -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCHv2 next 1/2] batman-adv: use VLAN_VID_MASK when printing the vid
by Antonio Quartulli 12 May '13

12 May '13

Introduced in 454b849c7de18a7b44eecebe889f5f3149d24780 ("batman-adv: print the VID properly") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index d575436..8bcffa5 100644 --- a/main.h +++ b/main.h @@ -175,7 +175,7 @@ enum batadv_vlan_flags { /* mask needed to extract the vlan ID (12bits) from a 16bits variable */ #define BATADV_VID_MASK 0x0FFF #define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ - (int)(vid & BATADV_VID_MASK) : -1) + (int)(vid & VLAN_VID_MASK) : -1) extern char batadv_routing_algo[]; extern struct list_head batadv_hardif_list; -- 1.8.1.5

2 3

Re: [B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. 802.11s)
by ajeet singh 12 May '13

12 May '13

Hello All, Thanks a lot for reply. After applying patch http://www.spinics.net/lists/linux-wireless/msg107080.html , I am able to run batman-adv and 802.11s on top of the same wireless chipset (One after another). I am using Atheros-AR9271 chipsets (ath9k_htc) for my tests. I am getting good ping latency in both cases IBSS (Batman-adv) and mesh mode (802.11s), but latency fluctuation is there in the case of mesh mode. 802.11s gives around 15 mbps between two nodes but there is unexpected throughput result in the case of batman-adv. It’s coming in kbps sometimes. As I have tested batman-adv with different chipsets and got pretty good throughput around 30 mbps. I suspect there may be something with ath9k_htc driver and batman-adv compatibility. I will be investigating the problem in details. Please let me know if you people have any information related to this problem. Thanks for providing the paper URL (http://wwwtlc.iet.unipi.it/research/ggt-iswpc10.pdf), but this paper is a quite old and within 2 years, both protocols have evolved a lot. Thanks Ajeet On Sat, May 11, 2013 at 3:30 PM, <b.a.t.m.a.n-request(a)lists.open-mesh.org> wrote: > Send B.A.T.M.A.N mailing list submissions to > b.a.t.m.a.n(a)lists.open-mesh.org > > To subscribe or unsubscribe via the World Wide Web, visit > https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n > or, via email, send a message with subject or body 'help' to > b.a.t.m.a.n-request(a)lists.open-mesh.org > > You can reach the person managing the list at > b.a.t.m.a.n-owner(a)lists.open-mesh.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of B.A.T.M.A.N digest..." > > > Today's Topics: > > 1. Re: Performance Comparison (Batman-adv. vs. 802.11s) > (Linus L?ssing) > 2. Re: Performance Comparison (Batman-adv. vs. 802.11s) > (Thomas Pedersen) > 3. Re: Performance Comparison (Batman-adv. vs. 802.11s) > (Yeoh Chun-Yeow) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Fri, 10 May 2013 15:07:06 +0200 > From: Linus L?ssing <linus.luessing(a)web.de> > To: The list for a Better Approach To Mobile Ad-hoc Networking > <b.a.t.m.a.n(a)lists.open-mesh.org> > Subject: Re: [B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. > 802.11s) > Message-ID: <20130510130706.GA11726@Linus-Debian> > Content-Type: text/plain; charset=utf-8 > > Hi Ajeet, > > As far as I know it is not possible to have a virtual 802.11s mesh > and an IBSS interface at the same time with the ath5k/ath9k (at least > I think that was the case during the Wireless BattleMesh v6). You > might need to run tests one after the other or you could try to make > the ath5k/9k VAP patches [1],[2],[3] to not only work for IBSS but > also mesh mode. > > Cheers, Linus > > [1]: openwrt/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch > [2]: openwrt/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch > [3]: openwrt/package/mac80211/patches/412-mac80211_allow_adhoc_and_ap.patch > > > On Fri, May 10, 2013 at 08:56:27AM +0530, ajeet singh wrote: >> Dear all, >> >> I have done the set-up of Batman-adv. and 802.11s in my lab. >> I am comparing their working functionalities and performance >> measurements (throughput etc.). >> >> Have anyone tested batman-adv. and 802.11s with same test setup (I >> mean with same wireless chipsets)? >> >> Please provide me any related URLs. >> >> Thanks in advance. >> >> Thanks >> Ajeet > > > ------------------------------ > > Message: 2 > Date: Fri, 10 May 2013 16:40:44 -0700 > From: Thomas Pedersen <thomas(a)cozybit.com> > To: The list for a Better Approach To Mobile Ad-hoc Networking > <b.a.t.m.a.n(a)lists.open-mesh.org> > Subject: Re: [B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. > 802.11s) > Message-ID: > <CAG6hwVNYGxnO4rJoxBS387U0wuMEOnxLram4ZNq5rW4Ybx2SeQ(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > Hi Ajeet, > > This should be possible with the patches Linus posted, but you'll > probably need the one at > http://www.spinics.net/lists/linux-wireless/msg107080.html as well. > > On Fri, May 10, 2013 at 6:07 AM, Linus L?ssing <linus.luessing(a)web.de> wrote: >> Hi Ajeet, >> >> As far as I know it is not possible to have a virtual 802.11s mesh >> and an IBSS interface at the same time with the ath5k/ath9k (at least >> I think that was the case during the Wireless BattleMesh v6). You >> might need to run tests one after the other or you could try to make >> the ath5k/9k VAP patches [1],[2],[3] to not only work for IBSS but >> also mesh mode. >> >> Cheers, Linus >> >> [1]: openwrt/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch >> [2]: openwrt/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch >> [3]: openwrt/package/mac80211/patches/412-mac80211_allow_adhoc_and_ap.patch >> >> >> On Fri, May 10, 2013 at 08:56:27AM +0530, ajeet singh wrote: >>> Dear all, >>> >>> I have done the set-up of Batman-adv. and 802.11s in my lab. >>> I am comparing their working functionalities and performance >>> measurements (throughput etc.). >>> >>> Have anyone tested batman-adv. and 802.11s with same test setup (I >>> mean with same wireless chipsets)? >>> >>> Please provide me any related URLs. >>> >>> Thanks in advance. >>> >>> Thanks >>> Ajeet > > > > -- > Thomas > > > ------------------------------ > > Message: 3 > Date: Sat, 11 May 2013 11:59:21 +0800 > From: Yeoh Chun-Yeow <yeohchunyeow(a)gmail.com> > To: The list for a Better Approach To Mobile Ad-hoc Networking > <b.a.t.m.a.n(a)lists.open-mesh.org> > Subject: Re: [B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. > 802.11s) > Message-ID: > <CAEFj985diyOZstxbb5chNPXxQz4mswsaWPhD5_LqBfATuic4fQ(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > Hi, Ajeet > > You can take a look on this paper [1] published in year 2010. > > [1] http://wwwtlc.iet.unipi.it/research/ggt-iswpc10.pdf > > ---- > Chun-Yeow > > > ------------------------------ > > Subject: Digest Footer > > _______________________________________________ > B.A.T.M.A.N mailing list > B.A.T.M.A.N(a)lists.open-mesh.org > https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n > > > ------------------------------ > > End of B.A.T.M.A.N Digest, Vol 77, Issue 12 > ******************************************* -- Thanks Ajeet

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2013