B.A.T.M.A.N November 2012

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

24 participants
65 discussions

[B.A.T.M.A.N.] [PATCHv2 0/5] TT "fixing" campaign

by Antonio Quartulli

Hello, This is a second version of the TT patchset I recently sent. In this case I decided to rearrange the patches. Pathces listed here are not improvements, but they are fixes that should go into batman-adv/next. The remaining patches, which are improvements intended for batman-adv/master, will be sent in another patchset soon. Thank you, Antonio Quartulli (5): batman-adv: fix TT packet rerouting batman-adv: fix debug message batman-adv: remove useless goto batman-adv: send ROAMING_ADV once batman-adv: fix local client recognition in is_my_client() routing.c | 36 ++++++++++++++++++++++++++---------- translation-table.c | 10 ++++++---- 2 files changed, 32 insertions(+), 14 deletions(-) -- 1.8.0

10 years, 4 months

[B.A.T.M.A.N.] Broadcasting of GPS-coordinates?

by Rene Bartsch

Hi, I'm new to B.A.T.M.A.N, so a "Hello" to all! :) Does B.A.T.M.A.N support some kind of broadcasting node positions? The idea is to broadcast TX-Power/RX-Gain and the position of a node determined by a GPS-device to create maps with network coverage. Is that possible anyhow? Regards, Renne

10 years, 4 months

[B.A.T.M.A.N.] [RFC 1/4] batman-adv: Align skb for better alignment

by Sven Eckelmann

The ethernet header is 14 bytes long. Therefore, the data after it is not 4 byte aligned and may cause problems on systems without unaligned data access. Reserving NET_IP_ALIGN more bytes can fix the misalignment of the ethernet header. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bat_iv_ogm.c | 2 +- icmp_socket.c | 2 +- translation-table.c | 10 +++++----- vis.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 75403a4..5be9a3e 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -422,7 +422,7 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, kfree(forw_packet_aggr); goto out; } - skb_reserve(forw_packet_aggr->skb, ETH_HLEN); + skb_reserve(forw_packet_aggr->skb, ETH_HLEN + NET_IP_ALIGN); INIT_HLIST_NODE(&forw_packet_aggr->list); diff --git a/icmp_socket.c b/icmp_socket.c index 5874c0e..f64e9c8 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -183,7 +183,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, goto out; } - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len); if (copy_from_user(icmp_packet, buff, packet_len)) { diff --git a/translation-table.c b/translation-table.c index 6fecb94..bb3941c 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1598,7 +1598,7 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, if (!skb) goto out; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); tt_response = (struct batadv_tt_query_packet *)skb_put(skb, len); tt_response->ttvn = ttvn; @@ -1663,7 +1663,7 @@ static int batadv_send_tt_request(struct batadv_priv *bat_priv, if (!skb) goto out; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); tt_req_len = sizeof(*tt_request); tt_request = (struct batadv_tt_query_packet *)skb_put(skb, tt_req_len); @@ -1765,7 +1765,7 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, if (!skb) goto unlock; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); packet_pos = skb_put(skb, len); tt_response = (struct batadv_tt_query_packet *)packet_pos; tt_response->ttvn = req_ttvn; @@ -1884,7 +1884,7 @@ batadv_send_my_tt_response(struct batadv_priv *bat_priv, if (!skb) goto unlock; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); packet_pos = skb_put(skb, len); tt_response = (struct batadv_tt_query_packet *)packet_pos; tt_response->ttvn = req_ttvn; @@ -2215,7 +2215,7 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, if (!skb) goto out; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); roam_adv_packet = (struct batadv_roam_adv_packet *)skb_put(skb, len); diff --git a/vis.c b/vis.c index 79589a3..b004560 100644 --- a/vis.c +++ b/vis.c @@ -401,7 +401,7 @@ batadv_add_packet(struct batadv_priv *bat_priv, kfree(info); return NULL; } - skb_reserve(info->skb_packet, ETH_HLEN); + skb_reserve(info->skb_packet, ETH_HLEN + NET_IP_ALIGN); packet = (struct batadv_vis_packet *)skb_put(info->skb_packet, len); kref_init(&info->refcount); @@ -861,7 +861,7 @@ int batadv_vis_init(struct batadv_priv *bat_priv) if (!bat_priv->vis.my_info->skb_packet) goto free_info; - skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN); + skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN + NET_IP_ALIGN); tmp_skb = bat_priv->vis.my_info->skb_packet; packet = (struct batadv_vis_packet *)skb_put(tmp_skb, sizeof(*packet)); -- 1.7.10.4

10 years, 4 months

[B.A.T.M.A.N.] [PATCH] batman-adv: fix ROAM flag de-selection

by Antonio Quartulli

In tt_global_add() the ROAM flag is improperly unset. This makes the next check fail and so preventing emptying the old originator_list for the involved tt_global_entry This was introduced by ("batman-adv: roaming handling mechanism redesign") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- This patch should go to next so that it can be squashed with the one introducing the "broken" change. translation-table.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/translation-table.c b/translation-table.c index 6fecb94..f30360c 100644 --- a/translation-table.c +++ b/translation-table.c @@ -860,14 +860,6 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, */ common->flags &= ~BATADV_TT_CLIENT_TEMP; - /* if this is a normal add, possibly unset the ROAM flag. This - * flag could have been set before because the client was - * roaming, but now that the node got the ADD event, the flag - * can be unset - */ - if (!(flags & BATADV_TT_CLIENT_ROAM)) - common->flags &= ~BATADV_TT_CLIENT_ROAM; - /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only * one originator left in the list and we previously received a * delete + roaming change for this originator. -- 1.8.0

10 years, 4 months

[B.A.T.M.A.N.] [PATCH 1/3] batman-adv: print the CRC together with the translation tables

by Antonio Quartulli

To simplify debugging operations, it is better to print the related CRC together with the translation table (local CRC for the local table and global CRC for each entry in the global table) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- ** this patches are based on top of master translation-table.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/translation-table.c b/translation-table.c index 6fecb94..b14f418 100644 --- a/translation-table.c +++ b/translation-table.c @@ -481,8 +481,9 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) goto out; seq_printf(seq, - "Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n", - net_dev->name, (uint8_t)atomic_read(&bat_priv->tt.vn)); + "Locally retrieved addresses (from %s) announced via TT (TTVN: %u CRC: %#.4x):\n", + net_dev->name, (uint8_t)atomic_read(&bat_priv->tt.vn), + bat_priv->tt.local_crc); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -968,10 +969,11 @@ batadv_tt_global_print_entry(struct batadv_tt_global_entry *tt_global_entry, best_entry = batadv_transtable_best_orig(tt_global_entry); if (best_entry) { last_ttvn = atomic_read(&best_entry->orig_node->last_ttvn); - seq_printf(seq, " %c %pM (%3u) via %pM (%3u) [%c%c%c]\n", + seq_printf(seq, + " %c %pM (%3u) via %pM (%3u) (%#.4x) [%c%c%c]\n", '*', tt_global_entry->common.addr, best_entry->ttvn, best_entry->orig_node->orig, - last_ttvn, + last_ttvn, best_entry->orig_node->tt_crc, (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.')); @@ -1013,8 +1015,9 @@ int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, "Globally announced TT entries received via the mesh %s\n", net_dev->name); - seq_printf(seq, " %-13s %s %-15s %s %s\n", - "Client", "(TTVN)", "Originator", "(Curr TTVN)", "Flags"); + seq_printf(seq, " %-13s %s %-15s %s (%-6s) %s\n", + "Client", "(TTVN)", "Originator", "(Curr TTVN)", "CRC", + "Flags"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; -- 1.8.0

10 years, 4 months

[B.A.T.M.A.N.] [PATCH] batctl: Guarantee delimiter after snprintf

by Sven Eckelmann

snprintf doesn't add a \0 delimiter when the size of the buffer is not big enough. The caller has to fix it manually to avoid crashes. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bisect_iv.c | 10 ++++++---- debugfs.c | 1 + sys.c | 8 ++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index c4c06c2..09171fb 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -639,9 +639,9 @@ static int print_rt_path_at_seqno(struct bat_node *src_node, struct bat_node *ds struct rt_hist *rt_hist; char curr_loop_magic[LOOP_MAGIC_LEN]; - memset(curr_loop_magic, 0, LOOP_MAGIC_LEN); - snprintf(curr_loop_magic, LOOP_MAGIC_LEN, "%s%s%lli%lli", src_node->name, + snprintf(curr_loop_magic, sizeof(curr_loop_magic), "%s%s%lli%lli", src_node->name, dst_node->name, seqno, seqno_rand); + curr_loop_magic[sizeof(curr_loop_magic) - 1] = '\0'; printf("Path towards %s (seqno %lli ", get_name_by_macstr(dst_node->name, read_opt), seqno); @@ -719,10 +719,10 @@ static int find_rt_table_change(struct bat_node *src_node, struct bat_node *dst_ return 0; } - memset(curr_loop_magic, 0, LOOP_MAGIC_LEN); - snprintf(curr_loop_magic, LOOP_MAGIC_LEN, "%s%s%lli%lli", + snprintf(curr_loop_magic, sizeof(curr_loop_magic), "%s%s%lli%lli", src_node->name, dst_node->name, seqno_min_tmp, seqno_rand); + curr_loop_magic[sizeof(curr_loop_magic) - 1] = '\0'; orig_event = orig_event_get_by_ptr(curr_node, dst_node); if (!orig_event) @@ -979,6 +979,7 @@ static void seqno_trace_print_neigh(struct seqno_trace_neigh *seqno_trace_neigh, (strlen(head) > 1 ? head : num_sisters == 0 ? " " : head), (strlen(head) == 1 ? " " : num_sisters == 0 ? " " : "| ")); + new_head[sizeof(new_head) - 1] = '\0'; seqno_trace_print_neigh(seqno_trace_neigh->seqno_trace_neigh[i], seqno_trace_neigh->seqno_event, seqno_trace_neigh->num_neighbors - i - 1, new_head, read_opt); @@ -1024,6 +1025,7 @@ static void seqno_trace_print(struct list_head_first *trace_list, char *trace_or snprintf(head, sizeof(head), "%c", (seqno_trace->seqno_trace_neigh.num_neighbors == i + 1 ? '\\' : '|')); + head[sizeof(head) - 1] = '\0'; seqno_trace_print_neigh(seqno_trace->seqno_trace_neigh.seqno_trace_neigh[i], NULL, diff --git a/debugfs.c b/debugfs.c index 549546c..9fc6f42 100644 --- a/debugfs.c +++ b/debugfs.c @@ -56,6 +56,7 @@ int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size) return len+1; snprintf(buffer, size-1, fmt, debugfs_mountpoint, mesh_iface); + buffer[size - 1] = '\0'; return 0; } diff --git a/sys.c b/sys.c index 9591416..e4112b7 100644 --- a/sys.c +++ b/sys.c @@ -136,6 +136,7 @@ static int print_interfaces(char *mesh_iface) while ((iface_dir = readdir(iface_base_dir)) != NULL) { snprintf(path_buff, PATH_BUFF_LEN, SYS_MESH_IFACE_FMT, iface_dir->d_name); + path_buff[PATH_BUFF_LEN - 1] = '\0'; res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) continue; @@ -153,6 +154,7 @@ static int print_interfaces(char *mesh_iface) line_ptr = NULL; snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, iface_dir->d_name); + path_buff[PATH_BUFF_LEN - 1] = '\0'; res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) { printf("<error reading status>\n"); @@ -216,9 +218,11 @@ int interface(char *mesh_iface, int argc, char **argv) for (i = 2; i < argc; i++) { snprintf(path_buff, PATH_BUFF_LEN, SYS_MESH_IFACE_FMT, argv[i]); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (!file_exists(path_buff)) { snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_DIR, argv[i]); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (!file_exists(path_buff)) { printf("Error - interface does not exist: %s\n", argv[i]); @@ -288,6 +292,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (argc != 1) { for (i = 1; i < argc; i++) { @@ -314,6 +319,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) } snprintf(str, sizeof(str), "%i", log_level); + str[sizeof(str) - 1] = '\0'; res = write_file(path_buff, SYS_LOG_LEVEL, str, NULL); goto out; } @@ -379,6 +385,7 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (argc == 1) { res = read_file(path_buff, (char *)batctl_settings[setting].sysfs_name, @@ -443,6 +450,7 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (argc == 1) { res = read_file(path_buff, SYS_GW_MODE, USE_READ_BUFF, 0, 0, 0); -- 1.7.10.4

10 years, 4 months

[B.A.T.M.A.N.] [PATCH v2 9/9] net: batman-adv: use per_cpu_add helper

by Shan Wei

From: Shan Wei <davidshan(a)tencent.com> As Christoph Lameter said: > In addition, following usage of per_cpu_ptr can be replaced by this_cpu_read. > > cpu=get_cpu() > .... > *per_cpu_ptr(p,cpu) > .... > .... > put_cpu() Right. Signed-off-by: Shan Wei <davidshan(a)tencent.com> --- net/batman-adv/main.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 897ba6a..3aef5b2 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -263,9 +263,7 @@ static inline bool batadv_has_timed_out(unsigned long timestamp, static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, size_t count) { - int cpu = get_cpu(); - per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count; - put_cpu(); + this_cpu_add(bat_priv->bat_counters[idx], count); } #define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1) -- 1.7.1

10 years, 4 months

[B.A.T.M.A.N.] [PATCH stable 3.5] batman-adv: Fix broadcast packet CRC calculation

by Antonio Quartulli

From: Linus Lüssing <linus.luessing(a)web.de> commit 7f112af40fecf5399b61e69ffc6b55a9d82789f7 upstream. So far the crc16 checksum for a batman-adv broadcast data packet, received on a batman-adv hard interface, was calculated over zero bytes of its content leading to many incoming broadcast data packets wrongly being dropped (60-80% packet loss). This patch fixes this issue by calculating the crc16 over the actual, complete broadcast payload. The issue is a regression introduced by ("batman-adv: add broadcast duplicate check"). Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- net/batman-adv/bridge_loop_avoidance.c | 16 +++++++--------- net/batman-adv/routing.c | 8 +++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index c5863f4..740bb6f 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1172,8 +1172,8 @@ int bla_init(struct bat_priv *bat_priv) /** * @bat_priv: the bat priv with all the soft interface information - * @bcast_packet: originator mac address - * @hdr_size: maximum length of the frame + * @bcast_packet: encapsulated broadcast frame plus batman header + * @bcast_packet_len: length of encapsulated broadcast frame plus batman header * * check if it is on our broadcast list. Another gateway might * have sent the same packet because it is connected to the same backbone, @@ -1183,19 +1183,17 @@ int bla_init(struct bat_priv *bat_priv) * with a good chance that it is the same packet. If it is furthermore * sent by another host, drop it. We allow equal packets from * the same host however as this might be intended. - * - **/ - -int bla_check_bcast_duplist(struct bat_priv *bat_priv, - struct bcast_packet *bcast_packet, - int hdr_size) + */ +int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, + struct batadv_bcast_packet *bcast_packet, + int bcast_packet_len) { int i, length, curr; uint8_t *content; uint16_t crc; struct bcast_duplist_entry *entry; - length = hdr_size - sizeof(*bcast_packet); + length = bcast_packet_len - sizeof(*bcast_packet); content = (uint8_t *)bcast_packet; content += sizeof(*bcast_packet); diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 015471d..0c2cb6b 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1081,8 +1081,14 @@ int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if) spin_unlock_bh(&orig_node->bcast_seqno_lock); + /* keep skb linear for crc calculation */ + if (skb_linearize(skb) < 0) + goto out; + + bcast_packet = (struct batadv_bcast_packet *)skb->data; + /* check whether this has been sent by another originator before */ - if (bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size)) + if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) goto out; /* rebroadcast packet */ -- 1.8.0

10 years, 4 months

[B.A.T.M.A.N.] pull request: batman-adv 2012-11-03

by Antonio Quartulli

Hello David, here you have another patchset with two new features intended for net-next/linux-3.8. Patch 1/9 adds the new UNICAST_4ADDR packet type which contains both the source and the destination node addresses (unlike the classic UNICAST which contains the destination only) and can encapsulate different packet subtypes. Then all the remaining patches introduce the new Distributed ARP Table (DAT) component. It is the first user of the new packet type introduced by 1/9. DAT is the results of Antonio Quartulli's Google Summer Of Code 2011. It was already sent to netdev once in the past, but got rejected because of its dependency on the ARP/neigh layer internals. In this new version a batman-adv private ARP storage has been implemented, so dropping any possible relationship with the inner neigh code. Please, let me know if there is any problem. Thank you very much, Antonio The following changes since commit b77bc2069d1e437d5a1a71bb5cfcf4556ee40015: ppp: make ppp_get_stats64 static (2012-11-01 12:38:31 -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 f113f61fd0af6dfd08f8110236cd47c410b36711: batman-adv: Add get_ethtool_stats() support for DAT (2012-11-02 21:50:15 +0100) ---------------------------------------------------------------- Included changes: - new packet type called UNICAST_4ADDR: in this packet it is possible to find both source and destination node (in the classic UNICAST header only the destination field exists). - a new feature: Distributed ARP Table (D.A.T.). It aims to reduce ARP lookups latency by means of a simil-DHT approach. ---------------------------------------------------------------- Antonio Quartulli (8): batman-adv: add UNICAST_4ADDR packet type batman-adv: Distributed ARP Table - add a new debug log level batman-adv: Distributed ARP Table - create DHT helper functions batman-adv: Distributed ARP Table - implement local storage batman-adv: Distributed ARP Table - add ARP parsing functions batman-adv: Distributed ARP Table - add snooping functions for ARP messages batman-adv: Distributed ARP Table - add compile option batman-adv: Distributed ARP Table - add runtime switch Martin Hundebøll (1): batman-adv: Add get_ethtool_stats() support for DAT Documentation/networking/batman-adv.txt | 3 +- net/batman-adv/Kconfig | 10 + net/batman-adv/Makefile | 1 + net/batman-adv/debugfs.c | 20 + net/batman-adv/distributed-arp-table.c | 1066 +++++++++++++++++++++++++++++++ net/batman-adv/distributed-arp-table.h | 167 +++++ net/batman-adv/hard-interface.c | 3 + net/batman-adv/main.c | 9 + net/batman-adv/main.h | 13 +- net/batman-adv/originator.c | 2 + net/batman-adv/packet.h | 43 +- net/batman-adv/routing.c | 41 +- net/batman-adv/send.c | 4 + net/batman-adv/soft-interface.c | 28 +- net/batman-adv/sysfs.c | 7 + net/batman-adv/types.h | 73 +++ net/batman-adv/unicast.c | 134 +++- net/batman-adv/unicast.h | 36 +- 18 files changed, 1631 insertions(+), 29 deletions(-) create mode 100644 net/batman-adv/distributed-arp-table.c create mode 100644 net/batman-adv/distributed-arp-table.h

10 years, 4 months

[B.A.T.M.A.N.] [PATCH patch 3.6] batman-adv: Fix broadcast packet CRC calculation

by Antonio Quartulli

From: Linus Lüssing <linus.luessing(a)web.de> commit 7f112af40fecf5399b61e69ffc6b55a9d82789f7 upstream. So far the crc16 checksum for a batman-adv broadcast data packet, received on a batman-adv hard interface, was calculated over zero bytes of its content leading to many incoming broadcast data packets wrongly being dropped (60-80% packet loss). This patch fixes this issue by calculating the crc16 over the actual, complete broadcast payload. The issue is a regression introduced by ("batman-adv: add broadcast duplicate check"). Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- net/batman-adv/bridge_loop_avoidance.c | 8 ++++---- net/batman-adv/routing.c | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 6705d35..e7b5777 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1205,8 +1205,8 @@ int batadv_bla_init(struct batadv_priv *bat_priv) /** * batadv_bla_check_bcast_duplist * @bat_priv: the bat priv with all the soft interface information - * @bcast_packet: originator mac address - * @hdr_size: maximum length of the frame + * @bcast_packet: encapsulated broadcast frame plus batman header + * @bcast_packet_len: length of encapsulated broadcast frame plus batman header * * check if it is on our broadcast list. Another gateway might * have sent the same packet because it is connected to the same backbone, @@ -1219,14 +1219,14 @@ int batadv_bla_init(struct batadv_priv *bat_priv) */ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct batadv_bcast_packet *bcast_packet, - int hdr_size) + int bcast_packet_len) { int i, length, curr; uint8_t *content; uint16_t crc; struct batadv_bcast_duplist_entry *entry; - length = hdr_size - sizeof(*bcast_packet); + length = bcast_packet_len - sizeof(*bcast_packet); content = (uint8_t *)bcast_packet; content += sizeof(*bcast_packet); diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index bc2b88b..f861b7c 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1136,8 +1136,14 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, spin_unlock_bh(&orig_node->bcast_seqno_lock); + /* keep skb linear for crc calculation */ + if (skb_linearize(skb) < 0) + goto out; + + bcast_packet = (struct batadv_bcast_packet *)skb->data; + /* check whether this has been sent by another originator before */ - if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size)) + if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) goto out; /* rebroadcast packet */ -- 1.8.0

10 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2012