B.A.T.M.A.N March 2014

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

19 participants
50 discussions

[B.A.T.M.A.N.] [PATCHv3 1/2] batctl: add switch for setting multicast_mode
by Linus Lüssing 02 May '14

02 May '14

This patch adds a switch for the new multicast_mode setting in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- v3: fix merge conflict (ordex was quicker with his isolation mark support patch :P) README | 7 +++++++ man/batctl.8 | 4 ++++ sys.c | 6 ++++++ sys.h | 1 + 4 files changed, 18 insertions(+) diff --git a/README b/README index a4507b7..fe8eed9 100644 --- a/README +++ b/README @@ -392,6 +392,13 @@ Usage: batctl network_coding|nc [0|1] Note that network coding requires a working promiscuous mode on all interfaces. +batctl multicast_mode +===================== + +display or modify the multicast mode setting + +Usage: batctl multicast_mode|mm [0|1] + batctl aggregation ================== diff --git a/man/batctl.8 b/man/batctl.8 index b808293..f92bf3a 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -88,6 +88,10 @@ disable fragmentation. If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. .br +.IP "\fBmulticast_mode\fP|\fBmm\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current multicast mode setting is displayed. Otherwise the parameter is used to enable or +disable multicast optimizations (i.e. disabling means always sending own multicast frames via classic flooding). +.br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. diff --git a/sys.c b/sys.c index fd6e107..d20696b 100644 --- a/sys.c +++ b/sys.c @@ -103,6 +103,12 @@ const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { .sysfs_name = "isolation_mark", .params = NULL, }, + { + .opt_long = "multicast_mode", + .opt_short = "mm", + .sysfs_name = "multicast_mode", + .params = sysfs_param_enable, + }, }; static void interface_usage(void) diff --git a/sys.h b/sys.h index 5633822..dd0bee5 100644 --- a/sys.h +++ b/sys.h @@ -47,6 +47,7 @@ enum batctl_settings_list { BATCTL_SETTINGS_FRAGMENTATION, BATCTL_SETTINGS_NETWORK_CODING, BATCTL_SETTINGS_ISOLATION_MARK, + BATCTL_SETTINGS_MULTICAST_MODE, BATCTL_SETTINGS_NUM, }; -- 1.7.10.4

2 7

[B.A.T.M.A.N.] [RFCv2 0/6] Export the expected throughput
by Antonio Quartulli 11 Apr '14

11 Apr '14

The "Expected throughput" towards a generic wireless peer is a value that can be used by other kernel components to achieve different goals. In particular we have 802.11s and batman-adv which will iuse this estimation to compute their throughput based metric. Therefore with this patchset I wanted to export this result and make it available for future use. Changes included in this patchset: - add the new get_expected_throughput() RC API - export the result of such API via cfg80211::get_station() - implement the get_expected_throughput() RC API for minstrel(_ht) For what concerns Minstrel_HT I decided to directly re-use the throughput value computed by the algorithm itself with minstrel_ht_calc_tp() for max_tp_rate. For the legacy Minstrel instead I computed the expected throughput as the product of the max_tp bitrate multplied by its probability of success. I am not entirely sure about passing sband as third parameter to get_expected_throughput()..maybe somebody can suggest a better solution. Cheers, Antonio Quartulli (6): cfg80211: export expected throughput through get_station() mac80211: add new RC API to retrieve expected throughput mac80211: export expected throughput in set_sta_info() mac80211: minstrel - implement get_expected_throughput() API mac80211: minstrel_ht - implement get_expected_throughput() API cfg80211: implement cfg80211_get_station cfg80211 API include/net/cfg80211.h | 74 +++++++++++++++++++++++--------------- include/net/mac80211.h | 3 ++ net/mac80211/cfg.c | 17 +++++++++ net/mac80211/rc80211_minstrel.c | 15 ++++++++ net/mac80211/rc80211_minstrel_ht.c | 19 ++++++++++ net/wireless/util.c | 18 ++++++++++ 6 files changed, 118 insertions(+), 28 deletions(-) -- 1.8.3.2

4 25

[B.A.T.M.A.N.] Batman-adv 2014.1.0 and 2014.0.0 issues with 3.10 and 3.8 kernels
by Bruno Antunes 01 Apr '14

01 Apr '14

Hi, Are recent batman-acv versions unusable with 3.10 or 3.8 kernels? The reason i'm asking is that with 2104.1.0 with two connected sta after restarting the wifi (also the same if restarting all the network) it gives the following message: root@Laguna1:/etc/config# wifi [37620.920000] batman_adv: bat0: Interface deactivated: adhoc0 [37621.140000] batman_adv: bat0: Removing interface: adhoc0 [37621.250000] br-mesh: port 2(bat0) entered disabled state [37621.250000] device bat0 left promiscuous mode [37621.260000] br-mesh: port 2(bat0) entered disabled state [37631.340000] unregister_netdevice: waiting for adhoc0 to become free. Usage count = 1 [37641.390000] unregister_netdevice: waiting for adhoc0 to become free. Usage count = 1 [37651.410000] unregister_netdevice: waiting for adhoc0 to become free. Usage count = 1 … And only restarting is possible to get the device back to work. Going back to 2014.0.0 it's worst with the system being very unstable and continuously restarting. After following the instructions from cmsv <cmsv(a)wirelesspt.net> and replacing the feeds.conf with src-git routing https://github.com/libre-mesh/openwrt-routing-packages I was able to compile the 2013.4.0 release which is very stable. But I really would like the vlan support from recent releases. My systems are: Laguna board OpenWrt trunk r38938 batctl 2013.4.0 [batman-adv: 2013.4.0] Linux Laguna1 3.8.13 #6 SMP Thu Mar 27 16:10:18 WET 2014 armv6l GNU/Linux Router station OpenWrt trunk r38938 batctl 2013.4.0 [batman-adv: 2013.4.0] Linux RSPro2 3.10.18 #2 Thu Mar 27 18:24:29 WET 2014 mips GNU/Linux Thanks in advance, Bruno

5 6

[B.A.T.M.A.N.] br-lan: received packet on bat0 with own address as source address
by Ilario Gelmetti 01 Apr '14

01 Apr '14

Hi all, I have two devices (Ubiquiti PicoStation M2 and Ubiquiti NanoStation M5) mounted on the same pole both running libre-mesh [1] firmware (batman-adv: 2014.1.0) and both attached to a Mikrotik RB250GS gigabit switch (latest 1.11 firmware, default configuration) which is attached to my pc [2]. When isolated (turning off the port of the other device via the switch interface), both Ubiquiti devices doesn't see any other device with batman neither have any client connected. Both the devices independently (also when are isolated) print the same error in dmesg: br-lan: received packet on bat0 with own address as source address This error is an indication that batman loop avoidance has some problems, right? Obviously loop avoidance is enabled. # batctl bl enabled Various interfaces are bridged, for example in PicoStation I have: # brctl show bridge name bridge id STP enabled interfaces br-lan 7fff.dc9fdb31c136 no eth0 bat0 wlan0_ap I noticed that I'm not the first to ask here about this message [3][4]. I attach to this email dmesg form both isolated devices, /etc/config/network, ip a, ifconfig, brctl and info from batctl. Thanks, Ilario [1] http://libre-mesh.org/projects/libre-mesh [2] https://github.com/ilario/configurazione-ilario-fisso [3] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2012-February/006234.html [4] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2013-October/010770.html

4 3

[B.A.T.M.A.N.] Line of Nodes
by Robert Schwebel 31 Mar '14

31 Mar '14

Hi, I have a little bit strange usecase for a wireless mesh network, and I'm wondering if B.A.T.M.A.N could be a good choice: my network stations, which are part of an industrial application, are located in a line: Gateway - A1 - A2 - A3 - A4 - A5 - ... - A120 Any station generates data and wants to transmit it to the gateway, with the smallest possible latency. The distance of the stations is pretty small: about 3...4 m. It might happen that someone re-arranges the stations: Gateway - A9 - A17 - A1 - A47 - A9 - ... - A6 but the topology stays the same (a line). It is allowed that one station sends its data to the farest reachable hop, so i.e. for my first example, if A5 wants to send data and is able to reach A2, it could directly do so. - What do you think, could B.A.T.M.A.N be a solution? - Could the short distance be a problem? - Is it possible to regulate the transmission power in order to avoid disturbance? Any hint, literature or link is appreciated. rsc -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |

4 8

[B.A.T.M.A.N.] [PATCHv3 maint] batman-adv: change the MAC of each VLAN upon ndo_set_mac_address
by Antonio Quartulli 31 Mar '14

31 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> The MAC address of the soft-interface is used to initialise the "non-purge" TT entry of each existing VLAN. Therefore when the user invokes ndo_set_mac_address() all the "non-purge" TT entries have to be updated, not only the one belonging to the non-tagged network. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- Changes from v2: - don't increment/decrement vlan->refcounter because we never use the vlan object outside of the rcu_read_lock/unlock area changes from v1: - declare vlan variable soft-interface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index f82c267..d962363 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -105,6 +105,7 @@ static struct net_device_stats *batadv_interface_stats(struct net_device *dev) static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) { struct batadv_priv *bat_priv = netdev_priv(dev); + struct batadv_softif_vlan *vlan; struct sockaddr *addr = p; uint8_t old_addr[ETH_ALEN]; @@ -115,12 +116,17 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); /* only modify transtable if it has been initialized before */ - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) { - batadv_tt_local_remove(bat_priv, old_addr, BATADV_NO_FLAGS, + if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) + return 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + batadv_tt_local_remove(bat_priv, old_addr, vlan->vid, "mac address changed", false); - batadv_tt_local_add(dev, addr->sa_data, BATADV_NO_FLAGS, + batadv_tt_local_add(dev, addr->sa_data, vlan->vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); } + rcu_read_unlock(); return 0; } -- 1.8.3.2

2 1

[B.A.T.M.A.N.] [PATCHv2 maint] batman-adv: fix local TT check for outgoing arp requests in DAT
by Antonio Quartulli 31 Mar '14

31 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> Change introduced by d6bd8b36fa1f3d72a6fd5942a6e9bde6ddafcd0d ("batman-adv: make DAT drop ARP requests targeting local clients") implements a check that prevents DAT from using the caching mechanism when the client that is supposed to provide a reply to an arp request is local. However change brought by 3e26722bc9f248ec4316749fc1957365c0fa5e4b ("batman-adv: make the Distributed ARP Table vlan aware") has not converted the above check into its vlan aware version thus making it useless when the local client is behind a vlan. Fix the behaviour by properly specifying the vlan when checking for a client being local or not. Reported-by: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- Changes from v2: - added reported-by clause distributed-arp-table.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 5bb37a8..a5d75be 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -940,8 +940,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, * additional DAT answer may trigger kernel warnings about * a packet coming from the wrong port. */ - if (batadv_is_my_client(bat_priv, dat_entry->mac_addr, - BATADV_NO_FLAGS)) { + if (batadv_is_my_client(bat_priv, dat_entry->mac_addr, vid)) { ret = true; goto out; } -- 1.8.3.2

2 1

[B.A.T.M.A.N.] [PATCH-maintv3 0/4] fix multiif regressions
by Simon Wunderlich 31 Mar '14

31 Mar '14

There are some regressions introduced my network wide multi interface optimization patchset which are adressed by this patchset. All of them fix some kind of leaks caused reference counter imbalances, which may lead to problems when an interface is removed which was previously used by batman-adv. The second series was only sent partially to the mailing list, and in this third revision another bugfix was added and a sparse warning was fixed. Thanks Antonio for your help tracking that down! Cheers, Simon Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo bat_iv_ogm.c | 2 ++ originator.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 4 deletions(-) -- 1.7.10.4

2 8

[B.A.T.M.A.N.] [PATCHv2 maint] batman-adv: tcpdump - fix IP header parsing
by Antonio Quartulli 31 Mar '14

31 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> Fix the IP header parsing by properly converting the source and the destination addresses to strings. The problem is given by the fact that inet_ntoa() uses a static buffer to store its result, therefore it cannot be invoked twice in a row without saving the first outcome. Moreover inet_ntoa() is deprecated in favor of inet_pton(). Introduced by 35b37756f4a3a230bf7941034d9da178ee5b4948 ("add IPv6 support to tcpdump parser") This patch also slightly beautifies the code. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- Change since v1: - print all errors on stderr tcpdump.c | 73 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index e9fac70..94e2a84 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -258,20 +258,27 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, 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]; + char ipsrc[INET6_ADDRSTRLEN], ipdst[INET6_ADDRSTRLEN]; struct nd_neighbor_solicit *nd_neigh_sol; struct nd_neighbor_advert *nd_advert; + char nd_nas_target[INET6_ADDRSTRLEN]; const char ip_string[] = "IP6"; iphdr = (struct ip6_hdr *)packet_buff; - LEN_CHECK((size_t)buff_len, (size_t)(sizeof(struct ip6_hdr)), "IP6"); + LEN_CHECK((size_t)buff_len, (size_t)(sizeof(struct ip6_hdr)), ip_string); 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); + if (!inet_ntop(AF_INET6, &iphdr->ip6_src, ipsrc, sizeof(ipsrc))) { + fprintf(stderr, "Cannot decode source IPv6\n"); + return; + } + + if (!inet_ntop(AF_INET6, &iphdr->ip6_dst, ipdst, sizeof(ipdst))) { + fprintf(stderr, "Cannot decode destination IPv6\n"); + return; + } switch (iphdr->ip6_nxt) { case IPPROTO_ICMPV6: @@ -280,7 +287,7 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, icmphdr = (struct icmp6_hdr *)(packet_buff + sizeof(struct ip6_hdr)); - printf("IP6 %s > %s ", ipv6_addr_src, ipv6_addr_dst); + printf("%s %s > %s ", ip_string, ipsrc, ipdst); if (icmphdr->icmp6_type < ICMP6_INFOMSG_MASK && (size_t)(buff_len) > IPV6_MIN_MTU) { fprintf(stderr, @@ -348,16 +355,12 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, } 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); + sizeof(struct ip6_hdr), ipsrc, ipdst); 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); + sizeof(struct ip6_hdr), ipsrc, ipdst); break; default: printf(" IPv6 unknown protocol: %i\n", iphdr->ip6_nxt); @@ -367,29 +370,40 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_printed) { + char ipsrc[INET_ADDRSTRLEN], ipdst[INET_ADDRSTRLEN]; struct iphdr *iphdr, *tmp_iphdr; + const char ip_string[] = "IP"; struct udphdr *tmp_udphdr; struct icmphdr *icmphdr; - const char ip_string[] = "IP"; iphdr = (struct iphdr *)packet_buff; - LEN_CHECK((size_t)buff_len, (size_t)(iphdr->ihl * 4), "IP"); + LEN_CHECK((size_t)buff_len, (size_t)(iphdr->ihl * 4), ip_string); if (!time_printed) print_time(); + if (!inet_ntop(AF_INET, &iphdr->saddr, ipsrc, sizeof(ipsrc))) { + fprintf(stderr, "Cannot decode source IP\n"); + return; + } + + if (!inet_ntop(AF_INET, &iphdr->daddr, ipdst, sizeof(ipdst))) { + fprintf(stderr, "Cannot decode destination IP\n"); + return; + } + switch (iphdr->protocol) { case IPPROTO_ICMP: LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4), sizeof(struct icmphdr), "ICMP"); icmphdr = (struct icmphdr *)(packet_buff + (iphdr->ihl * 4)); - printf("IP %s > ", inet_ntoa(*(struct in_addr *)&iphdr->saddr)); + printf("%s %s > ", ip_string, ipsrc); switch (icmphdr->type) { case ICMP_ECHOREPLY: printf("%s: ICMP echo reply, id %hu, seq %hu, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - ntohs(icmphdr->un.echo.id), ntohs(icmphdr->un.echo.sequence), + ipdst, ntohs(icmphdr->un.echo.id), + ntohs(icmphdr->un.echo.sequence), (size_t)buff_len - (iphdr->ihl * 4)); break; case ICMP_DEST_UNREACH: @@ -401,46 +415,43 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, tmp_iphdr = (struct iphdr *)(((char *)icmphdr) + sizeof(struct icmphdr)); tmp_udphdr = (struct udphdr *)(((char *)tmp_iphdr) + (tmp_iphdr->ihl * 4)); - printf("%s: ICMP ", inet_ntoa(*(struct in_addr *)&iphdr->daddr)); + printf("%s: ICMP ", ipdst); printf("%s udp port %hu unreachable, length %zu\n", - inet_ntoa(*(struct in_addr *)&tmp_iphdr->daddr), - ntohs(tmp_udphdr->dest), (size_t)buff_len - (iphdr->ihl * 4)); + ipdst, ntohs(tmp_udphdr->dest), + (size_t)buff_len - (iphdr->ihl * 4)); break; default: printf("%s: ICMP unreachable %hhu, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - icmphdr->code, (size_t)buff_len - (iphdr->ihl * 4)); + ipdst, icmphdr->code, + (size_t)buff_len - (iphdr->ihl * 4)); break; } break; case ICMP_ECHO: printf("%s: ICMP echo request, id %hu, seq %hu, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - ntohs(icmphdr->un.echo.id), ntohs(icmphdr->un.echo.sequence), + ipdst, ntohs(icmphdr->un.echo.id), + ntohs(icmphdr->un.echo.sequence), (size_t)buff_len - (iphdr->ihl * 4)); break; case ICMP_TIME_EXCEEDED: printf("%s: ICMP time exceeded in-transit, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - (size_t)buff_len - (iphdr->ihl * 4)); + ipdst, (size_t)buff_len - (iphdr->ihl * 4)); break; default: printf("%s: ICMP type %hhu, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), icmphdr->type, + ipdst, icmphdr->type, (size_t)buff_len - (iphdr->ihl * 4)); break; } break; case IPPROTO_TCP: 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)); + ipsrc, ipdst); break; case IPPROTO_UDP: 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)); + ipsrc, ipdst); break; default: printf("IP unknown protocol: %i\n", iphdr->protocol); -- 1.8.3.2

1 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: tcpdump - fix IP header parsing
by Antonio Quartulli 31 Mar '14

31 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> Fix the IP header parsing by properly converting the source and the destination addresses to strings. The problem is given by the fact that inet_ntoa() uses a static buffer to store its result, therefore it cannot be invoked twice in a row without saving the first outcome. Moreover inet_ntoa() is deprecated in favor of inet_pton(). Introduced by 35b37756f4a3a230bf7941034d9da178ee5b4948 ("add IPv6 support to tcpdump parser") This patch also slightly beautifies the code. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- tcpdump.c | 73 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index e9fac70..c37943e 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -258,20 +258,27 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, 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]; + char ipsrc[INET6_ADDRSTRLEN], ipdst[INET6_ADDRSTRLEN]; struct nd_neighbor_solicit *nd_neigh_sol; struct nd_neighbor_advert *nd_advert; + char nd_nas_target[INET6_ADDRSTRLEN]; const char ip_string[] = "IP6"; iphdr = (struct ip6_hdr *)packet_buff; - LEN_CHECK((size_t)buff_len, (size_t)(sizeof(struct ip6_hdr)), "IP6"); + LEN_CHECK((size_t)buff_len, (size_t)(sizeof(struct ip6_hdr)), ip_string); 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); + if (!inet_ntop(AF_INET6, &iphdr->ip6_src, ipsrc, sizeof(ipsrc))) { + printf("Cannot decode source IPv6\n"); + return; + } + + if (!inet_ntop(AF_INET6, &iphdr->ip6_dst, ipdst, sizeof(ipdst))) { + printf("Cannot decode destination IPv6\n"); + return; + } switch (iphdr->ip6_nxt) { case IPPROTO_ICMPV6: @@ -280,7 +287,7 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, icmphdr = (struct icmp6_hdr *)(packet_buff + sizeof(struct ip6_hdr)); - printf("IP6 %s > %s ", ipv6_addr_src, ipv6_addr_dst); + printf("%s %s > %s ", ip_string, ipsrc, ipdst); if (icmphdr->icmp6_type < ICMP6_INFOMSG_MASK && (size_t)(buff_len) > IPV6_MIN_MTU) { fprintf(stderr, @@ -348,16 +355,12 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, } 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); + sizeof(struct ip6_hdr), ipsrc, ipdst); 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); + sizeof(struct ip6_hdr), ipsrc, ipdst); break; default: printf(" IPv6 unknown protocol: %i\n", iphdr->ip6_nxt); @@ -367,29 +370,40 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_printed) { + char ipsrc[INET_ADDRSTRLEN], ipdst[INET_ADDRSTRLEN]; struct iphdr *iphdr, *tmp_iphdr; + const char ip_string[] = "IP"; struct udphdr *tmp_udphdr; struct icmphdr *icmphdr; - const char ip_string[] = "IP"; iphdr = (struct iphdr *)packet_buff; - LEN_CHECK((size_t)buff_len, (size_t)(iphdr->ihl * 4), "IP"); + LEN_CHECK((size_t)buff_len, (size_t)(iphdr->ihl * 4), ip_string); if (!time_printed) print_time(); + if (!inet_ntop(AF_INET, &iphdr->saddr, ipsrc, sizeof(ipsrc))) { + fprintf(stderr, "Cannot decode source IP\n"); + return; + } + + if (!inet_ntop(AF_INET, &iphdr->daddr, ipdst, sizeof(ipdst))) { + fprintf(stderr, "Cannot decode destination IP\n"); + return; + } + switch (iphdr->protocol) { case IPPROTO_ICMP: LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4), sizeof(struct icmphdr), "ICMP"); icmphdr = (struct icmphdr *)(packet_buff + (iphdr->ihl * 4)); - printf("IP %s > ", inet_ntoa(*(struct in_addr *)&iphdr->saddr)); + printf("%s %s > ", ip_string, ipsrc); switch (icmphdr->type) { case ICMP_ECHOREPLY: printf("%s: ICMP echo reply, id %hu, seq %hu, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - ntohs(icmphdr->un.echo.id), ntohs(icmphdr->un.echo.sequence), + ipdst, ntohs(icmphdr->un.echo.id), + ntohs(icmphdr->un.echo.sequence), (size_t)buff_len - (iphdr->ihl * 4)); break; case ICMP_DEST_UNREACH: @@ -401,46 +415,43 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, tmp_iphdr = (struct iphdr *)(((char *)icmphdr) + sizeof(struct icmphdr)); tmp_udphdr = (struct udphdr *)(((char *)tmp_iphdr) + (tmp_iphdr->ihl * 4)); - printf("%s: ICMP ", inet_ntoa(*(struct in_addr *)&iphdr->daddr)); + printf("%s: ICMP ", ipdst); printf("%s udp port %hu unreachable, length %zu\n", - inet_ntoa(*(struct in_addr *)&tmp_iphdr->daddr), - ntohs(tmp_udphdr->dest), (size_t)buff_len - (iphdr->ihl * 4)); + ipdst, ntohs(tmp_udphdr->dest), + (size_t)buff_len - (iphdr->ihl * 4)); break; default: printf("%s: ICMP unreachable %hhu, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - icmphdr->code, (size_t)buff_len - (iphdr->ihl * 4)); + ipdst, icmphdr->code, + (size_t)buff_len - (iphdr->ihl * 4)); break; } break; case ICMP_ECHO: printf("%s: ICMP echo request, id %hu, seq %hu, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - ntohs(icmphdr->un.echo.id), ntohs(icmphdr->un.echo.sequence), + ipdst, ntohs(icmphdr->un.echo.id), + ntohs(icmphdr->un.echo.sequence), (size_t)buff_len - (iphdr->ihl * 4)); break; case ICMP_TIME_EXCEEDED: printf("%s: ICMP time exceeded in-transit, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - (size_t)buff_len - (iphdr->ihl * 4)); + ipdst, (size_t)buff_len - (iphdr->ihl * 4)); break; default: printf("%s: ICMP type %hhu, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), icmphdr->type, + ipdst, icmphdr->type, (size_t)buff_len - (iphdr->ihl * 4)); break; } break; case IPPROTO_TCP: 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)); + ipsrc, ipdst); break; case IPPROTO_UDP: 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)); + ipsrc, ipdst); break; default: printf("IP unknown protocol: %i\n", iphdr->protocol); -- 1.8.3.2

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N March 2014