commits October 2013

commits@lists.open-mesh.org

1 participants
109 discussions

[linux-merge]linux integration; annotated tag, v3.12-rc7, created. v3.12-rc7

by postmaster＠open-mesh.org

The annotated tag, v3.12-rc7 has been created at af03676423fe9b4beefafcb8cd4a80164d4b0bd7 (tag) tagging 959f58544b7f20c92d5eb43d1232c96c15c01bfb (commit) replaces v3.12-rc6 tagged by Linus Torvalds on Sun Oct 27 16:12:14 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.12-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQEcBAABAgAGBQJSbZ3OAAoJEHm+PkMAQRiGHL4H/i8j7VKaIU5Jh7Y4anC692yP pjZt2wySFeXuZOh8RYpzRicNg58IN4rlMLpuYKJVC+78/e8ToXm/TCo92HNGHXKH mnMFWPzVllnt8hwFn22jJcwp4KhFTORCANjhHzUJt4VWWVpzutr15elMsizz2PFz zt3Y65ADX1Tjv7WQ1TG4d28Uui0nZN9Tyjoz0VpqgUr7L0Y6k73dg68iUqFlABWf KyduRP5lZIV8dv2OvO8j8MW7ONgVpeLG7LGmz+jCGaloNzai9TSR72JSOAxDrLCT 5P4NTixAI00QX1EfAlNdZ9m3c3eKyXx9312TWspgfuCF+gqLejXeSig98Dxx2f8= =Evwk -----END PGP SIGNATURE----- Matthias Schiffer (1): batman-adv: set up network coding packet handlers during module init ----------------------------------------------------------------------- -- linux integration

9 years, 7 months

[batctl] master's head updated: batctl: Finish resolving of mac address early (7cd9934)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: ef41a8d batctl: Fix static buffer for resolved mac adddress 7cd9934 batctl: Finish resolving of mac address early

9 years, 7 months

[batctl] next: batctl: Finish resolving of mac address early (7cd9934)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 7cd993422760d6ec1a2de29541afce48daa51706 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 15 18:01:09 2013 +0200 batctl: Finish resolving of mac address early It is not necessary to check the remaining msg buffer coming from the kernel when already the correct mac address was found. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 7cd993422760d6ec1a2de29541afce48daa51706 functions.c | 1 + 1 file changed, 1 insertion(+) diff --git a/functions.c b/functions.c index 959784b..f2b23f2 100644 --- a/functions.c +++ b/functions.c @@ -683,6 +683,7 @@ static struct ether_addr *resolve_mac_from_cache(int ai_family, if (parsed) { if (memcmp(&l3addr_tmp, l3addr, l3_len) == 0) { mac_result = &mac_tmp; + finished = 1; break; } }

9 years, 7 months

[batctl] next: batctl: Fix static buffer for resolved mac adddress (ef41a8d)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit ef41a8dff85ab2f9ecc64584ad3dee1262642cb9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 15 18:01:08 2013 +0200 batctl: Fix static buffer for resolved mac adddress The resolve_mac_* functions are currently not reentrant-safe because they are using ether_aton. Thus all functions returning a mac address in a similar way must also ensure that their data is in a statically allocated buffer and not on a stack. resolve_mac_from_cache did that for the wrong buffer. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ef41a8dff85ab2f9ecc64584ad3dee1262642cb9 functions.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions.c b/functions.c index 9e03e72..959784b 100644 --- a/functions.c +++ b/functions.c @@ -630,8 +630,8 @@ static int resolve_mac_from_cache_parse(struct ndmsg *ndmsg, size_t len_payload, static struct ether_addr *resolve_mac_from_cache(int ai_family, const void *l3addr) { - static uint8_t l3addr_tmp[16]; - struct ether_addr mac_tmp; + uint8_t l3addr_tmp[16]; + static struct ether_addr mac_tmp; struct ether_addr *mac_result = NULL; void *buf = NULL; size_t buflen;

9 years, 7 months

[batctl] master's head updated: batctl: generalize batman-adv icmp packet handling (33a35ac)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 33a35ac batctl: generalize batman-adv icmp packet handling

9 years, 7 months

[batctl] next: batctl: generalize batman-adv icmp packet handling (33a35ac)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 33a35ac0c09d12961bfbd246b93c9820a0ac6b1d Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Oct 22 22:50:09 2013 +0200 batctl: generalize batman-adv icmp packet handling 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 <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 33a35ac0c09d12961bfbd246b93c9820a0ac6b1d packet.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packet.h b/packet.h index 843b96a..207459b 100644 --- a/packet.h +++ b/packet.h @@ -239,6 +239,8 @@ struct batadv_icmp_packet_rr { uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; }; +#define BATADV_ICMP_MAX_PACKET_SIZE sizeof(struct batadv_icmp_packet_rr) + /* All packet headers in front of an ethernet header have to be completely * divisible by 2 but not by 4 to make the payload after the ethernet * header again 4 bytes boundary aligned.

9 years, 7 months

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been updated to 9bd671cec170a6661af3e016f73ca5fbb7667f1e (tag) from b579aaad62187bffdd9c591ccaf13119c65fada1 (which is now obsolete) tagging da6b8c20a5b8c7edce95c95fa2356300691094f5 (commit) replaces batman-adv-fix-for-davem tagged by Antonio Quartulli on Wed Oct 23 17:04:10 2013 +0200 - Shortlog ------------------------------------------------------------ Included changes: - data structure reshaping to accommodate multiple routing protocol implementations - routing protocol API enhancement - send to userspace the event "batman-adv Gateway loss" in case of soft-iface destruction and a "batman-adv Gateway" was configured - improve the TT component to support and advertise runtime flag changes - minor code refactoring - make the ICMP kernel-to-userspace communication more generic -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJSZ+VyAAoJEADl0hg6qKeOccIP/1RE68wFqd20BTh6WtnKo4s6 H/F5WMUrk/HCNe3p4JnIOYv5WESR3tqTylCqBIl3yzcsks2KsLm4zEG5FIx/0J3Y 1Mgy8V/xlGVN7M+wFSLCgzpTnJ3aCvy7+ied2qoz9KsC4vgiKUimDkPTsbUL7NUp OBmJGYfe/nLDoPI/CXu3nJCtNXcDgv5a5Z8ZMBuipeK++JsBMZRLfJEIM+7Q4Ouc KNLZFXavwtXAxsHLpWDS48MkVAz0tbyy4P6e2k7iQQq+W1WZjCoFMz0xLIKRFf+Y yOOZXItpTTX7rzLxFHkLAopZo9UMPsFjm/OceFBlnAbp24ftfR0b4gjFAUQiKFsq lGlGIXVkhsR6arfQ4SIlrrGOW7h+Kea2I1aPWC7yoi/97+22Nrr/a903p+kkhP4t sAoMk7DbbdajcV01RULF+xjaBFvEdaSfSBVB5j76Gf9AxNZfSGd7wH1qPG7O7HFT jO6Z4fbG6bbHBHMt9j4o9oGg4h5X8epbhZB7e8rwoBe/dSzw+B4CK2Y+j1/QW3C4 PDqL3t5yi0O0+dhkI2G8DmhTOm+ZKVZt60WIMM+G5T6DiLyECveexGWIbjjZR67w qgVXsvE0PwHabY8Ne/z+IlnHY8zegUFYVusQ0lQfLpkKhdjoYXLF709RT42r2QIN 8/6WlNGD2YG/0sWEDF7H =sYKR -----END PGP SIGNATURE----- Antonio Quartulli (39): batman-adv: switch to a new packet compatibility version batman-adv: use CRC32C instead of CRC16 in TT code batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit 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 batman-adv: check skb preparation return value 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 batman-adv: make struct batadv_neigh_node algorithm agnostic batman-adv: make struct batadv_orig_node algorithm agnostic batman-adv: add bat_orig_print API function batman-adv: add bat_neigh_cmp API function batman-adv: add bat_neigh_is_equiv_or_better API function batman-adv: adapt bonding to use the new API functions batman-adv: adapt the neighbor purging routine to use the new API functions batman-adv: provide orig_node routing API batman-adv: adapt the TT component to use the new API functions batman-adv: send GW_DEL event in case of soft-iface destruction 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 sync-flags when compute the global/local table CRC Linus Lüssing (2): batman-adv: Add dummy soft-interface rx mode handler batman-adv: refine API calls for unicast transmissions of SKBs Marek Lindner (10): batman-adv: tvlv - basic infrastructure batman-adv: tvlv - gateway download/upload bandwidth container batman-adv: tvlv - add distributed arp table container batman-adv: tvlv - add network coding container batman-adv: tvlv - convert tt data sent within OGMs batman-adv: tvlv - convert tt query packet to use tvlv unicast packets batman-adv: tvlv - convert roaming adv packet to use tvlv unicast packets batman-adv: consider network coding overhead when calculating required mtu batman-adv: update email address for Marek Lindner batman-adv: limit local translation table max size 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 (10): batman-adv: remove vis functionality batman-adv: add build check macros for packet member offset batman-adv: reorder packet types batman-adv: remove packed from batadv_ogm_packet batman-adv: reorder batadv_iv_flags batman-adv: only add recordroute information to icmp request/reply batman-adv: remove useless find_router look up batman-adv: update email address for Simon Wunderlich batman-adv: Start new development cycle batman-adv: generalize batman-adv icmp packet handling ----------------------------------------------------------------------- -- linux integration

9 years, 7 months

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been updated to b579aaad62187bffdd9c591ccaf13119c65fada1 (tag) from 37dd0a13adb5bccbee1af400123653297a876fff (which is now obsolete) tagging ddb5e35b3fae17c658603cab1c5e92f6f2b45105 (commit) replaces batman-adv-fix-for-davem tagged by Antonio Quartulli on Wed Oct 23 16:54:43 2013 +0200 - Shortlog ------------------------------------------------------------ Included changes: - data structure reshaping to accommodate multiple routing protocol implementations - routing protocol API enhancement - send to userspace the event "batman-adv Gateway loss" in case of soft-iface destruction and a "batman-adv Gateway" was configured - improve the TT component to support and advertise runtime flag changes - minor code refactoring - make the ICMP kernel-to-userspace communication more generic -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJSZ+NLAAoJEADl0hg6qKeOe7MQAKCP1PcHOwFB6KsexN8qD8iH 1tKHT5KCXt5W5XfnqwZtMwM1Tu+w7h3sL+CtbXH39CPReYH5KKDBJeNYMqENMqle 2v6Sv1aiIEAyGHT8YuiXcMJQc293Wv9HUhE/1wVgq20pawOzflyB5StShvLRUPfP e79VkQ0lcLdS2pL0dam89powU4I+wclfjpWoU0Xf149lCgq8/BMTZ165NlYr3gt6 nMKBHu1P3dLj83trb1yQ2s6UySKhY7Gh4q0pmqGsYY82zzlouBfr8WwWyb9vvdR0 k5lZtps+AzjPAegQ9T3gKReNIDgxUjZZiLDmi0zywuKc53LgCkiyrG4W1l3L+64l I0w0aYqSs85LSOp05eR11HHJKl/KMh94cQ29OVMbXrpk7n3G9yr6hrTo38pskjfF aqeT+pabXeVx0gV4UEWaDDukyhTk8zY3PDUu3WkNX2t0yhHPfI5zRXVeBw34E9nZ Ud3DIE861uPpoL7dr9YfhWDLi1Lvg2Vvmk5mdnIRxo14myvWaBXkZiSU2MBZJdax sPD0vmFSR/VNw2cP/0/SKs1XM/aATacGfZVFr9uOmNHI2Ro0gN/NTbQujlRrCEGh X35j7nQMP2S49mqNT+NmhqP87pmQA0Ltphsjqe7p+reNCxNo5QH216uLskHV3kEN M/uQRR/gtZBnzUFB22d+ =6IVY -----END PGP SIGNATURE----- Antonio Quartulli (39): batman-adv: switch to a new packet compatibility version batman-adv: use CRC32C instead of CRC16 in TT code batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit 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 batman-adv: check skb preparation return value 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 batman-adv: make struct batadv_neigh_node algorithm agnostic batman-adv: make struct batadv_orig_node algorithm agnostic batman-adv: add bat_orig_print API function batman-adv: add bat_neigh_cmp API function batman-adv: add bat_neigh_is_equiv_or_better API function batman-adv: adapt bonding to use the new API functions batman-adv: adapt the neighbor purging routine to use the new API functions batman-adv: provide orig_node routing API batman-adv: adapt the TT component to use the new API functions batman-adv: send GW_DEL event in case of soft-iface destruction 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 sync-flags when compute the global/local table CRC Linus Lüssing (2): batman-adv: Add dummy soft-interface rx mode handler batman-adv: refine API calls for unicast transmissions of SKBs Marek Lindner (10): batman-adv: tvlv - basic infrastructure batman-adv: tvlv - gateway download/upload bandwidth container batman-adv: tvlv - add distributed arp table container batman-adv: tvlv - add network coding container batman-adv: tvlv - convert tt data sent within OGMs batman-adv: tvlv - convert tt query packet to use tvlv unicast packets batman-adv: tvlv - convert roaming adv packet to use tvlv unicast packets batman-adv: consider network coding overhead when calculating required mtu batman-adv: update email address for Marek Lindner batman-adv: limit local translation table max size 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 (10): batman-adv: remove vis functionality batman-adv: add build check macros for packet member offset batman-adv: reorder packet types batman-adv: remove packed from batadv_ogm_packet batman-adv: reorder batadv_iv_flags batman-adv: only add recordroute information to icmp request/reply batman-adv: remove useless find_router look up batman-adv: update email address for Simon Wunderlich batman-adv: Start new development cycle batman-adv: generalize batman-adv icmp packet handling ----------------------------------------------------------------------- -- linux integration

9 years, 7 months

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, created. batman-adv-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been created at 37dd0a13adb5bccbee1af400123653297a876fff (tag) tagging ddb5e35b3fae17c658603cab1c5e92f6f2b45105 (commit) replaces batman-adv-fix-for-davem tagged by Antonio Quartulli on Wed Oct 23 15:51:18 2013 +0200 - Shortlog ------------------------------------------------------------ Included changes: - data structure reshaping to accommodate multiple routing protocol implementations - routing protocol API enhancement - send to userspace the event "batman-adv Gateway loss" in case of soft-iface destruction - improve the TT component to support and advertise runtime flag changes - minor code refactoring - make the ICMP kernel-to-userspace communication more generic -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJSZ9VeAAoJEADl0hg6qKeO2qoQAJ7ScN94zbndIdozv/gw9qlY nU1Vl+pl2dKYvctu3sathaJZqKN6irTI0FBktZnl5KYDjv7ZDi+ihbsBbz14OWDY jyoozN7/tcNG8cW3AhtEUcuVrUs9Ry7M6Tl6FYXFwkJLdRsY/HHN+2Fz645VW6LA YbFFUrMroODDaPgy96dOEqawJsv7mRjBChsH8ZXLTa5IQpzfehwTjJmNoj0W3VqG Md3cTBcEMtaot4kyrw9Hf46EkwUjJ1k7Pg4HF43+30OXQHcSXkg6QlVayKUpmATN zArjtgt83j7pst0ri5Z1D0IOSFGWBCLH+NFeTChYUOxMH51qlG+4jbbEJgYSFpB3 8p56WY/6JbcI9nUM3707/cXbO7ZqEYJqCbxOV8M7w+KBdGV8GqFpgazgmb4XK9Gr jMnt+bzHmy5nEVxghBBNM4tH6X6hkiZw25S6/swrx6JyaLtqFYg4/q+UgLNZ//Pz +IiXRggf8vUkFhEI8gD3JBQYN7pzqBv+0QxpO6pnK6c7ilNZNUK5STVMKp1oAtz/ TcmgbqhgeTpEymIslu9Lfinp3r2ohZEwxSwCHxXpU7afeC0gp235ZdCwij99xhWH WAPmpPDbYXs/1nt9V65UKuRonyc5V3LtcfeTgR5cTOuLYAYK/NlXPxbKrDCAiIw8 zba2lR+1uMFupkxwCcFJ =MuG1 -----END PGP SIGNATURE----- Antonio Quartulli (39): batman-adv: switch to a new packet compatibility version batman-adv: use CRC32C instead of CRC16 in TT code batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit 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 batman-adv: check skb preparation return value 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 batman-adv: make struct batadv_neigh_node algorithm agnostic batman-adv: make struct batadv_orig_node algorithm agnostic batman-adv: add bat_orig_print API function batman-adv: add bat_neigh_cmp API function batman-adv: add bat_neigh_is_equiv_or_better API function batman-adv: adapt bonding to use the new API functions batman-adv: adapt the neighbor purging routine to use the new API functions batman-adv: provide orig_node routing API batman-adv: adapt the TT component to use the new API functions batman-adv: send GW_DEL event in case of soft-iface destruction 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 sync-flags when compute the global/local table CRC Linus Lüssing (2): batman-adv: Add dummy soft-interface rx mode handler batman-adv: refine API calls for unicast transmissions of SKBs Marek Lindner (10): batman-adv: tvlv - basic infrastructure batman-adv: tvlv - gateway download/upload bandwidth container batman-adv: tvlv - add distributed arp table container batman-adv: tvlv - add network coding container batman-adv: tvlv - convert tt data sent within OGMs batman-adv: tvlv - convert tt query packet to use tvlv unicast packets batman-adv: tvlv - convert roaming adv packet to use tvlv unicast packets batman-adv: consider network coding overhead when calculating required mtu batman-adv: update email address for Marek Lindner batman-adv: limit local translation table max size 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 (10): batman-adv: remove vis functionality batman-adv: add build check macros for packet member offset batman-adv: reorder packet types batman-adv: remove packed from batadv_ogm_packet batman-adv: reorder batadv_iv_flags batman-adv: only add recordroute information to icmp request/reply batman-adv: remove useless find_router look up batman-adv: update email address for Simon Wunderlich batman-adv: Start new development cycle batman-adv: generalize batman-adv icmp packet handling ----------------------------------------------------------------------- -- linux integration

9 years, 7 months

[linux-merge]linux integration; branch, merge/master, updated. v3.12-rc1-1954-g2138883

by postmaster＠open-mesh.org

The following commit has been merged in the merge/master branch: commit 2138883c56a6c983a7f04e0253bac68abad4725a Merge: f917087f1bdbd432cab308736246780911dbff1b 03b50b510c3df2d9dc65dccafb021a5c49e66e0e Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed Oct 23 15:30:39 2013 +0200 Merge commit '03b50b510c3df2d9dc65dccafb021a5c49e66e0e' into merge/master diff --combined net/batman-adv/icmp_socket.c index 82ac647,29ae4ef..29ae4ef --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@@ -29,7 -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) @@@ -155,13 -155,13 +155,13 @@@ static ssize_t batadv_socket_write(stru struct batadv_priv *bat_priv = socket_client->bat_priv; struct batadv_hard_iface *primary_if = NULL; struct sk_buff *skb; - struct batadv_icmp_packet_rr *icmp_packet; - + struct batadv_icmp_packet_rr *icmp_packet_rr; + struct batadv_icmp_header *icmp_header; struct batadv_orig_node *orig_node = NULL; struct batadv_neigh_node *neigh_node = NULL; size_t packet_len = sizeof(struct batadv_icmp_packet); - if (len < sizeof(struct batadv_icmp_packet)) { + if (len < sizeof(struct batadv_icmp_header)) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Error - can't send packet from char device: invalid packet size\n"); return -EINVAL; @@@ -174,8 -174,10 +174,10 @@@ goto out; } - if (len >= sizeof(struct batadv_icmp_packet_rr)) - packet_len = sizeof(struct batadv_icmp_packet_rr); + if (len >= BATADV_ICMP_MAX_PACKET_SIZE) + packet_len = BATADV_ICMP_MAX_PACKET_SIZE; + else + packet_len = len; skb = netdev_alloc_skb_ip_align(NULL, packet_len + ETH_HLEN); if (!skb) { @@@ -185,67 -187,78 +187,78 @@@ skb->priority = TC_PRIO_CONTROL; skb_reserve(skb, ETH_HLEN); - icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len); + icmp_header = (struct batadv_icmp_header *)skb_put(skb, packet_len); - if (copy_from_user(icmp_packet, buff, packet_len)) { + if (copy_from_user(icmp_header, buff, packet_len)) { len = -EFAULT; goto free_skb; } - if (icmp_packet->icmph.header.packet_type != BATADV_ICMP) { + if (icmp_header->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->icmph.msg_type != BATADV_ECHO_REQUEST) { + switch (icmp_header->msg_type) { + case BATADV_ECHO_REQUEST: + if (len < sizeof(struct batadv_icmp_packet)) { + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Error - can't send packet from char device: invalid packet size\n"); + len = -EINVAL; + goto free_skb; + } + + if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) + goto dst_unreach; + + orig_node = batadv_orig_hash_find(bat_priv, icmp_header->dst); + if (!orig_node) + goto dst_unreach; + + neigh_node = batadv_orig_node_get_router(orig_node); + if (!neigh_node) + goto dst_unreach; + + if (!neigh_node->if_incoming) + goto dst_unreach; + + if (neigh_node->if_incoming->if_status != BATADV_IF_ACTIVE) + goto dst_unreach; + + icmp_packet_rr = (struct batadv_icmp_packet_rr *)icmp_header; + if (packet_len == sizeof(*icmp_packet_rr)) + memcpy(icmp_packet_rr->rr, + neigh_node->if_incoming->net_dev->dev_addr, + ETH_ALEN); + + break; + default: batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n"); + "Error - can't send packet from char device: got unknown message type\n"); len = -EINVAL; goto free_skb; } - icmp_packet->icmph.uid = socket_client->index; + icmp_header->uid = socket_client->index; - 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, + if (icmp_header->header.version != BATADV_COMPAT_VERSION) { + icmp_header->msg_type = BATADV_PARAMETER_PROBLEM; + icmp_header->header.version = BATADV_COMPAT_VERSION; + batadv_socket_add_packet(socket_client, icmp_header, packet_len); goto free_skb; } - if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) - goto dst_unreach; - - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.dst); - if (!orig_node) - goto dst_unreach; - - neigh_node = batadv_orig_node_get_router(orig_node); - if (!neigh_node) - goto dst_unreach; - - if (!neigh_node->if_incoming) - goto dst_unreach; - - if (neigh_node->if_incoming->if_status != BATADV_IF_ACTIVE) - goto dst_unreach; - - memcpy(icmp_packet->icmph.orig, - primary_if->net_dev->dev_addr, ETH_ALEN); - - if (packet_len == sizeof(struct batadv_icmp_packet_rr)) - memcpy(icmp_packet->rr, - neigh_node->if_incoming->net_dev->dev_addr, ETH_ALEN); + memcpy(icmp_header->orig, primary_if->net_dev->dev_addr, ETH_ALEN); batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); goto out; dst_unreach: - icmp_packet->icmph.msg_type = BATADV_DESTINATION_UNREACHABLE; - batadv_socket_add_packet(socket_client, icmp_packet, packet_len); + icmp_header->msg_type = BATADV_DESTINATION_UNREACHABLE; + batadv_socket_add_packet(socket_client, icmp_header, packet_len); free_skb: kfree_skb(skb); out: @@@ -298,27 -311,40 +311,40 @@@ 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); - socket_packet->icmp_len = icmp_len; + memcpy(&socket_packet->icmp_packet, icmph, len); + socket_packet->icmp_len = len; spin_lock_bh(&socket_client->lock); /* 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 -368,18 +368,18 @@@ 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 --combined net/batman-adv/icmp_socket.h index 1fcca37,6665080..6665080 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.h @@@ -24,7 -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 --combined net/batman-adv/packet.h index 843b96a,207459b..207459b --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@@ -239,6 -239,8 +239,8 @@@ struct batadv_icmp_packet_rr uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; }; + #define BATADV_ICMP_MAX_PACKET_SIZE sizeof(struct batadv_icmp_packet_rr) + /* All packet headers in front of an ethernet header have to be completely * divisible by 2 but not by 4 to make the payload after the ethernet * header again 4 bytes boundary aligned. diff --combined net/batman-adv/routing.c index 71fba14,d4114d7..d4114d7 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@@ -260,47 -260,65 +260,65 @@@ bool batadv_check_management_packet(str 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; - int ret = NET_RX_DROP; - - icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; - - /* add data to device queue */ - if (icmp_packet->icmph.msg_type != BATADV_ECHO_REQUEST) { - batadv_socket_receive_packet(icmp_packet, icmp_len); - goto out; - } + struct batadv_icmp_header *icmph; + int res, ret = NET_RX_DROP; - primary_if = batadv_primary_if_get_selected(bat_priv); - if (!primary_if) - goto out; + icmph = (struct batadv_icmp_header *)skb->data; - /* answer echo request (ping) */ - /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.orig); - if (!orig_node) - goto out; + switch (icmph->msg_type) { + case BATADV_ECHO_REPLY: + case BATADV_DESTINATION_UNREACHABLE: + case BATADV_TTL_EXCEEDED: + /* receive the packet */ + if (skb_linearize(skb) < 0) + break; - /* create a copy of the skb, if needed, to modify it. */ - if (skb_cow(skb, ETH_HLEN) < 0) + batadv_socket_receive_packet(icmph, skb->len); + break; + case BATADV_ECHO_REQUEST: + /* answer echo request (ping) */ + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if) + goto out; + + /* get routing information */ + orig_node = batadv_orig_hash_find(bat_priv, icmph->orig); + if (!orig_node) + 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; + + 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; + + res = batadv_send_skb_to_orig(skb, orig_node, NULL); + if (res != NET_XMIT_DROP) + ret = NET_RX_SUCCESS; + + break; + default: + /* drop unknown type */ goto out; - - icmp_packet = (struct batadv_icmp_packet_rr *)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; - - if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP) - ret = NET_RX_SUCCESS; - + } out: if (primary_if) batadv_hardif_free_ref(primary_if); @@@ -363,16 -381,13 +381,13 @@@ int batadv_recv_icmp_packet(struct sk_b 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 -406,39 +406,39 @@@ 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 -446,10 +446,10 @@@ 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) diff --combined net/batman-adv/sysfs.c index 096b511,6335433..6335433 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@@ -54,7 -54,7 +54,7 @@@ static struct batadv_priv *batadv_vlan_ if (!strcmp(BATADV_SYSFS_IF_MESH_SUBDIR, obj->name)) return batadv_kobj_to_batpriv(obj); - /* ..while the attributed for the tagged vlans are located in + /* ..while the attributes for the tagged vlans are located in * the in the corresponding "vlan%VID" subfolder */ return batadv_kobj_to_batpriv(obj->parent); diff --combined net/batman-adv/types.h index 3c21162,91dd369..91dd369 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@@ -749,7 -749,7 +749,7 @@@ struct batadv_socket_client struct batadv_socket_packet { struct list_head list; size_t icmp_len; - struct batadv_icmp_packet_rr icmp_packet; + uint8_t icmp_packet[BATADV_ICMP_MAX_PACKET_SIZE]; }; /** -- linux integration

9 years, 7 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2013