commits January 2013

commits@lists.open-mesh.org

1 participants
119 discussions

[batman-adv] master: batman-adv: replace redudant primary_if_get calls (8d58064)
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 8d58064e5e3420e86de6d10d6956c1e4c34f4ea9 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jan 12 19:19:06 2013 +0800 batman-adv: replace redudant primary_if_get calls 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> >--------------------------------------------------------------- 8d58064e5e3420e86de6d10d6956c1e4c34f4ea9 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 ea0bd31..c19e60f 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -819,7 +819,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; @@ -841,22 +840,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"); @@ -869,8 +864,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; } @@ -890,7 +883,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; @@ -915,12 +907,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) @@ -944,8 +932,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 0

[batman-adv] master's head updated: Merge branch 'maint' into next (c23b3d3)
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 3b24193 batman-adv: check for more types of invalid IP addresses in DAT ab361a9 batman-adv: filter ARP packets with invalid MAC addresses in DAT c23b3d3 Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (c23b3d3)
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit c23b3d3cd0ded371943c39d27aba4e87fd84d51d Merge: efcf448 ab361a9 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Jan 27 08:37:26 2013 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- c23b3d3cd0ded371943c39d27aba4e87fd84d51d distributed-arp-table.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (c23b3d3)
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 3b24193 batman-adv: check for more types of invalid IP addresses in DAT ab361a9 batman-adv: filter ARP packets with invalid MAC addresses in DAT c23b3d3 Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: filter ARP packets with invalid MAC addresses in DAT (ab361a9)
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit ab361a9ccc584e7501c06bfe1c00cb0411feebaf Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Thu Jan 24 18:18:27 2013 +0100 batman-adv: filter ARP packets with invalid MAC addresses in DAT We never want multicast MAC addresses in the Distributed ARP Table, so it's best to completely ignore ARP packets containing them where we expect unicast addresses. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- ab361a9ccc584e7501c06bfe1c00cb0411feebaf distributed-arp-table.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index be3be28..ea0bd31 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -738,6 +738,7 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv, struct arphdr *arphdr; struct ethhdr *ethhdr; __be32 ip_src, ip_dst; + uint8_t *hw_src, *hw_dst; uint16_t type = 0; /* pull the ethernet header */ @@ -782,6 +783,18 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv, ipv4_is_zeronet(ip_dst) || ipv4_is_lbcast(ip_dst)) goto out; + hw_src = batadv_arp_hw_src(skb, hdr_size); + if (is_zero_ether_addr(hw_src) || is_multicast_ether_addr(hw_src)) + goto out; + + /* we don't care about the destination MAC address in ARP requests */ + if (arphdr->ar_op != htons(ARPOP_REQUEST)) { + hw_dst = batadv_arp_hw_dst(skb, hdr_size); + if (is_zero_ether_addr(hw_dst) || + is_multicast_ether_addr(hw_dst)) + goto out; + } + type = ntohs(arphdr->ar_op); out: return type;

1 0

[batman-adv] maint: batman-adv: check for more types of invalid IP addresses in DAT (3b24193)
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 3b24193d7cfc18f0cc005811ca4aab3479c2f1c6 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Thu Jan 24 18:18:26 2013 +0100 batman-adv: check for more types of invalid IP addresses in DAT There are more types of IP addresses that may appear in ARP packets that we don't want to process. While some of these should never appear in sane ARP packets, a 0.0.0.0 source is used for duplicate address detection and thus seen quite often. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 3b24193d7cfc18f0cc005811ca4aab3479c2f1c6 distributed-arp-table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 9f4cff3..be3be28 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -777,7 +777,9 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv, ip_src = batadv_arp_ip_src(skb, hdr_size); ip_dst = batadv_arp_ip_dst(skb, hdr_size); if (ipv4_is_loopback(ip_src) || ipv4_is_multicast(ip_src) || - ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst)) + ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst) || + ipv4_is_zeronet(ip_src) || ipv4_is_lbcast(ip_src) || + ipv4_is_zeronet(ip_dst) || ipv4_is_lbcast(ip_dst)) goto out; type = ntohs(arphdr->ar_op);

1 0

[linux-merge]linux integration; annotated tag, v3.8-rc5, created. v3.8-rc5
by postmaster＠open-mesh.org 25 Jan '13

25 Jan '13

The annotated tag, v3.8-rc5 has been created at b67f19a416919ae48c98105a7e32886b15f6e0d8 (tag) tagging 949db153b6466c6f7cad5a427ecea94985927311 (commit) replaces v3.8-rc4 tagged by Linus Torvalds on Fri Jan 25 11:57:38 2013 -0800 - Shortlog ------------------------------------------------------------ Linux 3.8-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRAuO3AAoJEHm+PkMAQRiGbfAH/1C3QQKB11aBpYLAw7qijAze yOui26UCnwRryxsO8zBCQjGoByy5DvY/Q0zyUCWUE6nf/JFSoKGUHzfJ1ATyzGll 3vENP6Fnmq0Hgc4t8/gXtXrZ1k/c43cYA2XEhDnEsJlFNmNj2wCQQj9njTNn2cl1 k6XhZ9U1V2hGYpLL5bmsZiLVI6dIpkCVw8d4GZ8BKxSLUacVKMS7ml2kZqxBTMgt AF6T2SPagBBxxNq8q87x4b7vyHYchZmk+9tAV8UMs1ecimasLK8vrRAJvkXXaH1t xgtR0sfIp5raEjoFYswCK+cf5NEusLZDKOEvoABFfEgL4/RKFZ8w7MMsmG8m0rk= =m68Y -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master's head updated: Merge branch 'maint' into next (efcf448)
by postmaster＠open-mesh.org 24 Jan '13

24 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 977d8c6 batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply() efcf448 Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (efcf448)
by postmaster＠open-mesh.org 24 Jan '13

24 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit efcf448c066e199a5abddf7b5deefeae7bae00d6 Merge: 1d8cfbf 977d8c6 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Jan 24 21:30:26 2013 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- efcf448c066e199a5abddf7b5deefeae7bae00d6 distributed-arp-table.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (efcf448)
by postmaster＠open-mesh.org 24 Jan '13

24 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 977d8c6 batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply() efcf448 Merge branch 'maint' into next

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2013