commits August 2013

commits@lists.open-mesh.org

1 participants
51 discussions

[batman-adv] maint: batman-adv: Unmap fragment page once iterator is done (0d941e8)
by postmaster＠open-mesh.org 17 Aug '13

17 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 0d941e82ab5f92faf33bee6abdde519056f3ac2d Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Wed Jun 26 11:37:51 2013 +0200 batman-adv: Unmap fragment page once iterator is done Callers of skb_seq_read() are currently forced to call skb_abort_seq_read() even when consuming all the data because the last call to skb_seq_read (the one that returns 0 to indicate the end) fails to unmap the last fragment page. With this patch callers will be allowed to traverse the SKB data by calling skb_prepare_seq_read() once and repeatedly calling skb_seq_read() as originally intended (and documented in the original commit 677e90eda), that is, only call skb_abort_seq_read() if the sequential read is actually aborted. Signed-off-by: Wedson Almeida Filho <wedsonaf(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 0d941e82ab5f92faf33bee6abdde519056f3ac2d compat.h | 8 ++++++++ main.c | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/compat.h b/compat.h index 17ef089..346a824 100644 --- a/compat.h +++ b/compat.h @@ -306,6 +306,14 @@ static int __batadv_interface_set_mac_addr(x, y) #define netdev_notifier_info_to_dev(ptr) ptr +/* older kernels still need to call skb_abort_seq_read() */ +#define skb_seq_read(consumed, data, st) \ + ({ \ + int len = skb_seq_read(consumed, data, st); \ + if (len == 0) \ + skb_abort_seq_read(st); \ + len; \ + }) #endif /* < KERNEL_VERSION(3, 11, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/main.c b/main.c index 51aafd6..08125f3 100644 --- a/main.c +++ b/main.c @@ -473,7 +473,6 @@ __be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr) crc = crc32c(crc, data, len); consumed += len; } - skb_abort_seq_read(&st); return htonl(crc); }

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 17 Aug '13

17 Aug '13

The annotated tag, batman-adv-fix-for-davem has been updated to d0f2962a9090479faf2de36b3b257f03a996b52e (tag) from 370e4bcab1b168941c4ff48a80ae3874e087f82f (which is now obsolete) tagging d823c33c0717cffea2dc73180ef780bf626908c7 (commit) replaces v3.11-rc5 tagged by Antonio Quartulli on Sat Aug 17 12:55:05 2013 +0200 - Shortlog ------------------------------------------------------------ Included change: - Add a missing skb_abort_seq_read() to properly close seq_read session - Check if the skb has been correctly prepared before going on -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAABCAAGBQJSD1apAAoJEADl0hg6qKeO284P/RjIv2IJ+iLjmiQRkedu/gGi 2rTYUn3Z+ZRWrGD7qIexCyg3oNodD2nW9r/UJprYuzun14y7SwL9sswWDtjTE3DG drFouFpbZLCheGpmVewJN9t4N2BaWSDk/J/Zj/fivata+LHonMyM/E3cEKTiQTy4 hx1XJd5ZWelqork2CuFTluwp8SFWQ+pzWO4gvsd8rIOFrgEDev1A0T+wbZhkyB2m frhA1EKWJwG8Wp5VZxcxlxV4T/824Lsed1rPj54kRB1qHuQNabcnXqpWidQ7Mfqw begdqIJPvjZO0o/RB5DTMzhXGMN+goFZ7PECXgaAMfc9c6AeLf6FemXAzQoc+p8p 4vvhrNBZMWfwfBnkasQz1A6qnUHTkSZG9p0nlFHCVbr6G/DC+4JfWdyjGt/vLKs8 UAi96cUWaBaumrt8KKktZ2Wby0rXUsgNobcixcp3fzicWSN+ZYdWr61cZCSGpDsi zPrTAnnAppH7NN0re6P3y7LC7Ckt62DnGys5/hr86mS4K3u4N4EyjlfKo7NjzpGI ookgYmYZ3qUWLK1A9PUxDI/K4mZ6xvArrolM0oEDLDh38kGRAZeRhNdpgU/j3e4e ODVjipARL1A3u2zpnS+R0TrQKOBSxVsJztNc4GrbXF0+gQRXKKMXhmM71bcv5TtU tWx9UGtwAdrPTYHT/qUd =vsE9 -----END PGP SIGNATURE----- Antonio Quartulli (1): batman-adv: properly end seq_read session Linus Lüssing (2): batman-adv: fix potential kernel paging errors for unicast transmissions batman-adv: check return type of unicast packet preparations ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, created. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 17 Aug '13

17 Aug '13

The annotated tag, batman-adv-fix-for-davem has been created at 370e4bcab1b168941c4ff48a80ae3874e087f82f (tag) tagging 9863634227f1390737104f93c0748e6a7b52020e (commit) replaces v3.11-rc5 tagged by Antonio Quartulli on Sat Aug 17 12:23:51 2013 +0200 - Shortlog ------------------------------------------------------------ Included change: - Add a missing skb_abort_seq_read() to properly close seq_read session -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAABCAAGBQJSD09QAAoJEADl0hg6qKeOcvsQAMLwYUKpTyBdhj2mAL+4qqsp zvMBtw48jcSn/VaxWqTrGV0+Kk/l7oQz7RzV2439J5uTNP8atbYrkf3sDwnC2efi lpo9vgQcIMCqLtoYRIzbX2zg7cHF3lc7NjRINC8KzTaqzEQqXZpBSIWjhZxrxQFB BA6olXHhdpZHidI7SrO8HaoXuMfJl6vYUdJnluQ45DEpqReiX7G7w7PRGOSkeh1W kZ2vrJxTshPlu1xAF4gvPRPIFdrJbvDu6biQKzu4remDSvTDoTk3Km8ZA5Aqgl8n Vmj3kmwdw9UWPtjH7Uj/xTxsElEze2LVprVj7RLZdAB8DHDn615kfatf9Px7n8aa RToV6TbMgxRs3n161LMHTV8VVLMBkimfpc2Cj6go6dy/XZ9Lndcw7dyRsNVykHpE u51bfUYggjQingUeSGbW16I8SjL3WKLQh8bpQutdGtdJnAt9jreZz/Senu90f+oJ OcP3I08QlhFKwL5/aEuML8Qdg3dd4pM6MpAO692aSzgVzrXasfg1gjGA1B9+V41g LgYa3QxepN8eYfUU4GTLAS2kEXVqsFNOxbYicj68lKjQAXGHqrj/dHu7jJ68gjrI Mm/t1ITRIdtW9PPxC+Ccs37CfF6lY5CkwTaXOV3gkV97TpWmtbkHM+SDxsHb2LuW Mx3s3tHGaqC83j0Olg8o =5a7Y -----END PGP SIGNATURE----- Antonio Quartulli (1): batman-adv: properly end seq_read session Linus Lüssing (1): batman-adv: fix potential kernel paging errors for unicast transmissions ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, deleted. v3.11-rc3-414-g9d2c948
by postmaster＠open-mesh.org 17 Aug '13

17 Aug '13

The annotated tag, batman-adv-fix-for-davem has been deleted was 094d6045dc10c76dc523912cf4d46081157c41a8 ----------------------------------------------------------------------- tag batman-adv-fix-for-davem Included change: - reassign pointers to data after skb reallocation to avoid kernel paging errors -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAABCAAGBQJSBqldAAoJEADl0hg6qKeO9eQQAKUod+Or+ldfBU5b6OvkDFAr FjSMxVgGS/YFSrD81WLnIGTW/ujz8VrVM7zrUrKJZfsVtBJw5/6hTTV5M/vl6FqQ k+q6L6R1EqR9qRxqFhxD4u6+Zscc3+2KvS2rAqL8PQmJq0STn4h+Lk3J38DrKF9l dBn28FUcX4ON/D5uI0AZU/iM/OxTgWLxhYhFbSjxPnAhJEyIii+D6yrBLNN1SZDx McAKvJ78Tf9rEWt11KBDs6uNtEOSFy0v6hJVkZEiX941rkGOiShzPcU8FCICEaie EGQisQvVYho+ABHofHcMUkMvXwrtLT0WgiIbxRKS9DJdMBOuu99v/zX2T0thZLUK l2GvQZQ6/hS/iMNSQvXhxemyZoAxvjxkSBMwrK/BVv5XLUM+sOo+Og4/ADZviPaY suFwbCDtdr4jzeqBdVxn6mZGosVLtaNM74xpc+cxm7BwmeB2XL22S3sR2WRwsurU AV+bU2NUpRWGg+rsmQCyUrfD/mGZuiyR12Z7BTYA4KoDPkeh/fpGJZS77aRTgSm5 kIXl1aCtRdw31mebdjrNU4Cp6oOnQ3A2jzb8nKoiBUiKPkEZ16h8QB5ktLjsYrKL VFQChSWHUwlgzS3xBu3BVQOZ8WwlEV6z6D3TX9RAlhQqjGbk9OujbQJjmBVwLQdH wWPzO9LSQ9cLYFqAnBof =QkbK -----END PGP SIGNATURE----- 9d2c9488cedb666bc8206fbdcdc1575e0fbc5929 batman-adv: fix potential kernel paging errors for unicast transmissions ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: properly print the VID in DAT (2cc9694)
by postmaster＠open-mesh.org 16 Aug '13

16 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 2cc96940a89d13086210e3cca701e93932f9852d Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Aug 10 12:57:27 2013 +0200 batman-adv: properly print the VID in DAT Make the DAT code use the PRINT_VID macro to print the VIDs. Introduced by 3e26722bc9f248ec4316749fc1957365c0fa5e4b ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 2cc96940a89d13086210e3cca701e93932f9852d distributed-arp-table.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 081c1af..df65f8c 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -282,8 +282,9 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, memcpy(dat_entry->mac_addr, mac_addr, ETH_ALEN); dat_entry->last_update = jiffies; batadv_dbg(BATADV_DBG_DAT, bat_priv, - "Entry updated: %pI4 %pM (vid: %u)\n", - &dat_entry->ip, dat_entry->mac_addr, vid); + "Entry updated: %pI4 %pM (vid: %d)\n", + &dat_entry->ip, dat_entry->mac_addr, + BATADV_PRINT_VID(vid)); goto out; } @@ -307,8 +308,8 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, goto out; } - batadv_dbg(BATADV_DBG_DAT, bat_priv, "New entry added: %pI4 %pM (vid: %u)\n", - &dat_entry->ip, dat_entry->mac_addr, vid); + batadv_dbg(BATADV_DBG_DAT, bat_priv, "New entry added: %pI4 %pM (vid: %d)\n", + &dat_entry->ip, dat_entry->mac_addr, BATADV_PRINT_VID(vid)); out: if (dat_entry)

1 0

[linux-merge]linux integration; annotated tag, v3.11-rc5, created. v3.11-rc5
by postmaster＠open-mesh.org 12 Aug '13

12 Aug '13

The annotated tag, v3.11-rc5 has been created at e49ee8a9d47753e7cd0f6e1827a95c436bc7544c (tag) tagging d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (commit) replaces v3.11-rc4 tagged by Linus Torvalds on Sun Aug 11 18:04:31 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.11-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJSCDSjAAoJEHm+PkMAQRiGDXMIAI7Loae0Oqb1eoeJkvjyZsBS OJDeeEcn+k58VbxVHyRdc7hGo4yI4tUZm172SpnOaM8sZ/ehPU7zBrwJK2lzX334 /jAM3uvVPfxA2nu0I4paNpkED/NQ8NRRsYE1iTE8dzHXOH6dA3mgp5qfco50rQvx rvseXpME4KIAJEq4jnyFZF5+nuHiPueM9JftPmSSmJJ3/KY9kY1LESovyWd7ttg1 jYSVPFal9J0E+tl2UQY5g9H16GqhhjYn+39Iei6Q5P4bL4ZubQgTRQTN9nyDc06Z ezQtGoqZ8kEz/2SyRlkda6PzjSEhgXlc8mCL5J7AW+dMhTHHx2IrosjiCA80kG8= =c0rK -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] master: alfred: handle failing write() in unix sockets (4a77be4)
by postmaster＠open-mesh.org 12 Aug '13

12 Aug '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 4a77be45885342192a852bf2ebe5e70126c766f2 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Fri Aug 9 17:17:25 2013 +0200 alfred: handle failing write() in unix sockets This is not really critical, but some compilers seem to complain about that. Reported-by: Braden Aran <bradenaran(a)gmail.com> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> >--------------------------------------------------------------- 4a77be45885342192a852bf2ebe5e70126c766f2 unix_sock.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/unix_sock.c b/unix_sock.c index b29f635..c778a61 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -158,7 +158,7 @@ static int unix_sock_req_data_reply(struct globals *globals, int client_sock, struct alfred_push_data_v0 *push; struct hash_it_t *hashit = NULL; uint8_t buf[MAX_PAYLOAD]; - uint16_t seqno = 0; + uint16_t seqno = 0, ret = 0; /* send some data back through the unix socket */ @@ -184,12 +184,15 @@ static int unix_sock_req_data_reply(struct globals *globals, int client_sock, push->header.length = htons(len); push->tx.seqno = htons(seqno++); - write(client_sock, buf, sizeof(push->header) + len); + if (write(client_sock, buf, sizeof(push->header) + len) < 0) { + ret = -1; + break; + } } close(client_sock); - return 0; + return ret; } static int unix_sock_req_data(struct globals *globals, @@ -234,7 +237,7 @@ int unix_sock_req_data_finish(struct globals *globals, struct transaction_head *head) { struct alfred_status_v0 status; - int send_data = 1; + int ret = 0, send_data = 1; int client_sock; uint16_t id; uint8_t requested_type; @@ -258,10 +261,11 @@ int unix_sock_req_data_finish(struct globals *globals, status.header.length = htons(sizeof(status) - sizeof(status.header)); status.tx.id = htons(id); status.tx.seqno = 1; - write(client_sock, &status, sizeof(status)); + if (write(client_sock, &status, sizeof(status)) < 0) + ret = -1; close(client_sock); - return 0; + return ret; } int unix_sock_read(struct globals *globals)

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, created. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 10 Aug '13

10 Aug '13

The annotated tag, batman-adv-fix-for-davem has been created at 094d6045dc10c76dc523912cf4d46081157c41a8 (tag) tagging 9d2c9488cedb666bc8206fbdcdc1575e0fbc5929 (commit) replaces v3.11-rc3 tagged by Antonio Quartulli on Sat Aug 10 22:57:11 2013 +0200 - Shortlog ------------------------------------------------------------ Included change: - reassign pointers to data after skb reallocation to avoid kernel paging errors -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAABCAAGBQJSBqldAAoJEADl0hg6qKeO9eQQAKUod+Or+ldfBU5b6OvkDFAr FjSMxVgGS/YFSrD81WLnIGTW/ujz8VrVM7zrUrKJZfsVtBJw5/6hTTV5M/vl6FqQ k+q6L6R1EqR9qRxqFhxD4u6+Zscc3+2KvS2rAqL8PQmJq0STn4h+Lk3J38DrKF9l dBn28FUcX4ON/D5uI0AZU/iM/OxTgWLxhYhFbSjxPnAhJEyIii+D6yrBLNN1SZDx McAKvJ78Tf9rEWt11KBDs6uNtEOSFy0v6hJVkZEiX941rkGOiShzPcU8FCICEaie EGQisQvVYho+ABHofHcMUkMvXwrtLT0WgiIbxRKS9DJdMBOuu99v/zX2T0thZLUK l2GvQZQ6/hS/iMNSQvXhxemyZoAxvjxkSBMwrK/BVv5XLUM+sOo+Og4/ADZviPaY suFwbCDtdr4jzeqBdVxn6mZGosVLtaNM74xpc+cxm7BwmeB2XL22S3sR2WRwsurU AV+bU2NUpRWGg+rsmQCyUrfD/mGZuiyR12Z7BTYA4KoDPkeh/fpGJZS77aRTgSm5 kIXl1aCtRdw31mebdjrNU4Cp6oOnQ3A2jzb8nKoiBUiKPkEZ16h8QB5ktLjsYrKL VFQChSWHUwlgzS3xBu3BVQOZ8WwlEV6z6D3TX9RAlhQqjGbk9OujbQJjmBVwLQdH wWPzO9LSQ9cLYFqAnBof =QkbK -----END PGP SIGNATURE----- Linus Lüssing (1): batman-adv: fix potential kernel paging errors for unicast transmissions ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, deleted. v3.10-rc4-218-gd5b4c93
by postmaster＠open-mesh.org 10 Aug '13

10 Aug '13

The annotated tag, batman-adv-fix-for-davem has been deleted was f50bf90b4d0eeff37a42e6767d8ad8f96e004e36 ----------------------------------------------------------------------- tag batman-adv-fix-for-davem Included change: - fix "rtnl locked" concurrent executions by using rtnl_lock instead of rtnl_trylock. This fix enables batman-adv initialisation to do not fail just because somewhere else in the system another code path is holding the rtnl lock. It is easy to see the problem when batman-adv is trying to start together with other networking components. - fix the routing protocol forwarding policy by enhancing the duplicate control packet detection. When the right circumstances trigger the issue, some nodes in the network become totally unreachable, so breaking the mesh connectivity. - fix the Bridge Loop Avoidance component by not running the originator address change handling routine when the component is disabled. The routine was generating useless packets that were sent over the network. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABCAAGBQJRtkFtAAoJEADl0hg6qKeOBHUP/1Ni8juzvoQwR/gYjq0p2lHM LvkZ/KI74QP96rfDog+nhP9fcOgjSt2MF+sSa6is92RavrKFZQyO2J/GKkrHu2HA gaLKxN6S28Hi2qVbVXgSqT9RQ3XvpzIaojtNvb0tC1onzGzLtd6V5FURIq0FRHvN RvP4w+1HwH2CsQlgjQq1OPwUllVqTUzGYH0fl/U+0mw7h+q0ZWCA1IZln/t08xjl ViCCydbD1Th2tgK7uzFg8X3EJZN1CkrBWflb7X3YK5zeps1NC+l4OuUOK+K2L+fx vCMu603FXKi+SjM24d+eGJx6kQPCapYThIrp1qy43SLkNazRIAmgbZpndme0QP/8 eSUozWAusWIESJI3Krneh3i70agMeg2MK4nAp51z54j52urDlOGURyNf7TkieaT4 Vti5QG0poXncIb1XQ+yaKDCORwkn18QjmtfNmCCgT2YF91pOSYCrlgONi65K6DIs F4eDk7sTgHAIgYO/XEet/V5p06SO86ksF/C13Dqug64s3rkw9ejqgLZBEy3OH1AF IFgws3qE6GiSiXLMiiheplBYD51au+V1Jihqvw/lo2JzlOw4PRNRYsaQgVaUH/MJ jupEjA8V0swMtDIi6ixcPE/P60OJR41VuT8gVGWbrTKnHZ0yyIfgZwPcLZaQ2X0e EIlTJdtS7lVpleZ2C/H1 =oGCV -----END PGP SIGNATURE----- d5b4c93e67b0b1291aa8e2aaf694e40afc3412d0 batman-adv: Don't handle address updates when bla is disabled ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: make the backbone gw check VLAN specific (5af869e)
by postmaster＠open-mesh.org 08 Aug '13

08 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5af869e10857764c2a61559ec66176eb533a9ceb Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Wed Aug 7 18:28:56 2013 +0200 batman-adv: make the backbone gw check VLAN specific The backbone gw check has to be VLAN specific so that code using it can specify VID where the check has to be done. In the TT code, the check has been moved into the tt_global_add() function so that it can be performed on a per-entry basis instead of ignoring all the TT data received from another backbone node. Only TT global entries belonging to the VLAN where the backbone node is connected to are skipped. All the other spots where the TT code was checking whether a node is a backbone have been removed. Moreover, batadv_bla_is_backbone_gw_orig() now returns bool since it used to return only 1 or 0. Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 5af869e10857764c2a61559ec66176eb533a9ceb bridge_loop_avoidance.c | 19 +++++++++++-------- bridge_loop_avoidance.h | 10 ++++++---- translation-table.c | 41 ++++++++++------------------------------- 3 files changed, 27 insertions(+), 43 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 3b3867d..28eb5e6 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1315,12 +1315,14 @@ out: /* @bat_priv: the bat priv with all the soft interface information * @orig: originator mac address + * @vid: VLAN identifier * - * check if the originator is a gateway for any VLAN ID. + * Check if the originator is a gateway for the VLAN identified by vid. * - * returns 1 if it is found, 0 otherwise + * Returns true if orig is a backbone for this vid, false otherwise. */ -int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig) +bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig, + unsigned short vid) { struct batadv_hashtable *hash = bat_priv->bla.backbone_hash; struct hlist_head *head; @@ -1328,25 +1330,26 @@ int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig) int i; if (!atomic_read(&bat_priv->bridge_loop_avoidance)) - return 0; + return false; if (!hash) - return 0; + return false; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; rcu_read_lock(); hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) { - if (batadv_compare_eth(backbone_gw->orig, orig)) { + if (batadv_compare_eth(backbone_gw->orig, orig) && + backbone_gw->vid == vid) { rcu_read_unlock(); - return 1; + return true; } } rcu_read_unlock(); } - return 0; + return false; } diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 4b102e7..da173e7 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -30,7 +30,8 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset); -int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig); +bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig, + unsigned short vid); int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct sk_buff *skb); void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, @@ -74,10 +75,11 @@ static inline int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, return 0; } -static inline int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, - uint8_t *orig) +static inline bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, + uint8_t *orig, + unsigned short vid) { - return 0; + return false; } static inline int diff --git a/translation-table.c b/translation-table.c index b12d781..2b4d9ed 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1153,6 +1153,10 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, struct batadv_tt_common_entry *common; uint16_t local_flags; + /* ignore global entries from backbone nodes */ + if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig, vid)) + return true; + tt_global_entry = batadv_tt_global_hash_find(bat_priv, tt_addr, vid); tt_local_entry = batadv_tt_local_hash_find(bat_priv, tt_addr, vid); @@ -2135,7 +2139,8 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, * the CRC as we ignore all the global entries over it */ if (batadv_bla_is_backbone_gw_orig(orig_node->bat_priv, - orig_node->orig)) + orig_node->orig, + ntohs(tt_vlan_tmp->vid))) continue; vlan = batadv_orig_node_vlan_get(orig_node, @@ -2183,7 +2188,8 @@ static void batadv_tt_global_update_crc(struct batadv_priv *bat_priv, /* if orig_node is a backbone node for this VLAN, don't compute * the CRC as we ignore all the global entries over it */ - if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig)) + if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig, + vlan->vid)) continue; crc = batadv_tt_global_crc(bat_priv, orig_node, vlan->vid); @@ -2527,16 +2533,11 @@ static bool batadv_send_tt_response(struct batadv_priv *bat_priv, struct batadv_tvlv_tt_data *tt_data, uint8_t *req_src, uint8_t *req_dst) { - if (batadv_is_my_mac(bat_priv, req_dst)) { - /* don't answer backbone gws! */ - if (batadv_bla_is_backbone_gw_orig(bat_priv, req_src)) - return true; - + if (batadv_is_my_mac(bat_priv, req_dst)) return batadv_send_my_tt_response(bat_priv, tt_data, req_src); - } else { + else return batadv_send_other_tt_response(bat_priv, tt_data, req_src, req_dst); - } } static void _batadv_tt_update_changes(struct batadv_priv *bat_priv, @@ -2668,10 +2669,6 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv, resp_src, tt_data->ttvn, num_entries, (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.')); - /* we should have never asked a backbone gw */ - if (batadv_bla_is_backbone_gw_orig(bat_priv, resp_src)) - goto out; - orig_node = batadv_orig_hash_find(bat_priv, resp_src); if (!orig_node) goto out; @@ -3052,10 +3049,6 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, struct batadv_tvlv_tt_vlan_data *tt_vlan; bool full_table = true; - /* don't care about a backbone gateways updates. */ - if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig)) - return; - tt_vlan = (struct batadv_tvlv_tt_vlan_data *)tt_buff; /* orig table not initialised AND first diff is in the OGM OR the ttvn * increased by one -> we can apply the attached changes @@ -3177,13 +3170,6 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, { bool ret = false; - /* if the originator is a backbone node (meaning it belongs to the same - * LAN of this node) the temporary client must not be added because to - * reach such destination the node must use the LAN instead of the mesh - */ - if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig)) - goto out; - if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid, BATADV_TT_CLIENT_TEMP, atomic_read(&orig_node->last_ttvn))) @@ -3344,13 +3330,6 @@ static int batadv_roam_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv, if (!batadv_is_my_mac(bat_priv, dst)) return NET_RX_DROP; - /* check if it is a backbone gateway. we don't accept - * roaming advertisement from it, as it has the same - * entries as we have. - */ - if (batadv_bla_is_backbone_gw_orig(bat_priv, src)) - goto out; - if (tvlv_value_len < sizeof(*roaming_adv)) goto out;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2013