commits March 2016

commits@lists.open-mesh.org

1 participants
51 discussions

[batman-adv] maint: batman-adv: Reduce refcnt of removed router when updating route (08ba64d)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 08ba64d0b558be47b48c1ef275b671b518581d04 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 20 12:27:53 2016 +0100 batman-adv: Reduce refcnt of removed router when updating route _batadv_update_route rcu_derefences orig_ifinfo->router outside of a spinlock protected region to print some information messages to the debug log. But this pointer is not checked again when the new pointer is assigned in the spinlock protected region. Thus is can happen that the value of orig_ifinfo->router changed in the meantime and thus the reference counter of the wrong router gets reduced after the spinlock protected region. Just rcu_dereferencing the value of orig_ifinfo->router inside the spinlock protected region (which also set the new pointer) is enough to get the correct old router object. Fixes: d90ddb94423f ("batman-adv: Make orig_node->router an rcu protected pointer") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 08ba64d0b558be47b48c1ef275b671b518581d04 net/batman-adv/routing.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 1fb1be3..7b260e1 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -104,6 +104,15 @@ static void _batadv_update_route(struct batadv_priv *bat_priv, neigh_node = NULL; spin_lock_bh(&orig_node->neigh_list_lock); + /* curr_router used earlier may not be the current orig_ifinfo->router + * anymore because it was dereferenced outside of the neigh_list_lock + * protected region. After the new best neighbor has replace the current + * best neighbor the reference counter needs to decrease. Consequently, + * the code needs to ensure the curr_router variable contains a pointer + * to the replaced best neighbor. + */ + curr_router = rcu_dereference_protected(orig_ifinfo->router, true); + rcu_assign_pointer(orig_ifinfo->router, neigh_node); spin_unlock_bh(&orig_node->neigh_list_lock); batadv_orig_ifinfo_free_ref(orig_ifinfo);

6 years, 12 months

[batman-adv] master: batman-adv: Fix function names on new line starting with '*' (39c3bcc)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 39c3bccf7ade7dbc47ff6e7b2ba489cd2e02a0e7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 5 15:56:01 2016 +0100 batman-adv: Fix function names on new line starting with '*' Some really long function names in batman-adv require a newline between return type and the function name. This has lead to some lines starting with *batadv_... This * belongs to the return type and thus should be on the same line as the return type. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 39c3bccf7ade7dbc47ff6e7b2ba489cd2e02a0e7 net/batman-adv/bridge_loop_avoidance.c | 6 +++--- net/batman-adv/main.c | 8 ++++---- net/batman-adv/network-coding.c | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 642167f..943f9e2 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -200,9 +200,9 @@ static void batadv_claim_put(struct batadv_bla_claim *claim) * * Return: claim if found or NULL otherwise. */ -static struct batadv_bla_claim -*batadv_claim_hash_find(struct batadv_priv *bat_priv, - struct batadv_bla_claim *data) +static struct batadv_bla_claim * +batadv_claim_hash_find(struct batadv_priv *bat_priv, + struct batadv_bla_claim *data) { struct batadv_hashtable *hash = bat_priv->bla.claim_hash; struct hlist_head *head; diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index d64ddb9..78c05a9 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -663,8 +663,8 @@ static void batadv_tvlv_handler_put(struct batadv_tvlv_handler *tvlv_handler) * * Return: tvlv handler if found or NULL otherwise. */ -static struct batadv_tvlv_handler -*batadv_tvlv_handler_get(struct batadv_priv *bat_priv, u8 type, u8 version) +static struct batadv_tvlv_handler * +batadv_tvlv_handler_get(struct batadv_priv *bat_priv, u8 type, u8 version) { struct batadv_tvlv_handler *tvlv_handler_tmp, *tvlv_handler = NULL; @@ -722,8 +722,8 @@ static void batadv_tvlv_container_put(struct batadv_tvlv_container *tvlv) * * Return: tvlv container if found or NULL otherwise. */ -static struct batadv_tvlv_container -*batadv_tvlv_container_get(struct batadv_priv *bat_priv, u8 type, u8 version) +static struct batadv_tvlv_container * +batadv_tvlv_container_get(struct batadv_priv *bat_priv, u8 type, u8 version) { struct batadv_tvlv_container *tvlv_tmp, *tvlv = NULL; diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 32f9fa1..dd99e53 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -793,10 +793,10 @@ static bool batadv_can_nc_with_orig(struct batadv_priv *bat_priv, * * Return: the nc_node if found, NULL otherwise. */ -static struct batadv_nc_node -*batadv_nc_find_nc_node(struct batadv_orig_node *orig_node, - struct batadv_orig_node *orig_neigh_node, - bool in_coding) +static struct batadv_nc_node * +batadv_nc_find_nc_node(struct batadv_orig_node *orig_node, + struct batadv_orig_node *orig_neigh_node, + bool in_coding) { struct batadv_nc_node *nc_node, *nc_node_out = NULL; struct list_head *list; @@ -835,11 +835,11 @@ static struct batadv_nc_node * * Return: the nc_node if found or created, NULL in case of an error. */ -static struct batadv_nc_node -*batadv_nc_get_nc_node(struct batadv_priv *bat_priv, - struct batadv_orig_node *orig_node, - struct batadv_orig_node *orig_neigh_node, - bool in_coding) +static struct batadv_nc_node * +batadv_nc_get_nc_node(struct batadv_priv *bat_priv, + struct batadv_orig_node *orig_node, + struct batadv_orig_node *orig_neigh_node, + bool in_coding) { struct batadv_nc_node *nc_node; spinlock_t *lock; /* Used to lock list selected by "int in_coding" */

6 years, 12 months

[batctl] master: batctl: tcpdump - add OGM2 and ELP parsing support (7075be1)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 7075be16f03bb924f199a8d88c47b9f082cfffaf Author: Antonio Quartulli <antonio.quartulli(a)open-mesh.com> Date: Mon Mar 14 12:05:44 2016 +0800 batctl: tcpdump - add OGM2 and ELP parsing support These new packet types were introduced with B.A.T.M.A.N. V and required tcpdump parsing support. With this change it is now possible to properly read the content these packets by means of the batctl tdpcump command. In order to reduce code duplication, the mechanism used to dump TVLV containers has been extracted and moved to a new function. Signed-off-by: Antonio Quartulli <antonio.quartulli(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 7075be16f03bb924f199a8d88c47b9f082cfffaf tcpdump.c | 164 ++++++++++++++++++++++++++++++++++++++++++++------------------ tcpdump.h | 11 +++-- 2 files changed, 123 insertions(+), 52 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index db28414..a30e34b 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -49,6 +49,8 @@ #include "bat-hosts.h" #include "functions.h" +#define BATADV_THROUGHPUT_MAX_VALUE 0xFFFFFFFF + #ifndef ETH_P_BATMAN #define ETH_P_BATMAN 0x4305 #endif /* ETH_P_BATMAN */ @@ -62,8 +64,10 @@ if ((size_t)(buff_len) < (check_len)) { \ return; \ } -static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATICMP | DUMP_TYPE_BATUCAST | - DUMP_TYPE_BATBCAST | DUMP_TYPE_BATUTVLV | DUMP_TYPE_BATFRAG | DUMP_TYPE_NONBAT; +static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATELP | + DUMP_TYPE_BATICMP | DUMP_TYPE_BATUCAST | + DUMP_TYPE_BATBCAST | DUMP_TYPE_BATUTVLV | + DUMP_TYPE_BATFRAG | DUMP_TYPE_NONBAT; static unsigned short dump_level; static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed); @@ -78,7 +82,9 @@ static void tcpdump_usage(void) fprintf(stderr, " \t -p dump specific packet type\n"); fprintf(stderr, " \t -x dump all packet types except specified\n"); fprintf(stderr, "packet types:\n"); - fprintf(stderr, " \t\t%3d - batman ogm packets\n", DUMP_TYPE_BATOGM); + fprintf(stderr, " \t\t%3d - batman ogm/ogmv2 packets\n", + DUMP_TYPE_BATOGM); + fprintf(stderr, " \t\t%3d - batman elp packets\n", DUMP_TYPE_BATELP); fprintf(stderr, " \t\t%3d - batman icmp packets\n", DUMP_TYPE_BATICMP); fprintf(stderr, " \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); fprintf(stderr, " \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); @@ -246,20 +252,43 @@ static batctl_tvlv_parser_t tvlv_parser_get(uint8_t type, uint8_t version) } } +static void dump_tvlv(unsigned char *ptr, ssize_t tvlv_len) +{ + struct batadv_tvlv_hdr *tvlv_hdr; + batctl_tvlv_parser_t parser; + ssize_t len; + + while (tvlv_len >= (ssize_t)sizeof(*tvlv_hdr)) { + tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; + + /* data after TVLV header */ + ptr = (uint8_t *)(tvlv_hdr + 1); + tvlv_len -= sizeof(*tvlv_hdr); + + len = ntohs(tvlv_hdr->len); + LEN_CHECK(tvlv_len, (size_t)len, "BAT TVLV"); + + parser = tvlv_parser_get(tvlv_hdr->type, tvlv_hdr->version); + if (parser) + parser(ptr, len); + + /* go to the next container */ + ptr += len; + tvlv_len -= len; + } +} + static void dump_batman_ucast_tvlv(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct batadv_unicast_tvlv_packet *tvlv_packet; - struct batadv_tvlv_hdr *tvlv_hdr; struct ether_header *ether_header; struct ether_addr *src, *dst; - batctl_tvlv_parser_t parser; - ssize_t check_len, tvlv_len, len; - uint8_t *ptr; + ssize_t check_len, tvlv_len; check_len = (size_t)buff_len - sizeof(struct ether_header); - LEN_CHECK(check_len, sizeof(*tvlv_packet), "BAT TVLV"); + LEN_CHECK(check_len, sizeof(*tvlv_packet), "BAT UCAST TVLV"); check_len -= sizeof(*tvlv_packet); ether_header = (struct ether_header *)packet_buff; @@ -281,26 +310,7 @@ static void dump_batman_ucast_tvlv(unsigned char *packet_buff, ssize_t buff_len, buff_len - sizeof(struct ether_header), tvlv_len, tvlv_packet->ttl); - ptr = (uint8_t *)(tvlv_packet + 1); - - while (tvlv_len >= (ssize_t)sizeof(*tvlv_hdr)) { - tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; - - /* data after TVLV header */ - ptr = (uint8_t *)(tvlv_hdr + 1); - tvlv_len -= sizeof(*tvlv_hdr); - - len = ntohs(tvlv_hdr->len); - LEN_CHECK(tvlv_len, (size_t)len, "BAT UCAST TVLV"); - - parser = tvlv_parser_get(tvlv_hdr->type, tvlv_hdr->version); - if (parser) - parser(ptr, len); - - /* go to the next container */ - ptr += len; - tvlv_len -= len; - } + dump_tvlv((uint8_t *)(tvlv_packet + 1), tvlv_len); } static int dump_bla2_claim(struct ether_header *eth_hdr, @@ -686,10 +696,7 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int { struct ether_header *ether_header; struct batadv_ogm_packet *batman_ogm_packet; - struct batadv_tvlv_hdr *tvlv_hdr; - ssize_t tvlv_len, len, check_len; - batctl_tvlv_parser_t parser; - uint8_t *ptr; + ssize_t tvlv_len, check_len; check_len = (size_t)buff_len - sizeof(struct ether_header); LEN_CHECK(check_len, sizeof(struct batadv_ogm_packet), "BAT IV OGM"); @@ -716,26 +723,79 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int check_len -= sizeof(struct batadv_ogm_packet); LEN_CHECK(check_len, (size_t)tvlv_len, "BAT OGM TVLV (containers)"); - ptr = (uint8_t *)(batman_ogm_packet + 1); + dump_tvlv((uint8_t *)(batman_ogm_packet + 1), tvlv_len); +} - while (tvlv_len >= (ssize_t)sizeof(*tvlv_hdr)) { - tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; +static void dump_batman_ogm2(unsigned char *packet_buff, ssize_t buff_len, + int read_opt, int time_printed) +{ + struct batadv_ogm2_packet *batman_ogm2; + struct ether_header *ether_header; + struct ether_addr *ether_addr; + ssize_t tvlv_len, check_len; + uint32_t throughput; + char thr_str[20]; - /* data after TVLV header */ - ptr = (uint8_t *)(tvlv_hdr + 1); - tvlv_len -= sizeof(*tvlv_hdr); + check_len = (size_t)buff_len - sizeof(struct ether_header); + LEN_CHECK(check_len, BATADV_OGM2_HLEN, "BAT OGM2"); - len = ntohs(tvlv_hdr->len); - LEN_CHECK(tvlv_len, (size_t)len, "BAT IV OGM TVLV"); + ether_header = (struct ether_header *)packet_buff; + batman_ogm2 = (struct batadv_ogm2_packet *)(packet_buff + + sizeof(struct ether_header)); - parser = tvlv_parser_get(tvlv_hdr->type, tvlv_hdr->version); - if (parser) - parser(ptr, len); + if (!time_printed) + print_time(); - /* go to the next container */ - ptr += len; - tvlv_len -= len; - } + ether_addr = (struct ether_addr *)batman_ogm2->orig; + printf("BAT %s: ", get_name_by_macaddr(ether_addr, read_opt)); + + tvlv_len = ntohs(batman_ogm2->tvlv_len); + + throughput = ntohl(batman_ogm2->throughput); + if (throughput == BATADV_THROUGHPUT_MAX_VALUE) + snprintf(thr_str, sizeof(thr_str), "MAX"); + else + snprintf(thr_str, sizeof(thr_str), "%.1fMbps", + (float)ntohl(batman_ogm2->throughput) / 10); + + ether_addr = (struct ether_addr *)ether_header->ether_shost; + printf("OGM2 via neigh %s, seq %u, throughput %s, ttl %2d, v %d, length %zu, tvlv_len %zu\n", + get_name_by_macaddr(ether_addr, read_opt), + ntohl(batman_ogm2->seqno), thr_str, batman_ogm2->ttl, + batman_ogm2->version, check_len, tvlv_len); + + check_len -= BATADV_OGM2_HLEN; + LEN_CHECK(check_len, (size_t)tvlv_len, "BAT OGM2 TVLV (containers)"); + + dump_tvlv((uint8_t *)(batman_ogm2 + 1), tvlv_len); +} + +static void dump_batman_elp(unsigned char *packet_buff, ssize_t buff_len, + int read_opt, int time_printed) +{ + struct batadv_elp_packet *batman_elp; + struct ether_header *ether_header; + struct ether_addr *ether_addr; + ssize_t check_len; + + check_len = (size_t)buff_len - sizeof(struct ether_header); + LEN_CHECK(check_len, BATADV_ELP_HLEN, "BAT ELP"); + + ether_header = (struct ether_header *)packet_buff; + batman_elp = (struct batadv_elp_packet *)(packet_buff + + sizeof(struct ether_header)); + + if (!time_printed) + print_time(); + + ether_addr = (struct ether_addr *)batman_elp->orig; + printf("BAT %s: ", get_name_by_macaddr(ether_addr, read_opt)); + + ether_addr = (struct ether_addr *)ether_header->ether_shost; + printf("ELP via iface %s, seq %u, v %d, interval %ums, length %zu\n", + get_name_by_macaddr(ether_addr, read_opt), + ntohl(batman_elp->seqno), batman_elp->version, + ntohl(batman_elp->elp_interval), check_len); } static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) @@ -902,6 +962,16 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read if (dump_level & DUMP_TYPE_BATOGM) dump_batman_iv_ogm(packet_buff, buff_len, read_opt, time_printed); break; + case BATADV_OGM2: + if (dump_level & DUMP_TYPE_BATOGM) + dump_batman_ogm2(packet_buff, buff_len, + read_opt, time_printed); + break; + case BATADV_ELP: + if (dump_level & DUMP_TYPE_BATELP) + dump_batman_elp(packet_buff, buff_len, + read_opt, time_printed); + break; case BATADV_ICMP: if (dump_level & DUMP_TYPE_BATICMP) dump_batman_icmp(packet_buff, buff_len, read_opt, time_printed); diff --git a/tcpdump.h b/tcpdump.h index dc9e5a6..5ec474f 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -38,11 +38,12 @@ #endif #define DUMP_TYPE_BATOGM 1 -#define DUMP_TYPE_BATICMP 2 -#define DUMP_TYPE_BATUCAST 4 -#define DUMP_TYPE_BATBCAST 8 -#define DUMP_TYPE_BATUTVLV 16 -#define DUMP_TYPE_BATFRAG 32 +#define DUMP_TYPE_BATELP 2 +#define DUMP_TYPE_BATICMP 4 +#define DUMP_TYPE_BATUCAST 8 +#define DUMP_TYPE_BATBCAST 16 +#define DUMP_TYPE_BATUTVLV 32 +#define DUMP_TYPE_BATFRAG 64 #define DUMP_TYPE_NONBAT 128 #define IEEE80211_FCTL_FTYPE 0x0c00

6 years, 12 months

[batman-adv] master: Merge branch 'next' (99c2204)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 99c22044c68827af1c7467d1620d15947456f325 Merge: ef38843 fbb98aa Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Mar 27 15:09:01 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 99c22044c68827af1c7467d1620d15947456f325 net/batman-adv/hard-interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

6 years, 12 months

[batman-adv] master's head updated: Merge branch 'next' (99c2204)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: fbb98aa batman-adv: Deactive TO_BE_ACTIVATED hardif on shutdown 99c2204 Merge branch 'next'

6 years, 12 months

[batman-adv] next: batman-adv: Deactive TO_BE_ACTIVATED hardif on shutdown (fbb98aa)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit fbb98aa65dbba86c94808204060434393c2ad19e Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 19 13:55:21 2016 +0100 batman-adv: Deactive TO_BE_ACTIVATED hardif on shutdown The shutdown of an batman-adv interface can happen with one of its slave interfaces still being in the BATADV_IF_TO_BE_ACTIVATED state. A possible reason for it is that the routing algorithm BATMAN_V was selected and batadv_schedule_bat_ogm was not yet called for this interface. This slave interface still has to be set to BATADV_IF_INACTIVE or the batman-adv interface will never reduce its usage counter and thus never gets shutdown. This problem can be simulated via: $ modprobe dummy $ modprobe batman-adv routing_algo=BATMAN_V $ ip link add bat0 type batadv $ ip link set dummy0 master bat0 $ ip link set dummy0 up $ ip link del bat0 unregister_netdevice: waiting for bat0 to become free. Usage count = 3 Fixes: 88861ea9acb7 ("[batman-adv] replacing if up/down timer with kernel notifications") Reported-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- fbb98aa65dbba86c94808204060434393c2ad19e net/batman-adv/hard-interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index b22b277..c61d5b0 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -572,8 +572,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_hard_iface *primary_if = NULL; - if (hard_iface->if_status == BATADV_IF_ACTIVE) - batadv_hardif_deactivate_interface(hard_iface); + batadv_hardif_deactivate_interface(hard_iface); if (hard_iface->if_status != BATADV_IF_INACTIVE) goto out;

6 years, 12 months

[batman-adv] master: batman-adv: replace ethertype variable with ETH_P_BATMAN for readability (ef38843)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ef388433c1de7216a9d55aa9aef2b9ca15c1b913 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Mar 20 18:39:56 2016 +0800 batman-adv: replace ethertype variable with ETH_P_BATMAN for readability Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Reviewed-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ef388433c1de7216a9d55aa9aef2b9ca15c1b913 net/batman-adv/soft-interface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 1c1ed5a..4667719 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -186,7 +186,6 @@ static int batadv_interface_tx(struct sk_buff *skb, struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_hard_iface *primary_if = NULL; struct batadv_bcast_packet *bcast_packet; - __be16 ethertype = htons(ETH_P_BATMAN); static const u8 stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; static const u8 ectp_addr[ETH_ALEN] = {0xCF, 0x00, 0x00, 0x00, @@ -216,7 +215,8 @@ static int batadv_interface_tx(struct sk_buff *skb, case ETH_P_8021Q: vhdr = vlan_eth_hdr(skb); - if (vhdr->h_vlan_encapsulated_proto != ethertype) { + /* drop batman-in-batman packets to prevent loops */ + if (vhdr->h_vlan_encapsulated_proto != htons(ETH_P_BATMAN)) { network_offset += VLAN_HLEN; break; } @@ -404,7 +404,6 @@ void batadv_interface_rx(struct net_device *soft_iface, { struct batadv_bcast_packet *batadv_bcast_packet; struct batadv_priv *bat_priv = netdev_priv(soft_iface); - __be16 ethertype = htons(ETH_P_BATMAN); struct vlan_ethhdr *vhdr; struct ethhdr *ethhdr; unsigned short vid; @@ -434,7 +433,8 @@ void batadv_interface_rx(struct net_device *soft_iface, vhdr = (struct vlan_ethhdr *)skb->data; - if (vhdr->h_vlan_encapsulated_proto != ethertype) + /* drop batman-in-batman packets to prevent loops */ + if (vhdr->h_vlan_encapsulated_proto != htons(ETH_P_BATMAN)) break; /* fall through */

6 years, 12 months

[linux-merge]linux integration; annotated tag, v4.6-rc1, created. v4.6-rc1

by postmaster＠open-mesh.org

The annotated tag, v4.6-rc1 has been created at 5c1930df65df4be8312d705037ac9a8a33cc2a31 (tag) tagging f55532a0c0b8bb6148f4e07853b876ef73bc69ca (commit) replaces v4.5 tagged by Linus Torvalds on Sat Mar 26 16:03:44 2016 -0700 - Shortlog ------------------------------------------------------------ Linux 4.6-rc1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJW9xVQAAoJEHm+PkMAQRiGLCYH/RaD6PE78ttLoAIm2rTUY+P9 jtNhRVVNPmNn6103r0g9RYxyN0k+KyRQiO0I3XC77i30ksJV0duqhZfpg9nyHaFZ ljiYBLWFcc6qyMiE5B9ogEwveQriKtbUTrIPHer/vEmOdJHDRoUIVZ/qQ+eNzGmq aHa0bJalCXqkRpXatfZBUz8OyblrNjZMpX6907vqR5kRrcXqRn52X32gmy6bwSRp oRRQvSjzzZzApISz1uQIY5TFEb9ARrtK2FUf/rM0WS4gE1tB/p8Ccx7iopqk/zjI f+vZEdQ6o6FdPZ38XZGnwyr1nf52AV5/7wJs+5D1rLCHK8buEJD01BiT7qQvpnI= =q0+P -----END PGP SIGNATURE----- Antonio Quartulli (12): batman-adv: fix kerneldoc for DAT functions batman-adv: fix kerneldoc for TT functions batman-adv: add kernel doc for AP isolation attributes in bat_priv batman-adv: remove unused BATADV_BONDING_TQ_THRESHOLD constant batman-adv: OGMv2 - add basic infrastructure batman-adv: OGMv2 - implement originators logic batman-adv: add throughput override attribute to hard_ifaces batman-adv: keep track of when unicast packets are sent batman-adv: ELP - compute the metric based on the estimated throughput batman-adv: ELP - send unicast ELP packets for throughput sampling batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls batman-adv: B.A.T.M.A.N. V - implement bat_orig_print API Arnd Bergmann (1): batman-adv: clarify CFG80211 dependency David S. Miller (4): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Linus Luessing (5): batman-adv: Add hard_iface specific sysfs wrapper macros for UINT batman-adv: ELP - adding basic infrastructure batman-adv: ELP - creating neighbor structures batman-adv: ELP - adding sysfs parameter for elp interval batman-adv: B.A.T.M.A.N. V - implement bat_neigh_print API Marek Lindner (1): batman-adv: kernel doc readability updates Simon Wunderlich (4): batman-adv: Update/repair bridge loop avoidance kerneldoc batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet batman-adv: add seqno maximum age and protection start flag parameters batman-adv: Start new development cycle Sven Eckelmann (49): batman-adv: Fix kerneldoc parsing of structs/enums batman-adv: Remove kerneldoc for missing parameters batman-adv: Fix names in kerneldoc of functions batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs batman-adv: Fix kerneldoc parsing of return description batman-adv: Fix kerneldoc of main functions batman-adv: Fix kerneldoc of network-coding functions batman-adv: Fix kernel-doc for batadv_claim_free_ref batman-adv: update copyright years for 2016 batman-adv: Switch to HTTPS version of links batman-adv: Drop reference to netdevice on last reference batman-adv: Add lockdep assert for container_list_lock batman-adv: Convert batadv_hardif_neigh_node to kref batman-adv: Convert batadv_gw_node to kref batman-adv: Convert batadv_softif_vlan to kref batman-adv: Convert batadv_bla_backbone_gw to kref batman-adv: Convert batadv_bla_claim to kref batman-adv: Convert batadv_nc_node to kref batman-adv: Convert batadv_nc_path to kref batman-adv: Convert batadv_dat_entry to kref batman-adv: Convert batadv_tvlv_container to kref batman-adv: Convert batadv_tvlv_handler to kref batman-adv: Convert batadv_tt_orig_list_entry to kref batman-adv: Convert batadv_neigh_ifinfo to kref batman-adv: Convert batadv_orig_ifinfo to kref batman-adv: Convert batadv_neigh_node to kref batman-adv: Convert batadv_hard_iface to kref batman-adv: Convert batadv_orig_node_vlan to kref batman-adv: Convert batadv_orig_node to kref batman-adv: Convert batadv_tt_common_entry to kref batman-adv: Rename batadv_orig_node *_free_ref function to *_put batman-adv: Rename batadv_hardif *_free_ref function to *_put batman-adv: Rename batadv_neigh_node *_free_ref function to *_put batman-adv: Rename batadv_neigh_ifinfo *_free_ref function to *_put batman-adv: Rename batadv_orig_ifinfo *_free_ref function to *_put batman-adv: Rename batadv_hardif_neigh *_free_ref function to *_put batman-adv: Rename batadv_backbone_gw *_free_ref function to *_put batman-adv: Rename batadv_claim *_free_ref function to *_put batman-adv: Rename batadv_dat_entry *_free_ref function to *_put batman-adv: Rename batadv_gw_node *_free_ref function to *_put batman-adv: Rename batadv_tvlv_handler *_free_ref function to *_put batman-adv: Rename batadv_tvlv_container *_free_ref function to *_put batman-adv: Rename batadv_softif_vlan *_free_ref function to *_put batman-adv: Rename batadv_nc_node *_free_ref function to *_put batman-adv: Rename batadv_nc_path *_free_ref function to *_put batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_put batman-adv: Rename batadv_tt_local_entry *_free_ref function to *_put batman-adv: Rename batadv_tt_global_entry *_free_ref function to *_put batman-adv: Rename batadv_tt_orig_list_entry *_free_ref function to *_put ----------------------------------------------------------------------- -- linux integration

6 years, 12 months

[batman-adv] master: batman-adv: Add missing headers for bool type (2bf6bf5)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 2bf6bf58b34c1eddd509703c65bf69d5c543a3fa Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 29 08:51:07 2016 +0100 batman-adv: Add missing headers for bool type Fixes: d58a13597ec2 ("batman-adv: Use bool as return type for boolean functions") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2bf6bf58b34c1eddd509703c65bf69d5c543a3fa net/batman-adv/bitarray.h | 1 + net/batman-adv/soft-interface.h | 1 + 2 files changed, 2 insertions(+) diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index f93cbc7..0e6e9d0 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -22,6 +22,7 @@ #include <linux/bitops.h> #include <linux/compiler.h> +#include <linux/stddef.h> #include <linux/types.h> /** diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 15c2884..13dcfe5 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -20,6 +20,7 @@ #include "main.h" +#include <linux/types.h> #include <net/rtnetlink.h> struct net_device;

7 years

[batman-adv] master's head updated: Merge branch 'next' (27a4cc2)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 9e5e037 batman-adv: init neigh node last seen field 27a4cc2 Merge branch 'next'

7 years

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2016