B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] (no subject)
by Antonio Quartulli 20 Oct '13

20 Oct '13

Hello David, this is another batch intended for net-next/linux-3.13. This pull request is a bit bigger than usual, but 6 patches are very small (three of them are about email updates).. Patch 1 is fixing a previous merge conflict resolution that went wrong (I realised that only now while checking other patches..). Patches from 2 to 4 that are updating our emails in all the proper files (Documentation/, headers and MAINTAINERS). Patches 5, 6 and 7 are bringing a big improvement to the TranslationTable component: it is now able to group non-mesh clients based on the VLAN they belong to. In this way a lot a new enhancements are now possible thanks to the fact that each batman-adv behaviour can be applied on a per VLAN basis. And, of course, in patches from 8 to 12 you have some of the enhancements I was talking about: - make the batman-Gateway selection VLAN dependent - make DAT (Distributed ARP Table) group ARP entries on a VLAN basis (this allows DAT to work even when the admin decided to use the same IP subnet on different VLANs) - make the AP-Isolation behaviour switchable on each VLAN independently - export VLAN specific attributes via sysfs. Switches like the AP-Isolation are now exported once per VLAN (backward compatibility of the sysfs interface has been preserved) Patches 13 and 14 are small code cleanups. Patch 15 is a minor improvement in the TT locking mechanism. Patches 16 and 17 are other enhancements to the TT component. Those allow a node to parse a "non-mesh client announcement message" and accept only those TT entries belonging to certain VLANs. Patch 18 exploits this parse&accept mechanism to make the Bridge Loop Avoidance component reject only TT entries connected to the VLAN where it is operating. Previous to this change, BLA was rejecting all the entries coming from any other Backbone node, regardless of the VLAN (for more details about how the Bridge Loop Avoidance works please check [1]). Please pull or let me know of any problem. Thanks a lot, Antonio [1] http://www.open-mesh.org/projects/batman-adv/wiki/Bridge-loop-avoidance-II The following changes since commit b1eda2ac3fa6bf23b27c7c70eda6885124c79ed3: em_ipset: use dev_net() accessor (2013-10-18 16:23:06 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to cfd4f75701b6b13b1ec74e6f65ad0d1969c19247: batman-adv: make the backbone gw check VLAN specific (2013-10-19 23:25:38 +0200) ---------------------------------------------------------------- Included changed: - email addresses update in documentation, source files and MAINTAINERS - make the TT component distinguish non-mesh clients based on the VLAN they belong to - improve all the internal components to properly work on a per-VLAN basis (enabled by the new TT-VLAN feature) - enhance the sysfs interface in order to provide behaviour switches on a per-VLAN basis (enabled by the new TT-VLAN feature) - improve TT lock mechanism - improve unicast transmission APIs ---------------------------------------------------------------- Antonio Quartulli (15): batman-adv: check skb preparation return value batman-adv: update email address for Antonio Quartulli batman-adv: add the VLAN ID attribute to the TT entry batman-adv: use vid when computing local and global TT CRC batman-adv: print the VID together with the TT entries batman-adv: make the GW module correctly talk to the new VLAN-TT batman-adv: make the Distributed ARP Table vlan aware batman-adv: add per VLAN interface attribute framework batman-adv: add sysfs framework for VLAN batman-adv: make the AP isolation attribute VLAN specific batman-adv: remove bogus comment batman-adv: lock around TT operations to avoid sending inconsistent data batman-adv: make the TT CRC logic VLAN specific batman-adv: make the TT global purge routine VLAN specific batman-adv: make the backbone gw check VLAN specific Linus Lüssing (1): batman-adv: refine API calls for unicast transmissions of SKBs Marek Lindner (1): batman-adv: update email address for Marek Lindner Simon Wunderlich (1): batman-adv: update email address for Simon Wunderlich .../ABI/testing/sysfs-class-net-batman-adv | 4 +- Documentation/ABI/testing/sysfs-class-net-mesh | 23 +- Documentation/networking/batman-adv.txt | 4 +- MAINTAINERS | 2 +- net/batman-adv/bridge_loop_avoidance.c | 58 +- net/batman-adv/bridge_loop_avoidance.h | 10 +- net/batman-adv/distributed-arp-table.c | 160 ++- net/batman-adv/gateway_client.c | 25 +- net/batman-adv/hard-interface.c | 2 + net/batman-adv/main.c | 33 +- net/batman-adv/main.h | 15 +- net/batman-adv/originator.c | 104 +- net/batman-adv/originator.h | 7 + net/batman-adv/packet.h | 32 +- net/batman-adv/routing.c | 28 +- net/batman-adv/send.c | 98 +- net/batman-adv/send.h | 51 +- net/batman-adv/soft-interface.c | 227 +++- net/batman-adv/soft-interface.h | 4 + net/batman-adv/sysfs.c | 178 ++- net/batman-adv/sysfs.h | 10 + net/batman-adv/translation-table.c | 1157 +++++++++++++++----- net/batman-adv/translation-table.h | 23 +- net/batman-adv/types.h | 83 +- 24 files changed, 1851 insertions(+), 487 deletions(-)

2 20

[B.A.T.M.A.N.] [PATCH next] batman-adv: fix typ0s in comment and kerneldoc
by Antonio Quartulli 19 Oct '13

19 Oct '13

Introduced by 21a57f6e7a3b4455dfe68ee07a7b901d9e7f200b ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- translation-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index 5750c88..4add57d 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2181,7 +2181,7 @@ static int batadv_tt_global_valid(const void *entry_ptr, } /** - * batadv_tt_tvlv_generate - fill the tvlv buff it with the tt entries from the + * batadv_tt_tvlv_generate - fill the tvlv buff with the tt entries from the * specified tt hash * @bat_priv: the bat priv with all the soft interface information * @hash: hash table containing the tt entries @@ -2359,7 +2359,7 @@ static int batadv_send_tt_request(struct batadv_priv *bat_priv, tvlv_tt_data->num_vlan = htons(num_vlan); /* send all the CRCs within the request. This is needed by intermediate - * node to ensure they have the correct table before replying + * nodes to ensure they have the correct table before replying */ tt_vlan_req = (struct batadv_tvlv_tt_vlan_data *)(tvlv_tt_data + 1); for (i = 0; i < num_vlan; i++) { -- 1.8.4

2 1

[B.A.T.M.A.N.] [PATCH next] batman-adv: fix typ0 in kernel doc
by Antonio Quartulli 19 Oct '13

19 Oct '13

Introduced by 9a40777e03bb2710a4f716867b2153257098972f ("batman-adv: make the GW module correctly talk to the new VLAN-TT") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- gateway_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gateway_client.c b/gateway_client.c index 7299936..2449afa 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -722,7 +722,7 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) } /** - * batadv_gw_out_of_range - check if the dhcp request destination the best gw + * 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 * @skb: the outgoing packet * -- 1.8.4

2 1

[B.A.T.M.A.N.] [PATCH next] batman-adv: fix arguments order when calling tt_local_add
by Antonio Quartulli 19 Oct '13

19 Oct '13

Introduced by c018ad3de61a1dc4194879a53e5559e094aa7b1a ("batman-adv: add the VLAN ID attribute to the TT entry") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- soft-interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index a1f00e8..36f0508 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -120,8 +120,8 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) { batadv_tt_local_remove(bat_priv, old_addr, BATADV_NO_FLAGS, "mac address changed", false); - batadv_tt_local_add(dev, addr->sa_data, BATADV_NULL_IFINDEX, - BATADV_NO_FLAGS); + batadv_tt_local_add(dev, addr->sa_data, BATADV_NO_FLAGS, + BATADV_NULL_IFINDEX); } return 0; -- 1.8.4

2 1

[B.A.T.M.A.N.] pull request: batman-adv 2013-10-13
by Antonio Quartulli 17 Oct '13

17 Oct '13

Hello David, this is our second pull request intended for net-next/linux-3.13. The most important piece in this patchset is the new packet fragmentation code implemented by Martin Hundebøll during his Google Summer of Code 2012[1]. This code is entirely substituting the current fragmentation mechanism. Other than this you have: - the creation of a common BAT ICMP header which makes the ICMP subsystem more flexible and extensible - the addition of a dummy rx mode handler for the soft-interface which allows users to set static multicast listeners - some minor improvements and code cleanups Please pull or let me know of any problem. Thank you very much, Antonio [1] http://www.open-mesh.org/projects/batman-adv/wiki/Fragmentation The following changes since commit ccdbb6e96beca362db876d820ac1e560ff6d9579: tcp: tcp_transmit_skb() optimizations (2013-10-11 17:48:18 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to a4deee1ad42d93746562fe7de2149729017e3fd1: batman-adv: Add dummy soft-interface rx mode handler (2013-10-12 17:17:12 +0200) ---------------------------------------------------------------- Included changes: - ensure RecordRoute information is added to BAT_ICMP echo_request/reply only - use VLAN_ETH_HLEN when possible - use htons when possible - substitute old fragmentation code with a new improved implementation by Martin Hundebøll - create common header for BAT_ICMP packets to improve extendibility - consider the network coding overhead when computing the overall room needed by batman headers - add dummy soft-interface rx mode handler - minor code refactoring and cleanups ---------------------------------------------------------------- Antonio Quartulli (9): batman-adv: make tt_global_add static and return bool batman-adv: remove batadv_tt_global_add_orig declaration batman-adv: don't use call_rcu if not needed batman-adv: h_vlan_encapsulated_proto access refactoring batman-adv: use VLAN_ETH_HLEN instead of sizeof(struct vlan_eth_hdr) batman-adv: use htons when possible batman-adv: create common header for ICMP packets batman-adv: implement batadv_tt_entries batman-adv: make batadv_tt_save_orig_buffer() generic Linus Lüssing (1): batman-adv: Add dummy soft-interface rx mode handler Marek Lindner (1): batman-adv: consider network coding overhead when calculating required mtu 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 Simon Wunderlich (2): batman-adv: only add recordroute information to icmp request/reply batman-adv: remove useless find_router look up net/batman-adv/Makefile | 2 +- net/batman-adv/bridge_loop_avoidance.c | 14 +- net/batman-adv/distributed-arp-table.c | 11 +- net/batman-adv/fragmentation.c | 491 +++++++++++++++++++++++++++++++++ net/batman-adv/fragmentation.h | 50 ++++ net/batman-adv/gateway_client.c | 23 +- net/batman-adv/hard-interface.c | 22 +- net/batman-adv/icmp_socket.c | 22 +- net/batman-adv/main.c | 37 ++- net/batman-adv/main.h | 10 + net/batman-adv/originator.c | 19 +- net/batman-adv/packet.h | 79 ++++-- net/batman-adv/routing.c | 185 ++++++------- net/batman-adv/routing.h | 4 +- net/batman-adv/send.c | 186 ++++++++++++- net/batman-adv/send.h | 40 +++ net/batman-adv/soft-interface.c | 34 ++- net/batman-adv/translation-table.c | 63 +++-- net/batman-adv/translation-table.h | 7 - net/batman-adv/types.h | 70 +++-- net/batman-adv/unicast.c | 491 --------------------------------- net/batman-adv/unicast.h | 92 ------ 22 files changed, 1105 insertions(+), 847 deletions(-) create mode 100644 net/batman-adv/fragmentation.c create mode 100644 net/batman-adv/fragmentation.h delete mode 100644 net/batman-adv/unicast.c delete mode 100644 net/batman-adv/unicast.h

2 17

[B.A.T.M.A.N.] batman-adv 2013.4.0 released
by Marek Lindner 16 Oct '13

16 Oct '13

On October 16th, B.A.T.M.A.N. has released batman-adv 2013.4.0, the newest in a series of stability and bugfix releases. The recently introduced data distribution daemon 'alfred' received quite some attention and gained new features. As the kernel module always depends on the Linux kernel it was compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: http://downloads.open-mesh.org/batman/releases/batman-adv-2013.4.0/ as well as prepackaged binaries in your distribution. Thanks ------ Thanks to all people sending in patches: * Andrew Lunn <andrew(a)lunn.ch> * Antonio Quartulli <ordex(a)autistici.org> * Linus Lüssing <linus.luessing(a)web.de> * Marco Dalla Torre <marco.dallato(a)gmail.com> * Marek Lindner <mareklindner(a)neomailbox.ch> * Matthias Schiffer <mschiffer(a)universe-factory.net> * Simon Wunderlich <sw(a)simonwunderlich.de> * Sven Eckelmann <sven(a)open-mesh.com> * Wedson Almeida Filho <wedsonaf(a)gmail.com> batman-adv ---------- With this release comes a fix for a kernel crash running on hardware with specific Ethernet chips triggering a rare code path when forwarding traffic. A fix for the network coding initialization was submitted to allow to create multiple batX interfaces when this feature has been included in the module. The bridge loop avoidance now correctly handles VLAN tags (a regression introduced with the previous release). Additional Linux kernel backward compatibility code enables batman-adv to run on various kernel versions. batctl ------ The incorrectly reported TCP payload length in the tcpdump component was fixed. The hyphens in the manpage were properly escaped to be groff compliant. C types and error handling were improved to better handle some error cases. alfred ------ In order to allow a mesh topology visualization with true geographic layout alfred was enriched with a location service based on libgpsd. In addition to retrieving the location via GPS on mobile nodes alfred can be configured with a static location on stationary nodes to be announced in the network. A new JSON output format for the vis service was added. The newly added format is JSON compliant throughout an entire message, in contrast to the "legacy" per-line JSON output. Alfred also learned to be tolerant to vanishing/reappearing interfaces and to switch its operation mode (slave/master) without the need for a restart or losing cached information. To avoid conflicts in distributions with other "vis" binaries (like the batmand vis), the binary was renamed to "batadv-vis". Manpages have been added to help documenting the growing functionality. Also various code/build system cleanups and bugfixes have been integrated. Happy routing, The B.A.T.M.A.N. team

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: generalize batman-adv icmp packet handling
by Simon Wunderlich 16 Oct '13

16 Oct '13

Instead of handling icmp packets only up to length of icmp_packet_rr, the code should handle any icmp length size. Therefore the length truncating is moved to when the packet is actually sent to userspace (this does not support lengths longer than icmp_packet_rr yet). Longer packets are forwarded without truncating. This patch also cleans up some parts where the icmp header struct could be used instead of other icmp_packet(_rr) structs to make the code more readable. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- icmp_socket.c | 38 ++++++++++++++++++++------- icmp_socket.h | 2 +- routing.c | 80 +++++++++++++++++++++++++++++++++++---------------------- 3 files changed, 79 insertions(+), 41 deletions(-) diff --git a/icmp_socket.c b/icmp_socket.c index 82ac647..3c1125e 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -29,7 +29,7 @@ static struct batadv_socket_client *batadv_socket_client_hash[256]; static void batadv_socket_add_packet(struct batadv_socket_client *socket_client, - struct batadv_icmp_packet_rr *icmp_packet, + struct batadv_icmp_header *icmph, size_t icmp_len); void batadv_socket_init(void) @@ -211,7 +211,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (icmp_packet->icmph.header.version != BATADV_COMPAT_VERSION) { icmp_packet->icmph.msg_type = BATADV_PARAMETER_PROBLEM; icmp_packet->icmph.header.version = BATADV_COMPAT_VERSION; - batadv_socket_add_packet(socket_client, icmp_packet, + batadv_socket_add_packet(socket_client, &icmp_packet->icmph, packet_len); goto free_skb; } @@ -245,7 +245,8 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, dst_unreach: icmp_packet->icmph.msg_type = BATADV_DESTINATION_UNREACHABLE; - batadv_socket_add_packet(socket_client, icmp_packet, packet_len); + batadv_socket_add_packet(socket_client, &icmp_packet->icmph, + packet_len); free_skb: kfree_skb(skb); out: @@ -298,19 +299,32 @@ err: return -ENOMEM; } +/** + * batadv_socket_receive_packet - schedule an icmp packet to be sent to userspace + * on an icmp socket. + * @socket_client: the socket this packet belongs to + * @icmph: pointer to the header of the icmp packet + * @icmp_len: total length of the icmp packet + */ static void batadv_socket_add_packet(struct batadv_socket_client *socket_client, - struct batadv_icmp_packet_rr *icmp_packet, + struct batadv_icmp_header *icmph, size_t icmp_len) { struct batadv_socket_packet *socket_packet; + size_t len; socket_packet = kmalloc(sizeof(*socket_packet), GFP_ATOMIC); if (!socket_packet) return; + len = icmp_len; + /* check the maximum length before filling the buffer */ + if (len > sizeof(socket_packet->icmp_packet)) + len = sizeof(socket_packet->icmp_packet); + INIT_LIST_HEAD(&socket_packet->list); - memcpy(&socket_packet->icmp_packet, icmp_packet, icmp_len); + memcpy(&socket_packet->icmp_packet, icmph, icmp_len); socket_packet->icmp_len = icmp_len; spin_lock_bh(&socket_client->lock); @@ -318,7 +332,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->icmph.uid]) { + if (!batadv_socket_client_hash[icmph->uid]) { spin_unlock_bh(&socket_client->lock); kfree(socket_packet); return; @@ -342,12 +356,18 @@ static void batadv_socket_add_packet(struct batadv_socket_client *socket_client, wake_up(&socket_client->queue_wait); } -void batadv_socket_receive_packet(struct batadv_icmp_packet_rr *icmp_packet, +/** + * batadv_socket_receive_packet - schedule an icmp packet to be received + * locally and sent to userspace. + * @icmph: pointer to the header of the icmp packet + * @icmp_len: total length of the icmp packet + */ +void batadv_socket_receive_packet(struct batadv_icmp_header *icmph, size_t icmp_len) { struct batadv_socket_client *hash; - hash = batadv_socket_client_hash[icmp_packet->icmph.uid]; + hash = batadv_socket_client_hash[icmph->uid]; if (hash) - batadv_socket_add_packet(hash, icmp_packet, icmp_len); + batadv_socket_add_packet(hash, icmph, icmp_len); } diff --git a/icmp_socket.h b/icmp_socket.h index 1fcca37..6665080 100644 --- a/icmp_socket.h +++ b/icmp_socket.h @@ -24,7 +24,7 @@ void batadv_socket_init(void); int batadv_socket_setup(struct batadv_priv *bat_priv); -void batadv_socket_receive_packet(struct batadv_icmp_packet_rr *icmp_packet, +void batadv_socket_receive_packet(struct batadv_icmp_header *icmph, size_t icmp_len); #endif /* _NET_BATMAN_ADV_ICMP_SOCKET_H_ */ diff --git a/routing.c b/routing.c index 71fba14..eea4c04 100644 --- a/routing.c +++ b/routing.c @@ -260,19 +260,30 @@ bool batadv_check_management_packet(struct sk_buff *skb, return true; } +/** + * batadv_recv_my_icmp_packet - receive an icmp packet locally + * @bat_priv: the bat priv with all the soft interface information + * @skb: icmp packet to process + * + * Returns NET_RX_SUCCESS if the packet has been consumed or NET_RX_DROP + * otherwise. + */ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, - struct sk_buff *skb, size_t icmp_len) + struct sk_buff *skb) { struct batadv_hard_iface *primary_if = NULL; struct batadv_orig_node *orig_node = NULL; - struct batadv_icmp_packet_rr *icmp_packet; + struct batadv_icmp_header *icmph; int ret = NET_RX_DROP; - icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; + icmph = (struct batadv_icmp_header *)skb->data; /* add data to device queue */ - if (icmp_packet->icmph.msg_type != BATADV_ECHO_REQUEST) { - batadv_socket_receive_packet(icmp_packet, icmp_len); + if (icmph->msg_type != BATADV_ECHO_REQUEST) { + if (skb_linearize(skb) < 0) + goto out; + + batadv_socket_receive_packet(icmph, skb->len); goto out; } @@ -282,7 +293,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->icmph.orig); + orig_node = batadv_orig_hash_find(bat_priv, icmph->orig); if (!orig_node) goto out; @@ -290,13 +301,12 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, if (skb_cow(skb, ETH_HLEN) < 0) goto out; - icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; + icmph = (struct batadv_icmp_header *)skb->data; - memcpy(icmp_packet->icmph.dst, icmp_packet->icmph.orig, ETH_ALEN); - memcpy(icmp_packet->icmph.orig, primary_if->net_dev->dev_addr, - ETH_ALEN); - icmp_packet->icmph.msg_type = BATADV_ECHO_REPLY; - icmp_packet->icmph.header.ttl = BATADV_TTL; + memcpy(icmph->dst, icmph->orig, ETH_ALEN); + memcpy(icmph->orig, primary_if->net_dev->dev_addr, ETH_ALEN); + icmph->msg_type = BATADV_ECHO_REPLY; + icmph->header.ttl = BATADV_TTL; if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP) ret = NET_RX_SUCCESS; @@ -363,16 +373,13 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if) { struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); - struct batadv_icmp_packet_rr *icmp_packet; + struct batadv_icmp_header *icmph; + struct batadv_icmp_packet_rr *icmp_packet_rr; struct ethhdr *ethhdr; struct batadv_orig_node *orig_node = NULL; - int hdr_size = sizeof(struct batadv_icmp_packet); + int hdr_size = sizeof(struct batadv_icmp_header); int ret = NET_RX_DROP; - /* we truncate all incoming icmp packets if they don't match our size */ - if (skb->len >= sizeof(struct batadv_icmp_packet_rr)) - hdr_size = sizeof(struct batadv_icmp_packet_rr); - /* drop packet if it has not necessary minimum size */ if (unlikely(!pskb_may_pull(skb, hdr_size))) goto out; @@ -391,28 +398,39 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest)) goto out; - icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; + icmph = (struct batadv_icmp_header *)skb->data; /* add record route information if not full */ - if ((icmp_packet->icmph.msg_type == BATADV_ECHO_REPLY || - icmp_packet->icmph.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]), + if ((icmph->msg_type == BATADV_ECHO_REPLY || + icmph->msg_type == BATADV_ECHO_REQUEST) && + (skb->len >= sizeof(struct batadv_icmp_packet_rr))) { + if (skb_linearize(skb) < 0) + goto out; + + /* create a copy of the skb, if needed, to modify it. */ + if (skb_cow(skb, ETH_HLEN) < 0) + goto out; + + icmph = (struct batadv_icmp_header *)skb->data; + icmp_packet_rr = (struct batadv_icmp_packet_rr *)icmph; + if (icmp_packet_rr->rr_cur >= BATADV_RR_LEN) + goto out; + + memcpy(&(icmp_packet_rr->rr[icmp_packet_rr->rr_cur]), ethhdr->h_dest, ETH_ALEN); - icmp_packet->rr_cur++; + icmp_packet_rr->rr_cur++; } /* packet for me */ - if (batadv_is_my_mac(bat_priv, icmp_packet->icmph.dst)) - return batadv_recv_my_icmp_packet(bat_priv, skb, hdr_size); + if (batadv_is_my_mac(bat_priv, icmph->dst)) + return batadv_recv_my_icmp_packet(bat_priv, skb); /* TTL exceeded */ - if (icmp_packet->icmph.header.ttl < 2) + if (icmph->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->icmph.dst); + orig_node = batadv_orig_hash_find(bat_priv, icmph->dst); if (!orig_node) goto out; @@ -420,10 +438,10 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, if (skb_cow(skb, ETH_HLEN) < 0) goto out; - icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; + icmph = (struct batadv_icmp_header *)skb->data; /* decrement ttl */ - icmp_packet->icmph.header.ttl--; + icmph->header.ttl--; /* route it */ if (batadv_send_skb_to_orig(skb, orig_node, recv_if) != NET_XMIT_DROP) -- 1.7.10.4

3 4

[B.A.T.M.A.N.] [PATCH] batctl: Fix warning about comparing signed vs. unsigned
by Sven Eckelmann 15 Oct '13

15 Oct '13

The macros NLMSG_OK and NLMSG_NEXT operate on the parameter len as if it would be a variable from the type size_t. Using ssize_t (signed size_t) can cause warnings about comparing a signed with an unsigned variable. It is ok to store the signed len variable in an unsigned variable because an check is used to stop processing when it was negative. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> --- functions.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functions.c b/functions.c index d8d86ce..9e03e72 100644 --- a/functions.c +++ b/functions.c @@ -637,7 +637,7 @@ static struct ether_addr *resolve_mac_from_cache(int ai_family, size_t buflen; struct nlmsghdr *nh; ssize_t len; - size_t l3_len; + size_t l3_len, mlen; int socknl; int parsed; int finished = 0; @@ -667,8 +667,9 @@ static struct ether_addr *resolve_mac_from_cache(int ai_family, len = resolve_mac_from_cache_dump(socknl, &buf, &buflen); if (len < 0) goto err_sock; + mlen = len; - for (nh = buf; NLMSG_OK(nh, len); nh = NLMSG_NEXT(nh, len)) { + for (nh = buf; NLMSG_OK(nh, mlen); nh = NLMSG_NEXT(nh, mlen)) { if (nh->nlmsg_type == NLMSG_DONE) { finished = 1; break; -- 1.8.4.rc3

2 1

[B.A.T.M.A.N.] [PATCHv2 0/4] Introduce the SYNCHRONIZED TT flags
by Antonio Quartulli 14 Oct '13

14 Oct '13

Hello list, as some of you may know, each TT client store in a node local/global table is also accompanied by a set of flags some of which are of global interest (every node in the network needs to know if this flag is set or not). However it may happen that a flag may be unset (or set) after that a TT client has already be announced. With the current implementation there is no way for the nodes to detect this event and to react accordingly. With this patchset we introduce all those means needed to synchronize a selected subset of TT flags among the network. Flags belonging to this set are the "Synchronized TT flags". Right now only the WIFI flag belongs to this set, but another on is already planned to be added soonish. Cheers, [This patchset is based on top of origin/simon/network-wide-multiif] Antonio Quartulli (4): batman-adv: don't switch byte order too often if not needed batman-adv: invoke dev_get_by_index() outside of is_wifi_iface() batman-adv: improve the TT component to support runtime flag changes batman-adv: include the synch-flags when compute the global/local table CRC hard-interface.c | 31 +++---------------------------- hard-interface.h | 1 - packet.h | 17 +++++++++++++++-- routing.c | 8 +++++--- translation-table.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 73 insertions(+), 36 deletions(-) -- 1.8.3.2

2 10

[B.A.T.M.A.N.] [PATCH] batman-adv: properly rename define in distributed arp table header file
by Antonio Quartulli 14 Oct '13

14 Oct '13

Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- distributed-arp-table.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 60d853b..79a078b 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -17,8 +17,8 @@ * 02110-1301, USA */ -#ifndef _NET_BATMAN_ADV_ARP_H_ -#define _NET_BATMAN_ADV_ARP_H_ +#ifndef _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ +#define _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ #ifdef CONFIG_BATMAN_ADV_DAT @@ -169,4 +169,4 @@ static inline void batadv_dat_inc_counter(struct batadv_priv *bat_priv, #endif /* CONFIG_BATMAN_ADV_DAT */ -#endif /* _NET_BATMAN_ADV_ARP_H_ */ +#endif /* _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ */ -- 1.8.3.2

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N