commits November 2012

commits@lists.open-mesh.org

1 participants
86 discussions

[openwrt-feed-batman-adv] master: batman-adv-devel: fix race condition between iface add and iface up (58875db)
by postmaster＠open-mesh.org 26 Nov '12

26 Nov '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 58875db4e6984bcd9866e568bc45f1dc01155687 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 26 18:49:17 2012 +0800 batman-adv-devel: fix race condition between iface add and iface up Signed-off-by: Gui Iribarren <gui(a)altermundi.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 58875db4e6984bcd9866e568bc45f1dc01155687 batman-adv-devel/Makefile | 3 ++- batman-adv-devel/files/etc/hotplug.d/iface/99-batman-adv | 12 ++++++++++++ batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv | 1 - batman-adv-devel/files/lib/batman-adv/config.sh | 1 - 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index c57c327..e80b49a 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -113,10 +113,11 @@ define Build/Clean endef define KernelPackage/batman-adv-devel/install - $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/lib/batman-adv $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config $(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv $(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net + $(INSTALL_BIN) ./files/etc/hotplug.d/iface/99-batman-adv $(1)/etc/hotplug.d/iface $(INSTALL_BIN) ./files/usr/sbin/batman-adv $(1)/usr/sbin $(BATCTL_INSTALL) endef diff --git a/batman-adv-devel/files/etc/hotplug.d/iface/99-batman-adv b/batman-adv-devel/files/etc/hotplug.d/iface/99-batman-adv new file mode 100644 index 0000000..9206c42 --- /dev/null +++ b/batman-adv-devel/files/etc/hotplug.d/iface/99-batman-adv @@ -0,0 +1,12 @@ +#!/bin/sh + +. /lib/batman-adv/config.sh + +bat_load_module +config_load batman-adv + +case "$ACTION" in + ifup) + [ -d /sys/class/net/$DEVICE/batman_adv/ ] && config_foreach bat_add_interface mesh "$DEVICE" + ;; +esac diff --git a/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv b/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv index 42d4c29..47132c1 100644 --- a/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv +++ b/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv @@ -8,7 +8,6 @@ config_load batman-adv case "$ACTION" in add) [ -d /sys/class/net/$INTERFACE/mesh/ ] && bat_config "$INTERFACE" - [ -d /sys/class/net/$INTERFACE/batman_adv/ ] && config_foreach bat_add_interface mesh "$INTERFACE" ;; remove) [ -d /sys/class/net/$INTERFACE/batman_adv/ ] && config_foreach bat_del_interface mesh "$INTERFACE" diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 0917462..5260c01 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -51,7 +51,6 @@ bat_add_interface() local interface="$2" local interfaces - sleep 3s # some device (ath) is very lazy to start config_get interfaces $mesh interfaces for iface in $interfaces; do [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || {

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 21 Nov '12

21 Nov '12

The annotated tag, batman-adv-for-davem has been updated to a4dad9f81dfb65ec417228601c319e3358f9d538 (tag) from 09319d48f2d06366fb4d2288eeacb86ac499b03e (which is now obsolete) tagging e022b956c11084f3ee1c6ece523e14ac07b7c645 (commit) replaces v3.7-rc6 tagged by Antonio Quartulli on Wed Nov 21 12:36:04 2012 +0100 - Shortlog ------------------------------------------------------------ Included changes: - Increase batman-adv version - Bridge Loop Avoidance: compute checksum (using crc32) on skb fragments instead of linearising it - sort the sysfs documentation - some other minor cleanups -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlCsvK0ACgkQpGgxIkP9cwfqxACeOAPgCi+t6skliCgCmvsxU0GZ shkAoJA7K4n6cqCzVz89xixoLWb2WOdg =uoM7 -----END PGP SIGNATURE----- Antonio Quartulli (24): batman-adv: use check_unicast_packet() in recv_roam_adv() batman-adv: return proper value in case of hash_add failure batman-adv: properly store the roaming time batman-adv: print packets re-routing on DBG_TT and ratelimit it batman-adv: check for more space before accessing the skb batman-adv: properly convert flag into a boolean value batman-adv: pass the WIFI flag from the local to global entry batman-adv: add kernel-doc for enum batadv_dbg_level batman-adv: add UNICAST_4ADDR packet type batman-adv: Distributed ARP Table - add a new debug log level batman-adv: Distributed ARP Table - create DHT helper functions batman-adv: Distributed ARP Table - implement local storage batman-adv: Distributed ARP Table - add ARP parsing functions batman-adv: Distributed ARP Table - add snooping functions for ARP messages batman-adv: Distributed ARP Table - add compile option batman-adv: Distributed ARP Table - add runtime switch batman-adv: enable fast client detection using unicast_4addr packets batman-adv: fix wrong spinlock inline comment batman-adv: prevent using any virtual device created on batman-adv as hard-interface batman-adv: substitute tt_poss_change with a per-tt_entry flag batman-adv: refactor code to simplify long lines batman-adv: refactor tt_global_del_struct() batman-adv: roaming handling mechanism redesign batman-adv: support array of debugfs general attributes David S. Miller (1): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Marek Lindner (2): batman-adv: split hard_iface struct for each routing protocol batman-adv: consolidate duplicated primary_if checking code Martin Hundebøll (2): batman-adv: Add get_ethtool_stats() support for DAT batman-adv: Add wrapper to look up neighbor and send skb Simon Wunderlich (7): batman-adv: don't allow ECTP traffic on batman-adv batman-adv: don't rely on positions in struct for hashing batman-adv: send announcement when backbone gw is registered batman-adv: allow bla traffic only after first worker period batman-adv: wait multiple periods before activating bla batman-adv: fix bla compare function batman-adv: Fix broadcast duplist for fragmentation Sven Eckelmann (12): batman-adv: Remove unused define BAT_ATTR_HIF_UINT batman-adv: Set special lockdep classes to avoid lockdep warning batman-adv: Remove extra check in batadv_bit_get_packet batman-adv: Check return value of try_module_get batman-adv: Only increase refcounter once for alternate router batman-adv: Reserve extra bytes in skb for better alignment batman-adv: Mark correctly aligned headers not as __packed batman-adv: Remove instant overwritten variable initialization batman-adv: Mark best gateway in transtable_global debugfs batman-adv: Add function to calculate crc32c for the skb payload batman-adv: Start new development cycle batman-adv: Use packing of 2 for all headers before an ethernet header ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.7-rc1-1632-g76c3bf9
by postmaster＠open-mesh.org 21 Nov '12

21 Nov '12

The following commit has been merged in the merge/master branch: commit 76c3bf90141655b220fed95bc194e0518fc05ed1 Merge: 3e51b89dc683c8814ac06410e9b0aaff660148ed eba8ed0c3326efb644341e604e2a6640ba3cac87 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Nov 21 12:33:01 2012 +0100 Merge remote-tracking branch 'pkg/next' into merge/master diff --combined net/batman-adv/debugfs.c index ae79b19,6f58ddd..6f58ddd --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@@ -245,16 -245,6 +245,6 @@@ static int batadv_algorithms_open(struc return single_open(file, batadv_algo_seq_print_text, NULL); } - /** - * batadv_compat_open - Prepare file handler for printing of the compat version - * @inode: inode which was opened - * @file: file handle to be initialized - */ - static int batadv_compat_open(struct inode *inode, struct file *file) - { - return single_open(file, batadv_compat_seq_print_text, NULL); - } - static int batadv_originators_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; @@@ -337,11 -327,9 +327,9 @@@ struct batadv_debuginfo batadv_debuginf * placed in the BATADV_DEBUGFS_SUBDIR subdirectory of debugfs */ static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open); static struct batadv_debuginfo *batadv_general_debuginfos[] = { &batadv_debuginfo_routing_algos, - &batadv_debuginfo_compat_version, NULL, }; diff --combined net/batman-adv/main.c index 253e240,f65a222..f65a222 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@@ -423,18 -423,6 +423,6 @@@ int batadv_algo_seq_print_text(struct s } /** - * batadv_compat_seq_print_text - print the compatibility version - * @seq: debugfs table seq_file struct - * @offset: not used - */ - int batadv_compat_seq_print_text(struct seq_file *seq, void *offset) - { - seq_printf(seq, "%d\n", BATADV_COMPAT_VERSION); - - return 0; - } - - /** * batadv_skb_crc32 - calculate CRC32 of the whole packet and skip bytes in * the header * @skb: skb pointing to fragmented socket buffers diff --combined net/batman-adv/main.h index e2b7e1a,0000000..2f85577 mode 100644,000000..100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@@ -1,302 -1,0 +1,301 @@@ +/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * 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 + */ + +#ifndef _NET_BATMAN_ADV_MAIN_H_ +#define _NET_BATMAN_ADV_MAIN_H_ + +#define BATADV_DRIVER_AUTHOR "Marek Lindner <lindner_marek(a)yahoo.de>, " \ + "Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>" +#define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" +#define BATADV_DRIVER_DEVICE "batman-adv" + +#ifndef BATADV_SOURCE_VERSION +#define BATADV_SOURCE_VERSION "2012.5.0" +#endif + +/* B.A.T.M.A.N. parameters */ + +#define BATADV_TQ_MAX_VALUE 255 +#define BATADV_JITTER 20 + +/* Time To Live of broadcast messages */ +#define BATADV_TTL 50 + +/* purge originators after time in seconds if no valid packet comes in + * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE + */ +#define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */ +#define BATADV_TT_LOCAL_TIMEOUT 3600000 /* in milliseconds */ +#define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in milliseconds */ +#define BATADV_TT_CLIENT_TEMP_TIMEOUT 600000 /* in milliseconds */ +#define BATADV_DAT_ENTRY_TIMEOUT (5*60000) /* 5 mins in milliseconds */ +/* sliding packet range of received originator messages in sequence numbers + * (should be a multiple of our word size) + */ +#define BATADV_TQ_LOCAL_WINDOW_SIZE 64 +/* milliseconds we have to keep pending tt_req */ +#define BATADV_TT_REQUEST_TIMEOUT 3000 + +#define BATADV_TQ_GLOBAL_WINDOW_SIZE 5 +#define BATADV_TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 +#define BATADV_TQ_LOCAL_BIDRECT_RECV_MINIMUM 1 +#define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1 + +/* number of OGMs sent with the last tt diff */ +#define BATADV_TT_OGM_APPEND_MAX 3 + +/* Time in which a client can roam at most ROAMING_MAX_COUNT times in + * milliseconds + */ +#define BATADV_ROAMING_MAX_TIME 20000 +#define BATADV_ROAMING_MAX_COUNT 5 + +#define BATADV_NO_FLAGS 0 + +#define BATADV_NULL_IFINDEX 0 /* dummy ifindex used to avoid iface checks */ + +#define BATADV_NUM_WORDS BITS_TO_LONGS(BATADV_TQ_LOCAL_WINDOW_SIZE) + +#define BATADV_LOG_BUF_LEN 8192 /* has to be a power of 2 */ + +/* msecs after which an ARP_REQUEST is sent in broadcast as fallback */ +#define ARP_REQ_DELAY 250 +/* numbers of originator to contact for any PUT/GET DHT operation */ +#define BATADV_DAT_CANDIDATES_NUM 3 + +#define BATADV_VIS_INTERVAL 5000 /* 5 seconds */ + +/* how much worse secondary interfaces may be to be considered as bonding + * candidates + */ +#define BATADV_BONDING_TQ_THRESHOLD 50 + +/* should not be bigger than 512 bytes or change the size of + * forw_packet->direct_link_flags + */ +#define BATADV_MAX_AGGREGATION_BYTES 512 +#define BATADV_MAX_AGGREGATION_MS 100 + +#define BATADV_BLA_PERIOD_LENGTH 10000 /* 10 seconds */ +#define BATADV_BLA_BACKBONE_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 3) +#define BATADV_BLA_CLAIM_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 10) +#define BATADV_BLA_WAIT_PERIODS 3 + +#define BATADV_DUPLIST_SIZE 16 +#define BATADV_DUPLIST_TIMEOUT 500 /* 500 ms */ +/* don't reset again within 30 seconds */ +#define BATADV_RESET_PROTECTION_MS 30000 +#define BATADV_EXPECTED_SEQNO_RANGE 65536 + +enum batadv_mesh_state { + BATADV_MESH_INACTIVE, + BATADV_MESH_ACTIVE, + BATADV_MESH_DEACTIVATING, +}; + +#define BATADV_BCAST_QUEUE_LEN 256 +#define BATADV_BATMAN_QUEUE_LEN 256 + +enum batadv_uev_action { + BATADV_UEV_ADD = 0, + BATADV_UEV_DEL, + BATADV_UEV_CHANGE, +}; + +enum batadv_uev_type { + BATADV_UEV_GW = 0, +}; + +#define BATADV_GW_THRESHOLD 50 + +#define BATADV_DAT_CANDIDATE_NOT_FOUND 0 +#define BATADV_DAT_CANDIDATE_ORIG 1 + +/* Debug Messages */ +#ifdef pr_fmt +#undef pr_fmt +#endif +/* Append 'batman-adv: ' before kernel messages */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +/* Kernel headers */ + +#include <linux/mutex.h> /* mutex */ +#include <linux/module.h> /* needed by all modules */ +#include <linux/netdevice.h> /* netdevice */ +#include <linux/etherdevice.h> /* ethernet address classification */ +#include <linux/if_ether.h> /* ethernet header */ +#include <linux/poll.h> /* poll_table */ +#include <linux/kthread.h> /* kernel threads */ +#include <linux/pkt_sched.h> /* schedule types */ +#include <linux/workqueue.h> /* workqueue */ +#include <linux/percpu.h> +#include <linux/slab.h> +#include <net/sock.h> /* struct sock */ +#include <linux/jiffies.h> +#include <linux/seq_file.h> +#include "types.h" + +extern char batadv_routing_algo[]; +extern struct list_head batadv_hardif_list; + +extern unsigned char batadv_broadcast_addr[]; +extern struct workqueue_struct *batadv_event_workqueue; + +int batadv_mesh_init(struct net_device *soft_iface); +void batadv_mesh_free(struct net_device *soft_iface); +int batadv_is_my_mac(const uint8_t *addr); +struct batadv_hard_iface * +batadv_seq_print_text_primary_if_get(struct seq_file *seq); +int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *ptype, + struct net_device *orig_dev); +int +batadv_recv_handler_register(uint8_t packet_type, + int (*recv_handler)(struct sk_buff *, + struct batadv_hard_iface *)); +void batadv_recv_handler_unregister(uint8_t packet_type); +int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); +int batadv_algo_select(struct batadv_priv *bat_priv, char *name); +int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); - int batadv_compat_seq_print_text(struct seq_file *seq, void *offset); +__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr); + +/** + * enum batadv_dbg_level - available log levels + * @BATADV_DBG_BATMAN: OGM and TQ computations related messages + * @BATADV_DBG_ROUTES: route added / changed / deleted + * @BATADV_DBG_TT: translation table messages + * @BATADV_DBG_BLA: bridge loop avoidance messages + * @BATADV_DBG_DAT: ARP snooping and DAT related messages + * @BATADV_DBG_ALL: the union of all the above log levels + */ +enum batadv_dbg_level { + BATADV_DBG_BATMAN = BIT(0), + BATADV_DBG_ROUTES = BIT(1), + BATADV_DBG_TT = BIT(2), + BATADV_DBG_BLA = BIT(3), + BATADV_DBG_DAT = BIT(4), + BATADV_DBG_ALL = 31, +}; + +#ifdef CONFIG_BATMAN_ADV_DEBUG +int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...) +__printf(2, 3); + +#define batadv_dbg(type, bat_priv, fmt, arg...) \ + do { \ + if (atomic_read(&bat_priv->log_level) & type) \ + batadv_debug_log(bat_priv, fmt, ## arg);\ + } \ + while (0) +#else /* !CONFIG_BATMAN_ADV_DEBUG */ +__printf(3, 4) +static inline void batadv_dbg(int type __always_unused, + struct batadv_priv *bat_priv __always_unused, + const char *fmt __always_unused, ...) +{ +} +#endif + +#define batadv_info(net_dev, fmt, arg...) \ + do { \ + struct net_device *_netdev = (net_dev); \ + struct batadv_priv *_batpriv = netdev_priv(_netdev); \ + batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ + pr_info("%s: " fmt, _netdev->name, ## arg); \ + } while (0) +#define batadv_err(net_dev, fmt, arg...) \ + do { \ + struct net_device *_netdev = (net_dev); \ + struct batadv_priv *_batpriv = netdev_priv(_netdev); \ + batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ + pr_err("%s: " fmt, _netdev->name, ## arg); \ + } while (0) + +/* returns 1 if they are the same ethernet addr + * + * note: can't use compare_ether_addr() as it requires aligned memory + */ +static inline int batadv_compare_eth(const void *data1, const void *data2) +{ + return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); +} + +/** + * has_timed_out - compares current time (jiffies) and timestamp + timeout + * @timestamp: base value to compare with (in jiffies) + * @timeout: added to base value before comparing (in milliseconds) + * + * Returns true if current time is after timestamp + timeout + */ +static inline bool batadv_has_timed_out(unsigned long timestamp, + unsigned int timeout) +{ + return time_is_before_jiffies(timestamp + msecs_to_jiffies(timeout)); +} + +#define batadv_atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) + +/* Returns the smallest signed integer in two's complement with the sizeof x */ +#define batadv_smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) + +/* Checks if a sequence number x is a predecessor/successor of y. + * they handle overflows/underflows and can correctly check for a + * predecessor/successor unless the variable sequence number has grown by + * more then 2**(bitwidth(x)-1)-1. + * This means that for a uint8_t with the maximum value 255, it would think: + * - when adding nothing - it is neither a predecessor nor a successor + * - before adding more than 127 to the starting value - it is a predecessor, + * - when adding 128 - it is neither a predecessor nor a successor, + * - after adding more than 127 to the starting value - it is a successor + */ +#define batadv_seq_before(x, y) ({typeof(x) _d1 = (x); \ + typeof(y) _d2 = (y); \ + typeof(x) _dummy = (_d1 - _d2); \ + (void) (&_d1 == &_d2); \ + _dummy > batadv_smallest_signed_int(_dummy); }) +#define batadv_seq_after(x, y) batadv_seq_before(y, x) + +/* Stop preemption on local cpu while incrementing the counter */ +static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, + size_t count) +{ + int cpu = get_cpu(); + per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count; + put_cpu(); +} + +#define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1) + +/* Sum and return the cpu-local counters for index 'idx' */ +static inline uint64_t batadv_sum_counter(struct batadv_priv *bat_priv, + size_t idx) +{ + uint64_t *counters, sum = 0; + int cpu; + + for_each_possible_cpu(cpu) { + counters = per_cpu_ptr(bat_priv->bat_counters, cpu); + sum += counters[idx]; + } + + return sum; +} + +#endif /* _NET_BATMAN_ADV_MAIN_H_ */ -- linux integration

1 0

[batctl] master's head updated: Merge branch 'next' (fe3e32e)
by postmaster＠open-mesh.org 21 Nov '12

21 Nov '12

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 449d4f7 Revert "batctl: Print compat version when querying the version" fe3e32e Merge branch 'next'

1 0

[batctl] master: Merge branch 'next' (fe3e32e)
by postmaster＠open-mesh.org 21 Nov '12

21 Nov '12

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit fe3e32ed27217ecd9ec1232fa6e3bcd7de4d9ee8 Merge: 68639a8 449d4f7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Nov 21 14:39:45 2012 +0800 Merge branch 'next' >--------------------------------------------------------------- fe3e32ed27217ecd9ec1232fa6e3bcd7de4d9ee8 main.c | 53 ++++++++++++----------------------------------------- 1 file changed, 12 insertions(+), 41 deletions(-)

1 0

[batctl] next: Revert "batctl: Print compat version when querying the version" (449d4f7)
by postmaster＠open-mesh.org 21 Nov '12

21 Nov '12

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 449d4f70b6ad831a3385edcfa37a7350713372ad Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Nov 20 20:59:36 2012 +0100 Revert "batctl: Print compat version when querying the version" This reverts commit a88e6b7b938ae201deba074e819b299ebb1c165f. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 449d4f70b6ad831a3385edcfa37a7350713372ad main.c | 53 ++++++++++++----------------------------------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/main.c b/main.c index e239b2a..5d85d8b 100644 --- a/main.c +++ b/main.c @@ -31,7 +31,6 @@ #include "main.h" #include "sys.h" #include "debug.h" -#include "debugfs.h" #include "ping.h" #include "translate.h" #include "traceroute.h" @@ -44,7 +43,6 @@ char mesh_dfl_iface[] = "bat0"; char module_ver_path[] = "/sys/module/batman_adv/version"; -char module_compat_ver_file[] = "batman_adv/compat_version"; void print_usage(void) { @@ -94,44 +92,6 @@ void print_usage(void) #endif } -static void print_version(void) -{ - int ret; - char *debugfs_mnt; - - printf("batctl %s [", SOURCE_VERSION); - - ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); - if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) - line_ptr[strlen(line_ptr) - 1] = '\0'; - - if (ret == EXIT_SUCCESS) { - printf("batman-adv: %s", line_ptr); - } else { - printf("module not loaded"); - goto out; - } - - free(line_ptr); - line_ptr = NULL; - - debugfs_mnt = debugfs_mount(NULL); - if (!debugfs_mnt) - goto out; - - ret = read_file(debugfs_mnt, module_compat_ver_file, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); - if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) - line_ptr[strlen(line_ptr) - 1] = '\0'; - - if (ret == EXIT_SUCCESS) - printf(", compat: %s", line_ptr); - -out: - free(line_ptr); - line_ptr = NULL; - printf("]\n"); -} - int main(int argc, char **argv) { int i, ret = EXIT_FAILURE; @@ -158,7 +118,18 @@ int main(int argc, char **argv) goto err; if (strcmp(argv[1], "-v") == 0) { - print_version(); + printf("batctl %s [batman-adv: ", SOURCE_VERSION); + + ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); + if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (ret == EXIT_SUCCESS) + printf("%s]\n", line_ptr); + else + printf("module not loaded]\n"); + + free(line_ptr); exit(EXIT_SUCCESS); }

1 0

[batman-adv] master's head updated: Merge branch 'next' (1da1935)
by postmaster＠open-mesh.org 21 Nov '12

21 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: eba8ed0 Revert "batman-adv: export compatibility version via debugfs" 1da1935 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (1da1935)
by postmaster＠open-mesh.org 21 Nov '12

21 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1da19357fa79bf7d4a245fd0089129364d4e716b Merge: 1f59c6d eba8ed0 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Nov 21 14:37:17 2012 +0800 Merge branch 'next' >--------------------------------------------------------------- 1da19357fa79bf7d4a245fd0089129364d4e716b debugfs.c | 12 ------------ main.c | 12 ------------ main.h | 1 - 3 files changed, 25 deletions(-)

1 0

[batman-adv] next: Revert "batman-adv: export compatibility version via debugfs" (eba8ed0)
by postmaster＠open-mesh.org 21 Nov '12

21 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit eba8ed0c3326efb644341e604e2a6640ba3cac87 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Nov 20 20:44:15 2012 +0100 Revert "batman-adv: export compatibility version via debugfs" This reverts commit 0679ec75758588e185ceec11e5823de65b427a6f. Conflicts: main.c main.h Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- eba8ed0c3326efb644341e604e2a6640ba3cac87 debugfs.c | 12 ------------ main.c | 12 ------------ main.h | 1 - 3 files changed, 25 deletions(-) diff --git a/debugfs.c b/debugfs.c index ae79b19..6f58ddd 100644 --- a/debugfs.c +++ b/debugfs.c @@ -245,16 +245,6 @@ static int batadv_algorithms_open(struct inode *inode, struct file *file) return single_open(file, batadv_algo_seq_print_text, NULL); } -/** - * batadv_compat_open - Prepare file handler for printing of the compat version - * @inode: inode which was opened - * @file: file handle to be initialized - */ -static int batadv_compat_open(struct inode *inode, struct file *file) -{ - return single_open(file, batadv_compat_seq_print_text, NULL); -} - static int batadv_originators_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; @@ -337,11 +327,9 @@ struct batadv_debuginfo batadv_debuginfo_##_name = { \ * placed in the BATADV_DEBUGFS_SUBDIR subdirectory of debugfs */ static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open); -static BATADV_DEBUGINFO(compat_version, S_IRUGO, batadv_compat_open); static struct batadv_debuginfo *batadv_general_debuginfos[] = { &batadv_debuginfo_routing_algos, - &batadv_debuginfo_compat_version, NULL, }; diff --git a/main.c b/main.c index 253e240..f65a222 100644 --- a/main.c +++ b/main.c @@ -423,18 +423,6 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) } /** - * batadv_compat_seq_print_text - print the compatibility version - * @seq: debugfs table seq_file struct - * @offset: not used - */ -int batadv_compat_seq_print_text(struct seq_file *seq, void *offset) -{ - seq_printf(seq, "%d\n", BATADV_COMPAT_VERSION); - - return 0; -} - -/** * batadv_skb_crc32 - calculate CRC32 of the whole packet and skip bytes in * the header * @skb: skb pointing to fragmented socket buffers diff --git a/main.h b/main.h index ec9c5ad..94de8ee 100644 --- a/main.h +++ b/main.h @@ -176,7 +176,6 @@ void batadv_recv_handler_unregister(uint8_t packet_type); int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); int batadv_algo_select(struct batadv_priv *bat_priv, char *name); int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); -int batadv_compat_seq_print_text(struct seq_file *seq, void *offset); __be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr); /**

1 0

[batman-adv] master: batman-adv: remove useless assignment in tt_local_add() (1f59c6d)
by postmaster＠open-mesh.org 19 Nov '12

19 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1f59c6d63e93bbf7c9c0afa7f67d484a237ad75b Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 19 09:01:44 2012 +0100 batman-adv: remove useless assignment in tt_local_add() The flag field of the tt_local_entry->common structure in tt_local_add() is first assigned NO_FLAGS and then TT_CLIENT_NEW so nullifying the first operation. For this reason it is safe to remove the first assignment. This was introuduced by ("batman-adv: keep local table consistency for further TT_RESPONSE") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 1f59c6d63e93bbf7c9c0afa7f67d484a237ad75b translation-table.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/translation-table.c b/translation-table.c index 9769e62..1335294 100644 --- a/translation-table.c +++ b/translation-table.c @@ -305,7 +305,11 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, (uint8_t)atomic_read(&bat_priv->tt.vn)); memcpy(tt_local->common.addr, addr, ETH_ALEN); - tt_local->common.flags = BATADV_NO_FLAGS; + /* The local entry has to be marked as NEW to avoid to send it in + * a full table response going out before the next ttvn increment + * (consistency check) + */ + tt_local->common.flags = BATADV_TT_CLIENT_NEW; if (batadv_is_wifi_iface(ifindex)) tt_local->common.flags |= BATADV_TT_CLIENT_WIFI; atomic_set(&tt_local->common.refcount, 2); @@ -316,12 +320,6 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (batadv_compare_eth(addr, soft_iface->dev_addr)) tt_local->common.flags |= BATADV_TT_CLIENT_NOPURGE; - /* The local entry has to be marked as NEW to avoid to send it in - * a full table response going out before the next ttvn increment - * (consistency check) - */ - tt_local->common.flags |= BATADV_TT_CLIENT_NEW; - hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt, batadv_choose_orig, &tt_local->common, &tt_local->common.hash_entry);

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2012