B.A.T.M.A.N May 2012

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

20 participants
51 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: clear ADD+DEL (and viceversa) events in the same orig-interval
by Antonio Quartulli 14 May '12

14 May '12

During an OGM-interval (time between two different OGM sendings) the same client could roam away and then roam back to us. In this case the node would add two events to the events list (that is going to be sent appended to the next OGM). A DEL one and an ADD one. Obviously they will only increase the overhead (either in the air and on the receiver side) and eventually trigger wrong states/events without producing any real effect. For this reason we can safely delete any ADD event with its related DEL one. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/translation-table.c b/translation-table.c index 2ecf3a2..c134a29 100644 --- a/translation-table.c +++ b/translation-table.c @@ -154,7 +154,9 @@ static void tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry) static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr, uint8_t flags) { - struct tt_change_node *tt_change_node; + struct tt_change_node *tt_change_node, *entry, *safe; + bool event_removed = false; + bool del_op_requested, del_op_entry; tt_change_node = kmalloc(sizeof(*tt_change_node), GFP_ATOMIC); @@ -164,13 +166,46 @@ static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr, tt_change_node->change.flags = flags; memcpy(tt_change_node->change.addr, addr, ETH_ALEN); + del_op_requested = flags & TT_CLIENT_DEL; + + /* check for ADD+DEL or DEL+ADD events */ spin_lock_bh(&bat_priv->tt_changes_list_lock); + list_for_each_entry_safe(entry, safe, &bat_priv->tt_changes_list, + list) { + if (!compare_eth(entry->change.addr, addr)) + continue; + + /* DEL+ADD in the same orig interval have no effect and can be + * removed to avoid silly behaviour on the receiver side. The + * other way around (ADD+DEL) can happen in case of roaming of + * a client still in the NEW state. Roaming of NEW clients is + * now possible due to automatically recognition of "temporary" + * clients + */ + del_op_entry = entry->change.flags & TT_CLIENT_DEL; + if (!del_op_requested && del_op_entry) + goto del; + else if (del_op_requested && !del_op_entry) + goto del; + else + continue; +del: + list_del(&entry->list); + kfree(entry); + event_removed = true; + goto unlock; + } + /* track the change in the OGMinterval list */ list_add_tail(&tt_change_node->list, &bat_priv->tt_changes_list); - atomic_inc(&bat_priv->tt_local_changes); + +unlock: spin_unlock_bh(&bat_priv->tt_changes_list_lock); - atomic_set(&bat_priv->tt_ogm_append_cnt, 0); + if (event_removed) + atomic_dec(&bat_priv->tt_local_changes); + else + atomic_inc(&bat_priv->tt_local_changes); } int tt_len(int changes_num) -- 1.7.9.4

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: beautify tt_global_add() argument list
by Antonio Quartulli 14 May '12

14 May '12

Instead of adding a new bool argument each time it is needed, it is better (and simpler) to pass an 8bit flag argument which contains all the needed flags Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 2 +- translation-table.c | 19 +++++++------------ translation-table.h | 3 +-- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/routing.c b/routing.c index e4d13dc..6c50b1d 100644 --- a/routing.c +++ b/routing.c @@ -686,7 +686,7 @@ int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if) roam_adv_packet->src, roam_adv_packet->client); tt_global_add(bat_priv, orig_node, roam_adv_packet->client, - atomic_read(&orig_node->last_ttvn) + 1, true, false); + TT_CLIENT_ROAM, atomic_read(&orig_node->last_ttvn) + 1); /* Roaming phase starts: I have new information but the ttvn has not * been incremented yet. This flag will make me check all the incoming diff --git a/translation-table.c b/translation-table.c index c134a29..e5b6f25 100644 --- a/translation-table.c +++ b/translation-table.c @@ -647,24 +647,22 @@ static void tt_global_add_orig_entry(struct tt_global_entry *tt_global_entry, /* caller must hold orig_node refcount */ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, - const unsigned char *tt_addr, uint8_t ttvn, bool roaming, - bool wifi) + const unsigned char *tt_addr, uint8_t flags, uint8_t ttvn) { struct tt_global_entry *tt_global_entry = NULL; + struct tt_orig_list_entry *orig_entry; int ret = 0; int hash_added; tt_global_entry = tt_global_hash_find(bat_priv, tt_addr); if (!tt_global_entry) { - tt_global_entry = kzalloc(sizeof(*tt_global_entry), - GFP_ATOMIC); + tt_global_entry = kzalloc(sizeof(*tt_global_entry), GFP_ATOMIC); if (!tt_global_entry) goto out; memcpy(tt_global_entry->common.addr, tt_addr, ETH_ALEN); - - tt_global_entry->common.flags = NO_FLAGS; + tt_global_entry->common.flags = flags; tt_global_entry->roam_at = 0; atomic_set(&tt_global_entry->common.refcount, 2); @@ -703,9 +701,6 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, ttvn); } - if (wifi) - tt_global_entry->common.flags |= TT_CLIENT_WIFI; - bat_dbg(DBG_TT, bat_priv, "Creating new global tt entry: %pM (via %pM)\n", tt_global_entry->common.addr, orig_node->orig); @@ -713,7 +708,7 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, out_remove: /* remove address from local hash if present */ tt_local_remove(bat_priv, tt_global_entry->common.addr, - "global tt received", roaming); + "global tt received", flags & TT_CLIENT_ROAM); ret = 1; out: if (tt_global_entry) @@ -1733,9 +1728,9 @@ static void _tt_update_changes(struct bat_priv *bat_priv, (tt_change + i)->flags & TT_CLIENT_ROAM); else if (!tt_global_add(bat_priv, orig_node, - (tt_change + i)->addr, ttvn, false, + (tt_change + i)->addr, (tt_change + i)->flags & - TT_CLIENT_WIFI)) + TT_CLIENT_WIFI, ttvn)) /* In case of problem while storing a * global_entry, we stop the updating * procedure without committing the diff --git a/translation-table.h b/translation-table.h index d6af2ba..d32f975 100644 --- a/translation-table.h +++ b/translation-table.h @@ -32,8 +32,7 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset); void tt_global_add_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, const unsigned char *tt_buff, int tt_buff_len); int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, - const unsigned char *addr, uint8_t ttvn, bool roaming, - bool wifi); + const unsigned char *addr, uint8_t flags, uint8_t ttvn); int tt_global_seq_print_text(struct seq_file *seq, void *offset); void tt_global_del_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, const char *message); -- 1.7.9.4

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: fix comment style and typo
by Antonio Quartulli 13 May '12

13 May '12

Fix to David's style Introduced by b46c60b9e1ee7a1909c542413a85875a750955d6 Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- This patch is for next routing.c | 3 ++- translation-table.c | 3 ++- unicast.c | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/routing.c b/routing.c index 2181a91..4f2059f 100644 --- a/routing.c +++ b/routing.c @@ -922,7 +922,8 @@ static int check_unicast_ttvn(struct bat_priv *bat_priv, sizeof(struct unicast_packet)); /* we don't have an updated route for this client, so we should - * not try to reroute the packet!! */ + * not try to reroute the packet!! + */ if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) return 1; diff --git a/translation-table.c b/translation-table.c index 88e4c8e..a66c2dc 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2122,7 +2122,8 @@ request_table: /* returns true whether we know that the client has moved from its old * originator to another one. This entry is kept is still kept for consistency - * purposes */ + * purposes + */ bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr) { struct tt_global_entry *tt_global_entry; diff --git a/unicast.c b/unicast.c index 62ea9f1..e5c7999 100644 --- a/unicast.c +++ b/unicast.c @@ -395,10 +395,11 @@ find_router: unicast_packet = (struct unicast_packet *)skb->data; - /* inform the destination ode that we are still missing a correct route + /* inform the destination node that we are still missing a correct route * for this client. The destination will receive this packet and will * try to reroute it because the ttvn contained in the header is less - * than the current one */ + * than the current one + */ if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) unicast_packet->ttvn = unicast_packet->ttvn - 1; -- 1.7.9.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Directly print to seq_file in vis
by Sven Eckelmann 13 May '12

13 May '12

The vis output doesn't need to be buffered in an character buffer before it can be send to the userspace program that reads from the vis debug file. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- vis.c | 228 ++++++++++++++++++++++++----------------------------------------- 1 file changed, 83 insertions(+), 145 deletions(-) diff --git a/vis.c b/vis.c index 6b7a1c0..3095c41 100644 --- a/vis.c +++ b/vis.c @@ -140,72 +140,117 @@ static void batadv_vis_data_insert_interface(const uint8_t *interface, hlist_add_head(&entry->list, if_list); } -static ssize_t batadv_vis_prim_sec(char *buff, const struct hlist_head *if_list) +static void batadv_vis_data_read_prim_sec(struct seq_file *seq, + const struct hlist_head *if_list) { struct if_list_entry *entry; struct hlist_node *pos; - size_t len = 0; hlist_for_each_entry(entry, pos, if_list, list) { if (entry->primary) - len += sprintf(buff + len, "PRIMARY, "); + seq_printf(seq, "PRIMARY, "); else - len += sprintf(buff + len, "SEC %pM, ", entry->addr); + seq_printf(seq, "SEC %pM, ", entry->addr); } - - return len; -} - -static size_t batadv_vis_cnt_prim_sec(struct hlist_head *if_list) -{ - struct if_list_entry *entry; - struct hlist_node *pos; - size_t count = 0; - - hlist_for_each_entry(entry, pos, if_list, list) { - if (entry->primary) - count += 9; - else - count += 23; - } - - return count; } /* read an entry */ -static ssize_t batadv_vis_data_read_entry(char *buff, +static ssize_t batadv_vis_data_read_entry(struct seq_file *seq, const struct vis_info_entry *entry, const uint8_t *src, bool primary) { - /* maximal length: max(4+17+2, 3+17+1+3+2) == 26 */ if (primary && entry->quality == 0) - return sprintf(buff, "TT %pM, ", entry->dest); + return seq_printf(seq, "TT %pM, ", entry->dest); else if (batadv_compare_eth(entry->src, src)) - return sprintf(buff, "TQ %pM %d, ", entry->dest, - entry->quality); + return seq_printf(seq, "TQ %pM %d, ", entry->dest, + entry->quality); return 0; } +static void batadv_vis_data_insert_interfaces(struct hlist_head *list, + struct vis_packet *packet, + struct vis_info_entry *entries) +{ + int i; + + for (i = 0; i < packet->entries; i++) { + if (entries[i].quality == 0) + continue; + + if (batadv_compare_eth(entries[i].src, packet->vis_orig)) + continue; + + batadv_vis_data_insert_interface(entries[i].src, list, false); + } +} + +static void batadv_vis_data_read_entries(struct seq_file *seq, + struct hlist_head *list, + struct vis_packet *packet, + struct vis_info_entry *entries) +{ + int i; + struct if_list_entry *entry; + struct hlist_node *pos; + + hlist_for_each_entry(entry, pos, list, list) { + seq_printf(seq, "%pM,", entry->addr); + + for (i = 0; i < packet->entries; i++) + batadv_vis_data_read_entry(seq, &entries[i], + entry->addr, entry->primary); + + /* add primary/secondary records */ + if (batadv_compare_eth(entry->addr, packet->vis_orig)) + batadv_vis_data_read_prim_sec(seq, list); + + seq_printf(seq, "\n"); + } +} + +static void batadv_vis_seq_print_text_bucket(struct seq_file *seq, + const struct hlist_head *head) +{ + struct hlist_node *node; + struct vis_info *info; + struct vis_packet *packet; + uint8_t *entries_pos; + struct vis_info_entry *entries; + struct if_list_entry *entry; + struct hlist_node *pos, *n; + + HLIST_HEAD(vis_if_list); + + hlist_for_each_entry_rcu(info, node, head, hash_entry) { + packet = (struct vis_packet *)info->skb_packet->data; + entries_pos = (uint8_t *)packet + sizeof(*packet); + entries = (struct vis_info_entry *)entries_pos; + + batadv_vis_data_insert_interface(packet->vis_orig, &vis_if_list, + true); + batadv_vis_data_insert_interfaces(&vis_if_list, packet, + entries); + batadv_vis_data_read_entries(seq, &vis_if_list, packet, + entries); + + hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, list) { + hlist_del(&entry->list); + kfree(entry); + } + } +} + int batadv_vis_seq_print_text(struct seq_file *seq, void *offset) { struct hard_iface *primary_if; - struct hlist_node *node; struct hlist_head *head; - struct vis_info *info; - struct vis_packet *packet; - struct vis_info_entry *entries; struct net_device *net_dev = (struct net_device *)seq->private; struct bat_priv *bat_priv = netdev_priv(net_dev); struct hashtable_t *hash = bat_priv->vis_hash; - HLIST_HEAD(vis_if_list); - struct if_list_entry *entry; - struct hlist_node *pos, *n; uint32_t i; - int j, ret = 0; + int ret = 0; int vis_server = atomic_read(&bat_priv->vis_mode); - size_t buff_pos, buf_size; - char *buff; primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) @@ -214,120 +259,13 @@ int batadv_vis_seq_print_text(struct seq_file *seq, void *offset) if (vis_server == VIS_TYPE_CLIENT_UPDATE) goto out; - buf_size = 1; - /* Estimate length */ spin_lock_bh(&bat_priv->vis_hash_lock); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; - - rcu_read_lock(); - hlist_for_each_entry_rcu(info, node, head, hash_entry) { - packet = (struct vis_packet *)info->skb_packet->data; - entries = (struct vis_info_entry *) - ((char *)packet + sizeof(*packet)); - - batadv_vis_data_insert_interface(packet->vis_orig, - &vis_if_list, true); - - for (j = 0; j < packet->entries; j++) { - if (entries[j].quality == 0) - continue; - if (batadv_compare_eth(entries[j].src, - packet->vis_orig)) - continue; - batadv_vis_data_insert_interface(entries[j].src, - &vis_if_list, - false); - } - - hlist_for_each_entry(entry, pos, &vis_if_list, list) { - buf_size += 18 + 26 * packet->entries; - - /* add primary/secondary records */ - if (batadv_compare_eth(entry->addr, - packet->vis_orig)) - buf_size += - batadv_vis_cnt_prim_sec(&vis_if_list); - - buf_size += 1; - } - - hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, - list) { - hlist_del(&entry->list); - kfree(entry); - } - } - rcu_read_unlock(); + batadv_vis_seq_print_text_bucket(seq, head); } - - buff = kmalloc(buf_size, GFP_ATOMIC); - if (!buff) { - spin_unlock_bh(&bat_priv->vis_hash_lock); - ret = -ENOMEM; - goto out; - } - buff[0] = '\0'; - buff_pos = 0; - - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - - rcu_read_lock(); - hlist_for_each_entry_rcu(info, node, head, hash_entry) { - packet = (struct vis_packet *)info->skb_packet->data; - entries = (struct vis_info_entry *) - ((char *)packet + sizeof(*packet)); - - batadv_vis_data_insert_interface(packet->vis_orig, - &vis_if_list, true); - - for (j = 0; j < packet->entries; j++) { - if (entries[j].quality == 0) - continue; - if (batadv_compare_eth(entries[j].src, - packet->vis_orig)) - continue; - batadv_vis_data_insert_interface(entries[j].src, - &vis_if_list, - false); - } - - hlist_for_each_entry(entry, pos, &vis_if_list, list) { - buff_pos += sprintf(buff + buff_pos, "%pM,", - entry->addr); - - for (j = 0; j < packet->entries; j++) - buff_pos += batadv_vis_data_read_entry( - buff + buff_pos, - &entries[j], - entry->addr, - entry->primary); - - /* add primary/secondary records */ - if (batadv_compare_eth(entry->addr, - packet->vis_orig)) - buff_pos += - batadv_vis_prim_sec(buff + buff_pos, - &vis_if_list); - - buff_pos += sprintf(buff + buff_pos, "\n"); - } - - hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, - list) { - hlist_del(&entry->list); - kfree(entry); - } - } - rcu_read_unlock(); - } - spin_unlock_bh(&bat_priv->vis_hash_lock); - seq_printf(seq, "%s", buff); - kfree(buff); - out: if (primary_if) batadv_hardif_free_ref(primary_if); -- 1.7.10

1 0

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Replace simple function like defines with functions
by Sven Eckelmann 13 May '12

13 May '12

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bat_debugfs.c | 5 +--- distributed-arp-table.c | 75 +++++++++++++++++++++++++++++++++-------------- distributed-arp-table.h | 8 ----- main.h | 37 +++++++++++++++-------- 4 files changed, 79 insertions(+), 46 deletions(-) diff --git a/bat_debugfs.c b/bat_debugfs.c index 004d94f..b4d622b 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -74,16 +74,13 @@ static int batadv_fdebug_log(struct debug_log *debug_log, const char *fmt, ...) return 0; } -int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...) +int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, va_list args) { - va_list args; char tmp_log_buf[256]; - va_start(args, fmt); vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args); batadv_fdebug_log(bat_priv->debug_log, "[%10u] %s", jiffies_to_msecs(jiffies), tmp_log_buf); - va_end(args); return 0; } diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 07ef1fe..ebe9969 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -32,6 +32,31 @@ #include "translation-table.h" #include "unicast.h" +static uint8_t *batadv_arp_hw_src(struct sk_buff *skb, int hdr_size) +{ + uint8_t *addr; + + addr = (uint8_t *)(skb->data + hdr_size); + addr += ETH_HLEN + sizeof(struct arphdr); + + return addr; +} + +static __be32 batadv_arp_ip_src(struct sk_buff *skb, int hdr_size) +{ + return *(__be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN); +} + +static uint8_t *batadv_arp_hw_dst(struct sk_buff *skb, int hdr_size) +{ + return batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN + 4; +} + +static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size) +{ + return *(__be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN * 2 + 4); +} + /* hash function to choose an entry in a hash table of given size. * hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ @@ -60,14 +85,19 @@ static void batadv_dbg_arp(struct bat_priv *bat_priv, struct sk_buff *skb, uint16_t type, int hdr_size, char *msg) { struct unicast_4addr_packet *unicast_4addr_packet; + __be32 src_ip, dst_ip; if (msg) batadv_dbg(DBG_DAT, bat_priv, "%s\n", msg); + src_ip = batadv_arp_ip_src(skb, hdr_size); + dst_ip = batadv_arp_ip_dst(skb, hdr_size); batadv_dbg(DBG_DAT, bat_priv, "ARP MSG = [src: %pM-%pI4 dst: %pM-%pI4]\n", - ARP_HW_SRC(skb, hdr_size), &ARP_IP_SRC(skb, hdr_size), - ARP_HW_DST(skb, hdr_size), &ARP_IP_DST(skb, hdr_size)); + batadv_arp_hw_src(skb, hdr_size), + &src_ip, + batadv_arp_hw_dst(skb, hdr_size), + &dst_ip); if (hdr_size == 0) return; @@ -383,8 +413,8 @@ static uint16_t batadv_arp_get_type(struct bat_priv *bat_priv, /* Check for bad reply/request. If the ARP message is not sane, DAT * will simply ignore it */ - ip_src = ARP_IP_SRC(skb, hdr_size); - ip_dst = ARP_IP_DST(skb, hdr_size); + ip_src = batadv_arp_ip_src(skb, hdr_size); + ip_dst = batadv_arp_ip_dst(skb, hdr_size); if (ipv4_is_loopback(ip_src) || ipv4_is_multicast(ip_src) || ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst)) goto out; @@ -418,9 +448,9 @@ bool batadv_dat_snoop_outgoing_arp_request(struct bat_priv *bat_priv, batadv_dbg_arp(bat_priv, skb, type, 0, "Parsing outgoing ARP REQUEST"); - ip_src = ARP_IP_SRC(skb, 0); - hw_src = ARP_HW_SRC(skb, 0); - ip_dst = ARP_IP_DST(skb, 0); + ip_src = batadv_arp_ip_src(skb, 0); + hw_src = batadv_arp_hw_src(skb, 0); + ip_dst = batadv_arp_ip_dst(skb, 0); primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) @@ -480,9 +510,9 @@ bool batadv_dat_snoop_incoming_arp_request(struct bat_priv *bat_priv, if (type != ARPOP_REQUEST) goto out; - hw_src = ARP_HW_SRC(skb, hdr_size); - ip_src = ARP_IP_SRC(skb, hdr_size); - ip_dst = ARP_IP_DST(skb, hdr_size); + hw_src = batadv_arp_hw_src(skb, hdr_size); + ip_src = batadv_arp_ip_src(skb, hdr_size); + ip_dst = batadv_arp_ip_dst(skb, hdr_size); batadv_dbg_arp(bat_priv, skb, type, hdr_size, "Parsing incoming ARP REQUEST"); @@ -538,10 +568,10 @@ bool batadv_dat_snoop_outgoing_arp_reply(struct bat_priv *bat_priv, batadv_dbg_arp(bat_priv, skb, type, 0, "Parsing outgoing ARP REPLY"); - hw_src = ARP_HW_SRC(skb, 0); - ip_src = ARP_IP_SRC(skb, 0); - hw_dst = ARP_HW_DST(skb, 0); - ip_dst = ARP_IP_DST(skb, 0); + hw_src = batadv_arp_hw_src(skb, 0); + ip_src = batadv_arp_ip_src(skb, 0); + hw_dst = batadv_arp_hw_dst(skb, 0); + ip_dst = batadv_arp_ip_dst(skb, 0); batadv_arp_neigh_update(bat_priv, ip_src, hw_src); batadv_arp_neigh_update(bat_priv, ip_dst, hw_dst); @@ -576,10 +606,10 @@ bool batadv_dat_snoop_incoming_arp_reply(struct bat_priv *bat_priv, batadv_dbg_arp(bat_priv, skb, type, hdr_size, "Parsing incoming ARP REPLY"); - hw_src = ARP_HW_SRC(skb, hdr_size); - ip_src = ARP_IP_SRC(skb, hdr_size); - hw_dst = ARP_HW_DST(skb, hdr_size); - ip_dst = ARP_IP_DST(skb, hdr_size); + hw_src = batadv_arp_hw_src(skb, hdr_size); + ip_src = batadv_arp_ip_src(skb, hdr_size); + hw_dst = batadv_arp_hw_dst(skb, hdr_size); + ip_dst = batadv_arp_ip_dst(skb, hdr_size); /* Update our internal cache with both the IP addresses we fetched from * the ARP reply @@ -601,6 +631,7 @@ bool batadv_dat_drop_broadcast_packet(struct bat_priv *bat_priv, { struct neighbour *n; const size_t bcast_len = sizeof(struct bcast_packet); + __be32 dst_ip; /* If this packet is an ARP_REQUEST and we already have the information * that it is going to ask, we can drop the packet @@ -608,19 +639,19 @@ bool batadv_dat_drop_broadcast_packet(struct bat_priv *bat_priv, if (!forw_packet->num_packets && (ARPOP_REQUEST == batadv_arp_get_type(bat_priv, forw_packet->skb, bcast_len))) { - n = neigh_lookup(&arp_tbl, - &ARP_IP_DST(forw_packet->skb, bcast_len), + dst_ip = batadv_arp_ip_dst(forw_packet->skb, bcast_len); + n = neigh_lookup(&arp_tbl, &dst_ip, forw_packet->if_incoming->soft_iface); /* check if we already know this neigh */ if (n && (n->nud_state & NUD_CONNECTED)) { batadv_dbg(DBG_DAT, bat_priv, "ARP Request for %pI4: fallback prevented\n", - &ARP_IP_DST(forw_packet->skb, bcast_len)); + &dst_ip); return true; } batadv_dbg(DBG_DAT, bat_priv, "ARP Request for %pI4: fallback\n", - &ARP_IP_DST(forw_packet->skb, bcast_len)); + &dst_ip); } return false; } diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 6b1d22c..47fe32f 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -29,14 +29,6 @@ #define DAT_ADDR_MAX ((dat_addr_t)~(dat_addr_t)0) -#define ARP_HW_SRC(skb, hdr_size) ((uint8_t *)(skb->data + hdr_size) + \ - ETH_HLEN + sizeof(struct arphdr)) -#define ARP_IP_SRC(skb, hdr_size) (*(__be32 *)(ARP_HW_SRC(skb, hdr_size) + \ - ETH_ALEN)) -#define ARP_HW_DST(skb, hdr_size) (ARP_HW_SRC(skb, hdr_size) + ETH_ALEN + 4) -#define ARP_IP_DST(skb, hdr_size) (*(__be32 *)(ARP_HW_SRC(skb, hdr_size) + \ - ETH_ALEN * 2 + 4)) - bool batadv_dat_snoop_outgoing_arp_request(struct bat_priv *bat_priv, struct sk_buff *skb); bool batadv_dat_snoop_incoming_arp_request(struct bat_priv *bat_priv, diff --git a/main.h b/main.h index 245323b..ea5d7d5 100644 --- a/main.h +++ b/main.h @@ -187,24 +187,37 @@ int batadv_algo_select(struct bat_priv *bat_priv, char *name); int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); #ifdef CONFIG_BATMAN_ADV_DEBUG -int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...) -__printf(2, 3); +int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, va_list args); + +static inline void batadv_vdbg(int type, struct bat_priv *bat_priv, + const char *fmt, va_list args) +{ + if (atomic_read(&bat_priv->log_level) & type) + batadv_debug_log(bat_priv, fmt, args); +} -#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 bat_priv *bat_priv __always_unused, - const char *fmt __always_unused, ...) + +static inline void batadv_vdbg(int type __always_unused, + struct bat_priv *bat_priv __always_unused, + const char *fmt __always_unused, + va_list args __always_unused) { } + #endif +__printf(3, 4) +static inline void batadv_dbg(int type, struct bat_priv *bat_priv, + const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + batadv_vdbg(type, bat_priv, fmt, args); + va_end(args); +} + #define bat_info(net_dev, fmt, arg...) \ do { \ struct net_device *_netdev = (net_dev); \ -- 1.7.10

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Mark only locally used symbol batadv_tt_local_crc as static
by Sven Eckelmann 13 May '12

13 May '12

29ccfec94d51f7725124786e29d023b212920661 changed the translation table code in such a way that it doesn't use the symbol tt_local_crc outside of translation-table.c Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- translation-table.c | 2 +- translation-table.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index f50e795..62dda2b 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1172,7 +1172,7 @@ static uint16_t batadv_tt_global_crc(struct bat_priv *bat_priv, } /* Calculates the checksum of the local table */ -uint16_t batadv_tt_local_crc(struct bat_priv *bat_priv) +static uint16_t batadv_tt_local_crc(struct bat_priv *bat_priv) { uint16_t total = 0, total_one; struct hashtable_t *hash = bat_priv->tt_local_hash; diff --git a/translation-table.h b/translation-table.h index 56e8016..7edc9df 100644 --- a/translation-table.h +++ b/translation-table.h @@ -41,7 +41,6 @@ void batadv_tt_global_del_orig(struct bat_priv *bat_priv, struct orig_node *batadv_transtable_search(struct bat_priv *bat_priv, const uint8_t *src, const uint8_t *addr); -uint16_t batadv_tt_local_crc(struct bat_priv *bat_priv); void batadv_tt_free(struct bat_priv *bat_priv); bool batadv_send_tt_response(struct bat_priv *bat_priv, struct tt_query_packet *tt_request); -- 1.7.10

1 0

[B.A.T.M.A.N.] Improving the roaming procedure: multiple roaming within one orig interval
by Antonio Quartulli 12 May '12

12 May '12

Hello people, as some of you may know, batman-adv has client fast-roaming support since version 2011.3.0. This technique has been introduced together with the new client announcement mechanism and it is described on its wikipage[0]. At the bottom of the same it is also written that multiple roaming of the same client within one originator interval are not supported. Right now I am working on a concept that would enable such possibility. I tried to summarise my ideas on the wiki as well[1] in order to share with you the solution I am thinking about. The document is still a draft and may not be 100% understandable. If you have time and you are curious enough to read the wiki, please drop me your feedback, it would really be appreciated :-) Thank you, [0] http://www.open-mesh.org/wiki/batman-adv/Client-roaming [1] http://www.open-mesh.org/wiki/batman-adv/MultipleRoaming -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara

2 2

[B.A.T.M.A.N.] Fwd: Batman-adv simple configuration example
by Pedro Nuno Costa Rodrigues 12 May '12

12 May '12

Hello again! First of all thank's Sven Eckelmann and Guido Iribarren for your replies and for the attention in my issue. I would like to say that i already found the solution, as you can see below. I couldn't split the radios on the wireless network, because i'm using only chips broadcom (and it isn't possible to have more than 1 radio interface). When i said that i only need a simple two router network, doesn't mean that i only going to use 2 routers... the gold is to use many of them in a mesh network, but i needed to start with a simple 2 mesh configuration router configuration. After some configuration, it worked correctly in ad-hoc mode... and to the clients access the mesh through wireless i´m going to use another router linked by cable (ethernet) using lan ports, with dd-wrt firmware (or something like that) as a AP -access point (only used to forward the signal to wireless). By cable it isn't necessary an access point, only plug the cable in batman-adv node. I'm using backfire (openwrt build): cat /home/pedro/backfire/feeds/packages/net/batman-adv/Makefile | grep 2012 # Copyright (C) 2010-2012 OpenWrt.org PKG_VERSION:=2012.0.0 BATCTL_VERSION:=2012.0.0 The batman-adv-devel version didn't work...: In the:https://dev.openwrt.org/wiki/GetSource downloaded: svn co svn://svn.openwrt.org/openwrt/trunk/ with this feed in feeds.conf.default: src-svn batman http://downloads.open-mesh.org/svn/openwrt-feed/ (i know this is a issue related with openwrt, but i must explain how i did) this is the version of the batman-adv-devel: cat /home/pedro/trunk/feeds/packages/net/batman-adv/Makefile | grep 2012 PKG_VERSION:=2012.1.0 BATCTL_VERSION:=2012.1.0 root@OpenWrt:~# batctl -v batctl 54b7d54 [batman-adv: master-b0f3829] the error was using the same configurations file (below) that worked with batman-adv backfire stable release: root@OpenWrt:/lib/batman-adv# batman-adv start /usr/sbin/batman-adv: eval: line 1: can't create/sys/class/net/bat0/mesh/orig_interval: nonexistent directory /usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/log_level: nonexistent directory /usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/bonding: nonexistent directory/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/fragmentation: nonexistent directory /usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/gw_bandwidth: nonexistent directory /usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/gw_mode: nonexistent directory/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/vis_mode: nonexistent directory /usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/ap_isolation: nonexistent directory I tryed to analyze if the problem was with the "crc16" lib in the configuration files, but it wasn't... the configuration files were like the backfire stable release... pedro@rodrigues:~/trunk/feeds/packages/net/batman-adv/files/lib/batman-adv$ vi config.sh #!/bin/sh bat_load_module(){ [ -d "/sys/module/batman_adv/" ] && return . /etc/functions.sh load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-batman-adv*} etc.......... This is a issue to analyze... Going back to the stable release that worked fine: this is the server file of batman-adv configuration(with # comment is the client version modifications): root@OpenWrt:/etc/config# vi batman-adv config 'mesh' 'bat0' option 'interfaces' 'wifi' option 'aggregated_ogms' '1' option 'ap_isolation' '0' option 'bonding' '0' option 'fragmentation' '1' option 'gw_bandwidth' '5mbit/1024kbit' #comented line in client mode option 'gw_mode' 'server' #'client' #option 'gw_sel_class' #option 'gw_sel_class' '2' option 'log_level' 'all' option 'orig_interval' '1000' option 'vis_mode' 'server' #option 'vis_mode' 'client' ------------------------------------ this is the dhcp configuration: root@OpenWrt:/etc/config# vi dhcp config dnsmasq option domainneeded 1 option boguspriv 1 option filterwin2k 0 # enable for dial on demand option localise_queries 1 option rebind_protection 1 # disable if upstream must serve RFC1918 addresses option rebind_localhost 1 # enable for RBL checking and similar services #list rebind_domain example.lan # whitelist RFC1918 responses for domains option local '/lan/' option domain 'lan' option expandhosts 1 option nonegcache 0 option authoritative 1 option readethers 1 option leasefile '/tmp/dhcp.leases' option resolvfile '/tmp/resolv.conf.auto' #list server '/mycompany.local/1.2.3.4' #option nonwildcard 1 #list interface br-lan #list notinterface lo #list bogusnxdomain '64.94.110.11' config dhcp lan option interface lan option start 51 option limit 70 #option leasetime 12h option force 1 #this line is only for server router, the #one who is going to distribute the IP's to the clients config dhcp wan option interface wan option ignore 1 ____________________________________ this is the network file configuration: root@OpenWrt:/etc/config# vi network #### VLAN configurationconfig switch eth0 option enable 1 config switch_vlan eth0 0 option device "eth0" option vlan 0 option ports "1 2 3 4 5" config switch_vlan eth0_1 option device "eth0" option vlan 1 option ports "0 5" #### Loopback configuration config interface loopback option ifname "lo" option proto static option ipaddr 127.0.0.1 option netmask 255.0.0.0 #### LAN configuration config interface lan option type bridge option ifname "eth0.0 bat0 wlan0" option proto static option ipaddr 10.3.1.1 #10.3.1.X for other routers option netmask 255.255.255.0 option broadcast 10.3.1.255 option mtu 1500 #### WLAN configuration config interface wifi option proto none option ifname "wlan0" #option ipaddr 10.1.1.1 #option netmask 255.255.255.0 option mtu 1528 #### WAN configuration config interface wan option ifname "eth0.1" option proto dhcp ________________________________- this is the wireless file configuration: root@OpenWrt:/etc/config# vi wireless config wifi-device radio0 option type mac80211 option channel 6 option phy phy0 option hwmode 11g option country PT option txpower 20 option disabled 0 config wifi-iface option device radio0 option network wifi option mode adhoc option ssid PR option bssid XX:XX:XX:XX:XX:XX #the bssid must be the same in all routers option encryption none ______________________________________- all these configuration files are located in "/etc/config". As you can see the mesh interface is the wireless "wifi": the bat0 interface it appears only in the lan bridge; and it worked fine. root@OpenWrt:/etc/config# batctl if wlan0: active root@OpenWrt:/etc/config# batctl o [B.A.T.M.A.N. adv 2012.0.0, MainIF/MAC: wlan0/00:13:10:7c:da:73 (bat0)] Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ...00:06:25:00:63:7b 0.228s (246) 00:06:25:00:63:7b [ wlan0]: 00:06:25:00:63:7b (246) root@OpenWrt:/etc/config# batctl vd dot digraph { "00:13:10:7c:da:73" -> "00:06:25:00:63:7b" [label="1.000"] "00:13:10:7c:da:73" -> "76:0f:22:e4:5f:d8" [label="TT"] subgraph "cluster_00:13:10:7c:da:73" { "00:13:10:7c:da:73" [peripheries=2] } "00:06:25:00:63:7b" -> "00:13:10:7c:da:73" [label="1.214"] "00:06:25:00:63:7b" -> "56:71:dc:31:13:2c" [label="TT"] subgraph "cluster_00:06:25:00:63:7b" { "00:06:25:00:63:7b" [peripheries=2] } } using the xdot ubuntu application it made the figure (.png) that shows the batman-adv mesh picture. The only thing that didn't start with the boot of the routers was the: -option 'gw_bandwidth' '5mbit/1024kbit' -option 'gw_mode' 'server' -option 'vis_mode' 'server' it was necessary to start manually... the rest worked weel in the boot.Just one thing before i forget... the router "server" must be the first one to start (switch on)... we must wait until it finish the boot and then we can start the client router... (the problem is probably the definition who is the master -IP distribution and so on...)(i used the "option force 1 in the dhcp configuration file, but didn't worked...) if we start the client first it will not be possible to access the internet, supposed the ISP is connected with the "server" router... the ad-hoc mode and the mesh network works the same way (works fine)... is a issue to study (yes i know that is a openwrt problem, and there are a bunch of openwrt problems here).My gold is to contribute with something here, and to get my job done as well. For now i stay here, and thank you for your lights and publications, they helped me a lot!! Best regards,Pedro Rodrigues - Portugal

3 4

Re: [B.A.T.M.A.N.] Batman-adv simple configuration example
by Pedro Nuno Costa Rodrigues 12 May '12

12 May '12

Hello again! First of all thank's Sven Eckelmann and Guido Iribarren for your replies and for the attention in my issue. I would like to say that i already found the solution, as you can see below. I couldn't split the radios on the wireless network, because i'm using only chips broadcom (and it isn't possible to have more than 1 radio interface). When i said that i only need a simple two router network, doesn't mean that i only going to use 2 routers... the gold is to use many of them in a mesh network, but i needed to start with a simple 2 mesh configuration router configuration. After some configuration, it worked correctly in ad-hoc mode... and to the clients access the mesh through wireless i´m going to use another router linked by cable (ethernet) using lan ports, with dd-wrt firmware (or something like that) as a AP -access point (only used to forward the signal to wireless). By cable it isn't necessary an access point, only plug the cable in batman-adv node. I'm using backfire (openwrt build): cat /home/pedro/backfire/feeds/packages/net/batman-adv/Makefile | grep 2012# Copyright (C) 2010-2012 OpenWrt.orgPKG_VERSION:=2012.0.0BATCTL_VERSION:=2012.0.0 The batman-adv-devel version didn't work...: In the:https://dev.openwrt.org/wiki/GetSource downloaded: svn co svn://svn.openwrt.org/openwrt/trunk/ with this feed in feeds.conf.default:src-svn batman http://downloads.open-mesh.org/svn/openwrt-feed/ (i know this is a issue related with openwrt, but i must explain how i did) this is the version of the batman-adv-devel:cat /home/pedro/trunk/feeds/packages/net/batman-adv/Makefile | grep 2012PKG_VERSION:=2012.1.0BATCTL_VERSION:=2012.1.0 root@OpenWrt:~# batctl -vbatctl 54b7d54 [batman-adv: master-b0f3829] the error was using the same configurations file (below) that worked with batman-adv backfire stable release: root@OpenWrt:/lib/batman-adv# batman-adv start/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/orig_interval: nonexistent directory/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/log_level: nonexistent directory/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/bonding: nonexistent directory/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/fragmentation: nonexistent directory/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/gw_bandwidth: nonexistent directory/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/gw_mode: nonexistent directory/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/vis_mode: nonexistent directory/usr/sbin/batman-adv: eval: line 1: can't create /sys/class/net/bat0/mesh/ap_isolation: nonexistent directory I tryed to analyze if the problem was with the "crc16" lib in the configuration files, but it wasn't... the configuration files were like the backfire stable release... pedro@rodrigues:~/trunk/feeds/packages/net/batman-adv/files/lib/batman-adv$ vi config.sh #!/bin/sh bat_load_module(){ [ -d "/sys/module/batman_adv/" ] && return . /etc/functions.sh load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-batman-adv*} etc.......... This is a issue to analyze... Going back to the stable release that worked fine: this is the server file of batman-adv configuration(with # comment is the client version modifications): root@OpenWrt:/etc/config# vi batman-advconfig 'mesh' 'bat0' option 'interfaces' 'wifi' option 'aggregated_ogms' '1' option 'ap_isolation' '0' option 'bonding' '0' option 'fragmentation' '1' option 'gw_bandwidth' '5mbit/1024kbit' #comented line in client mode option 'gw_mode' 'server' #'client' #option 'gw_sel_class' #option 'gw_sel_class' '2' option 'log_level' 'all' option 'orig_interval' '1000' option 'vis_mode' 'server' #option 'vis_mode' 'client' ------------------------------------ this is the dhcp configuration: root@OpenWrt:/etc/config# vi dhcpconfig dnsmasq option domainneeded 1 option boguspriv 1 option filterwin2k 0 # enable for dial on demand option localise_queries 1 option rebind_protection 1 # disable if upstream must serve RFC1918 addresses option rebind_localhost 1 # enable for RBL checking and similar services #list rebind_domain example.lan # whitelist RFC1918 responses for domains option local '/lan/' option domain 'lan' option expandhosts 1 option nonegcache 0 option authoritative 1 option readethers 1 option leasefile '/tmp/dhcp.leases' option resolvfile '/tmp/resolv.conf.auto' #list server '/mycompany.local/1.2.3.4' #option nonwildcard 1 #list interface br-lan #list notinterface lo #list bogusnxdomain '64.94.110.11' config dhcp lan option interface lan option start 51 option limit 70 #option leasetime 12h option force 1 #this line is only for server router, the #one who is going to distribute the IP's to the clients config dhcp wan option interface wan option ignore 1 ____________________________________ this is the network file configuration: root@OpenWrt:/etc/config# vi network#### VLAN configurationconfig switch eth0 option enable 1 config switch_vlan eth0_0 option device "eth0" option vlan 0 option ports "1 2 3 4 5" config switch_vlan eth0_1 option device "eth0" option vlan 1 option ports "0 5" #### Loopback configurationconfig interface loopback option ifname "lo" option proto static option ipaddr 127.0.0.1 option netmask 255.0.0.0 #### LAN configurationconfig interface lan option type bridge option ifname "eth0.0 bat0 wlan0" option proto static option ipaddr 10.3.1.1 #10.3.1.X for other routers option netmask 255.255.255.0 option broadcast 10.3.1.255 option mtu 1500 #### WLAN configurationconfig interface wifi option proto none option ifname "wlan0" #option ipaddr 10.1.1.1 #option netmask 255.255.255.0 option mtu 1528 #### WAN configuration config interface wan option ifname "eth0.1" option proto dhcp ________________________________- this is the wireless file configuration: root@OpenWrt:/etc/config# vi wirelessconfig wifi-device radio0 option type mac80211 option channel 6 option phy phy0 option hwmode 11g option country PT option txpower 20 option disabled 0 config wifi-iface option device radio0 option network wifi option mode adhoc option ssid PR option bssid XX:XX:XX:XX:XX:XX #the bssid must be the same in all routers option encryption none ______________________________________- all these configuration files are located in "/etc/config". As you can see the mesh interface is the wireless "wifi":the bat0 interface it appears only in the lan bridge;and it worked fine. root@OpenWrt:/etc/config# batctl if wlan0: active root@OpenWrt:/etc/config# batctl o [B.A.T.M.A.N. adv 2012.0.0, MainIF/MAC: wlan0/00:13:10:7c:da:73 (bat0)] Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ...00:06:25:00:63:7b 0.228s (246) 00:06:25:00:63:7b [ wlan0]: 00:06:25:00:63:7b (246) root@OpenWrt:/etc/config# batctl vd dotdigraph { "00:13:10:7c:da:73" -> "00:06:25:00:63:7b" [label="1.000"] "00:13:10:7c:da:73" -> "76:0f:22:e4:5f:d8" [label="TT"] subgraph "cluster_00:13:10:7c:da:73" { "00:13:10:7c:da:73" [peripheries=2] } "00:06:25:00:63:7b" -> "00:13:10:7c:da:73" [label="1.214"] "00:06:25:00:63:7b" -> "56:71:dc:31:13:2c" [label="TT"] subgraph "cluster_00:06:25:00:63:7b" { "00:06:25:00:63:7b" [peripheries=2] }} using the xdot ubuntu application it made the figure (.png) that shows the batman-adv mesh picture. The only thing that didn't start with the boot of the routers was the:-option 'gw_bandwidth' '5mbit/1024kbit'-option 'gw_mode' 'server'-option 'vis_mode' 'server' it was necessary to start manually... the rest worked weel in the boot.Just one thing before i forget... the router "server" must be the first one to start (switch on)... we must wait until it finish the boot and then we can start the client router...(the problem is probably the definition who is the master -IP distribution and so on...)(i used the "option force 1 in the dhcp configuration file, but didn't worked...) if we start the client first it will not be possible to access the internet, supposed the ISP is connected with the "server" router... the ad-hoc mode and the mesh network works the same way (works fine)... is a issue to study (yes i know that is a openwrt problem, and there are a bunch of openwrt problems here).My gold is to contribute with something here, and to get my job done as well. For now i stay here, and thank you for your lights and publications, they helped me a lot!! Best regards,Pedro Rodrigues - Portugal

3 4

[B.A.T.M.A.N.] pull request: batman-adv 2012-05-11
by Antonio Quartulli 11 May '12

11 May '12

Hello David, this is a fixed version of the pull request issued on 2012-05-09. Comments introduced in this patchset are not following the net-tree guidelines. Another patch changing all the already existing comments will follow later. New exported functions follow the new name convention we discussed so far. A patch renaming all the existing exported functions will follow. Please let me know if there is any problem. Thank you, Antonio The following changes since commit 06a4c1c55dbe5d9f7a708e8f1a52fd2ac8e5874f: 6lowpan: IPv6 link local address (2012-05-10 23:38:22 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 35c133a000d54b7e3fe81e8c8e4b8af5878ad6dd: batman-adv: add contributor name (2012-05-11 13:56:08 +0200) ---------------------------------------------------------------- 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 ---------------------------------------------------------------- Antonio Quartulli (3): batman-adv: fix wrong dhcp option list browsing batman-adv: update copyright years batman-adv: add contributor name Linus Luessing (1): batman-adv: Adding hard_iface specific sysfs wrapper macros for UINT Marek Lindner (11): 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 net/batman-adv/bat_debugfs.c | 4 +- net/batman-adv/bat_iv_ogm.c | 176 +++++++++++++++++++++----------- net/batman-adv/bat_sysfs.c | 100 +++++++++++++----- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/bridge_loop_avoidance.h | 2 +- net/batman-adv/gateway_client.c | 6 +- net/batman-adv/hard-interface.c | 117 +-------------------- net/batman-adv/main.c | 124 +++++++++++++++++++++- net/batman-adv/main.h | 6 ++ net/batman-adv/originator.c | 51 +++++---- net/batman-adv/originator.h | 7 +- net/batman-adv/packet.h | 1 + net/batman-adv/routing.c | 22 ++-- net/batman-adv/routing.h | 4 +- net/batman-adv/send.c | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 17 ++- 18 files changed, 380 insertions(+), 265 deletions(-)

3 17

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2012