B.A.T.M.A.N November 2013

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

16 participants
49 discussions

[B.A.T.M.A.N.] [RFCv4] [batctl] add IPv6 support to tcpdump parser
by Marco Dalla Torre 23 Dec '13

23 Dec '13

Extends 'tcpdump' functionality in 'batctl' to parse and report IPv6 communications. 'batctl' now recognizes TCP, UDP packets and the most common ICMPv6 packet types: -ECHO request and ECHO reply -unreachable destination and subcases -time exceeded -neighbor discovery protocol 'solicit' and 'advert' TCP and UDP parsing code has been moved from the IPv4 specific codepath to separate functions in order to allow reuse regardless the underlying protocol. Signed-off-by: Marco Dalla Torre <marco.dallato(a)gmail.com> --- CHANGE FROM V3 - fixed a string spacing issue To apply on fix "batctl tcpdump: Fix reported length of TCP payload" tcpdump.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 187 insertions(+), 45 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index e6f8f7d..01ec445 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -32,9 +32,11 @@ #include <net/if_arp.h> #include <netinet/in.h> #include <netinet/ip.h> +#include <netinet/ip6.h> #include <netinet/tcp.h> #include <netinet/udp.h> #include <netinet/ip_icmp.h> +#include <netinet/icmp6.h> #include <netinet/if_ether.h> #include "main.h" @@ -47,6 +49,8 @@ #define ETH_P_BATMAN 0x4305 #endif /* ETH_P_BATMAN */ +#define IPV6_MIN_MTU 1280 + #define LEN_CHECK(buff_len, check_len, desc) \ if ((size_t)(buff_len) < (check_len)) { \ fprintf(stderr, "Warning - dropping received %s packet as it is smaller than expected (%zu): %zu\n", \ @@ -188,13 +192,181 @@ static void dump_arp(unsigned char *packet_buff, ssize_t buff_len, } } -static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_printed) +static void dump_tcp(const char ip_string[], unsigned char *packet_buff, + ssize_t buff_len, size_t ip6_header_len, char *src_addr, + char *dst_addr) { - struct iphdr *iphdr, *tmp_iphdr; + uint16_t tcp_header_len; struct tcphdr *tcphdr; - struct udphdr *udphdr, *tmp_udphdr; + + LEN_CHECK((size_t)buff_len - ip6_header_len, + sizeof(struct tcphdr), "TCP"); + tcphdr = (struct tcphdr *)(packet_buff + ip6_header_len); + tcp_header_len = tcphdr->doff * 4; + printf("%s %s.%i > ", ip_string, src_addr, ntohs(tcphdr->source)); + printf("%s.%i: TCP, Flags [%c%c%c%c%c%c], length %zu\n", + dst_addr, ntohs(tcphdr->dest), + (tcphdr->fin ? 'F' : '.'), (tcphdr->syn ? 'S' : '.'), + (tcphdr->rst ? 'R' : '.'), (tcphdr->psh ? 'P' : '.'), + (tcphdr->ack ? 'A' : '.'), (tcphdr->urg ? 'U' : '.'), + (size_t)buff_len - ip6_header_len - tcp_header_len); +} + +static void dump_udp(const char ip_string[], unsigned char *packet_buff, + ssize_t buff_len, size_t ip6_header_len, char *src_addr, + char *dst_addr) +{ + struct udphdr *udphdr; + + LEN_CHECK((size_t)buff_len - ip6_header_len, sizeof(struct udphdr), + "UDP"); + udphdr = (struct udphdr *)(packet_buff + ip6_header_len); + printf("%s %s.%i > ", ip_string, src_addr, ntohs(udphdr->source)); + + switch (ntohs(udphdr->dest)) { + case 67: + LEN_CHECK((size_t)buff_len - ip6_header_len - + sizeof(struct udphdr), (size_t) 44, "DHCP"); + printf("%s.67: BOOTP/DHCP, Request from %s, length %zu\n", + dst_addr, + ether_ntoa_long((struct ether_addr *)(((char *)udphdr) + + sizeof(struct udphdr) + 28)), + (size_t)buff_len - ip6_header_len - + sizeof(struct udphdr)); + break; + case 68: + printf("%s.68: BOOTP/DHCP, Reply, length %zu\n", dst_addr, + (size_t)buff_len - ip6_header_len - + sizeof(struct udphdr)); + break; + default: + printf("%s.%i: UDP, length %zu\n", dst_addr, + ntohs(udphdr->dest), + (size_t)buff_len - ip6_header_len - + sizeof(struct udphdr)); + break; + } +} + +static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, + int time_printed) +{ + struct ip6_hdr *iphdr; + struct icmp6_hdr *icmphdr; + + char ipv6_addr_src[40], ipv6_addr_dst[40]; + char ip_saddr[40], ip_daddr[40], nd_nas_target[40]; + struct nd_neighbor_solicit *nd_neigh_sol; + struct nd_neighbor_advert *nd_advert; + const char ip_string[] = "IP6"; + + iphdr = (struct ip6_hdr *)packet_buff; + LEN_CHECK((size_t)buff_len, (size_t)(sizeof(struct ip6_hdr)), "IP6"); + + if (!time_printed) + print_time(); + + inet_ntop(AF_INET6, &(iphdr->ip6_src), ipv6_addr_src, 40); + inet_ntop(AF_INET6, &(iphdr->ip6_dst), ipv6_addr_dst, 40); + + switch (iphdr->ip6_nxt) { + case IPPROTO_ICMPV6: + LEN_CHECK((size_t)buff_len - (size_t)(sizeof(struct ip6_hdr)), + sizeof(struct icmp6_hdr), "ICMPv6"); + icmphdr = (struct icmp6_hdr *)(packet_buff + + sizeof(struct ip6_hdr)); + + printf("IP6 %s > %s ", ipv6_addr_src, ipv6_addr_dst); + if (icmphdr->icmp6_type < ICMP6_INFOMSG_MASK && + (size_t)(buff_len) > IPV6_MIN_MTU) { + fprintf(stderr, + "Warning - dropping received 'ICMPv6 destination unreached' packet as it is bigger than maximum allowed size (%u): %zu\n", + IPV6_MIN_MTU, (size_t)(buff_len)); + return; + } + + printf("ICMP6"); + switch (icmphdr->icmp6_type) { + case ICMP6_DST_UNREACH: + switch (icmphdr->icmp6_code) { + case ICMP6_DST_UNREACH_NOROUTE: + printf(", unreachable route\n"); + break; + case ICMP6_DST_UNREACH_ADMIN: + printf(", unreachable prohibited\n"); + break; + case ICMP6_DST_UNREACH_ADDR: + printf(", unreachable address\n"); + break; + case ICMP6_DST_UNREACH_BEYONDSCOPE: + printf(", beyond scope\n"); + break; + case ICMP6_DST_UNREACH_NOPORT: + printf(", unreachable port\n"); + break; + default: + printf(" unknown unreach code (%u)\n", + icmphdr->icmp6_code); + } + break; + case ICMP6_ECHO_REQUEST: + printf(" echo request, id: %d, seq: %d, length: %hu\n", + icmphdr->icmp6_id, icmphdr->icmp6_seq, + iphdr->ip6_plen); + break; + case ICMP6_ECHO_REPLY: + printf(" echo reply, id: %d, seq: %d, length: %hu\n", + icmphdr->icmp6_id, icmphdr->icmp6_seq, + iphdr->ip6_plen); + break; + case ICMP6_TIME_EXCEEDED: + printf(" time exceeded in-transit, length %zu\n", + (size_t)buff_len - sizeof(struct icmp6_hdr)); + break; + case ND_NEIGHBOR_SOLICIT: + nd_neigh_sol = (struct nd_neighbor_solicit *)icmphdr; + inet_ntop(AF_INET6, &(nd_neigh_sol->nd_ns_target), + nd_nas_target, 40); + printf(" neighbor solicitation, who has %s, length %zd\n", + nd_nas_target, buff_len); + break; + case ND_NEIGHBOR_ADVERT: + nd_advert = (struct nd_neighbor_advert *)icmphdr; + inet_ntop(AF_INET6, &(nd_advert->nd_na_target), + nd_nas_target, 40); + printf(" neighbor advertisement, tgt is %s, length %zd\n", + nd_nas_target, buff_len); + break; + default: + printf(", destination unreachable, unknown icmp6 type (%u)\n", + icmphdr->icmp6_type); + break; + } + break; + case IPPROTO_TCP: + inet_ntop(AF_INET6, &(iphdr->ip6_src), ip_saddr, 40); + inet_ntop(AF_INET6, &(iphdr->ip6_dst), ip_daddr, 40); + dump_tcp(ip_string, packet_buff, buff_len, + sizeof(struct ip6_hdr), ip_saddr, ip_daddr); + break; + case IPPROTO_UDP: + inet_ntop(AF_INET6, &(iphdr->ip6_src), ip_saddr, 40); + inet_ntop(AF_INET6, &(iphdr->ip6_dst), ip_daddr, 40); + dump_udp(ip_string, packet_buff, buff_len, + sizeof(struct ip6_hdr), ip_saddr, ip_daddr); + break; + default: + printf(" IPv6 unknown protocol: %i\n", iphdr->ip6_nxt); + } +} + +static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, + int time_printed) +{ + struct iphdr *iphdr, *tmp_iphdr; + struct udphdr *tmp_udphdr; struct icmphdr *icmphdr; - uint16_t tcp_header_len; + const char ip_string[] = "IP"; iphdr = (struct iphdr *)packet_buff; LEN_CHECK((size_t)buff_len, (size_t)(iphdr->ihl * 4), "IP"); @@ -255,51 +427,16 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_print (size_t)buff_len - (iphdr->ihl * 4)); break; } - break; case IPPROTO_TCP: - tcphdr = (struct tcphdr *)(packet_buff + (iphdr->ihl * 4)); - tcp_header_len = tcphdr->doff * 4; - LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4), - (size_t)tcp_header_len, "TCP"); - - printf("IP %s.%i > ", inet_ntoa(*(struct in_addr *)&iphdr->saddr), ntohs(tcphdr->source)); - printf("%s.%i: TCP, flags [%c%c%c%c%c%c], length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(tcphdr->dest), - (tcphdr->fin ? 'F' : '.'), (tcphdr->syn ? 'S' : '.'), - (tcphdr->rst ? 'R' : '.'), (tcphdr->psh ? 'P' : '.'), - (tcphdr->ack ? 'A' : '.'), (tcphdr->urg ? 'U' : '.'), - (size_t)buff_len - (iphdr->ihl * 4) - tcp_header_len); + dump_tcp(ip_string, packet_buff, buff_len, iphdr->ihl * 4, + inet_ntoa(*(struct in_addr *)&iphdr->saddr), + inet_ntoa(*(struct in_addr *)&iphdr->daddr)); break; case IPPROTO_UDP: - LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4), sizeof(struct udphdr), "UDP"); - - udphdr = (struct udphdr *)(packet_buff + (iphdr->ihl * 4)); - printf("IP %s.%i > ", inet_ntoa(*(struct in_addr *)&iphdr->saddr), ntohs(udphdr->source)); - - switch (ntohs(udphdr->dest)) { - case 67: - LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr), (size_t) 44, "DHCP"); - printf("%s.67: BOOTP/DHCP, Request from %s, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - ether_ntoa_long((struct ether_addr *)(((char *)udphdr) + sizeof(struct udphdr) + 28)), - (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); - break; - case 68: - printf("%s.68: BOOTP/DHCP, Reply, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); - break; - default: - printf("%s.%i: UDP, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(udphdr->dest), - (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); - break; - } - - break; - case IPPROTO_IPV6: - printf("IP6: not implemented yet\n"); + dump_udp(ip_string, packet_buff, buff_len, iphdr->ihl * 4, + inet_ntoa(*(struct in_addr *)&iphdr->saddr), + inet_ntoa(*(struct in_addr *)&iphdr->daddr)); break; default: printf("IP unknown protocol: %i\n", iphdr->protocol); @@ -500,6 +637,11 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read if ((dump_level & DUMP_TYPE_NONBAT) || (time_printed)) dump_ip(packet_buff + ETH_HLEN, buff_len - ETH_HLEN, time_printed); break; + case ETH_P_IPV6: + if ((dump_level & DUMP_TYPE_NONBAT) || (time_printed)) + dump_ipv6(packet_buff + ETH_HLEN, buff_len - ETH_HLEN, + time_printed); + break; case ETH_P_8021Q: if ((dump_level & DUMP_TYPE_NONBAT) || (time_printed)) dump_vlan(packet_buff, buff_len, read_opt, time_printed); -- 1.8.3.2

2 1

[B.A.T.M.A.N.] [PATCH] Fix ARM BUILD_BUG_ON() errors with batman-adv
by Russell King - ARM Linux 02 Dec '13

02 Dec '13

From: Russell King <rmk+kernel(a)arm.linux.org.uk> The following errors were observed on ARM during a randconfig build. This patch addresses them by ensuring that the batadv_header structure is appropriately packed; this structure contains three 8-bit elements so there should be no undesired side effect from this packing. net/batman-adv/main.c: In function 'batadv_init': net/batman-adv/main.c:425:279: error: call to '__compiletime_assert_425' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_unicast_4addr_packet, src) != 10 net/batman-adv/main.c:426:267: error: call to '__compiletime_assert_426' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_unicast_packet, dest) != 4 net/batman-adv/main.c:427:275: error: call to '__compiletime_assert_427' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_unicast_tvlv_packet, dst) != 4 net/batman-adv/main.c:428:261: error: call to '__compiletime_assert_428' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_frag_packet, dest) != 4 net/batman-adv/main.c:429:271: error: call to '__compiletime_assert_429' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_icmp_packet, icmph.dst) != 4 net/batman-adv/main.c:430:277: error: call to '__compiletime_assert_430' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_icmp_packet_rr, icmph.dst) != 4 Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> --- net/batman-adv/packet.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 207459b62966..4039f25794e0 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -171,7 +171,7 @@ struct batadv_header { /* the parent struct has to add a byte after the header to make * everything 4 bytes aligned again */ -}; +} __attribute__((packed)); /** * struct batadv_ogm_packet - ogm (routing protocol) packet

5 15

[B.A.T.M.A.N.] Loss of connection to remote nodes, from clients only.
by tjhowse 30 Nov '13

30 Nov '13

In my test system I have 11 dual-channel nodes. The 5GHz link is used for interconnect between the nodes and the 2.4GHz link is for clients. One of the nodes is distant. My laptop is connected to a common-SSID AP link from one of the local nodes. I can always ping the distant node from one of the local nodes, but the link from my laptop is less reliable. I can have an SSH session open to the distant node and a local node, pinging the distant node from both the local node and my laptop. At no particular point the distant node will stop pinging from my laptop and its SSH session will drop, while the ping continues just fine from the local node. The connection can restore equally mysteriously. Can anyone explain this behavior? No manual network configuration changes are being made at the point at which the connection drops or is restored, though I suppose my laptop could be hopping between one of the local APs. I am pinging an IP attached to the bridge joining bat0, the copper node LAN and the 2.4GHz client LAN.

2 1

[B.A.T.M.A.N.] fool batman by simulating a layer3 mesh
by Bastian Bittorf 27 Nov '13

27 Nov '13

discussed in IRC, i'am searched for a better way to load-balance a batman network. not the whole shaping/splashing should run on one (central) node, so we needed something to stick it to the node/AP which the user is connected to. than we have also the ability to show a good page when the network is b0rken. short overview: NODE-1 (master/gateway) ipv4: 192.168.1.1/16 dhcp: 192.168.1.x / gateway: 192.168.0.1 gateway: e.g. pppoe NODE-2 ipv4: 192.168.2.1/16 dhcp: 192.168.2.x / gateway: 192.168.0.1 gateway: 192.168.1.1 NODE-3 ipv4: 192.168.3.1/16 dhcp: 192.168.3.x / gateway: 192.168.0.1 gateway: 192.168.1.1 the trick is, that every node offers DHCP which does not interfere with other nodes AND offers a gateway which is always the same: 192.168.0.1 if a user roams he simply moves on layer 1/2 and its further working ok. important: the MAC of the gateway should not change otherwise it's not working for some seconds till the ARP times out. this can be circumvented via kmod-macvlan: ip link add link br-mybridge gateway0 address '02:00:c0:ca:c0:1a' type macvlan ip address add 192.168.0.1/16 dev gateway0 ip link set dev gateway0 up then the IP 192.168.0.1 is always reachable with the same MAC. thats it. we can use the "normal" iptables/tc stuff like in olsrd-networks... giving out such dhcp-leases needs a fix to /etc/init.d/dhcp which is available soon on OpenWrt mailinglist. bye, bastian PS: thanks for the discussion and help, escpecially to T_X, ordex and marec

4 5

[B.A.T.M.A.N.] mad mad batman ...
by Nicolás Echániz 26 Nov '13

26 Nov '13

While I'm still in Europe I've observed that the network in Quintana has started performing very poorly today. It was working perfectly fine until yesterday. The logs on every router have started showing entries like these: Oct 13 18:09:43 frigorifico kern.warn kernel: [12018.150000] br-lan: received packet on bat0 with own address as source address Oct 13 18:09:45 frigorifico kern.warn kernel: [12020.040000] br-lan: received packet on bat0 with own address as source address Oct 13 18:09:45 frigorifico kern.warn kernel: [12020.040000] br-lan: received packet on bat0 with own address as source address Oct 13 18:09:45 frigorifico kern.warn kernel: [12020.550000] br-lan: received packet on bat0 with own address as source address Oct 13 18:09:45 frigorifico kern.warn kernel: [12020.550000] br-lan: received packet on bat0 with own address as source address Oct 13 18:09:45 frigorifico kern.warn kernel: [12020.570000] br-lan: received packet on bat0 with own address as source address Oct 13 18:09:45 frigorifico kern.warn kernel: [12020.580000] br-lan: received packet on bat0 with own address as source address Oct 13 18:09:46 frigorifico kern.warn kernel: [12021.040000] br-lan: received packet on bat0 with own address as source address As you can see there are many per second. I've pasted a bit of batctl ll batman; batctl log here: http://pastebin.com/HX1LBPK4 ...it's only showing the "originator packet from myself" lines and one line before. (the sample is less than 5 secs of logs) Every node I checked is showing the same. Last time this happened it was due to a router that had been affected by a nearby lightning bolt. The switch went crazy. It took a while to detect it and the network was 15 nodes big. Now it's 40 and we are quite far away :) If anyone has an idea of how to better test where the problem is originated, I'll be glad to hear it. Also if any batman devel wishes to log in to the net to check first hand, just let me know. Cheers! Nico PS: batman version is 2012.4

4 7

[B.A.T.M.A.N.] [PATCH 1/3] batman-adv: fix another sparse warning in batadv_iv_ogm_emit
by Simon Wunderlich 25 Nov '13

25 Nov '13

From: Simon Wunderlich <simon(a)open-mesh.com> Since the directlink variable was not needed anymore and was removed, more variables are now obsolete too, so remove them. The directlink flag commit (which was obviously incomplete) was a0fc2f129f7193cbdd7e9c2e4da0d6e7ac15dd58 ("batman-adv: fix sparse warning in batadv_iv_ogm_emit"), which itself was a fix for 29b9256e6631876d4f1719f4d5e13d7ee140c61b ("batman-adv: consider outgoing interface in OGM sending"). Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- bat_iv_ogm.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 92165cb..b9aec98 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -466,11 +466,6 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) struct net_device *soft_iface; struct batadv_priv *bat_priv; struct batadv_hard_iface *primary_if = NULL; - struct batadv_ogm_packet *batadv_ogm_packet; - uint8_t *packet_pos; - - packet_pos = forw_packet->skb->data; - batadv_ogm_packet = (struct batadv_ogm_packet *)packet_pos; if (!forw_packet->if_incoming) { pr_err("Error - can't forward packet: incoming iface not specified\n"); -- 1.7.10.4

2 5

[B.A.T.M.A.N.] [PATCH] batman-adv: fix compat macro for kstrtou32
by Antonio Quartulli 23 Nov '13

23 Nov '13

The macro previously introduced in the compat code to replace kstrtou32() may not work properly in case of a too large user input. Fix it by using a temporary variable of the proper length and then cast the result. Possibly return -ERANGE is the result is too big to fix a 32bit long variable. Cc: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- compat.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index a050bb8..6daeff9 100644 --- a/compat.h +++ b/compat.h @@ -152,8 +152,16 @@ static inline int batadv_param_set_copystring(const char *val, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) -/* cast last argument of strict_strtoul() because we have a uint32_t */ -#define kstrtou32(cp, base, v) strict_strtoul(cp, base, (unsigned long *)v) +#define kstrtou32(cp, base, v)\ +({\ + unsigned long _v;\ + int _r;\ + _r = strict_strtoul(cp, base, &_v);\ + *(v) = (uint32_t)_v;\ + if ((unsigned long)*(v) != _v)\ + _r = -ERANGE;\ + _r;\ +}) #define kstrtoul strict_strtoul #define kstrtol strict_strtol -- 1.8.4.4

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: fix neigh_node multiif regression in network coding
by Simon Wunderlich 23 Nov '13

23 Nov '13

From: Simon Wunderlich <simon(a)open-mesh.com> A previous commit for the multi interface optimization did not change the member access for neigh_node to their respective new ifinfo structures for the network coding implementation. This was introduced by change 9bb33b8d88e318c4879d37d06ad28e3e018b9036 ("batman-adv: split tq information in neigh_node struct") Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- network-coding.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/network-coding.c b/network-coding.c index 0b35e9e..8678448 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1005,6 +1005,8 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv, struct batadv_coded_packet *coded_packet; struct batadv_neigh_node *neigh_tmp, *router_neigh; struct batadv_neigh_node *router_coding = NULL; + struct batadv_neigh_ifinfo *router_neigh_ifinfo = NULL; + struct batadv_neigh_ifinfo *router_coding_ifinfo = NULL; uint8_t *first_source, *first_dest, *second_source, *second_dest; __be32 packet_id1, packet_id2; size_t count; @@ -1022,16 +1024,26 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv, if (!router_neigh) goto out; + router_neigh_ifinfo = batadv_neigh_ifinfo_get(router_neigh, + BATADV_IF_DEFAULT); + if (!router_neigh_ifinfo) + goto out; + neigh_tmp = nc_packet->neigh_node; router_coding = batadv_orig_router_get(neigh_tmp->orig_node, BATADV_IF_DEFAULT); if (!router_coding) goto out; - tq_tmp = batadv_nc_random_weight_tq(router_neigh->bat_iv.tq_avg); - tq_weighted_neigh = tq_tmp; - tq_tmp = batadv_nc_random_weight_tq(router_coding->bat_iv.tq_avg); - tq_weighted_coding = tq_tmp; + router_coding_ifinfo = batadv_neigh_ifinfo_get(router_coding, + BATADV_IF_DEFAULT); + if (!router_coding_ifinfo) + goto out; + + tq_tmp = router_neigh_ifinfo->bat_iv.tq_avg; + tq_weighted_neigh = batadv_nc_random_weight_tq(tq_tmp); + tq_tmp = router_coding_ifinfo->bat_iv.tq_avg; + tq_weighted_coding = batadv_nc_random_weight_tq(tq_tmp); /* Select one destination for the MAC-header dst-field based on * weighted TQ-values. @@ -1155,6 +1167,10 @@ out: batadv_neigh_node_free_ref(router_neigh); if (router_coding) batadv_neigh_node_free_ref(router_coding); + if (router_neigh_ifinfo) + batadv_neigh_ifinfo_free_ref(router_neigh_ifinfo); + if (router_coding_ifinfo) + batadv_neigh_ifinfo_free_ref(router_coding_ifinfo); return res; } -- 1.7.10.4

2 3

[B.A.T.M.A.N.] lost connection to a client / Q: transglobal-table
by Bastian Bittorf 23 Nov '13

23 Nov '13

in my small office-network we have _often_ the situation, that my laptop 8-) has no internet. if this happens, i can connect via ssh hop by hop and can see, that the network itself (wireless/wired) is working, but the 'routes' are wrong. here the transglobal-table in the master, my laptop is '00:21:6a:32:7c:1c' root@EG-labor-AP:~ batctl tg Globally announced TT entries received via the mesh bat0 Client (TTVN) Originator (Curr TTVN) (CRC ) Flags * 02:00:c0:ca:c0:1a ( 8) via 02:00:ca:b1:00:15 ( 8) (0xe285) [...] * 06:2f:65:8a:d2:b7 ( 1) via 02:00:ca:b1:00:02 ( 1) (0x50f6) [...] * 46:0a:75:3c:f2:47 ( 1) via 02:00:ca:b1:00:15 ( 8) (0xe285) [...] * 5e:27:29:d8:ee:b4 ( 1) via 02:00:ca:b1:00:76 ( 1) (0xc9fc) [...] * 72:f7:18:80:9d:9d ( 86) via 02:00:de:ad:00:03 ( 86) (0x7651) [...] * ae:d9:0f:ef:01:c3 ( 1) via 02:00:ca:b1:02:22 ( 5) (0x6456) [...] * 56:fb:55:27:b2:63 ( 1) via 02:00:ca:b1:00:58 ( 5) (0xac7c) [...] * 46:13:bf:2a:53:1e ( 1) via 02:00:ca:b1:00:13 ( 5) (0x8133) [...] * 0a:c6:fd:60:5d:5f ( 1) via 02:00:de:ad:02:23 ( 1) (0xa1c1) [...] ### interesting part: * 00:21:6a:32:7c:1c ( 4) via 02:00:ca:b1:02:22 ( 5) (0x6456) [.W.] + 00:21:6a:32:7c:1c ( 5) via 02:00:ca:b1:00:13 ( 5) [.W.] ### * e6:ad:ca:24:f6:10 ( 1) via 02:00:ca:b1:00:45 ( 3) (0x6182) [...] root@EG-labor-AP:~ batctl -v batctl 2013.4.0 [batman-adv: 2013.4.0] root@EG-labor-AP:~ cat /etc/openwrt_version r38568 the interesting thing is, that my laptop seems to be reachable via *:02:22 and *:00:13 - the 2nd entry has no hash (?), but 'batctl t 00:21:6a:32:7c:1c' outputs *:00:13 as originator. from the topology, it is impossible to be near this node, so no roaming can happen AND i can see on my laptop, that there was no roaming. the situation recovers without interaction after some minutes. the transglobal table does not change, but 'batctl t 00:21:6a:32:7c:1c' outputs the correct *:02:22 what can i do for more debugging or is this bug already solved in trunk? bye, bastian

3 9

[B.A.T.M.A.N.] [PATCH 1/4] batman-adv: fix multiline comment
by Simon Wunderlich 22 Nov '13

22 Nov '13

From: Simon Wunderlich <simon(a)open-mesh.com> This problem was introduced by commit 9bb33b8d88e318c4879d37d06ad28e3e018b9036 ("batman-adv: split tq information in neigh_node struct") Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- main.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.h b/main.h index 09cdebb..d154d4d 100644 --- a/main.h +++ b/main.h @@ -71,7 +71,8 @@ /* default interface for multi interface operation. The default interface is * used for communication which originated locally (i.e. is not forwarded) - * or where special forwarding is not desired/necessary. */ + * or where special forwarding is not desired/necessary. + */ #define BATADV_IF_DEFAULT ((struct batadv_hard_iface *)NULL) #define BATADV_NUM_WORDS BITS_TO_LONGS(BATADV_TQ_LOCAL_WINDOW_SIZE) -- 1.7.10.4

2 7

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2013