commits May 2012

commits@lists.open-mesh.org

1 participants
95 discussions

batman-adv; branch, master, updated. v2012.1.0-125-gcbe9711
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the master branch: commit cbe97119b339d684d2fa12ecd04506dfa07a28ac Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri May 11 16:10:50 2012 +0800 batman-adv: only store changed gw_bandwidth values Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/gateway_common.c b/gateway_common.c index ca57ac7..6e3b052 100644 --- a/gateway_common.c +++ b/gateway_common.c @@ -162,6 +162,9 @@ ssize_t gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count) **/ gw_bandwidth_to_kbit((uint8_t)gw_bandwidth_tmp, &down, &up); + if (atomic_read(&bat_priv->gw_bandwidth) == gw_bandwidth_tmp) + return count; + gw_deselect(bat_priv); bat_info(net_dev, "Changing gateway bandwidth from: '%i' to: '%ld' (propagating: %d%s/%d%s)\n", -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.1.0-124-g41c5874
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the master branch: commit 41c587435a5bde3331addf256e9f5ddea0bde8c5 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Tue May 8 22:31:57 2012 +0200 batman-adv: fix locking in hash_add() To ensure an entry isn't added twice all comparisons have to be protected by the hash line write spinlock. This doesn't really hurt as the case that it is tried to add an element already present to the hash shouldn't occur very often, so in most cases the lock would have have to be taken anyways. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Acked-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/hash.h b/hash.h index 7bcb98f..2e0409a 100644 --- a/hash.h +++ b/hash.h @@ -109,26 +109,23 @@ static inline int hash_add(struct hashtable_t *hash, head = &hash->table[index]; list_lock = &hash->list_locks[index]; - rcu_read_lock(); - __hlist_for_each_rcu(node, head) { + spin_lock_bh(list_lock); + + hlist_for_each(node, head) { if (!compare(node, data)) continue; ret = 1; - goto err_unlock; + goto unlock; } - rcu_read_unlock(); /* no duplicate found in list, add new element */ - spin_lock_bh(list_lock); hlist_add_head_rcu(data_node, head); - spin_unlock_bh(list_lock); ret = 0; - goto out; -err_unlock: - rcu_read_unlock(); +unlock: + spin_unlock_bh(list_lock); out: return ret; } -- batman-adv

1 0

batctl; branch, master, updated. v2012.1.0-26-gb9c5c52
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the master branch: commit b9c5c52bc65cd31e4b04da961d9236b349a41b10 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed May 9 03:35:39 2012 +0800 batctl: add statistic retrieval component Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/Makefile b/Makefile index c85dbaa..72cecde 100755 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ # batctl build BINARY_NAME = batctl -OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o list-batman.o hash.o vis.o debugfs.o bisect.o +OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o list-batman.o hash.o vis.o debugfs.o bisect.o ioctl.o MANPAGE = man/batctl.8 # batctl flags and options diff --git a/README b/README index 24dc4cf..44e1ac7 100644 --- a/README +++ b/README @@ -34,6 +34,48 @@ address to your provided host name. Host names are much easier to remember than MAC addresses. ;) +batctl statistics +================= + +The batman-adv kernel module maintains a number of traffic counters which are exported +to user space. With batctl these counters can be easily retrieved. The output may vary +depending on which features have been compiled into the kernel module. For example, if +the distributed arp table (short: dat) wasn't selected as an option at compile time +its counters won't be shown. +Each module subsystem has its own counters which are indicated by their prefixes: + * mgmt - mesh protocol counters + * tt - translation table counters + * dat - distributed arp table counters +All counters without a prefix concern payload (pure user data) traffic. + +Usage: batctl statistics + +Example: + +$ batctl statistics + tx: 14 + tx_bytes: 1316 + tx_errors: 0 + rx: 14 + rx_bytes: 1316 + forward: 0 + forward_bytes: 0 + mgmt_tx: 18 + mgmt_tx_bytes: 762 + mgmt_rx: 17 + mgmt_rx_bytes: 1020 + tt_request_tx: 0 + tt_request_rx: 0 + tt_response_tx: 0 + tt_response_rx: 0 + tt_roam_adv_tx: 0 + tt_roam_adv_rx: 0 + dat_request_tx: 0 + dat_request_rx: 0 + dat_reply_tx: 1 + dat_reply_rx: 0 + + batctl ping ============ diff --git a/ioctl.c b/ioctl.c new file mode 100644 index 0000000..92ffdb3 --- /dev/null +++ b/ioctl.c @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2012 B.A.T.M.A.N. contributors: + * + * Marek Lindner <lindner_marek(a)yahoo.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + +#include <stdio.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/ioctl.h> +#include <sys/socket.h> +#include <linux/if.h> +#include <linux/sockios.h> +#include <linux/ethtool.h> + +#include "main.h" +#include "ioctl.h" +#include "debugfs.h" + +typedef unsigned long long u64; + +const char proc_net_dev_path[] = "/proc/net/dev"; + +static int statistics_common_get(char *mesh_iface) +{ + FILE *fp; + char iface[IFNAMSIZ + 1], *line_ptr = NULL;; + unsigned long long rx_bytes, rx_packets, tx_bytes, tx_packets; + unsigned long tx_errors; + size_t len = 0; + int res, ret = EXIT_FAILURE; + + rx_bytes = rx_packets = tx_bytes = tx_packets = tx_errors = 0; + + fp = fopen(proc_net_dev_path, "r"); + if (!fp) { + printf("Error - can't open '%s' for read: %s\n", + proc_net_dev_path, strerror(errno)); + goto out; + } + + while (getline(&line_ptr, &len, fp) != -1) { + res = sscanf(line_ptr, " %" STR(IFNAMSIZ) "[^: \t]: %llu %llu %*d %*d %*d %*d %*d %*d %llu %llu %lu\n", + iface, &rx_bytes, &rx_packets, &tx_bytes, &tx_packets, &tx_errors); + + if (res != 6) + continue; + + if (strcmp(iface, mesh_iface) != 0) + continue; + + printf("\t%.*s: %llu\n", ETH_GSTRING_LEN, "tx", tx_packets); + printf("\t%.*s: %llu\n", ETH_GSTRING_LEN, "tx_bytes", tx_bytes); + printf("\t%.*s: %lu\n", ETH_GSTRING_LEN, "tx_errors", tx_errors); + printf("\t%.*s: %llu\n", ETH_GSTRING_LEN, "rx", rx_packets); + printf("\t%.*s: %llu\n", ETH_GSTRING_LEN, "rx_bytes", rx_bytes); + ret = EXIT_SUCCESS; + goto out; + } + + printf("Error - interface '%s' not found\n", mesh_iface); + +out: + fclose(fp); + free(line_ptr); + return ret; +} + +/* code borrowed from ethtool */ +static int statistics_custom_get(int fd, struct ifreq *ifr) +{ + struct ethtool_drvinfo drvinfo; + struct ethtool_gstrings *strings = NULL; + struct ethtool_stats *stats = NULL; + unsigned int n_stats, sz_str, sz_stats, i; + int err, ret = EXIT_FAILURE; + + drvinfo.cmd = ETHTOOL_GDRVINFO; + ifr->ifr_data = (caddr_t)&drvinfo; + err = ioctl(fd, SIOCETHTOOL, ifr); + if (err < 0) { + printf("Error - can't open driver information: %s\n", strerror(errno)); + goto out; + } + + n_stats = drvinfo.n_stats; + if (n_stats < 1) + goto success; + + sz_str = n_stats * ETH_GSTRING_LEN; + sz_stats = n_stats * sizeof(u64); + + strings = calloc(1, sz_str + sizeof(struct ethtool_gstrings)); + stats = calloc(1, sz_stats + sizeof(struct ethtool_stats)); + if (!strings || !stats) { + printf("Error - out of memory\n"); + goto out; + } + + strings->cmd = ETHTOOL_GSTRINGS; + strings->string_set = ETH_SS_STATS; + strings->len = n_stats; + ifr->ifr_data = (caddr_t)strings; + err = ioctl(fd, SIOCETHTOOL, ifr); + if (err < 0) { + printf("Error - can't get stats strings information: %s\n", strerror(errno)); + goto out; + } + + stats->cmd = ETHTOOL_GSTATS; + stats->n_stats = n_stats; + ifr->ifr_data = (caddr_t) stats; + err = ioctl(fd, SIOCETHTOOL, ifr); + if (err < 0) { + printf("Error - can't get stats information: %s\n", strerror(errno)); + goto out; + } + + for (i = 0; i < n_stats; i++) { + printf("\t%.*s: %llu\n", ETH_GSTRING_LEN, + &strings->data[i * ETH_GSTRING_LEN], stats->data[i]); + } + +success: + ret = EXIT_SUCCESS; + +out: + free(strings); + free(stats); + return ret; +} + +int ioctl_statistics_get(char *mesh_iface) +{ + struct ifreq ifr; + int fd = -1, ret = EXIT_FAILURE; + + memset(&ifr, 0, sizeof(ifr)); + strcpy(ifr.ifr_name, mesh_iface); + + fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + printf("Error - can't open socket: %s\n", strerror(errno)); + goto out; + } + + ret = statistics_common_get(mesh_iface); + if (ret != EXIT_SUCCESS) + goto out; + + ret = statistics_custom_get(fd, &ifr); + +out: + if (fd >= 0) + close(fd); + return ret; +} diff --git a/ping.h b/ioctl.h similarity index 87% copy from ping.h copy to ioctl.h index e3f47fc..0a6a7d6 100644 --- a/ping.h +++ b/ioctl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: + * Copyright (C) 2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * @@ -20,5 +20,4 @@ */ - -int ping(char *mesh_iface, int argc, char **argv); +int ioctl_statistics_get(char *mesh_iface); diff --git a/main.c b/main.c index 86e2078..72b1ea4 100644 --- a/main.c +++ b/main.c @@ -36,6 +36,7 @@ #include "tcpdump.h" #include "bisect.h" #include "vis.h" +#include "ioctl.h" #include "functions.h" #include <err.h> @@ -63,6 +64,7 @@ void print_usage(void) { printf(" \tfragmentation|f [0|1] \tdisplay or modify the fragmentation mode setting\n"); printf(" \tap_isolation|ap [0|1] \tdisplay or modify the ap isolation mode setting\n"); printf("\n"); + printf(" \tstatistics|s \tprint mesh statistics\n"); printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); @@ -213,6 +215,10 @@ int main(int argc, char **argv) ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, SYS_AP_ISOLA, ap_isolation_usage, sysfs_param_enable); + } else if ((strcmp(argv[1], "statistics") == 0) || (strcmp(argv[1], "s") == 0)) { + + ret = ioctl_statistics_get(mesh_iface); + } else if ((strcmp(argv[1], "bisect") == 0)) { ret = bisect(argc - 1, argv + 1); diff --git a/man/batctl.8 b/man/batctl.8 index 7b159d0..8c38d74 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -158,6 +158,25 @@ If no parameter is given the current fragmentation mode setting is displayed. Ot .IP "\fBap_isolation\fP|\fBap\fP [\fB1\fP|\fB0\fP]" If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or disable ap isolation. .br +.IP "\fBstatistics\fP|\fBs\fP" +Retrieve traffic counters from batman-adv kernel module. The output may vary depending on which features have +been compiled into the kernel module. For example, if the distributed arp table (short: dat) wasn't selected +as an option at compile time its counters won't be shown. +.br +Each module subsystem has its own counters which are indicated by their prefixes: +.RS 15 +mgmt - mesh protocol counters +.RE +.RS 17 +tt - translation table counters +.RE +.RS 16 +dat - distributed arp table counters +.RE +.RS 7 +All counters without a prefix concern payload (pure user data) traffic. +.RE +.br .IP "\fBping\fP|\fBp\fP [\fB\-c count\fP][\fB\-i interval\fP][\fB\-t time\fP][\fB\-R\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" Layer 2 ping of a MAC address or bat\-host name. batctl will try to find the bat\-host name if the given parameter was not a MAC -- batctl

1 0

batman-adv; branch, master, updated. v2012.1.0-123-g3806f0f
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the master branch: commit 3806f0f1af65c0283a9d3235d2d14a13ce5ae147 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed May 9 09:50:45 2012 +0200 batman-adv: use DBG_ALL in log_level sysfs definition Each time a new log level is added the developer must change either the DBG_ALL enum definition and the hard coded value in the bat_sysfs.c for the log_level attribute max value. This is extremely error prone. With this patch the code directly uses DBG_ALL in the sysfs definition Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/bat_sysfs.c b/bat_sysfs.c index 6ba3d89..dc1edbe 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -445,7 +445,7 @@ BAT_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE, static BAT_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, show_gw_bwidth, store_gw_bwidth); #ifdef CONFIG_BATMAN_ADV_DEBUG -BAT_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, 31, NULL); +BAT_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, DBG_ALL, NULL); #endif static struct bat_attribute *mesh_attrs[] = { -- batman-adv

1 0

batctl; branch, master, updated. v2012.1.0-25-g8d06132
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the master branch: commit 8d06132f0fc381022bc94c8275439d174e8ad912 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon May 7 21:36:51 2012 +0800 batctl: tcpdump - filter by compatibility number Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/README b/README index 0fe192f..24dc4cf 100644 --- a/README +++ b/README @@ -88,6 +88,7 @@ tcpdump layer 2 and/or layer 3 traffic on the given interface Usage: batctl tcpdump [options] interface [interface] options: + -c compat filter - only display packets matching own compat version (14) -h print this help -n don't convert addresses to bat-host names -p dump specific packet type diff --git a/functions.h b/functions.h index ea953dd..fe03dc0 100644 --- a/functions.h +++ b/functions.h @@ -48,4 +48,5 @@ enum { USE_READ_BUFF = 0x10, SILENCE_ERRORS = 0x20, NO_OLD_ORIGS = 0x40, + COMPAT_FILTER = 0x80, }; diff --git a/man/batctl.8 b/man/batctl.8 index 4f2e1c6..7b159d0 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -175,15 +175,39 @@ address. batctl will send 3 packets to each host and display the response time. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. .br -.IP "\fBtcpdump\fP|\fBtd\fP [\fB\-p filter\fP][\fB\-n\fP] \fBinterface ...\fP" -batctl will display all packets that are seen on the given -interface(s). The "\-p" options allows the filtering of certain packet -types: 1 - batman ogm packets, 2 - batman icmp packets, 4 - unicast -packets, 8 - broadcast packets, 16 - vis packets, and 32 - none batman -packets. These numbers can be added to filter more than one packet -type, e.g. use "\-p 3" to display batman ogm packets and batman icmp -packets only. If "\-n" is given batctl will not replace the MAC -addresses with bat\-host names in the output. +.IP "\fBtcpdump\fP|\fBtd\fP [\fB\-c\fP][\fB\-n\fP][\fB\-p filter\fP][\fB\-x filter\fP] \fBinterface ...\fP" +batctl will display all packets that are seen on the given interface(s). A variety of options to filter the output +are available: To only print packets that match the compatibility number of batctl specify the "\-c" (compat filter) +option. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. To filter +the shown packet types you can either use "\-p" (dump only specified packet types) or "\-x" (dump all packet types +except specified). The following packet types are available: +.RS 17 +1 - batman ogm packets +.RE +.RS 17 +2 - batman icmp packets +.RE +.RS 17 +4 - batman unicast packets +.RE +.RS 17 +8 - batman broadcast packets +.RE +.RS 16 +16 - batman vis packets +.RE +.RS 16 +32 - batman fragmented packets +.RE +.RS 16 +64 - batman tt / roaming packets +.RE +.RS 15 +128 - non batman packets +.RE +.RS 7 +Example: batctl td <interface> -p 129 \-> only display batman ogm packets and non batman packets +.RE .br .IP "\fBbisect\fP [\fB\-l MAC\fP][\fB\-t MAC\fP][\fB\-r MAC\fP][\fB\-s min\fP [\fB\- max\fP]][\fB\-o MAC\fP][\fB\-n\fP] \fBlogfile1\fP [\fBlogfile2\fP ... \fBlogfileN\fP]" Analyses the logfiles to build a small internal database of all sent diff --git a/tcpdump.c b/tcpdump.c index 72c9cf1..6672cf1 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -61,6 +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 -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"); @@ -491,6 +492,10 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read case 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)) + return; + switch (batman_ogm_packet->header.packet_type) { case BAT_IV_OGM: if (dump_level & DUMP_TYPE_BATOGM) @@ -639,8 +644,12 @@ int tcpdump(int argc, char **argv) dump_level = dump_level_all; - while ((optchar = getopt(argc, argv, "hnp:x:")) != -1) { + while ((optchar = getopt(argc, argv, "chnp:x:")) != -1) { switch (optchar) { + case 'c': + read_opt |= COMPAT_FILTER; + found_args += 1; + break; case 'h': tcpdump_usage(); return EXIT_SUCCESS; -- batctl

1 0

batman-adv; branch, master, updated. v2012.1.0-122-g29ccfec
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the master branch: commit 29ccfec94d51f7725124786e29d023b212920661 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon May 7 04:22:05 2012 +0800 batman-adv: turn tt commit code into routing protocol agnostic API Prior to this patch the translation table code made assumptions about how the routing protocol works and where its buffers are stored (to directly modify them). Each protocol now calls the tt code with the relevant pointers, thereby abstracting the code. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 8b0ecf3..f724d44 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -559,22 +559,28 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, if_incoming, 0, bat_iv_ogm_fwd_send_time()); } -static void bat_iv_ogm_schedule(struct hard_iface *hard_iface, - int tt_num_changes) +static void bat_iv_ogm_schedule(struct hard_iface *hard_iface) { struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batman_ogm_packet *batman_ogm_packet; struct hard_iface *primary_if; - int vis_server; + int vis_server, tt_num_changes = 0; vis_server = atomic_read(&bat_priv->vis_mode); primary_if = primary_if_get_selected(bat_priv); + if (hard_iface == primary_if) + tt_num_changes = batadv_tt_append_diff(bat_priv, + &hard_iface->packet_buff, + &hard_iface->packet_len, + BATMAN_OGM_HLEN); + batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff; /* change sequence number to network order */ batman_ogm_packet->seqno = htonl((uint32_t)atomic_read(&hard_iface->seqno)); + atomic_inc(&hard_iface->seqno); batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn); batman_ogm_packet->tt_crc = htons(bat_priv->tt_crc); @@ -593,8 +599,6 @@ static void bat_iv_ogm_schedule(struct hard_iface *hard_iface, else batman_ogm_packet->gw_flags = NO_FLAGS; - atomic_inc(&hard_iface->seqno); - slide_own_bcast_window(hard_iface); bat_iv_ogm_queue_add(bat_priv, hard_iface->packet_buff, hard_iface->packet_len, hard_iface, 1, diff --git a/send.c b/send.c index cebc14a..836b70d 100644 --- a/send.c +++ b/send.c @@ -78,62 +78,9 @@ send_skb_err: return NET_XMIT_DROP; } -static void realloc_packet_buffer(struct hard_iface *hard_iface, - int new_len) -{ - unsigned char *new_buff; - - new_buff = kmalloc(new_len, GFP_ATOMIC); - - /* keep old buffer if kmalloc should fail */ - if (new_buff) { - memcpy(new_buff, hard_iface->packet_buff, - BATMAN_OGM_HLEN); - - kfree(hard_iface->packet_buff); - hard_iface->packet_buff = new_buff; - hard_iface->packet_len = new_len; - } -} - -/* when calling this function (hard_iface == primary_if) has to be true */ -static int prepare_packet_buffer(struct bat_priv *bat_priv, - struct hard_iface *hard_iface) -{ - int new_len; - - new_len = BATMAN_OGM_HLEN + - tt_len((uint8_t)atomic_read(&bat_priv->tt_local_changes)); - - /* if we have too many changes for one packet don't send any - * and wait for the tt table request which will be fragmented */ - if (new_len > hard_iface->soft_iface->mtu) - new_len = BATMAN_OGM_HLEN; - - realloc_packet_buffer(hard_iface, new_len); - - bat_priv->tt_crc = tt_local_crc(bat_priv); - - /* reset the sending counter */ - atomic_set(&bat_priv->tt_ogm_append_cnt, TT_OGM_APPEND_MAX); - - return tt_changes_fill_buffer(bat_priv, - hard_iface->packet_buff + BATMAN_OGM_HLEN, - hard_iface->packet_len - BATMAN_OGM_HLEN); -} - -static int reset_packet_buffer(struct bat_priv *bat_priv, - struct hard_iface *hard_iface) -{ - realloc_packet_buffer(hard_iface, BATMAN_OGM_HLEN); - return 0; -} - void schedule_bat_ogm(struct hard_iface *hard_iface) { struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - struct hard_iface *primary_if; - int tt_num_changes = -1; if ((hard_iface->if_status == IF_NOT_IN_USE) || (hard_iface->if_status == IF_TO_BE_REMOVED)) @@ -149,26 +96,7 @@ void schedule_bat_ogm(struct hard_iface *hard_iface) if (hard_iface->if_status == IF_TO_BE_ACTIVATED) hard_iface->if_status = IF_ACTIVE; - primary_if = primary_if_get_selected(bat_priv); - - if (hard_iface == primary_if) { - /* if at least one change happened */ - if (atomic_read(&bat_priv->tt_local_changes) > 0) { - tt_commit_changes(bat_priv); - tt_num_changes = prepare_packet_buffer(bat_priv, - hard_iface); - } - - /* if the changes have been sent often enough */ - if (!atomic_dec_not_zero(&bat_priv->tt_ogm_append_cnt)) - tt_num_changes = reset_packet_buffer(bat_priv, - hard_iface); - } - - if (primary_if) - hardif_free_ref(primary_if); - - bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface, tt_num_changes); + bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface); } static void forw_packet_free(struct forw_packet *forw_packet) diff --git a/translation-table.c b/translation-table.c index 4155918..b16fb81 100644 --- a/translation-table.c +++ b/translation-table.c @@ -275,14 +275,64 @@ out: tt_global_entry_free_ref(tt_global_entry); } -int tt_changes_fill_buffer(struct bat_priv *bat_priv, - unsigned char *buff, int buff_len) +static void tt_realloc_packet_buff(unsigned char **packet_buff, + int *packet_buff_len, int min_packet_len, + int new_packet_len) +{ + unsigned char *new_buff; + + new_buff = kmalloc(new_packet_len, GFP_ATOMIC); + + /* keep old buffer if kmalloc should fail */ + if (new_buff) { + memcpy(new_buff, *packet_buff, min_packet_len); + kfree(*packet_buff); + *packet_buff = new_buff; + *packet_buff_len = new_packet_len; + } +} + +static void tt_prepare_packet_buff(struct bat_priv *bat_priv, + unsigned char **packet_buff, + int *packet_buff_len, int min_packet_len) +{ + struct hard_iface *primary_if; + int req_len; + + primary_if = primary_if_get_selected(bat_priv); + + req_len = min_packet_len; + req_len += tt_len(atomic_read(&bat_priv->tt_local_changes)); + + /* if we have too many changes for one packet don't send any + * and wait for the tt table request which will be fragmented + */ + if ((!primary_if) || (req_len > primary_if->soft_iface->mtu)) + req_len = min_packet_len; + + tt_realloc_packet_buff(packet_buff, packet_buff_len, + min_packet_len, req_len); + + if (primary_if) + hardif_free_ref(primary_if); +} + +static int tt_changes_fill_buff(struct bat_priv *bat_priv, + unsigned char **packet_buff, + int *packet_buff_len, int min_packet_len) { - int count = 0, tot_changes = 0; struct tt_change_node *entry, *safe; + int count = 0, tot_changes = 0, new_len; + unsigned char *tt_buff; + + tt_prepare_packet_buff(bat_priv, packet_buff, + packet_buff_len, min_packet_len); - if (buff_len > 0) - tot_changes = buff_len / tt_len(1); + new_len = *packet_buff_len - min_packet_len; + tt_buff = *packet_buff + min_packet_len; + + if (new_len > 0) + tot_changes = new_len / tt_len(1); spin_lock_bh(&bat_priv->tt_changes_list_lock); atomic_set(&bat_priv->tt_local_changes, 0); @@ -290,7 +340,7 @@ int tt_changes_fill_buffer(struct bat_priv *bat_priv, list_for_each_entry_safe(entry, safe, &bat_priv->tt_changes_list, list) { if (count < tot_changes) { - memcpy(buff + tt_len(count), + memcpy(tt_buff + tt_len(count), &entry->change, sizeof(struct tt_change)); count++; } @@ -304,17 +354,15 @@ int tt_changes_fill_buffer(struct bat_priv *bat_priv, kfree(bat_priv->tt_buff); bat_priv->tt_buff_len = 0; bat_priv->tt_buff = NULL; - /* We check whether this new OGM has no changes due to size - * problems */ - if (buff_len > 0) { - /** - * if kmalloc() fails we will reply with the full table + /* check whether this new OGM has no changes due to size problems */ + if (new_len > 0) { + /* if kmalloc() fails we will reply with the full table * instead of providing the diff */ - bat_priv->tt_buff = kmalloc(buff_len, GFP_ATOMIC); + bat_priv->tt_buff = kmalloc(new_len, GFP_ATOMIC); if (bat_priv->tt_buff) { - memcpy(bat_priv->tt_buff, buff, buff_len); - bat_priv->tt_buff_len = buff_len; + memcpy(bat_priv->tt_buff, tt_buff, new_len); + bat_priv->tt_buff_len = new_len; } } spin_unlock_bh(&bat_priv->tt_buff_lock); @@ -2025,20 +2073,56 @@ static void tt_local_purge_pending_clients(struct bat_priv *bat_priv) } -void tt_commit_changes(struct bat_priv *bat_priv) +static int tt_commit_changes(struct bat_priv *bat_priv, + unsigned char **packet_buff, int *packet_buff_len, + int packet_min_len) { - uint16_t changed_num = tt_set_flags(bat_priv->tt_local_hash, - TT_CLIENT_NEW, false); - /* all the reset entries have now to be effectively counted as local - * entries */ + uint16_t changed_num = 0; + + if (atomic_read(&bat_priv->tt_local_changes) < 1) + return -ENOENT; + + changed_num = tt_set_flags(bat_priv->tt_local_hash, + TT_CLIENT_NEW, false); + + /* all reset entries have to be counted as local entries */ atomic_add(changed_num, &bat_priv->num_local_tt); tt_local_purge_pending_clients(bat_priv); + bat_priv->tt_crc = tt_local_crc(bat_priv); /* Increment the TTVN only once per OGM interval */ atomic_inc(&bat_priv->ttvn); bat_dbg(DBG_TT, bat_priv, "Local changes committed, updating to ttvn %u\n", (uint8_t)atomic_read(&bat_priv->ttvn)); bat_priv->tt_poss_change = false; + + /* reset the sending counter */ + atomic_set(&bat_priv->tt_ogm_append_cnt, TT_OGM_APPEND_MAX); + + return tt_changes_fill_buff(bat_priv, packet_buff, + packet_buff_len, packet_min_len); +} + +/* when calling this function (hard_iface == primary_if) has to be true */ +int batadv_tt_append_diff(struct bat_priv *bat_priv, + unsigned char **packet_buff, int *packet_buff_len, + int packet_min_len) +{ + int tt_num_changes; + + /* if at least one change happened */ + tt_num_changes = tt_commit_changes(bat_priv, packet_buff, + packet_buff_len, packet_min_len); + + /* if the changes have been sent often enough */ + if ((tt_num_changes < 0) && + (!atomic_dec_not_zero(&bat_priv->tt_ogm_append_cnt))) { + tt_realloc_packet_buff(packet_buff, packet_buff_len, + packet_min_len, packet_min_len); + tt_num_changes = 0; + } + + return tt_num_changes; } bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst) diff --git a/translation-table.h b/translation-table.h index c43374d..d6af2ba 100644 --- a/translation-table.h +++ b/translation-table.h @@ -23,8 +23,6 @@ #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ int tt_len(int changes_num); -int tt_changes_fill_buffer(struct bat_priv *bat_priv, - unsigned char *buff, int buff_len); int tt_init(struct bat_priv *bat_priv); void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, int ifindex); @@ -48,11 +46,13 @@ bool send_tt_response(struct bat_priv *bat_priv, bool is_my_client(struct bat_priv *bat_priv, const uint8_t *addr); void handle_tt_response(struct bat_priv *bat_priv, struct tt_query_packet *tt_response); -void tt_commit_changes(struct bat_priv *bat_priv); bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst); void tt_update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, const unsigned char *tt_buff, uint8_t tt_num_changes, uint8_t ttvn, uint16_t tt_crc); +int batadv_tt_append_diff(struct bat_priv *bat_priv, + unsigned char **packet_buff, int *packet_buff_len, + int packet_min_len); bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr); diff --git a/types.h b/types.h index a23282d..875b2a5 100644 --- a/types.h +++ b/types.h @@ -428,8 +428,7 @@ struct bat_algo_ops { /* called when primary interface is selected / changed */ void (*bat_primary_iface_set)(struct hard_iface *hard_iface); /* prepare a new outgoing OGM for the send queue */ - void (*bat_ogm_schedule)(struct hard_iface *hard_iface, - int tt_num_changes); + void (*bat_ogm_schedule)(struct hard_iface *hard_iface); /* send scheduled OGM */ void (*bat_ogm_emit)(struct forw_packet *forw_packet); }; -- batman-adv

1 0

linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 11 May '12

11 May '12

The annotated tag, batman-adv-for-davem has been updated to 63c4ffbae4ae003eb3920a3da115501ea20f49dc (tag) from 6bb93204e973852e2b2eefc675a828ace7fb93b8 (which is now obsolete) tagging 35c133a000d54b7e3fe81e8c8e4b8af5878ad6dd (commit) replaces v3.4-rc5 tagged by Antonio Quartulli on Fri May 11 14:05:44 2012 +0200 - Shortlog ------------------------------------------------------------ Included changes: * fix a little bug in the DHCP packet snooping introduced so far * minor fixes and cleanups * minor routing protocol API cleanups * add a new contributor name to translation-table.{c,h} * update copyright years in file headers * minor improvement for the routing algorithm -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJPrQCdAAoJEFMQTLzJFOZFabwH/Rb0228L90+mCvntxbjOCgIt kmxbm1sJGpDUvkqB5sYCrpcvnVaogXvn30afq+DUQfh3UKd31S73pcvISV+0NpCg 0xNxFOGEk2WYo1e80rYsyaMJg48grFqrBRlPINY9VxEDbAyGBPbIS0TveBCgMDiU mDLRsilphTD0uQRv3MsVtNHwJK0oF7+i9QLMqFmeu9lKHiBNA08EQkZqwTZK/wxH 02M6HNQkVcK65zahla8R3pwWTKHxAC1A8hdfwPZq43WCWGvvFMdn5VNmeKlC0NC9 Upe6k9tGftiluB0IhuKDA2qicYv+G1xvQWeSTwf9xbFzo21AKpSFYAqoksAGMHg= =C3x/ -----END PGP SIGNATURE----- Antonio Quartulli (10): batman-adv: clean up Kconfig batman-adv: use ETH_ALEN instead of hardcoded numeric constants batman-adv: convert the tt_crc to network order batman-adv: remove duplicated line in comment batman-adv: use ETH_HLEN instead of sizeof(struct ethhdr) batman-adv: print OGM seq numbers as unsigned int batman-adv: skip the window protection test when the originator has no neighbours batman-adv: fix wrong dhcp option list browsing batman-adv: update copyright years batman-adv: add contributor name Eric Dumazet (1): net: cleanup unsigned to unsigned int Linus Luessing (1): batman-adv: Adding hard_iface specific sysfs wrapper macros for UINT Marek Lindner (20): batman-adv: encourage batman to take shorter routes by changing the default hop penalty batman-adv: move ogm initialization into the proper function batman-adv: refactoring API: find generalized name for bat_ogm_init callback batman-adv: randomize initial seqno to avoid collision batman-adv: add iface_disable() callback to routing API batman-adv: handle routing code initialization properly batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN batman-adv: mark existing ogm variables as batman iv batman-adv: introduce is_single_hop_neigh variable to increase readability batman-adv: introduce packet type handler array for incoming packets batman-adv: register batman ogm receive function during protocol init batman-adv: rename last_valid to last_seen batman-adv: replace HZ calculations with jiffies_to_msecs() batman-adv: split neigh_new function into generic and batman iv specific parts batman-adv: ignore protocol packets if the interface did not enable this protocol batman-adv: refactoring API: find generalized name for bat_ogm_update_mac callback batman-adv: rename sysfs macros to reflect the soft-interface dependency batman-adv: avoid temporary routing loops by being strict on forwarded OGMs batman-adv: fix checkpatch string complaint Simon Wunderlich (10): batman-adv: remove old bridge loop avoidance code batman-adv: add basic bridge loop avoidance code batman-adv: make bridge loop avoidance switchable batman-adv: export claim tables through debugfs batman-adv: allow multiple entries in tt_global_entries batman-adv: don't let backbone gateways exchange tt entries batman-adv: add broadcast duplicate check batman-adv: drop STP over batman batman-adv: form groups in the bridge loop avoidance batman-adv: add bridge loop avoidance compile option Sven Eckelmann (2): batman-adv: Replace bitarray operations with bitmap batman-adv: Remove declaration of only locally used functions ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 11 May '12

11 May '12

The annotated tag, batman-adv-for-davem has been updated to 6bb93204e973852e2b2eefc675a828ace7fb93b8 (tag) from b37885c686236be60cfa0933330b2fe0c5d0c17e (which is now obsolete) tagging 285d6d3cec18312bee016a189f9e60d3a9cdeb44 (commit) replaces v3.4-rc5 tagged by Antonio Quartulli on Fri May 11 10:27:21 2012 +0200 - Shortlog ------------------------------------------------------------ Included changes: * fix a little bug in the DHCP packet snooping introduced so far * minor fixes and cleanups * minor routing protocol API cleanups * add a new contributor name to translation-table.{c,h} * update copyright years in file headers * minor improvement for the routing algorithm -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJPrM3eAAoJEFMQTLzJFOZFCt4IAL1KuN9dKJanMfoPE3w9MC24 6TjEI6PWgnZjaSo2n6WvddX8OonPKdjM+s+XC2bXGWu8kKbcPUOHLU7dOiT64FDE 3SaZEXyXvIx8FIiEEVLXLeh6wFUKk4HUHOdEtC38stVyW5Knfr3x0zTLQvin+To9 q6XM6VvE+uxLamL3q0dErBSwQY/a20d82JikEn5lnHhjKeKpz6VJ4n5iCFoKvBfj vNpaGujQ1faR83vltCSywNV4nNOnlOffh94Fax2PPDebIHpFCBVMcH/n1AcBPzSY xz8hW0oFBaSUu5AFlYp1BbIzTO8UMFuT5RACqZG8WN8IQeMbDvZVLIOkMVDBxqM= =7YvG -----END PGP SIGNATURE----- Antonio Quartulli (10): batman-adv: clean up Kconfig batman-adv: use ETH_ALEN instead of hardcoded numeric constants batman-adv: convert the tt_crc to network order batman-adv: remove duplicated line in comment batman-adv: use ETH_HLEN instead of sizeof(struct ethhdr) batman-adv: print OGM seq numbers as unsigned int batman-adv: skip the window protection test when the originator has no neighbours batman-adv: fix wrong dhcp option list browsing batman-adv: update copyright years batman-adv: add contributor name Eric Dumazet (1): net: cleanup unsigned to unsigned int Linus Luessing (1): batman-adv: Adding hard_iface specific sysfs wrapper macros for UINT Marek Lindner (24): batman-adv: encourage batman to take shorter routes by changing the default hop penalty batman-adv: move ogm initialization into the proper function batman-adv: refactoring API: find generalized name for bat_ogm_init callback batman-adv: randomize initial seqno to avoid collision batman-adv: add iface_disable() callback to routing API batman-adv: handle routing code initialization properly batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN batman-adv: mark existing ogm variables as batman iv batman-adv: introduce is_single_hop_neigh variable to increase readability batman-adv: introduce packet type handler array for incoming packets batman-adv: register batman ogm receive function during protocol init batman-adv: rename last_valid to last_seen batman-adv: replace HZ calculations with jiffies_to_msecs() batman-adv: split neigh_new function into generic and batman iv specific parts batman_adv: fix namespace for neigh_node_new function batman-adv: ignore protocol packets if the interface did not enable this protocol batman-adv: change comment style for David batman-adv: refactoring API: find generalized name for bat_ogm_update_mac callback batman-adv: change comment style for David batman-adv: rename sysfs macros to reflect the soft-interface dependency batman-adv: avoid temporary routing loops by being strict on forwarded OGMs batman-adv: change comment style for David batman-adv: fix checkpatch string complaint Simon Wunderlich (10): batman-adv: remove old bridge loop avoidance code batman-adv: add basic bridge loop avoidance code batman-adv: make bridge loop avoidance switchable batman-adv: export claim tables through debugfs batman-adv: allow multiple entries in tt_global_entries batman-adv: don't let backbone gateways exchange tt entries batman-adv: add broadcast duplicate check batman-adv: drop STP over batman batman-adv: form groups in the bridge loop avoidance batman-adv: add bridge loop avoidance compile option Sven Eckelmann (2): batman-adv: Replace bitarray operations with bitmap batman-adv: Remove declaration of only locally used functions ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2012.1.0-121-g0268bdb
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the master branch: commit 0268bdbe7e0b6e63ff770f7515828cdacdb0883b Merge: 73cc7626aba1e2d35e2ad9a0a161e8bba187cba1 746e5dd81e4981d535d7100b414a78040522308f Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri May 11 15:38:02 2012 +0800 Merge branch 'next' Conflicts: bat_iv_ogm.c diff --combined bat_iv_ogm.c index bde28c3,92fad91..8b0ecf3 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@@ -34,11 -34,11 +34,12 @@@ static struct neigh_node *bat_iv_ogm_ne const uint8_t *neigh_addr, struct orig_node *orig_node, struct orig_node *orig_neigh, - uint32_t seqno) + __be32 seqno) { struct neigh_node *neigh_node; - neigh_node = neigh_node_new(hard_iface, neigh_addr, ntohl(seqno)); - neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, seqno); ++ neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, ++ ntohl(seqno)); if (!neigh_node) goto out; @@@ -196,12 -196,8 +197,12 @@@ static void bat_iv_ogm_send_to_if(struc /* create clone because function is called more than once */ skb = skb_clone(forw_packet->skb, GFP_ATOMIC); - if (skb) + if (skb) { + inc_counter(bat_priv, BAT_CNT_MGMT_TX); + add_counter(bat_priv, BAT_CNT_MGMT_TX_BYTES, + skb->len + ETH_HLEN); send_skb_packet(skb, hard_iface, broadcast_addr); + } } /* send a batman ogm packet */ @@@ -522,13 -518,12 +523,12 @@@ static void bat_iv_ogm_forward(struct o } if (!is_from_best_next_hop) { - /** - * Mark the forwarded packet when it is not coming from our best - * next hop. We still need to forward the packet for our neighbor - * link quality detection to work in case the packet originated - * from a single hop neighbor. Otherwise we can simply drop the - * ogm. - */ + /* Mark the forwarded packet when it is not coming from our + * best next hop. We still need to forward the packet for our + * neighbor link quality detection to work in case the packet + * originated from a single hop neighbor. Otherwise we can + * simply drop the ogm. + */ if (is_single_hop_neigh) batman_ogm_packet->flags |= NOT_BEST_NEXT_HOP; else @@@ -547,6 -542,9 +547,6 @@@ "Forwarding packet: tq: %i, ttl: %i\n", batman_ogm_packet->tq, batman_ogm_packet->header.ttl); - batman_ogm_packet->seqno = htonl(batman_ogm_packet->seqno); - batman_ogm_packet->tt_crc = htons(batman_ogm_packet->tt_crc); - /* switch of primaries first hop flag when forwarding */ batman_ogm_packet->flags &= ~PRIMARIES_FIRST_HOP; if (is_single_hop_neigh) @@@ -577,7 -575,8 +577,7 @@@ static void bat_iv_ogm_schedule(struct htonl((uint32_t)atomic_read(&hard_iface->seqno)); batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn); - batman_ogm_packet->tt_crc = htons((uint16_t) - atomic_read(&bat_priv->tt_crc)); + batman_ogm_packet->tt_crc = htons(bat_priv->tt_crc); if (tt_num_changes >= 0) batman_ogm_packet->tt_num_changes = tt_num_changes; @@@ -722,7 -721,7 +722,7 @@@ update_tt tt_update_orig(bat_priv, orig_node, tt_buff, batman_ogm_packet->tt_num_changes, batman_ogm_packet->ttvn, - batman_ogm_packet->tt_crc); + ntohs(batman_ogm_packet->tt_crc)); if (orig_node->gw_flags != batman_ogm_packet->gw_flags) gw_node_update(bat_priv, orig_node, @@@ -869,14 -868,13 +869,14 @@@ static int bat_iv_ogm_update_seqnos(con int32_t seq_diff; int need_update = 0; int set_mark, ret = -1; + uint32_t seqno = ntohl(batman_ogm_packet->seqno); orig_node = get_orig_node(bat_priv, batman_ogm_packet->orig); if (!orig_node) return 0; spin_lock_bh(&orig_node->ogm_cnt_lock); - seq_diff = batman_ogm_packet->seqno - orig_node->last_real_seqno; + seq_diff = seqno - orig_node->last_real_seqno; /* signalize caller that the packet is to be dropped. */ if (!hlist_empty(&orig_node->neigh_list) && @@@ -890,7 -888,7 +890,7 @@@ is_duplicate |= bat_test_bit(tmp_neigh_node->real_bits, orig_node->last_real_seqno, - batman_ogm_packet->seqno); + seqno); if (compare_eth(tmp_neigh_node->addr, ethhdr->h_source) && (tmp_neigh_node->if_incoming == if_incoming)) @@@ -912,8 -910,8 +912,8 @@@ if (need_update) { bat_dbg(DBG_BATMAN, bat_priv, "updating last_seqno: old %u, new %u\n", - orig_node->last_real_seqno, batman_ogm_packet->seqno); - orig_node->last_real_seqno = batman_ogm_packet->seqno; + orig_node->last_real_seqno, seqno); + orig_node->last_real_seqno = seqno; } ret = is_duplicate; @@@ -969,8 -967,8 +969,8 @@@ static void bat_iv_ogm_process(const st "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n", ethhdr->h_source, if_incoming->net_dev->name, if_incoming->net_dev->dev_addr, batman_ogm_packet->orig, - batman_ogm_packet->prev_sender, batman_ogm_packet->seqno, - batman_ogm_packet->ttvn, batman_ogm_packet->tt_crc, + batman_ogm_packet->prev_sender, ntohl(batman_ogm_packet->seqno), + batman_ogm_packet->ttvn, ntohs(batman_ogm_packet->tt_crc), batman_ogm_packet->tt_num_changes, batman_ogm_packet->tq, batman_ogm_packet->header.ttl, batman_ogm_packet->header.version, has_directlink_flag); @@@ -1041,7 -1039,7 +1041,7 @@@ word = &(orig_neigh_node->bcast_own[offset]); bat_set_bit(word, if_incoming_seqno - - batman_ogm_packet->seqno - 2); + ntohl(batman_ogm_packet->seqno) - 2); orig_neigh_node->bcast_own_sum[if_incoming->if_num] = bitmap_weight(word, TQ_LOCAL_WINDOW_SIZE); spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock); @@@ -1134,7 -1132,7 +1134,7 @@@ * seqno and similar ttl as the non-duplicate */ if (is_bidirectional && (!is_duplicate || - ((orig_node->last_real_seqno == batman_ogm_packet->seqno) && + ((orig_node->last_real_seqno == ntohl(batman_ogm_packet->seqno)) && (orig_node->last_ttl - 3 <= batman_ogm_packet->header.ttl)))) bat_iv_ogm_orig_update(bat_priv, orig_node, ethhdr, batman_ogm_packet, if_incoming, @@@ -1201,13 -1199,11 +1201,14 @@@ static int bat_iv_ogm_receive(struct sk return NET_RX_DROP; /* did we receive a B.A.T.M.A.N. IV OGM packet on an interface - * that does not have B.A.T.M.A.N. IV enabled ? */ + * that does not have B.A.T.M.A.N. IV enabled ? + */ if (bat_priv->bat_algo_ops->bat_ogm_emit != bat_iv_ogm_emit) return NET_RX_DROP; + inc_counter(bat_priv, BAT_CNT_MGMT_RX); + add_counter(bat_priv, BAT_CNT_MGMT_RX_BYTES, skb->len + ETH_HLEN); + packet_len = skb_headlen(skb); ethhdr = (struct ethhdr *)skb_mac_header(skb); packet_buff = skb->data; @@@ -1215,6 -1211,11 +1216,6 @@@ /* unpack the aggregated packets and process them one by one */ do { - /* network to host order for our 32bit seqno and the - orig_interval */ - batman_ogm_packet->seqno = ntohl(batman_ogm_packet->seqno); - batman_ogm_packet->tt_crc = ntohs(batman_ogm_packet->tt_crc); - tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN; bat_iv_ogm_process(ethhdr, batman_ogm_packet, @@@ -1233,7 -1234,7 +1234,7 @@@ } static struct bat_algo_ops batman_iv __read_mostly = { - .name = "BATMAN IV", + .name = "BATMAN_IV", .bat_iface_enable = bat_iv_ogm_iface_enable, .bat_iface_disable = bat_iv_ogm_iface_disable, .bat_iface_update_mac = bat_iv_ogm_iface_update_mac, diff --combined originator.c index 61e091d,c6a00b3..c17dc0c --- a/originator.c +++ b/originator.c @@@ -51,7 -51,7 +51,7 @@@ static int compare_orig(const struct hl int originator_init(struct bat_priv *bat_priv) { if (bat_priv->orig_hash) - return 1; + return 0; bat_priv->orig_hash = hash_new(1024); @@@ -59,10 -59,10 +59,10 @@@ goto err; start_purge_timer(bat_priv); - return 1; + return 0; err: - return 0; + return -ENOMEM; } void neigh_node_free_ref(struct neigh_node *neigh_node) @@@ -86,8 -86,9 +86,9 @@@ struct neigh_node *orig_node_get_router return router; } - struct neigh_node *neigh_node_new(struct hard_iface *hard_iface, - const uint8_t *neigh_addr, uint32_t seqno) + struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + uint32_t seqno) { struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct neigh_node *neigh_node; @@@ -489,7 -490,7 +490,7 @@@ static int orig_node_add_if(struct orig data_ptr = kmalloc(max_if_num * sizeof(unsigned long) * NUM_WORDS, GFP_ATOMIC); if (!data_ptr) - return -1; + return -ENOMEM; memcpy(data_ptr, orig_node->bcast_own, (max_if_num - 1) * sizeof(unsigned long) * NUM_WORDS); @@@ -498,7 -499,7 +499,7 @@@ data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); if (!data_ptr) - return -1; + return -ENOMEM; memcpy(data_ptr, orig_node->bcast_own_sum, (max_if_num - 1) * sizeof(uint8_t)); @@@ -529,7 -530,7 +530,7 @@@ int orig_hash_add_if(struct hard_iface ret = orig_node_add_if(orig_node, max_if_num); spin_unlock_bh(&orig_node->ogm_cnt_lock); - if (ret == -1) + if (ret == -ENOMEM) goto err; } rcu_read_unlock(); @@@ -555,7 -556,7 +556,7 @@@ static int orig_node_del_if(struct orig chunk_size = sizeof(unsigned long) * NUM_WORDS; data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); if (!data_ptr) - return -1; + return -ENOMEM; /* copy first part */ memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size); @@@ -574,7 -575,7 +575,7 @@@ free_bcast_own data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); if (!data_ptr) - return -1; + return -ENOMEM; memcpy(data_ptr, orig_node->bcast_own_sum, del_if_num * sizeof(uint8_t)); @@@ -613,7 -614,7 +614,7 @@@ int orig_hash_del_if(struct hard_iface hard_iface->if_num); spin_unlock_bh(&orig_node->ogm_cnt_lock); - if (ret == -1) + if (ret == -ENOMEM) goto err; } rcu_read_unlock(); diff --combined types.h index 41283e0,6474324..a23282d --- a/types.h +++ b/types.h @@@ -162,32 -162,9 +162,32 @@@ struct bcast_duplist_entry }; #endif +enum bat_counters { + BAT_CNT_FORWARD, + BAT_CNT_FORWARD_BYTES, + BAT_CNT_MGMT_TX, + BAT_CNT_MGMT_TX_BYTES, + BAT_CNT_MGMT_RX, + BAT_CNT_MGMT_RX_BYTES, + BAT_CNT_TT_REQUEST_TX, + BAT_CNT_TT_REQUEST_RX, + BAT_CNT_TT_RESPONSE_TX, + BAT_CNT_TT_RESPONSE_RX, + BAT_CNT_TT_ROAM_ADV_TX, + BAT_CNT_TT_ROAM_ADV_RX, +#ifdef CONFIG_BATMAN_ADV_DAT + BAT_CNT_DAT_REQUEST_TX, + BAT_CNT_DAT_REQUEST_RX, + BAT_CNT_DAT_REPLY_TX, + BAT_CNT_DAT_REPLY_RX, +#endif + BAT_CNT_NUM, +}; + struct bat_priv { atomic_t mesh_state; struct net_device_stats stats; + uint64_t __percpu *bat_counters; /* Per cpu counters */ atomic_t aggregated_ogms; /* boolean */ atomic_t bonding; /* boolean */ atomic_t fragmentation; /* boolean */ @@@ -247,7 -224,7 +247,7 @@@ spinlock_t vis_list_lock; /* protects vis_info::recv_list */ atomic_t num_local_tt; /* Checksum of the local table, recomputed before sending a new OGM */ - atomic_t tt_crc; + uint16_t tt_crc; unsigned char *tt_buff; int16_t tt_buff_len; spinlock_t tt_buff_lock; /* protects tt_buff */ @@@ -422,7 -399,8 +422,8 @@@ struct bat_algo_ops /* de-init routing info when hard-interface is disabled */ void (*bat_iface_disable)(struct hard_iface *hard_iface); /* (re-)init mac addresses of the protocol information - * belonging to this hard-interface */ + * belonging to this hard-interface + */ void (*bat_iface_update_mac)(struct hard_iface *hard_iface); /* called when primary interface is selected / changed */ void (*bat_primary_iface_set)(struct hard_iface *hard_iface); -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-94-g746e5dd
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the next branch: commit 746e5dd81e4981d535d7100b414a78040522308f Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu May 10 13:59:16 2012 +0800 batman_adv: fix namespace for neigh_node_new function Should be merged with 0c9a249ef4dcaf733f6c7f64d4ce5c97b4705968 Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index bcaa818..92fad91 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -38,7 +38,7 @@ static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface, { struct neigh_node *neigh_node; - neigh_node = neigh_node_new(hard_iface, neigh_addr, seqno); + neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, seqno); if (!neigh_node) goto out; diff --git a/originator.c b/originator.c index 30889c9..c6a00b3 100644 --- a/originator.c +++ b/originator.c @@ -86,8 +86,9 @@ struct neigh_node *orig_node_get_router(struct orig_node *orig_node) return router; } -struct neigh_node *neigh_node_new(struct hard_iface *hard_iface, - const uint8_t *neigh_addr, uint32_t seqno) +struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + uint32_t seqno) { struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct neigh_node *neigh_node; diff --git a/originator.h b/originator.h index 64c5d94..f74d0d6 100644 --- a/originator.h +++ b/originator.h @@ -29,8 +29,9 @@ void originator_free(struct bat_priv *bat_priv); void purge_orig_ref(struct bat_priv *bat_priv); void orig_node_free_ref(struct orig_node *orig_node); struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr); -struct neigh_node *neigh_node_new(struct hard_iface *hard_iface, - const uint8_t *neigh_addr, uint32_t seqno); +struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + uint32_t seqno); void neigh_node_free_ref(struct neigh_node *neigh_node); struct neigh_node *orig_node_get_router(struct orig_node *orig_node); int orig_seq_print_text(struct seq_file *seq, void *offset); -- batman-adv

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2012