B.A.T.M.A.N May 2011

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

14 participants
59 discussions

[B.A.T.M.A.N.] pull request: batman-adv 2011-05-08

by Sven Eckelmann

Hi, I would like to propose following patches for net-next-2.6/2.6.40. They include minor cleanups of comments, a big rename patch s/hna/tt/, but also a remove some duplicated code. The spinlock which protected the list of possible interfaces for batman-adv was completely replaced by rtnl_lock because we want to be in sync with the rest of the network stack and the extra spinlock made everything more complex without giving any additional feature (and rtnl_lock was already used everywhere). Related to this patch is also a fix which should prevent a deadlock between the sysfs code and the event listener. Also the reference counting in find_router was fixed when an error was detected after the refcounter was already increased. The only feature is the support for multiple vlans in the bridge loop detection code. I will submit a patch to remove the atomic_dec_not_zero from main.h after Linus accepted the patch you already saw. thanks, Sven The following changes since commit 32ae9b221e788413ce68feaae2ca39e406211a0a: batman-adv: Make bat_priv->primary_if an rcu protected pointer (2011-05-01 22:49:03 +0200) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Antonio Quartulli (1): batman-adv: rename everything from *hna* into *tt* (translation table) Daniele Furlan (1): batman-adv: remove duplicate code from function is_bidirectional_neigh() Marek Lindner (3): batman-adv: remove misplaced comment batman-adv: multi vlan support for bridge loop detection batman-adv: Fix refcount imbalance in find_router Sven Eckelmann (3): batman-adv: Remove unnecessary hardif_list_lock batman-adv: Avoid deadlock between rtnl_lock and s_active batman-adv: Remove multiline comments from line ending Documentation/networking/batman-adv.txt | 11 +- net/batman-adv/aggregation.c | 16 +- net/batman-adv/aggregation.h | 4 +- net/batman-adv/bat_debugfs.c | 4 +- net/batman-adv/bat_sysfs.c | 16 +- net/batman-adv/hard-interface.c | 36 +-- net/batman-adv/main.c | 20 +- net/batman-adv/main.h | 42 ++-- net/batman-adv/originator.c | 10 +- net/batman-adv/packet.h | 5 +- net/batman-adv/routing.c | 162 ++++++------- net/batman-adv/routing.h | 6 +- net/batman-adv/send.c | 16 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 409 +++++++++++++++++++++--------- net/batman-adv/translation-table.c | 417 ++++++++++++++++--------------- net/batman-adv/translation-table.h | 24 +- net/batman-adv/types.h | 49 +++-- net/batman-adv/unicast.c | 2 +- net/batman-adv/vis.c | 18 +- 20 files changed, 712 insertions(+), 557 deletions(-)

11 years, 10 months

[B.A.T.M.A.N.] Routing improvement taking into account links bit-rate

by Daniele Furlan

Hi all, as anticipated some weeks ago, I'm working on a modification of B.A.T.M.A.N. routing metric in order to take into account link bit-rate. As already exposed, in my opinion, it is important to consider bit-rate because there isn't any correlation between TQ and the physical capacity. I have called the new metric PCE (Physical Capacity Estimation), which is defined for each path as the minimum value of (tq_local * bit-rate) among all the link forming it. After a quick and dirty modification of the code, I've done some test on two simple topologies to verify whether there is an improvement or not. From this preliminary test seems that the improvement is remarkable. In the attached report there is a better explanation of the modification, and the results from the tests. Any comment will be appreciated!! Regards. -- Daniele Furlan

11 years, 10 months

[B.A.T.M.A.N.] [PATCH v2] batman-adv: remove duplicate code from function is_bidirectional_neigh()

by Daniele Furlan

Is there an error in the previous version. I'm sorry, this version instead works for me. Signed-off-by: Daniele Furlan <daniele.furlan(a)gmail.com> --- routing.c | 75 ++++++++++++++++++++---------------------------------------- 1 files changed, 25 insertions(+), 50 deletions(-) diff --git a/routing.c b/routing.c index 49f5715..c5dec8c 100644 --- a/routing.c +++ b/routing.c @@ -169,65 +169,40 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, uint8_t orig_eq_count, neigh_rq_count, tq_own; int tq_asym_penalty, ret = 0; - if (orig_node == orig_neigh_node) { - rcu_read_lock(); - hlist_for_each_entry_rcu(tmp_neigh_node, node, - &orig_node->neigh_list, list) { + /* find corresponding one hop neighbor */ + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, node, + &orig_neigh_node->neigh_list, list) { - if (!compare_eth(tmp_neigh_node->addr, - orig_neigh_node->orig)) - continue; + if (!compare_eth(tmp_neigh_node->addr, + orig_neigh_node->orig)) + continue; - if (tmp_neigh_node->if_incoming != if_incoming) - continue; + if (tmp_neigh_node->if_incoming != if_incoming) + continue; - if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) - continue; + if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + continue; - neigh_node = tmp_neigh_node; - } - rcu_read_unlock(); + neigh_node = tmp_neigh_node; + } + rcu_read_unlock(); - if (!neigh_node) - neigh_node = create_neighbor(orig_node, - orig_neigh_node, - orig_neigh_node->orig, - if_incoming); - if (!neigh_node) - goto out; + if (!neigh_node) + neigh_node = create_neighbor(orig_neigh_node, + orig_neigh_node, + orig_neigh_node->orig, + if_incoming); + if (!neigh_node) + goto out; + /* if orig_node is direct neighbour update neigh_node last_valid */ + if (orig_node == orig_neigh_node) neigh_node->last_valid = jiffies; - } else { - /* find packet count of corresponding one hop neighbor */ - rcu_read_lock(); - hlist_for_each_entry_rcu(tmp_neigh_node, node, - &orig_neigh_node->neigh_list, list) { - - if (!compare_eth(tmp_neigh_node->addr, - orig_neigh_node->orig)) - continue; - - if (tmp_neigh_node->if_incoming != if_incoming) - continue; - - if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) - continue; - - neigh_node = tmp_neigh_node; - } - rcu_read_unlock(); - - if (!neigh_node) - neigh_node = create_neighbor(orig_neigh_node, - orig_neigh_node, - orig_neigh_node->orig, - if_incoming); - if (!neigh_node) - goto out; - } orig_node->last_valid = jiffies; + /* find packet count of corresponding one hop neighbor */ spin_lock_bh(&orig_node->ogm_cnt_lock); orig_eq_count = orig_neigh_node->bcast_own_sum[if_incoming->if_num]; neigh_rq_count = neigh_node->real_packet_count; -- 1.7.1

11 years, 10 months

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove multiline comments from line ending

by Sven Eckelmann

It is slightly irritating that comments after a long line span over multiple lines without any code. It is easier to put them before the actual code and reduce the number of lines which the eye has to read. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- This patch makes batman-adv nearly checkpatch clean again - the other part was submitted to the checkpatch maintainer... maybe he fixes it now (informed him some months ago and got no reactions - maybe the patch helps him). main.h | 40 +++++++++++++++++++++------------------- packet.h | 3 +-- soft-interface.c | 4 ++-- types.h | 10 +++++----- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/main.h b/main.h index 4832f32..3ca3941 100644 --- a/main.h +++ b/main.h @@ -34,16 +34,18 @@ #define TQ_MAX_VALUE 255 #define JITTER 20 -#define TTL 50 /* Time To Live of broadcast messages */ -#define PURGE_TIMEOUT 200 /* purge originators after time in seconds if no - * valid packet comes in -> TODO: check - * influence on TQ_LOCAL_WINDOW_SIZE */ + /* Time To Live of broadcast messages */ +#define TTL 50 + +/* purge originators after time in seconds if no valid packet comes in + * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ +#define PURGE_TIMEOUT 200 #define TT_LOCAL_TIMEOUT 3600 /* in seconds */ -#define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator - * messages in squence numbers (should be a - * multiple of our word size) */ +/* sliding packet range of received originator messages in squence numbers + * (should be a multiple of our word size) */ +#define TQ_LOCAL_WINDOW_SIZE 64 #define TQ_GLOBAL_WINDOW_SIZE 5 #define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 #define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1 @@ -55,21 +57,20 @@ #define VIS_INTERVAL 5000 /* 5 seconds */ -/* how much worse secondary interfaces may be to - * to be considered as bonding candidates */ - +/* how much worse secondary interfaces may be to be considered as bonding + * candidates */ #define BONDING_TQ_THRESHOLD 50 -#define MAX_AGGREGATION_BYTES 512 /* should not be bigger than 512 bytes or - * change the size of - * forw_packet->direct_link_flags */ +/* should not be bigger than 512 bytes or change the size of + * forw_packet->direct_link_flags */ +#define MAX_AGGREGATION_BYTES 512 #define MAX_AGGREGATION_MS 100 #define SOFTIF_NEIGH_TIMEOUT 180000 /* 3 minutes */ +/* don't reset again within 30 seconds */ #define RESET_PROTECTION_MS 30000 #define EXPECTED_SEQNO_RANGE 65536 -/* don't reset again within 30 seconds */ #define MESH_INACTIVE 0 #define MESH_ACTIVE 1 @@ -84,12 +85,13 @@ #ifdef pr_fmt #undef pr_fmt #endif -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt /* Append 'batman-adv: ' before - * kernel messages */ +/* Append 'batman-adv: ' before kernel messages */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#define DBG_BATMAN 1 /* all messages related to routing / flooding / - * broadcasting / etc */ -#define DBG_ROUTES 2 /* route or tt entry added / changed / deleted */ +/* all messages related to routing / flooding / broadcasting / etc */ +#define DBG_BATMAN 1 +/* route or tt entry added / changed / deleted */ +#define DBG_ROUTES 2 #define DBG_ALL 3 diff --git a/packet.h b/packet.h index c225c3a..eda9965 100644 --- a/packet.h +++ b/packet.h @@ -128,8 +128,7 @@ struct vis_packet { uint8_t entries; /* number of entries behind this struct */ uint32_t seqno; /* sequence number */ uint8_t ttl; /* TTL */ - uint8_t vis_orig[6]; /* originator that informs about its - * neighbors */ + uint8_t vis_orig[6]; /* originator that announces its neighbors */ uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ } __packed; diff --git a/soft-interface.c b/soft-interface.c index ae10ecc..c76a33e 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -789,8 +789,8 @@ static void interface_setup(struct net_device *dev) * have not been initialized yet */ dev->mtu = ETH_DATA_LEN; - dev->hard_header_len = BAT_HEADER_LEN; /* reserve more space in the - * skbuff for our header */ + /* reserve more space in the skbuff for our header */ + dev->hard_header_len = BAT_HEADER_LEN; /* generate random address */ random_ether_addr(dev_addr); diff --git a/types.h b/types.h index 6b6c32e..fab70e8 100644 --- a/types.h +++ b/types.h @@ -89,11 +89,11 @@ struct orig_node { struct hlist_node hash_entry; struct bat_priv *bat_priv; unsigned long last_frag_packet; - spinlock_t ogm_cnt_lock; /* protects: bcast_own, bcast_own_sum, - * neigh_node->real_bits, - * neigh_node->real_packet_count */ - spinlock_t bcast_seqno_lock; /* protects bcast_bits, - * last_bcast_seqno */ + /* ogm_cnt_lock protects: bcast_own, bcast_own_sum, + * neigh_node->real_bits, neigh_node->real_packet_count */ + spinlock_t ogm_cnt_lock; + /* bcast_seqno_lock protects bcast_bits, last_bcast_seqno */ + spinlock_t bcast_seqno_lock; atomic_t bond_candidates; struct list_head bond_list; }; -- 1.7.5.1

11 years, 10 months

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Don't include bat_sysfs.h in compat.h

by Sven Eckelmann

bat_sysfs.h is included in compat.h to provide bat_attribute which is used in bat_wrapper_show and bat_wrapper_store. This could create a include loop which prevents that functions or datastructures defined elsewhere cannot be found in bat_sysfs.h when batman-adv gets compiled as external module, but are available when it is used as in-kernel module. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat.c | 29 +++++++++++++++++++++++++++++ compat.h | 26 ++++---------------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/compat.c b/compat.c index f4561c3..34b27a1 100644 --- a/compat.c +++ b/compat.c @@ -1,4 +1,33 @@ #include <linux/version.h> +#include "main.h" + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) + +#include "bat_sysfs.h" /* struct bat_attribute */ + +ssize_t bat_wrapper_show(struct kobject *kobj, struct attribute *attr, + char *buf) +{ + struct bat_attribute *bat_attr = to_battr(attr); + + if (bat_attr->show) + return bat_attr->show(kobj, attr, buf); + + return -EIO; +} + +ssize_t bat_wrapper_store(struct kobject *kobj, struct attribute *attr, + const char *buf, size_t count) +{ + struct bat_attribute *bat_attr = to_battr(attr); + + if (bat_attr->store) + return bat_attr->store(kobj, attr, (char *)buf, count); + + return -EIO; +} + +#endif /* < KERNEL_VERSION(2, 6, 25) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) diff --git a/compat.h b/compat.h index c3fd2cd..fb49f9d 100644 --- a/compat.h +++ b/compat.h @@ -26,7 +26,6 @@ #define _NET_BATMAN_ADV_COMPAT_H_ #include <linux/version.h> /* LINUX_VERSION_CODE */ -#include "bat_sysfs.h" /* struct bat_attribute */ #ifndef IPPROTO_UDP #define IPPROTO_UDP 17 @@ -107,28 +106,11 @@ static inline int skb_cow_head(struct sk_buff *skb, unsigned int headroom) #define to_battr(a) container_of(a, struct bat_attribute, attr) -static inline ssize_t bat_wrapper_show(struct kobject *kobj, - struct attribute *attr, char *buf) -{ - struct bat_attribute *bat_attr = to_battr(attr); +ssize_t bat_wrapper_show(struct kobject *kobj, struct attribute *attr, + char *buf); - if (bat_attr->show) - return bat_attr->show(kobj, attr, buf); - - return -EIO; -} - -static inline ssize_t bat_wrapper_store(struct kobject *kobj, - struct attribute *attr, - const char *buf, size_t count) -{ - struct bat_attribute *bat_attr = to_battr(attr); - - if (bat_attr->store) - return bat_attr->store(kobj, attr, (char *)buf, count); - - return -EIO; -} +ssize_t bat_wrapper_store(struct kobject *kobj, struct attribute *attr, + const char *buf, size_t count); static struct sysfs_ops bat_wrapper_ops = { .show = bat_wrapper_show, -- 1.7.5.1

11 years, 10 months

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix line over 80 characters

by Sven Eckelmann

160dd1399c4d589c0c5678a759e8ac7a7eefe64e introduced a line over 80 and can not be accepted according to the Linux Coding Style. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- translation-table.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/translation-table.c b/translation-table.c index 2bd6a31..7b72966 100644 --- a/translation-table.c +++ b/translation-table.c @@ -505,7 +505,8 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) goto out; } - seq_printf(seq, "Globally announced TT entries received via the mesh %s\n", + seq_printf(seq, + "Globally announced TT entries received via the mesh %s\n", net_dev->name); spin_lock_bh(&bat_priv->tt_ghash_lock); -- 1.7.5.1

11 years, 10 months

[B.A.T.M.A.N.] [PATCH] batctl: rename stuff from *hna* to *tt* (translation table)

by Antonio Quartulli

To be coherent, all the functions/variables/constats have been renamed to the TranslationTable style Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- README | 18 +++++++++--------- packet.h | 2 +- sys.c | 2 +- vis.c | 34 +++++++++++++++++----------------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README b/README index 8f22eb1..3311f05 100644 --- a/README +++ b/README @@ -312,7 +312,7 @@ Usage: batctl translocal|tl Example: $ batctl translocal -Locally retrieved addresses (from bat0) announced via HNA: +Locally retrieved addresses (from bat0) announced via TT: * d6:e0:fd:d9:00:00 batctl transglobal @@ -324,7 +324,7 @@ Usage: batctl transglobal|tg Example: -Globally announced HNAs received via the mesh (translation table): +Globally announced TT entries received via the mesh (translation table): * 16:aa:c4:a2:00:00 via fe:fe:00:00:09:01 * 5a:32:f9:df:00:00 via fe:fe:00:00:03:01 * 32:ae:5a:00:00:00 via fe:fe:00:00:04:01 @@ -356,9 +356,9 @@ display the VIS data in dot or JSON format Usage: -batctl vis dot {-h}{--no-HNA|-H} {--no-2nd|-2} {--numbers|-n} +batctl vis dot {-h}{--no-TT|-H} {--no-2nd|-2} {--numbers|-n} or -batctl vis json {-h}{--no-HNA|-H} {--no-2nd|-2} {--numbers|-n} +batctl vis json {-h}{--no-TT|-H} {--no-2nd|-2} {--numbers|-n} Example: @@ -367,19 +367,19 @@ Example: $ batctl vis_data dot digraph { "A" -> "B" [label="1.00"] - "A" -> "00:ff:f3:cc:68:ac" [label="HNA"] + "A" -> "00:ff:f3:cc:68:ac" [label="TT"] subgraph "cluster_A" { "A" [peripheries=2] } "B" -> "A" [label="1.00"] "B-if2" -> "C" [label="2.00"] - "B" -> "22:ff:f3:cc:68:ac" [label="HNA"] + "B" -> "22:ff:f3:cc:68:ac" [label="TT"] subgraph "cluster_B" { "B" [peripheries=2] "B-if2" } "C" -> "B-if2" [label="2.00"] - "C" -> "44:ff:f3:cc:68:ac" [label="HNA"] + "C" -> "44:ff:f3:cc:68:ac" [label="TT"] subgraph "cluster_C" { "C" [peripheries=2] } @@ -395,7 +395,7 @@ connection (100%), 2.0 means 50%, 3.0 means 33% and so on. A host's mac address which is currently connected to the interface of a mesh node (either the mesh node itself or hosts being bridged into the mesh) is -being displayed with an "HNA"-label. (--no-hna omits this output) +being displayed with an "TT"-label. (--no-TT omits this output) To still have the information about which interfaces belong to which mesh node a subgraph/cluster is being added. The subpgraph is being labeled with a mesh @@ -422,7 +422,7 @@ Meaning of the shapes in this image file: * Boxes: interfaces belonging to one BATMAN-node * double circled interfaces: the primary interface of a BATMAN-node (which is known to other BATMAN-nodes only, except direct neighbours) -* Ellipses with an HNA-arrow: mesh clients (this can be a BATMAN-node itself +* Ellipses with a TT-arrow: mesh clients (this can be a BATMAN-node itself with its bat0 interface or computers/devices being bridged into the mesh) * Arrows with numbers: the transmit quality (in the form 1/TQ) from one BATMAN interface to another BATMAN interface diff --git a/packet.h b/packet.h index e757187..c225c3a 100644 --- a/packet.h +++ b/packet.h @@ -61,7 +61,7 @@ struct batman_packet { uint8_t orig[6]; uint8_t prev_sender[6]; uint8_t ttl; - uint8_t num_hna; + uint8_t num_tt; uint8_t gw_flags; /* flags related to gateway class */ uint8_t align; } __packed; diff --git a/sys.c b/sys.c index 3511b40..f8fa1f2 100644 --- a/sys.c +++ b/sys.c @@ -213,7 +213,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) printf("[%c] %s (%d)\n", (line_ptr[0] == '1') ? 'x' : ' ', "messages related to routing / flooding / broadcasting", 1); printf("[%c] %s (%d)\n", (line_ptr[0] == '2') ? 'x' : ' ', - "messages related to route or hna added / changed / deleted", 2); + "messages related to route or tt entry added / changed / deleted", 2); printf("[%c] %s (%d)\n", (line_ptr[0] == '3') ? 'x' : ' ', "all debug messages", 3); diff --git a/vis.c b/vis.c index adb12d0..118c659 100644 --- a/vis.c +++ b/vis.c @@ -37,7 +37,7 @@ #define TQ_MAX_VALUE 255 typedef void (*print_tq_t) (char *orig, char *from, const long tq); -typedef void (*print_HNA_t) (char *orig, char *from); +typedef void (*print_TT_t) (char *orig, char *from); typedef void (*print_1st_t) (char *orig); typedef void (*print_2nd_t) (char *orig, char *from); typedef void (*print_header_t) (void); @@ -45,22 +45,22 @@ typedef void (*print_footer_t) (void); struct funcs { print_tq_t print_tq; - print_HNA_t print_HNA; + print_TT_t print_TT; print_1st_t print_1st; print_2nd_t print_2nd; print_header_t print_header; print_footer_t print_footer; }; -static bool with_HNA = true; +static bool with_TT = true; static bool with_2nd = true; static bool with_names = true; static void usage(void) { - printf("batctl vis_data dot {-h}{--no-HNA|-H} {--no-2nd|-2} {--numbers|-n}\n"); + printf("batctl vis_data dot {-h}{--no-TT|-H} {--no-2nd|-2} {--numbers|-n}\n"); printf("or\n"); - printf("batctl vis_data json {-h}{--no-HNA|-H} {--no-2nd|-2} {--numbers|-n}\n"); + printf("batctl vis_data json {-h}{--no-TT|-H} {--no-2nd|-2} {--numbers|-n}\n"); } static void dot_print_tq(char *orig, char *from, const long tq) @@ -75,11 +75,11 @@ static void dot_print_tq(char *orig, char *from, const long tq) int_part, frac_part); } -static void dot_print_HNA(char *orig, char *from) +static void dot_print_TT(char *orig, char *from) { printf("\t\"%s\" -> ", get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\"%s\" [label=\"HNA\"]\n", + printf("\"%s\" [label=\"TT\"]\n", get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); } @@ -114,7 +114,7 @@ static void dot_print_footer(void) } const struct funcs dot_funcs = { dot_print_tq, - dot_print_HNA, + dot_print_TT, dot_print_1st, dot_print_2nd, dot_print_header, @@ -133,11 +133,11 @@ static void json_print_tq(char *orig, char *from, const long tq) int_part, frac_part); } -static void json_print_HNA(char *orig, char *from) +static void json_print_TT(char *orig, char *from) { printf("{ \"router\" : \"%s\", ", get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\"gateway\" : \"%s\", \"label\" : \"HNA\" }\n", + printf("\"gateway\" : \"%s\", \"label\" : \"TT\" }\n", get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); } @@ -157,7 +157,7 @@ static void json_print_2nd(char *orig, char *from) } const struct funcs json_funcs = { json_print_tq, - json_print_HNA, + json_print_TT, json_print_1st, json_print_2nd, NULL, @@ -217,12 +217,12 @@ static int format(char *mesh_iface, const struct funcs *funcs) funcs->print_tq(orig, from, tq); continue; } - if (!strcmp(flag, "HNA")) { - /* We have an HNA record */ - if (!with_HNA) + if (!strcmp(flag, "TT")) { + /* We have a TT record */ + if (!with_TT) continue; from = strtok_r(NULL, " ", &component_save_ptr); - funcs->print_HNA(orig, from); + funcs->print_TT(orig, from); continue; } if (!strcmp(flag, "SEC") && with_2nd) { @@ -274,7 +274,7 @@ int vis_data(char *mesh_iface, int argc, char *argv[]) while (1) { int option_index = 0; static struct option long_options[] = { - {"no-HNA", 0, 0, 'H'}, + {"no-TT", 0, 0, 'H'}, {"no-2nd", 0, 0, '2'}, {"numbers", 0, 0, 'n'}, {0, 0, 0, 0} @@ -286,7 +286,7 @@ int vis_data(char *mesh_iface, int argc, char *argv[]) switch (c) { case 'H': - with_HNA = false; + with_TT = false; break; case '2': with_2nd = false; -- 1.7.3.4

11 years, 10 months

Re: [B.A.T.M.A.N.] mesh

by Sven Eckelmann

On Friday 06 May 2011 19:21:58 Jose Armando wrote: > Sorry seven here's is what looking for I would like to build a firmware > that work like mesh and I been told that Batman is the best I'm new one > this linux open source but I want to learn and I want to build mesh > firmware that work with this > 1 open ssid > 2 close ssid with wpa password > 3 mesh ssid by MAC addresses so I can mesh 20 routers > 4 used captival portal > Used Opendns So, do you want batman-adv or batmand or bmxd or bmx6? Why is one of the previous ones better then... lets say olsr or babeld. Do you want mesh for the backbone or for the actual clients? Do you want to use multiple interfaces? Why don't you use already existing solutions? What kind of router do you use? What do you mean by open ssid? How do you think is a ssid and wpa are related? What is a "ssid by MAC addresses"? Do you know what IBSS is? Why is a dns provider relevant? Are you able to build OpenWRT? Do you know what an OpenWRT feed is? Do you know how to build packages through OpenWRT feeds and integrate them in a OpenWRT image? Kind regards, Sven

11 years, 10 months

Re: [B.A.T.M.A.N.] mesh

by Sven Eckelmann

On Friday 06 May 2011 19:58:46 Sebastián D. Criado wrote: > El 06/05/11 14:39, Sven Eckelmann escribió: > > On Friday 06 May 2011 19:21:58 Jose Armando wrote: > >> Sorry seven here's is what looking for I would like to build a firmware > >> that work like mesh and I been told that Batman is the best I'm new one > >> this linux open source but I want to learn and I want to build mesh > >> firmware that work with this > >> 1 open ssid > >> 2 close ssid with wpa password > >> 3 mesh ssid by MAC addresses so I can mesh 20 routers > >> 4 used captival portal > >> Used Opendns > > Our development has everything he suggests. > > http://nightwing.lugro-mesh.org.ar/en/ > > Indeed. He knows this because it has been communicating with us for > assistance. > > http://lugro.org.ar/pipermail/nightwing/2011-February/000288.html > > I do not understand that says "i want to build" when it should say "im > using" > > In deed, today he communicated with us to offer a donation of equipment. Ok, so everything is already solved. Kind regards, Sven

11 years, 10 months

Re: [B.A.T.M.A.N.] mesh

by Sven Eckelmann

On Friday 06 May 2011 19:31:33 Jose Armando wrote: > Sven are u in usa? Not right now and propably not in the near future. Kind regards, Sven

11 years, 10 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2011