B.A.T.M.A.N June 2012

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

17 participants
55 discussions

[B.A.T.M.A.N.] [PATCH] batctl: Revert "add support for DBG_DAT log level"
by Sven Eckelmann 11 Jun '12

11 Jun '12

Distributed ARP table support was removed from the batman-adv module. Therefore, the support of the debug level should be removed from batctl until the support was readded. This reverts commit c8c043b9953cec095b7705e99443b37f6361c9a1. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- This one is for next README | 1 - man/batctl.8 | 2 +- sys.c | 7 +------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/README b/README index 44e1ac7..b06aacf 100644 --- a/README +++ b/README @@ -344,7 +344,6 @@ $ batctl loglevel [ ] messages related to route added / changed / deleted (routes) [ ] messages related to translation table operations (tt) [ ] messages related to bridge loop avoidance (bla) -[ ] messages related to the distributed arp table (dat) batctl aggregation ================== diff --git a/man/batctl.8 b/man/batctl.8 index 8c38d74..714f50a 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -65,7 +65,7 @@ Once started batctl will display the list of announced originators in the networ If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the originator interval. The interval is in units of milliseconds. .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. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'dat' enables messages related to the distributed arp table (DHT messages, ARP snooping and other debug logs). Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. +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. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. .br .IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. diff --git a/sys.c b/sys.c index d3bf7fa..0b4cac3 100644 --- a/sys.c +++ b/sys.c @@ -184,7 +184,6 @@ static void log_level_usage(void) printf(" \t routes Messages related to route added / changed / deleted\n"); printf(" \t tt Messages related to translation table operations\n"); printf(" \t bla Messages related to bridge loop avoidance\n"); - printf(" \t dat Messages related to the distributed arp table\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -215,7 +214,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level = 0; break; } else if (strcmp(argv[i], "all") == 0) { - log_level = 31; + log_level = 15; break; } else if (strcmp(argv[i], "batman") == 0) log_level |= (1 << 0); @@ -225,8 +224,6 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level |= (1 << 2); else if (strcmp(argv[i], "bla") == 0) log_level |= (1 << 3); - else if (strcmp(argv[i], "dat") == 0) - log_level |= (1 << 4); else { log_level_usage(); goto out; @@ -256,8 +253,6 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) "messages related to translation table operations", "tt"); printf("[%c] %s (%s)\n", (log_level & 8) ? 'x' : ' ', "messages related to bridge loop avoidance", "bla"); - printf("[%c] %s (%s)\n", (log_level & 16) ? 'x' : ' ', - "messages related to the distributed arp table", "dat"); out: free(path_buff); -- 1.7.10

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: fix SIF show / store uint regression
by Marek Lindner 11 Jun '12

11 Jun '12

Regression was introduced with commit: 98881e49 Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- bat_sysfs.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bat_sysfs.c b/bat_sysfs.c index e0272fe..e1ba286 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -135,8 +135,9 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ if (!hard_iface) \ return 0; \ \ - length = __store_uint_attr(buff, count, _min, _max, _post_func, \ - attr, &hard_iface->_name, net_dev); \ + length = __batadv_store_uint_attr(buff, count, _min, _max, \ + _post_func, attr, \ + &hard_iface->_name, net_dev); \ \ hardif_free_ref(hard_iface); \ return length; \ -- 1.7.9.1

2 5

Re: [B.A.T.M.A.N.] bridging problem
by Sven Eckelmann 11 Jun '12

11 Jun '12

On Monday 11 June 2012 15:49:24 Walter Robert Ditzler wrote: > hi sven, > > as promised my final report :-) > > at the end only one question has left, but it is hardware wifi related. i > have several alix hardware boxes, now all with double ath5 wlan cards. > strange is sometimes when i create the vif (iw phy phy1) becomes the wlan 0 > and sometimes wlan1. any glue on that? Sounds a little bit like udev is renaming the device even when you told iw how the device should be named (see persistent net settings). http://www.ducea.com/2008/09/01/remove-debian-udev-persistent-net-rules/ Kind regards, Sven Just for the other people: > *** > as you mentioned hostapd and ath5 are very buggy! under debian i only could > get it to run under following conditions: > > 1) system related > *************** > add to apt source list: > deb http://backports.debian.org/debian-backports squeeze-backports main > > install hostapd from: > DEBIAN_FRONTEND=noninteractive aptitude -y install -t squeeze-backports > batctl hostapd > > (hostapd >= 0.6.10) > > kernel: > *** > root@srv-ldeb-basic1:/etc/hostapd# cat /boot/config-3.4.0-adx-alix |grep > "80211" > CONFIG_CFG80211=m > CONFIG_NL80211_TESTMODE=y > CONFIG_CFG80211_DEVELOPER_WARNINGS=y > CONFIG_CFG80211_REG_DEBUG=y > CONFIG_CFG80211_DEFAULT_PS=y > CONFIG_CFG80211_DEBUGFS=y > CONFIG_CFG80211_INTERNAL_REGDB=y > CONFIG_CFG80211_WEXT=y > CONFIG_LIB80211=m > CONFIG_LIB80211_CRYPT_WEP=m > CONFIG_LIB80211_CRYPT_CCMP=m > CONFIG_LIB80211_CRYPT_TKIP=m > CONFIG_LIB80211_DEBUG=y > CONFIG_MAC80211=m > CONFIG_MAC80211_HAS_RC=y > CONFIG_MAC80211_RC_PID=y > CONFIG_MAC80211_RC_MINSTREL=y > CONFIG_MAC80211_RC_MINSTREL_HT=y > # CONFIG_MAC80211_RC_DEFAULT_PID is not set > CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y > CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" > CONFIG_MAC80211_MESH=y > CONFIG_MAC80211_LEDS=y > CONFIG_MAC80211_DEBUGFS=y > CONFIG_MAC80211_DEBUG_MENU=y > CONFIG_MAC80211_NOINLINE=y > CONFIG_MAC80211_VERBOSE_DEBUG=y > CONFIG_MAC80211_HT_DEBUG=y > CONFIG_MAC80211_TKIP_DEBUG=y > CONFIG_MAC80211_IBSS_DEBUG=y > CONFIG_MAC80211_VERBOSE_PS_DEBUG=y > CONFIG_MAC80211_VERBOSE_MPL_DEBUG=y > CONFIG_MAC80211_VERBOSE_MPATH_DEBUG=y > CONFIG_MAC80211_VERBOSE_MHWMP_DEBUG=y > CONFIG_MAC80211_VERBOSE_TDLS_DEBUG=y > CONFIG_MAC80211_DEBUG_COUNTERS=y > CONFIG_MAC80211_HWSIM=m > *** > > 2) wifi related > ************ > - ath5 only supports 1 adhoc vif > - ath5 can't run in master mode without hostapd > - ath5 bridging and mesh only possible with 2 wlan cards > - ath9 no problems at all > - ath9 bridging and mesh with one wlan card possible > > !!! attention !!! > > when using ath5 wlan cards hostapd service hast o be restared. only after > restarting the hostapd service you will be able to link second wlan ath5 > card into the bridge br0. i tried many thing but this ist he only way i > succeeded. > > > > *** (/etc/hostapd/hostapd,.conf can be also an adhoc vif) > interface=wlan1 > bridge=br0 > driver=nl80211 > hw_mode=g > channel=1 > ssid=adradix_test > macaddr_acl=0 > auth_algs=1 > ignore_broadcast_ssid=0 > wpa=2 > wpa_passphrase=xxx > wpa_key_mgmt=WPA-PSK > wpa_pairwise=TKIP > rsn_pairwise=CCMP > *** > > *** (network script > of course no need to use static ip's also dhcp > possible) > #!/bin/bash > > # ADRADIX MODIFIED AT 2012-06-09 23:51:24 > # > echo "1" > /proc/sys/net/ipv4/ip_forward > > ifconfig eth0 down > ifconfig wlan0 down > ifconfig wlan1 down > ifconfig mesh0 down > ifconfig bat0 down > ifconfig br0 down > > brctl delbr br0 > batctl if del mesh0 > > iw dev wlan0 del > iw dev wlan1 del > iw dev mesh0 del > iw dev mon.wlan0 del > iw dev mon.wlan1 del > > iw phy phy0 interface add mesh0 type adhoc > ifconfig mesh0 mtu 1528 > iwconfig mesh0 mode ad-hoc essid adradix_mesh ap xx:xx:xx:xx:xx:xx channel > 10 > batctl if add mesh0 > ifconfig mesh0 0.0.0.0 up > > iw phy phy1 interface add wlan1 type adhoc > > brctl addbr br0 > brctl addif br0 eth0 > brctl addif br0 bat0 > > ifconfig bat0 0.0.0.0 up > ifconfig eth0 0.0.0.0 up > ifconfig br0 10.xx.xx.xx netmask 255.255.255.0 up > > route add default gw 10.41.20.1 > > #echo "1" > /proc/sys/net/ipv4/conf/mesh0/proxy_arp > #echo "1" > /proc/sys/net/ipv4/conf/bat0/proxy_arp > #echo "1" > /proc/sys/net/ipv4/conf/br0/proxy_arp > #echo "1" > /proc/sys/net/ipv4/conf/eth0/proxy_arp > > # > # IMPORTANT: WITHOUT THAT RESTART BRIDGING DOES NOT WORK > /etc/init.d/hostapd restart > brctl addif br0 wlan1 > > exit 0; > ***

2 1

[B.A.T.M.A.N.] batman-adv gw_mode and ipv6 router advertisements
by Guido Iribarren 11 Jun '12

11 Jun '12

Hello everyone, in the deploy of DeltaLibre (a local WCN very similar to EigenNet (part of ninux) in Italy) i'm facing a dilemma: i'm currently using batman-adv gw_mode client in all nodes, and the ones that connect directly to internet through an ISP have gw_mode = server This way, clients have their DHCP requests transparently unicasted to the 'best' gateway, and get a corresponding IPv4 and default gw. Which is great. But in IPv6 there's no equivalent functionality. If two routers on the same broadcast domain (batman-adv cloud) run radvd and announce two different prefixes, all hosts on the network autoconfigure 2 ips, one in each prefix. Then, AFAIU, it's up to the client to choose between the announced gateways, to send the traffic. Are there any plans of implementing in batman-adv something analog to the mangling done on DHCPv4 packets, to RA packets as well? (the mechanism would be the inverse: instead of unicasting queries and replies, propagate to clients only 1 RA packet out of all incoming; decide which one to propagate based on gw_mode current logic) Or, at least, extend the current mangling done in DHCPv4 packets to DHCPv6 packets as well? I would *love* to simply show some code instead of asking 'wishlist' questions, but sadly i'm not a programmer :( Thanks a lot, Guido pd. I'm pretty new to ipv6, so It's possible that i'm overlooking 'obvious' concepts in my questions: in that case you can politely tell me to RTFM :)

4 4

[B.A.T.M.A.N.] [PATCH 1/3] batctl: Prefix packet defines with BATADV_
by Sven Eckelmann 10 Jun '12

10 Jun '12

Reported-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- packet.h | 12 ++++++------ ping.c | 16 ++++++++-------- tcpdump.c | 8 ++++---- traceroute.c | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packet.h b/packet.h index c90219c..e562414 100644 --- a/packet.h +++ b/packet.h @@ -20,7 +20,7 @@ #ifndef _NET_BATMAN_ADV_PACKET_H_ #define _NET_BATMAN_ADV_PACKET_H_ -#define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ +#define BATADV_ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { BAT_IV_OGM = 0x01, @@ -34,7 +34,7 @@ enum bat_packettype { }; /* this file is included by batctl which needs these defines */ -#define COMPAT_VERSION 14 +#define BATADV_COMPAT_VERSION 14 enum batman_iv_flags { NOT_BEST_NEXT_HOP = 1 << 3, @@ -65,7 +65,7 @@ enum unicast_frag_flags { }; /* TT_QUERY subtypes */ -#define TT_QUERY_TYPE_MASK 0x3 +#define BATADV_TT_QUERY_TYPE_MASK 0x3 enum tt_query_packettype { TT_REQUEST = 0, @@ -126,7 +126,7 @@ struct batman_ogm_packet { __be16 tt_crc; } __packed; -#define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet) +#define BATADV_OGM_HLEN sizeof(struct batman_ogm_packet) struct icmp_packet { struct batman_header header; @@ -138,7 +138,7 @@ struct icmp_packet { uint8_t reserved; } __packed; -#define BAT_RR_LEN 16 +#define BATADV_RR_LEN 16 /* icmp_packet_rr must start with all fields from imcp_packet * as this is assumed by code that handles ICMP packets @@ -151,7 +151,7 @@ struct icmp_packet_rr { __be16 seqno; uint8_t uid; uint8_t rr_cur; - uint8_t rr[BAT_RR_LEN][ETH_ALEN]; + uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; } __packed; struct unicast_packet { diff --git a/ping.c b/ping.c index 791cfb7..213f1e3 100644 --- a/ping.c +++ b/ping.c @@ -79,7 +79,7 @@ int ping(char *mesh_iface, int argc, char **argv) char *dst_string, *mac_string, *rr_string; double time_delta; float min = 0.0, max = 0.0, avg = 0.0, mdev = 0.0; - uint8_t last_rr_cur = 0, last_rr[BAT_RR_LEN][ETH_ALEN]; + uint8_t last_rr_cur = 0, last_rr[BATADV_RR_LEN][ETH_ALEN]; size_t packet_len; char *debugfs_mnt; char icmp_socket[MAX_PATH+1]; @@ -164,7 +164,7 @@ int ping(char *mesh_iface, int argc, char **argv) memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); icmp_packet_out.header.packet_type = BAT_ICMP; - icmp_packet_out.header.version = COMPAT_VERSION; + icmp_packet_out.header.version = BATADV_COMPAT_VERSION; icmp_packet_out.msg_type = ECHO_REQUEST; icmp_packet_out.header.ttl = 50; icmp_packet_out.seqno = 0; @@ -172,8 +172,8 @@ int ping(char *mesh_iface, int argc, char **argv) if (rr) { packet_len = sizeof(struct icmp_packet_rr); icmp_packet_out.rr_cur = 1; - memset(&icmp_packet_out.rr, 0, BAT_RR_LEN * ETH_ALEN); - memset(last_rr, 0, BAT_RR_LEN * ETH_ALEN); + memset(&icmp_packet_out.rr, 0, BATADV_RR_LEN * ETH_ALEN); + memset(last_rr, 0, BATADV_RR_LEN * ETH_ALEN); } printf("PING %s (%s) %zu(%zu) bytes of data\n", dst_string, mac_string, @@ -243,14 +243,14 @@ read_packet: if (read_len == sizeof(struct icmp_packet_rr)) { if (last_rr_cur == icmp_packet_in.rr_cur - && !memcmp(last_rr, icmp_packet_in.rr, BAT_RR_LEN * ETH_ALEN)) { + && !memcmp(last_rr, icmp_packet_in.rr, BATADV_RR_LEN * ETH_ALEN)) { printf("\t(same route)"); } else { printf("\nRR: "); - for (i = 0; i < BAT_RR_LEN + for (i = 0; i < BATADV_RR_LEN && i < icmp_packet_in.rr_cur; i++) { rr_mac = (struct ether_addr *)&icmp_packet_in.rr[i]; @@ -266,7 +266,7 @@ read_packet: } last_rr_cur = icmp_packet_in.rr_cur; - memcpy(last_rr, icmp_packet_in.rr, BAT_RR_LEN * ETH_ALEN); + memcpy(last_rr, icmp_packet_in.rr, BATADV_RR_LEN * ETH_ALEN); } } @@ -288,7 +288,7 @@ read_packet: break; case PARAMETER_PROBLEM: printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.header.version, COMPAT_VERSION); + icmp_packet_in.header.version, BATADV_COMPAT_VERSION); printf("Please make sure to use compatible versions!\n"); goto out; default: diff --git a/tcpdump.c b/tcpdump.c index 6672cf1..1ead780 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -61,7 +61,7 @@ static void tcpdump_usage(void) { printf("Usage: batctl tcpdump [options] interface [interface]\n"); printf("options:\n"); - printf(" \t -c compat filter - only display packets matching own compat version (%i)\n", COMPAT_VERSION); + printf(" \t -c compat filter - only display packets matching own compat version (%i)\n", BATADV_COMPAT_VERSION); printf(" \t -h print this help\n"); printf(" \t -n don't convert addresses to bat-host names\n"); printf(" \t -p dump specific packet type\n"); @@ -264,7 +264,7 @@ static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int rea if (!time_printed) print_time(); - switch (tt_query_packet->flags & TT_QUERY_TYPE_MASK) { + switch (tt_query_packet->flags & BATADV_TT_QUERY_TYPE_MASK) { case TT_REQUEST: tt_desc = "request"; tt_data = "crc"; @@ -489,11 +489,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_vlan(packet_buff, buff_len, read_opt, time_printed); break; - case ETH_P_BATMAN: + case BATADV_ETH_P_BATMAN: batman_ogm_packet = (struct batman_ogm_packet *)(packet_buff + ETH_HLEN); if ((read_opt & COMPAT_FILTER) && - (batman_ogm_packet->header.version != COMPAT_VERSION)) + (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION)) return; switch (batman_ogm_packet->header.packet_type) { diff --git a/traceroute.c b/traceroute.c index fdc9e4a..da0ba60 100644 --- a/traceroute.c +++ b/traceroute.c @@ -121,7 +121,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) } memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); - icmp_packet_out.header.version = COMPAT_VERSION; + icmp_packet_out.header.version = BATADV_COMPAT_VERSION; icmp_packet_out.header.packet_type = BAT_ICMP; icmp_packet_out.msg_type = ECHO_REQUEST; icmp_packet_out.seqno = 0; @@ -193,7 +193,7 @@ read_packet: goto out; case PARAMETER_PROBLEM: printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.header.version, COMPAT_VERSION); + icmp_packet_in.header.version, BATADV_COMPAT_VERSION); printf("Please make sure to use compatible versions!\n"); goto out; default: -- 1.7.10

2 5

[B.A.T.M.A.N.] [PATCH 1/6] batman-adv: Prefix local debugfs structs with batadv_
by Sven Eckelmann 10 Jun '12

10 Jun '12

Reported-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bat_debugfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bat_debugfs.c b/bat_debugfs.c index 2693be0..fbdd5d6 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -265,13 +265,13 @@ static int batadv_vis_data_open(struct inode *inode, struct file *file) return single_open(file, batadv_vis_seq_print_text, net_dev); } -struct bat_debuginfo { +struct batadv_debuginfo { struct attribute attr; const struct file_operations fops; }; #define BATADV_DEBUGINFO(_name, _mode, _open) \ -struct bat_debuginfo batadv_debuginfo_##_name = { \ +struct batadv_debuginfo batadv_debuginfo_##_name = { \ .attr = { .name = __stringify(_name), \ .mode = _mode, }, \ .fops = { .owner = THIS_MODULE, \ @@ -294,7 +294,7 @@ static BATADV_DEBUGINFO(transtable_local, S_IRUGO, batadv_transtable_local_open); static BATADV_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open); -static struct bat_debuginfo *batadv_mesh_debuginfos[] = { +static struct batadv_debuginfo *batadv_mesh_debuginfos[] = { &batadv_debuginfo_originators, &batadv_debuginfo_gateways, &batadv_debuginfo_transtable_global, @@ -308,7 +308,7 @@ static struct bat_debuginfo *batadv_mesh_debuginfos[] = { void batadv_debugfs_init(void) { - struct bat_debuginfo *bat_debug; + struct batadv_debuginfo *bat_debug; struct dentry *file; batadv_debugfs = debugfs_create_dir(BATADV_DEBUGFS_SUBDIR, NULL); @@ -340,7 +340,7 @@ void batadv_debugfs_destroy(void) int batadv_debugfs_add_meshif(struct net_device *dev) { struct bat_priv *bat_priv = netdev_priv(dev); - struct bat_debuginfo **bat_debug; + struct batadv_debuginfo **bat_debug; struct dentry *file; if (!batadv_debugfs) -- 1.7.10

2 11

[B.A.T.M.A.N.] [PATCH 01/16] batman-adv: Prefix local defines with BATADV_
by Sven Eckelmann 10 Jun '12

10 Jun '12

Reported-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bat_debugfs.c | 26 +++++++------ bat_sysfs.c | 112 +++++++++++++++++++++++++++--------------------------- gateway_client.c | 12 +++--- vis.c | 18 +++++---- 4 files changed, 87 insertions(+), 81 deletions(-) diff --git a/bat_debugfs.c b/bat_debugfs.c index 87349f4..095e6e8 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -35,14 +35,14 @@ static struct dentry *batadv_debugfs; #ifdef CONFIG_BATMAN_ADV_DEBUG -#define LOG_BUFF_MASK (batadv_log_buff_len - 1) -#define LOG_BUFF(idx) (debug_log->log_buff[(idx) & LOG_BUFF_MASK]) +#define BATADV_LOG_BUFF_MASK (batadv_log_buff_len - 1) +#define BATADV_LOG_BUFF(idx) (debug_log->log_buff[(idx) & BATADV_LOG_BUFF_MASK]) static int batadv_log_buff_len = LOG_BUF_LEN; static void batadv_emit_log_char(struct debug_log *debug_log, char c) { - LOG_BUFF(debug_log->log_end) = c; + BATADV_LOG_BUFF(debug_log->log_end) = c; debug_log->log_end++; if (debug_log->log_end - debug_log->log_start > batadv_log_buff_len) @@ -133,7 +133,7 @@ static ssize_t batadv_log_read(struct file *file, char __user *buf, while ((!error) && (i < count) && (debug_log->log_start != debug_log->log_end)) { - c = LOG_BUFF(debug_log->log_start); + c = BATADV_LOG_BUFF(debug_log->log_start); debug_log->log_start++; @@ -270,7 +270,7 @@ struct bat_debuginfo { const struct file_operations fops; }; -#define BAT_DEBUGINFO(_name, _mode, _open) \ +#define BATADV_DEBUGINFO(_name, _mode, _open) \ struct bat_debuginfo batadv_debuginfo_##_name = { \ .attr = { .name = __stringify(_name), \ .mode = _mode, }, \ @@ -282,15 +282,17 @@ struct bat_debuginfo batadv_debuginfo_##_name = { \ } \ }; -static BAT_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open); -static BAT_DEBUGINFO(originators, S_IRUGO, batadv_originators_open); -static BAT_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open); -static BAT_DEBUGINFO(transtable_global, S_IRUGO, batadv_transtable_global_open); +static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open); +static BATADV_DEBUGINFO(originators, S_IRUGO, batadv_originators_open); +static BATADV_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open); +static BATADV_DEBUGINFO(transtable_global, S_IRUGO, + batadv_transtable_global_open); #ifdef CONFIG_BATMAN_ADV_BLA -static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open); +static BATADV_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open); #endif -static BAT_DEBUGINFO(transtable_local, S_IRUGO, batadv_transtable_local_open); -static BAT_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open); +static BATADV_DEBUGINFO(transtable_local, S_IRUGO, + batadv_transtable_local_open); +static BATADV_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open); static struct bat_debuginfo *batadv_mesh_debuginfos[] = { &batadv_debuginfo_originators, diff --git a/bat_sysfs.c b/bat_sysfs.c index 07fde83..109c537 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -38,9 +38,9 @@ static struct bat_priv *batadv_kobj_to_batpriv(struct kobject *obj) return netdev_priv(net_dev); } -#define UEV_TYPE_VAR "BATTYPE=" -#define UEV_ACTION_VAR "BATACTION=" -#define UEV_DATA_VAR "BATDATA=" +#define BATADV_UEV_TYPE_VAR "BATTYPE=" +#define BATADV_UEV_ACTION_VAR "BATACTION=" +#define BATADV_UEV_DATA_VAR "BATDATA=" static char *batadv_uev_action_str[] = { "add", @@ -53,15 +53,15 @@ static char *batadv_uev_type_str[] = { }; /* Use this, if you have customized show and store functions */ -#define BAT_ATTR(_name, _mode, _show, _store) \ -struct bat_attribute batadv_attr_##_name = { \ - .attr = {.name = __stringify(_name), \ - .mode = _mode }, \ - .show = _show, \ - .store = _store, \ +#define BATADV_ATTR(_name, _mode, _show, _store) \ +struct bat_attribute batadv_attr_##_name = { \ + .attr = {.name = __stringify(_name), \ + .mode = _mode }, \ + .show = _show, \ + .store = _store, \ }; -#define BAT_ATTR_SIF_STORE_BOOL(_name, _post_func) \ +#define BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func) \ ssize_t batadv_store_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff, \ size_t count) \ @@ -72,7 +72,7 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ &bat_priv->_name, net_dev); \ } -#define BAT_ATTR_SIF_SHOW_BOOL(_name) \ +#define BATADV_ATTR_SIF_SHOW_BOOL(_name) \ ssize_t batadv_show_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff) \ { \ @@ -85,14 +85,14 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ /* Use this, if you are going to turn a [name] in the soft-interface * (bat_priv) on or off */ -#define BAT_ATTR_SIF_BOOL(_name, _mode, _post_func) \ - static BAT_ATTR_SIF_STORE_BOOL(_name, _post_func) \ - static BAT_ATTR_SIF_SHOW_BOOL(_name) \ - static BAT_ATTR(_name, _mode, batadv_show_##_name, \ - batadv_store_##_name) +#define BATADV_ATTR_SIF_BOOL(_name, _mode, _post_func) \ + static BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func) \ + static BATADV_ATTR_SIF_SHOW_BOOL(_name) \ + static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ + batadv_store_##_name) -#define BAT_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ +#define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ ssize_t batadv_store_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff, \ size_t count) \ @@ -104,7 +104,7 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ &bat_priv->_name, net_dev); \ } -#define BAT_ATTR_SIF_SHOW_UINT(_name) \ +#define BATADV_ATTR_SIF_SHOW_UINT(_name) \ ssize_t batadv_show_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff) \ { \ @@ -115,14 +115,14 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ /* Use this, if you are going to set [name] in the soft-interface * (bat_priv) to an unsigned integer value */ -#define BAT_ATTR_SIF_UINT(_name, _mode, _min, _max, _post_func) \ - static BAT_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ - static BAT_ATTR_SIF_SHOW_UINT(_name) \ - static BAT_ATTR(_name, _mode, batadv_show_##_name, \ +#define BATADV_ATTR_SIF_UINT(_name, _mode, _min, _max, _post_func) \ + static BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)\ + static BATADV_ATTR_SIF_SHOW_UINT(_name) \ + static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ batadv_store_##_name) -#define BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func) \ +#define BATADV_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func) \ ssize_t batadv_store_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff, \ size_t count) \ @@ -142,7 +142,7 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ return length; \ } -#define BAT_ATTR_HIF_SHOW_UINT(_name) \ +#define BATADV_ATTR_HIF_SHOW_UINT(_name) \ ssize_t batadv_show_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff) \ { \ @@ -163,11 +163,11 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ /* Use this, if you are going to set [name] in hard_iface to an * unsigned integer value */ -#define BAT_ATTR_HIF_UINT(_name, _mode, _min, _max, _post_func) \ - static BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func) \ - static BAT_ATTR_HIF_SHOW_UINT(_name) \ - static BAT_ATTR(_name, _mode, batadv_show_##_name, \ - batadv_store_##_name) +#define BATADV_ATTR_HIF_UINT(_name, _mode, _min, _max, _post_func) \ + static BATADV_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)\ + static BATADV_ATTR_HIF_SHOW_UINT(_name) \ + static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ + batadv_store_##_name) static int batadv_store_bool_attr(char *buff, size_t count, @@ -453,26 +453,27 @@ static ssize_t batadv_store_gw_bwidth(struct kobject *kobj, return batadv_gw_bandwidth_set(net_dev, buff, count); } -BAT_ATTR_SIF_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL); -BAT_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); +BATADV_ATTR_SIF_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL); +BATADV_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); #ifdef CONFIG_BATMAN_ADV_BLA -BAT_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); +BATADV_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); #endif -BAT_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu); -BAT_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); -static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, batadv_show_vis_mode, - batadv_store_vis_mode); -static BAT_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL); -static BAT_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode, - batadv_store_gw_mode); -BAT_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * JITTER, INT_MAX, NULL); -BAT_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, TQ_MAX_VALUE, NULL); -BAT_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE, - batadv_post_gw_deselect); -static BAT_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth, - batadv_store_gw_bwidth); +BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu); +BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); +static BATADV_ATTR(vis_mode, S_IRUGO | S_IWUSR, batadv_show_vis_mode, + batadv_store_vis_mode); +static BATADV_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL); +static BATADV_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode, + batadv_store_gw_mode); +BATADV_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * JITTER, INT_MAX, + NULL); +BATADV_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, TQ_MAX_VALUE, NULL); +BATADV_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE, + batadv_post_gw_deselect); +static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth, + batadv_store_gw_bwidth); #ifdef CONFIG_BATMAN_ADV_DEBUG -BAT_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, DBG_ALL, NULL); +BATADV_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, DBG_ALL, NULL); #endif static struct bat_attribute *batadv_mesh_attrs[] = { @@ -655,9 +656,9 @@ static ssize_t batadv_show_iface_status(struct kobject *kobj, return length; } -static BAT_ATTR(mesh_iface, S_IRUGO | S_IWUSR, - batadv_show_mesh_iface, batadv_store_mesh_iface); -static BAT_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL); +static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface, + batadv_store_mesh_iface); +static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL); static struct bat_attribute *batadv_batman_attrs[] = { &batadv_attr_mesh_iface, @@ -719,31 +720,32 @@ int batadv_throw_uevent(struct bat_priv *bat_priv, enum uev_type type, bat_kobj = &primary_if->soft_iface->dev.kobj; - uevent_env[0] = kmalloc(strlen(UEV_TYPE_VAR) + + uevent_env[0] = kmalloc(strlen(BATADV_UEV_TYPE_VAR) + strlen(batadv_uev_type_str[type]) + 1, GFP_ATOMIC); if (!uevent_env[0]) goto out; - sprintf(uevent_env[0], "%s%s", UEV_TYPE_VAR, batadv_uev_type_str[type]); + sprintf(uevent_env[0], "%s%s", BATADV_UEV_TYPE_VAR, + batadv_uev_type_str[type]); - uevent_env[1] = kmalloc(strlen(UEV_ACTION_VAR) + + uevent_env[1] = kmalloc(strlen(BATADV_UEV_ACTION_VAR) + strlen(batadv_uev_action_str[action]) + 1, GFP_ATOMIC); if (!uevent_env[1]) goto out; - sprintf(uevent_env[1], "%s%s", UEV_ACTION_VAR, + sprintf(uevent_env[1], "%s%s", BATADV_UEV_ACTION_VAR, batadv_uev_action_str[action]); /* If the event is DEL, ignore the data field */ if (action != UEV_DEL) { - uevent_env[2] = kmalloc(strlen(UEV_DATA_VAR) + + uevent_env[2] = kmalloc(strlen(BATADV_UEV_DATA_VAR) + strlen(data) + 1, GFP_ATOMIC); if (!uevent_env[2]) goto out; - sprintf(uevent_env[2], "%s%s", UEV_DATA_VAR, data); + sprintf(uevent_env[2], "%s%s", BATADV_UEV_DATA_VAR, data); } ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env); diff --git a/gateway_client.c b/gateway_client.c index fe7d846..7d186a7 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -33,8 +33,8 @@ /* This is the offset of the options field in a dhcp packet starting at * the beginning of the dhcp header */ -#define DHCP_OPTIONS_OFFSET 240 -#define DHCP_REQUEST 3 +#define BATADV_DHCP_OPTIONS_OFFSET 240 +#define BATADV_DHCP_REQUEST 3 static void batadv_gw_node_free_ref(struct gw_node *gw_node) { @@ -521,11 +521,11 @@ static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len) pkt_len = skb_headlen(skb); - if (pkt_len < header_len + DHCP_OPTIONS_OFFSET + 1) + if (pkt_len < header_len + BATADV_DHCP_OPTIONS_OFFSET + 1) goto out; - p = skb->data + header_len + DHCP_OPTIONS_OFFSET; - pkt_len -= header_len + DHCP_OPTIONS_OFFSET + 1; + p = skb->data + header_len + BATADV_DHCP_OPTIONS_OFFSET; + pkt_len -= header_len + BATADV_DHCP_OPTIONS_OFFSET + 1; /* Access the dhcp option lists. Each entry is made up by: * - octet 1: option type @@ -543,7 +543,7 @@ static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len) p += 2; /* check if the message type is what we need */ - if (*p == DHCP_REQUEST) + if (*p == BATADV_DHCP_REQUEST) ret = true; break; } else if (*p == 0) { diff --git a/vis.c b/vis.c index 3095c41..7dc7506 100644 --- a/vis.c +++ b/vis.c @@ -26,7 +26,7 @@ #include "hash.h" #include "originator.h" -#define MAX_VIS_PACKET_SIZE 1000 +#define BATADV_MAX_VIS_PACKET_SIZE 1000 static void batadv_start_vis_timer(struct bat_priv *bat_priv); @@ -544,10 +544,12 @@ static int batadv_find_best_vis_server(struct bat_priv *bat_priv, static bool batadv_vis_packet_full(const struct vis_info *info) { const struct vis_packet *packet; - packet = (struct vis_packet *)info->skb_packet->data; + size_t num_items; - if (MAX_VIS_PACKET_SIZE / sizeof(struct vis_info_entry) - < packet->entries + 1) + packet = (struct vis_packet *)info->skb_packet->data; + num_items = BATADV_MAX_VIS_PACKET_SIZE / sizeof(struct vis_info_entry); + + if (num_items < packet->entries + 1) return true; return false; } @@ -838,6 +840,7 @@ int batadv_vis_init(struct bat_priv *bat_priv) { struct vis_packet *packet; int hash_added; + unsigned int len; if (bat_priv->vis_hash) return 0; @@ -850,13 +853,12 @@ int batadv_vis_init(struct bat_priv *bat_priv) goto err; } - bat_priv->my_vis_info = kmalloc(MAX_VIS_PACKET_SIZE, GFP_ATOMIC); + bat_priv->my_vis_info = kmalloc(BATADV_MAX_VIS_PACKET_SIZE, GFP_ATOMIC); if (!bat_priv->my_vis_info) goto err; - bat_priv->my_vis_info->skb_packet = dev_alloc_skb(sizeof(*packet) + - MAX_VIS_PACKET_SIZE + - ETH_HLEN); + len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE + ETH_HLEN; + bat_priv->my_vis_info->skb_packet = dev_alloc_skb(len); if (!bat_priv->my_vis_info->skb_packet) goto free_info; -- 1.7.10

2 31

[B.A.T.M.A.N.] any progress or info on available throughput based routing?
by dan 09 Jun '12

09 Jun '12

I have been watching batman-adv for quite a while. I really love the progress that the devs have made and the concepts are great. I think the holy grail of mesh routing protocols is to handle 3 characteristics of routes and route choice per packet type, possibly using DSCP/TOS values or something. Those 3 characteristics are link quality, latency, and available throughput. And the multiple routing tables would be so that services requiring low latency can be routed on lowest latency routes, that may not have a lot of throughput, and bulk traffic can be routed through paths that have more available throughput. I have seen posts discussing interest in adding such features and I am interested to do some reading on this subject as it pertains to batman-adv. Is there anything out there? I couldn't find anything on the site.

2 1

Re: [B.A.T.M.A.N.] bridging problem
by Sven Eckelmann 06 Jun '12

06 Jun '12

On Wednesday 06 June 2012 18:13:57 Walter Robert Ditzler wrote: > hi sven, > > just not to mix many things my procedure bellow. i could change the mac of > my mesh0 > but i saw that there is a problem to bring up wlan0! The problem is that you have to change the mac of mesh0 before bringing up wlan0. Actually you should change it directly after creating it and before doing anything else. So somewhere between `iw phy phy0 interface add mesh0 type adhoc` and `ifconfig mesh0 mtu 1528` Kind regards, Sven

1 0

[B.A.T.M.A.N.] bridging problem
by Walter Robert Ditzler 06 Jun '12

06 Jun '12

hi batman list, i have problem setting up batman-adv "clients". i could need some help indeed. thank you very much for replying! walter what i want ********** | eth0 bat0(wlan0) | <mesh network> | bat(wlan0) eth0 | <ethernet> (backbone lan) | wlan0 (Client) | my questions: *********** 1) do i need 2 wifi network cards in the mp box to connect with wireless hosts (laptop's)? 2) if yes, how can i make the bridging to work form connected hosts (laptop's) and eth0? with what i work ************** 1) alix2 boards 2) debian 6.0.5 3) kernel 3.4 486 what i did ******** #!/bin/bash ifconfig eth0 down ifconfig wlan0 down ifconfig wlan1 down iw dev wlan0 del iw dev wlan1 del iw phy phy0 interface add mesh0 type adhoc ifconfig mesh0 mtu 1528 iwconfig mesh0 mode ad-hoc essid adradix_mesh ap 02:12:34:56:78:9A channel 3 batctl if add mesh0 ifconfig mesh0 0.0.0.0 up ifconfig bat0 0.0.0.0 up ifconfig eth0 0.0.0.0 up brctl addbr br0 brctl addif br0 bat0 brctl addif br0 eth0 ifconfig br0 10.10.10.11 netmask 255.255.255.0 up route add default gw 10.10.10.1 exit 0;

4 9

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N June 2012