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.] pull request: batman-adv 2013-01-29
by Antonio Quartulli 29 Jan '13

29 Jan '13

Hello David, here you have just a single patch which is fixing a pesky bug that I introduced within a patchset recently sent to net-next/linux-3.9. It is not big, but I think it is worth fixing the new behaviour before it gets released. Please pull or let me know if there is any problem. Thanks a lot, Antonio The following changes since commit cef401de7be8c4e155c6746bfccf721a4fa5fab9: net: fix possible wrong checksum generation (2013-01-28 00:27:15 -0500) 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 a7966d908ae8472e8183496916b7baec5f65b3a6: batman-adv: fix local translation table output (2013-01-28 20:46:03 +0100) ---------------------------------------------------------------- Included changes: - fix recently introduced output behaviour ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: fix local translation table output net/batman-adv/translation-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 2

[B.A.T.M.A.N.] [PATCHv4 0/6] CATWOMAN: Network coding in batman-adv
by Martin Hundebøll 29 Jan '13

29 Jan '13

I hereby bring you network coding in batman-adv (in its fourth revision). This allows a relay to send two packets (to two destinations) in a single transmission. Tests[1] have shown an increase in throughput up to 1.6 under the right circumstances. For this to work, you will need to compile batman-adv with CONFIG_BATMAN_ADV_NC=y and a wireless interface with working promiscuous mode. The rest is taken care of by batman-adv and the following patches. Patch 5/6 depends on my previous patch on the mailing list: "Return reason for failure in batadv_check_unicast_packet()" [1] http://www.open-mesh.org/projects/open-mesh/wiki/2011-08-18-network-coding-… Martin Hundebøll (6): batman-adv: Add the initial code for network coding. batman-adv: Detect coding nodes and remove these after timeout batman-adv: Buffer unicast packets before forward. batman-adv: Code and transmit packets if possible. batman-adv: Save overheard and tx packets for decoding. batman-adv: Receive coded packets and decode them. Makefile | 2 + Makefile.kbuild | 1 + bat_iv_ogm.c | 5 + compat.c | 10 + compat.h | 1 + debugfs.c | 18 + gen-compat-autoconf.sh | 1 + main.c | 6 + main.h | 12 +- network-coding.c | 1832 ++++++++++++++++++++++++++++++++++++++++++++++++ network-coding.h | 123 ++++ originator.c | 6 + packet.h | 33 + routing.c | 31 +- send.c | 5 + soft-interface.c | 14 + sysfs-class-net-mesh | 8 + sysfs.c | 6 + types.h | 136 ++++ 19 files changed, 2240 insertions(+), 10 deletions(-) create mode 100644 network-coding.c create mode 100644 network-coding.h -- 1.8.1.1

2 12

[B.A.T.M.A.N.] Dynamic OGM interval
by ajeet singh 29 Jan '13

29 Jan '13

Hello All, Is there any plane to support dynamic OGM interval selection in future? Thanks Ajeet Kumar Singh

3 2

[B.A.T.M.A.N.] [PATCH next] batman-adv: fix local translation output
by Antonio Quartulli 28 Jan '13

28 Jan '13

The last-seen field has to be print for all the entries but the one marked as no-purge. Introduced by 15727323d9f8864b2d41930940acc38de987045a ("batman-adv: don't print the last_seen time for bat0 TT local entry") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index fb15b4c..d44672f 100644 --- a/translation-table.c +++ b/translation-table.c @@ -517,8 +517,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - no_purge ? last_seen_secs : 0, - no_purge ? last_seen_msecs : 0); + no_purge ? 0 : last_seen_secs, + no_purge ? 0 : last_seen_msecs); } rcu_read_unlock(); } -- 1.8.1.1

2 2

[B.A.T.M.A.N.] pull request: batman-adv 2013-01-27
by Antonio Quartulli 28 Jan '13

28 Jan '13

This is a small patchset intended for net/linux-3.8. Here there are three small patches from Matthias Schiffer aimed to fix some memory problems in the recently introduced D.A.T. component. One of them is fixing an skb memleak, one is fixing the ARP filter routine by preventing DAT to parse not useful messages (so reducing the amount of memory used by the local cache) and one fixing again the ARP filter routine by preventing DAT to overwrite correct entries with bogus ones in the local cache. Please pull or let me know if there is any problem. Thanks a lot, Antonio The following changes since commit 1591ab6740326aaf41e194c43bdf8ece6e2e4835: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-01-27 01:37:22 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to b618ad1103c9ea0c4a69b44f42fc3c7b4e231e22: batman-adv: filter ARP packets with invalid MAC addresses in DAT (2013-01-27 14:02:39 +0100) ---------------------------------------------------------------- Included changes ares: - fix an skb memleak in DAT - fix the ARP filtering routine in DAT by preventing bogus entries to overwrite already existing ones in the local cache. - fix the ARP filtering routine in DAT by preventing it to parse and add to the cache bogus entries ---------------------------------------------------------------- Matthias Schiffer (3): batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply() batman-adv: check for more types of invalid IP addresses in DAT batman-adv: filter ARP packets with invalid MAC addresses in DAT net/batman-adv/distributed-arp-table.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)

2 4

[B.A.T.M.A.N.] [PATCHv2] batman-adv: don't use !! in bool conversion
by Antonio Quartulli 27 Jan '13

27 Jan '13

In C standard any expression different from 0 will be converted to 'true' when casting to bool (whatever is the length of the value). Therefore all the "!!" conversions can be removed. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- * v2: - commit message reworded translation-table.c | 4 ++-- unicast.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/translation-table.c b/translation-table.c index fb15b4c..e711b05 100644 --- a/translation-table.c +++ b/translation-table.c @@ -912,7 +912,7 @@ out_remove: /* remove address from local hash if present */ local_flags = batadv_tt_local_remove(bat_priv, tt_addr, "global tt received", - !!(flags & BATADV_TT_CLIENT_ROAM)); + flags & BATADV_TT_CLIENT_ROAM); tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI; if (!(flags & BATADV_TT_CLIENT_ROAM)) @@ -2540,7 +2540,7 @@ bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv, if (!tt_global_entry) goto out; - ret = !!(tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM); + ret = tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM; batadv_tt_global_entry_free_ref(tt_global_entry); out: return ret; diff --git a/unicast.c b/unicast.c index 50e079f..0bb3b59 100644 --- a/unicast.c +++ b/unicast.c @@ -122,7 +122,7 @@ batadv_frag_search_packet(struct list_head *head, { struct batadv_frag_packet_list_entry *tfp; struct batadv_unicast_frag_packet *tmp_up = NULL; - int is_head_tmp, is_head; + bool is_head_tmp, is_head; uint16_t search_seqno; if (up->flags & BATADV_UNI_FRAG_HEAD) @@ -130,7 +130,7 @@ batadv_frag_search_packet(struct list_head *head, else search_seqno = ntohs(up->seqno)-1; - is_head = !!(up->flags & BATADV_UNI_FRAG_HEAD); + is_head = up->flags & BATADV_UNI_FRAG_HEAD; list_for_each_entry(tfp, head, list) { if (!tfp->skb) @@ -142,7 +142,7 @@ batadv_frag_search_packet(struct list_head *head, tmp_up = (struct batadv_unicast_frag_packet *)tfp->skb->data; if (tfp->seqno == search_seqno) { - is_head_tmp = !!(tmp_up->flags & BATADV_UNI_FRAG_HEAD); + is_head_tmp = tmp_up->flags & BATADV_UNI_FRAG_HEAD; if (is_head_tmp != is_head) return tfp; else -- 1.8.0.2

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: Return reason for failure in batadv_check_unicast_packet()
by Martin Hundebøll 27 Jan '13

27 Jan '13

batadv_check_unicast_packet() is changed to return a value based on the reason to drop the packet, which will be useful information for future users of batadv_check_unicast_packet(). Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- v2: * Changed return values to defined error codes. * Send as separate patch routing.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/routing.c b/routing.c index 1aa1722..a3ee5be 100644 --- a/routing.c +++ b/routing.c @@ -552,27 +552,37 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig, return router; } +/** + * batadv_check_unicast_packet - Check for malformed unicast packets + * @skb: packet to check + * @hdr_size: size of header to pull + * + * Check for short header and bad addresses in given packet. Returns negative + * value when check fails and 0 otherwise. The negative value depends on the + * reason: -ENODATA for bad header, -EBADR for broadcast destination or source + * source, and -EREMOTE for non-local (other host) destination. + */ static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size) { struct ethhdr *ethhdr; /* drop packet if it has not necessary minimum size */ if (unlikely(!pskb_may_pull(skb, hdr_size))) - return -1; + return -ENODATA; ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with unicast indication but broadcast recipient */ if (is_broadcast_ether_addr(ethhdr->h_dest)) - return -1; + return -EBADR; /* packet with broadcast sender address */ if (is_broadcast_ether_addr(ethhdr->h_source)) - return -1; + return -EBADR; /* not for me */ if (!batadv_is_my_mac(ethhdr->h_dest)) - return -1; + return -EREMOTE; return 0; } -- 1.8.1

3 3

[B.A.T.M.A.N.] [PATCH] batman-adv: replace redudant primary_if_get calls
by Marek Lindner 27 Jan '13

27 Jan '13

The batadv_priv struct carries a pointer to its own interface struct. Therefore, it is not necessary to retrieve the soft_iface via the primary interface. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- distributed-arp-table.c | 22 ++++------------------ sysfs.c | 10 +--------- translation-table.c | 25 ++++++------------------- 3 files changed, 11 insertions(+), 46 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 7485a78..71c4f53 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -804,7 +804,6 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, bool ret = false; struct batadv_dat_entry *dat_entry = NULL; struct sk_buff *skb_new; - struct batadv_hard_iface *primary_if = NULL; if (!atomic_read(&bat_priv->distributed_arp_table)) goto out; @@ -826,22 +825,18 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, dat_entry = batadv_dat_entry_hash_find(bat_priv, ip_dst); if (dat_entry) { - primary_if = batadv_primary_if_get_selected(bat_priv); - if (!primary_if) - goto out; - skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, - primary_if->soft_iface, ip_dst, hw_src, + bat_priv->soft_iface, ip_dst, hw_src, dat_entry->mac_addr, hw_src); if (!skb_new) goto out; skb_reset_mac_header(skb_new); skb_new->protocol = eth_type_trans(skb_new, - primary_if->soft_iface); + bat_priv->soft_iface); bat_priv->stats.rx_packets++; bat_priv->stats.rx_bytes += skb->len + ETH_HLEN; - primary_if->soft_iface->last_rx = jiffies; + bat_priv->soft_iface->last_rx = jiffies; netif_rx(skb_new); batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n"); @@ -854,8 +849,6 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, out: if (dat_entry) batadv_dat_entry_free_ref(dat_entry); - if (primary_if) - batadv_hardif_free_ref(primary_if); return ret; } @@ -875,7 +868,6 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, __be32 ip_src, ip_dst; uint8_t *hw_src; struct sk_buff *skb_new; - struct batadv_hard_iface *primary_if = NULL; struct batadv_dat_entry *dat_entry = NULL; bool ret = false; int err; @@ -900,12 +892,8 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, if (!dat_entry) goto out; - primary_if = batadv_primary_if_get_selected(bat_priv); - if (!primary_if) - goto out; - skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, - primary_if->soft_iface, ip_dst, hw_src, + bat_priv->soft_iface, ip_dst, hw_src, dat_entry->mac_addr, hw_src); if (!skb_new) @@ -929,8 +917,6 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, out: if (dat_entry) batadv_dat_entry_free_ref(dat_entry); - if (primary_if) - batadv_hardif_free_ref(primary_if); if (ret) kfree_skb(skb); return ret; diff --git a/sysfs.c b/sysfs.c index afbba31..6a44fed 100644 --- a/sysfs.c +++ b/sysfs.c @@ -688,15 +688,10 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, enum batadv_uev_action action, const char *data) { int ret = -ENOMEM; - struct batadv_hard_iface *primary_if; struct kobject *bat_kobj; char *uevent_env[4] = { NULL, NULL, NULL, NULL }; - primary_if = batadv_primary_if_get_selected(bat_priv); - if (!primary_if) - goto out; - - bat_kobj = &primary_if->soft_iface->dev.kobj; + bat_kobj = &bat_priv->soft_iface->dev.kobj; uevent_env[0] = kmalloc(strlen(BATADV_UEV_TYPE_VAR) + strlen(batadv_uev_type_str[type]) + 1, @@ -732,9 +727,6 @@ out: kfree(uevent_env[1]); kfree(uevent_env[2]); - if (primary_if) - batadv_hardif_free_ref(primary_if); - if (ret) batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n", diff --git a/translation-table.c b/translation-table.c index fb15b4c..607fd3c 100644 --- a/translation-table.c +++ b/translation-table.c @@ -387,25 +387,19 @@ static void batadv_tt_prepare_packet_buff(struct batadv_priv *bat_priv, int *packet_buff_len, int min_packet_len) { - struct batadv_hard_iface *primary_if; int req_len; - primary_if = batadv_primary_if_get_selected(bat_priv); - req_len = min_packet_len; req_len += batadv_tt_len(atomic_read(&bat_priv->tt.local_changes)); /* if we have too many changes for one packet don't send any * and wait for the tt table request which will be fragmented */ - if ((!primary_if) || (req_len > primary_if->soft_iface->mtu)) + if (req_len > bat_priv->soft_iface->mtu) req_len = min_packet_len; batadv_tt_realloc_packet_buff(packet_buff, packet_buff_len, min_packet_len, req_len); - - if (primary_if) - batadv_hardif_free_ref(primary_if); } static int batadv_tt_changes_fill_buff(struct batadv_priv *bat_priv, @@ -1590,7 +1584,7 @@ static int batadv_tt_global_valid(const void *entry_ptr, static struct sk_buff * batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, struct batadv_hashtable *hash, - struct batadv_hard_iface *primary_if, + struct batadv_priv *bat_priv, int (*valid_cb)(const void *, const void *), void *cb_data) { @@ -1605,8 +1599,8 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, uint32_t i; size_t len; - if (tt_query_size + tt_len > primary_if->soft_iface->mtu) { - tt_len = primary_if->soft_iface->mtu - tt_query_size; + if (tt_query_size + tt_len > bat_priv->soft_iface->mtu) { + tt_len = bat_priv->soft_iface->mtu - tt_query_size; tt_len -= tt_len % sizeof(struct batadv_tt_change); } tt_tot = tt_len / sizeof(struct batadv_tt_change); @@ -1726,7 +1720,6 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, { struct batadv_orig_node *req_dst_orig_node; struct batadv_orig_node *res_dst_orig_node = NULL; - struct batadv_hard_iface *primary_if = NULL; uint8_t orig_ttvn, req_ttvn, ttvn; int ret = false; unsigned char *tt_buff; @@ -1751,10 +1744,6 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, if (!res_dst_orig_node) goto out; - primary_if = batadv_primary_if_get_selected(bat_priv); - if (!primary_if) - goto out; - orig_ttvn = (uint8_t)atomic_read(&req_dst_orig_node->last_ttvn); req_ttvn = tt_request->ttvn; @@ -1802,7 +1791,7 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, skb = batadv_tt_response_fill_table(tt_len, ttvn, bat_priv->tt.global_hash, - primary_if, + bat_priv, batadv_tt_global_valid, req_dst_orig_node); if (!skb) @@ -1839,8 +1828,6 @@ out: batadv_orig_node_free_ref(res_dst_orig_node); if (req_dst_orig_node) batadv_orig_node_free_ref(req_dst_orig_node); - if (primary_if) - batadv_hardif_free_ref(primary_if); if (!ret) kfree_skb(skb); return ret; @@ -1918,7 +1905,7 @@ batadv_send_my_tt_response(struct batadv_priv *bat_priv, skb = batadv_tt_response_fill_table(tt_len, ttvn, bat_priv->tt.local_hash, - primary_if, + bat_priv, batadv_tt_local_valid_entry, NULL); if (!skb) -- 1.7.10.4

1 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply()
by Matthias Schiffer 27 Jan '13

27 Jan '13

The callers of batadv_dat_snoop_incoming_arp_reply() assume the skb has been freed when it returns true; fix this by calling kfree_skb before returning as it is done in batadv_dat_snoop_incoming_arp_request(). Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> --- distributed-arp-table.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 7485a78..9f4cff3 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1012,6 +1012,8 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, */ ret = !batadv_is_my_client(bat_priv, hw_dst); out: + if (ret) + kfree_skb(skb); /* if ret == false -> packet has to be delivered to the interface */ return ret; } -- 1.8.1.1

3 22

[B.A.T.M.A.N.] [PATCHv3 0/6] CATWOMAN: Network coding in batman-adv
by Martin Hundebøll 24 Jan '13

24 Jan '13

I hereby bring you network coding in batman-adv (in its third revision. This allows a relay to send two packets (to two destinations) in a single transmission. Tests[1] have shown an increase in throughput up to 1.6 under the right circumstances. For this to work, you will need to compile batman-adv with CONFIG_BATMAN_ADV_NC=y and a wireless interface with working promiscuous mode. The rest is taken care of by batman-adv and the following patches. Patch 5/6 depends on my previous patch on the mailing list: "Return reason for failure in batadv_check_unicast_packet()" [1] http://www.open-mesh.org/projects/open-mesh/wiki/2011-08-18-network-coding-… Martin Hundebøll (6): batman-adv: Add the initial code for network coding. batman-adv: Detect coding nodes and remove these after timeout batman-adv: Buffer unicast packets before forward. batman-adv: Code and transmit packets if possible. batman-adv: Save overheard and tx packets for decoding. batman-adv: Receive coded packets and decode them. Makefile | 2 + Makefile.kbuild | 1 + bat_iv_ogm.c | 5 + compat.c | 10 + compat.h | 1 + debugfs.c | 18 + gen-compat-autoconf.sh | 1 + main.c | 6 + main.h | 12 +- network-coding.c | 1832 ++++++++++++++++++++++++++++++++++++++++++++++++ network-coding.h | 123 ++++ originator.c | 6 + packet.h | 33 + routing.c | 31 +- send.c | 5 + soft-interface.c | 14 + sysfs-class-net-mesh | 8 + sysfs.c | 6 + types.h | 124 ++++ 19 files changed, 2228 insertions(+), 10 deletions(-) create mode 100644 network-coding.c create mode 100644 network-coding.h -- 1.8.1.1

2 10

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