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

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

17 participants
55 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: only drop packets of known wifi clients
by Marek Lindner 22 Jun '12

22 Jun '12

If the source or destination mac address of an ethernet packet could not be found in the translation table the packet was dropped if AP isolation was turned on. This behavior would make it impossible to send broadcast packets over the mesh as the broadcast address will never enter the translation table. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- This patch is for maint and possibly for stable. translation-table.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/translation-table.c b/translation-table.c index a66c2dc..660c40f 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2031,10 +2031,10 @@ bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst) { struct tt_local_entry *tt_local_entry = NULL; struct tt_global_entry *tt_global_entry = NULL; - bool ret = true; + bool ret = false; if (!atomic_read(&bat_priv->ap_isolation)) - return false; + goto out; tt_local_entry = tt_local_hash_find(bat_priv, dst); if (!tt_local_entry) @@ -2044,10 +2044,10 @@ bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst) if (!tt_global_entry) goto out; - if (_is_ap_isolated(tt_local_entry, tt_global_entry)) + if (!_is_ap_isolated(tt_local_entry, tt_global_entry)) goto out; - ret = false; + ret = true; out: if (tt_global_entry) -- 1.7.9.1

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Add the backbone gateway list to debugfs
by Simon Wunderlich 22 Jun '12

22 Jun '12

This is especially useful if there are no claims yet, but we still want to know which gateways are using bridge loop avoidance in the network. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- bridge_loop_avoidance.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ bridge_loop_avoidance.h | 8 ++++++ debugfs.c | 12 +++++++++ 3 files changed, 88 insertions(+) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 38aab1e..f3c6dc0 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1592,3 +1592,71 @@ out: batadv_hardif_free_ref(primary_if); return ret; } + +int batadv_bla_gw_table_seq_print_text(struct seq_file *seq, void *offset) +{ + struct net_device *net_dev = (struct net_device *)seq->private; + struct batadv_priv *bat_priv = netdev_priv(net_dev); + struct batadv_hashtable *hash = bat_priv->backbone_hash; + struct batadv_backbone_gw *backbone_gw; + struct batadv_hard_iface *primary_if; + struct hlist_node *node; + struct hlist_head *head; + int last_seen_secs; + int last_seen_msecs; + uint32_t i; + bool is_own; + int ret = 0; + uint8_t *primary_addr; + + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if) { + ret = seq_printf(seq, + "BATMAN mesh %s disabled - please specify interfaces to enable it\n", + net_dev->name); + goto out; + } + + if (primary_if->if_status != BATADV_IF_ACTIVE) { + ret = seq_printf(seq, + "BATMAN mesh %s disabled - primary interface not active\n", + net_dev->name); + goto out; + } + + primary_addr = primary_if->net_dev->dev_addr; + seq_printf(seq, + "Backbones announced for the mesh %s (orig %pM, group id %04x)\n", + net_dev->name, primary_addr, + ntohs(bat_priv->claim_dest.group)); + seq_printf(seq, " %-17s %-5s %-9s (%-4s)\n", + "Originator", "VID", "last seen", "CRC"); + for (i = 0; i < hash->size; i++) { + head = &hash->table[i]; + + rcu_read_lock(); + hlist_for_each_entry_rcu(backbone_gw, node, head, hash_entry) { + last_seen_msecs = jiffies_to_msecs(jiffies - + backbone_gw->lasttime); + last_seen_secs = last_seen_msecs / 1000; + last_seen_msecs = last_seen_msecs % 1000; + + + is_own = batadv_compare_eth(backbone_gw->orig, + primary_addr); + if (is_own) + continue; + + seq_printf(seq, + " * %pM on % 5d % 4i.%03is (%04x)\n", + backbone_gw->orig, backbone_gw->vid, + last_seen_secs, last_seen_msecs, + backbone_gw->crc); + } + rcu_read_unlock(); + } +out: + if (primary_if) + batadv_hardif_free_ref(primary_if); + return ret; +} diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 08d13cb..58015ce 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -26,6 +26,8 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid); int batadv_bla_is_backbone_gw(struct sk_buff *skb, struct batadv_orig_node *orig_node, int hdr_size); int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); +int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, + void *offset); int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig); int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct batadv_bcast_packet *bcast_packet, @@ -64,6 +66,12 @@ static inline int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, return 0; } +static inline int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, + void *offset) +{ + return 0; +} + static inline int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig) { diff --git a/debugfs.c b/debugfs.c index e45cf0e..ee8b322 100644 --- a/debugfs.c +++ b/debugfs.c @@ -263,6 +263,15 @@ static int batadv_bla_claim_table_open(struct inode *inode, struct file *file) return single_open(file, batadv_bla_claim_table_seq_print_text, net_dev); } + +static int batadv_bla_backbone_table_open(struct inode *inode, + struct file *file) +{ + struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_bla_backbone_table_seq_print_text, + net_dev); +} + #endif static int batadv_transtable_local_open(struct inode *inode, struct file *file) @@ -301,6 +310,8 @@ static BATADV_DEBUGINFO(transtable_global, S_IRUGO, batadv_transtable_global_open); #ifdef CONFIG_BATMAN_ADV_BLA static BATADV_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open); +static BATADV_DEBUGINFO(bla_backbone_table, S_IRUGO, + batadv_bla_backbone_table_open); #endif static BATADV_DEBUGINFO(transtable_local, S_IRUGO, batadv_transtable_local_open); @@ -312,6 +323,7 @@ static struct batadv_debuginfo *batadv_mesh_debuginfos[] = { &batadv_debuginfo_transtable_global, #ifdef CONFIG_BATMAN_ADV_BLA &batadv_debuginfo_bla_claim_table, + &batadv_debuginfo_bla_backbone_table, #endif &batadv_debuginfo_transtable_local, &batadv_debuginfo_vis_data, -- 1.7.10

3 13

[B.A.T.M.A.N.] [PATCH] batman-adv: prepend BATADV_ in front of the TT_OGM_APPEND_MAX in comments
by Antonio Quartulli 22 Jun '12

22 Jun '12

Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- patch based on top of next translation-table.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index b6931d0..ab7618a 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2292,7 +2292,8 @@ void batadv_tt_update_orig(struct batadv_priv *bat_priv, if ((!orig_node->tt_initialised && ttvn == 1) || ttvn - orig_ttvn == 1) { /* the OGM could not contain the changes due to their size or - * because they have already been sent TT_OGM_APPEND_MAX times. + * because they have already been sent BATADV_TT_OGM_APPEND_MAX + * times. * In this case send a tt request */ if (!tt_num_changes) { -- 1.7.9.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: prepend BATADV_ to TT flags in comments
by Antonio Quartulli 22 Jun '12

22 Jun '12

After having added the BATADV_ prefix to all the TT_CLIENT flags, we have to add the same prefix in every comment where they are mentioned. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- this patch is based on top of next. It should be merged into next in order to fix the patch adding the prefix in front of the TT flags packet.h | 2 +- translation-table.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packet.h b/packet.h index c0ed5b4..8d3e55a 100644 --- a/packet.h +++ b/packet.h @@ -77,7 +77,7 @@ enum batadv_tt_query_flags { BATADV_TT_FULL_TABLE = 1 << 2, }; -/* TT_CLIENT flags. +/* BATADV_TT_CLIENT flags. * Flags from 1 to 1 << 7 are sent on the wire, while flags from 1 << 8 to * 1 << 15 are used for local computation only */ diff --git a/translation-table.c b/translation-table.c index 2a6d7d6..b6931d0 100644 --- a/translation-table.c +++ b/translation-table.c @@ -245,7 +245,7 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (tt_local_entry) { tt_local_entry->last_seen = jiffies; - /* possibly unset the TT_CLIENT_PENDING flag */ + /* possibly unset the BATADV_TT_CLIENT_PENDING flag */ tt_local_entry->common.flags &= ~BATADV_TT_CLIENT_PENDING; goto out; } @@ -713,8 +713,8 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, } else { /* there is already a global entry, use this one. */ - /* If there is the TT_CLIENT_ROAM flag set, there is only one - * originator left in the list and we previously received a + /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only + * one originator left in the list and we previously received a * delete + roaming change for this originator. * * We should first delete the old originator before adding the @@ -889,8 +889,8 @@ batadv_tt_global_del_struct(struct batadv_priv *bat_priv, } /* If the client is to be deleted, we check if it is the last origantor entry - * within tt_global entry. If yes, we set the TT_CLIENT_ROAM flag and the timer, - * otherwise we simply remove the originator scheduled for deletion. + * within tt_global entry. If yes, we set the BATADV_TT_CLIENT_ROAM flag and the + * timer, otherwise we simply remove the originator scheduled for deletion. */ static void batadv_tt_global_del_roaming(struct batadv_priv *bat_priv, @@ -958,7 +958,7 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, * event, there are two possibilities: * 1) the client roamed from node A to node B => if there * is only one originator left for this client, we mark - * it with TT_CLIENT_ROAM, we start a timer and we + * it with BATADV_TT_CLIENT_ROAM, we start a timer and we * wait for node B to claim it. In case of timeout * the entry is purged. * @@ -2148,7 +2148,7 @@ out: return changed_num; } -/* Purge out all the tt local entries marked with TT_CLIENT_PENDING */ +/* Purge out all the tt local entries marked with BATADV_TT_CLIENT_PENDING */ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) { struct batadv_hashtable *hash = bat_priv->tt_local_hash; -- 1.7.9.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove space before semicolon
by Sven Eckelmann 22 Jun '12

22 Jun '12

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- This one is for next... thx hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash.c b/hash.c index 2b16381..0759c70 100644 --- a/hash.c +++ b/hash.c @@ -73,6 +73,6 @@ void batadv_hash_set_lock_class(struct batadv_hashtable *hash, { uint32_t i; - for (i = 0 ; i < hash->size; i++) + for (i = 0; i < hash->size; i++) lockdep_set_class(&hash->list_locks[i], key); } -- 1.7.10

2 2

[B.A.T.M.A.N.] [PATCH] batctl: tcpdump support for bla2 claim packets
by Marek Lindner 22 Jun '12

22 Jun '12

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- tcpdump.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 2 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index 302085b..cbae9bb 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -90,9 +90,75 @@ static int print_time(void) return 1; } -static void dump_arp(unsigned char *packet_buff, ssize_t buff_len, int time_printed) +static int dump_bla2_claim(struct ether_header *eth_hdr, + struct ether_arp *arphdr, int read_opt) +{ + uint8_t bla_claim_magic[3] = {0xff, 0x43, 0x05}; + struct batadv_bla_claim_dst *bla_dst; + int arp_is_bla2_claim = 0; + uint8_t *hw_src, *hw_dst; + + if (arphdr->ea_hdr.ar_hrd != htons(ARPHRD_ETHER)) + goto out; + + if (arphdr->ea_hdr.ar_pro != htons(ETH_P_IP)) + goto out; + + if (arphdr->ea_hdr.ar_hln != ETH_ALEN) + goto out; + + if (arphdr->ea_hdr.ar_pln != 4) + goto out; + + hw_src = arphdr->arp_sha; + hw_dst = arphdr->arp_tha; + bla_dst = (struct batadv_bla_claim_dst *)hw_dst; + + if (memcmp(bla_dst->magic, bla_claim_magic, sizeof(bla_claim_magic)) != 0) + goto out; + + switch (bla_dst->type) { + case BATADV_CLAIM_TYPE_ADD: + printf("BLA CLAIM, backbone %s, ", + get_name_by_macaddr((struct ether_addr *)hw_src, read_opt)); + printf("client %s, bla group %04x\n", + get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_shost, read_opt), + ntohs(bla_dst->group)); + break; + case BATADV_CLAIM_TYPE_DEL: + printf("BLA UNCLAIM, backbone %s, ", + get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_shost, read_opt)); + printf("client %s, bla group %04x\n", + get_name_by_macaddr((struct ether_addr *)hw_src, read_opt), + ntohs(bla_dst->group)); + break; + case BATADV_CLAIM_TYPE_ANNOUNCE: + printf("BLA ANNOUNCE, backbone %s, bla group %04x, crc %04x\n", + get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_shost, read_opt), + ntohs(bla_dst->group), ntohs(*((uint16_t *)(&hw_src[4])))); + break; + case BATADV_CLAIM_TYPE_REQUEST: + printf("BLA REQUEST, src backbone %s, ", + get_name_by_macaddr((struct ether_addr *)hw_src, read_opt)); + printf("dst backbone %s\n", + get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_dhost, read_opt)); + break; + default: + printf("BLA UNKNOWN, type %hhu\n", bla_dst->type); + break; + } + + arp_is_bla2_claim = 1; + +out: + return arp_is_bla2_claim; +} + +static void dump_arp(unsigned char *packet_buff, ssize_t buff_len, + struct ether_header *eth_hdr, int read_opt, int time_printed) { struct ether_arp *arphdr; + int arp_is_bla2_claim; LEN_CHECK((size_t)buff_len, sizeof(struct ether_arp), "ARP"); @@ -108,6 +174,10 @@ static void dump_arp(unsigned char *packet_buff, ssize_t buff_len, int time_prin ether_ntoa_long((struct ether_addr *)&arphdr->arp_sha), buff_len); break; case ARPOP_REPLY: + arp_is_bla2_claim = dump_bla2_claim(eth_hdr, arphdr, read_opt); + if (arp_is_bla2_claim) + break; + printf("ARP, Reply %s is-at %s, length %zd\n", inet_ntoa(*(struct in_addr *)&arphdr->arp_spa), ether_ntoa_long((struct ether_addr *)&arphdr->arp_sha), buff_len); break; @@ -479,7 +549,8 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read switch (ntohs(eth_hdr->ether_type)) { case ETH_P_ARP: if ((dump_level & DUMP_TYPE_NONBAT) || (time_printed)) - dump_arp(packet_buff + ETH_HLEN, buff_len - ETH_HLEN, time_printed); + dump_arp(packet_buff + ETH_HLEN, buff_len - ETH_HLEN, + eth_hdr, read_opt, time_printed); break; case ETH_P_IP: if ((dump_level & DUMP_TYPE_NONBAT) || (time_printed)) -- 1.7.9.1

1 1

[B.A.T.M.A.N.] [PATCH] batctl: check interface support and print corresponding error message
by Marek Lindner 22 Jun '12

22 Jun '12

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- functions.c | 7 +++++++ functions.h | 1 + main.h | 2 ++ sys.c | 17 +++++++++++++++++ sys.h | 1 + 5 files changed, 28 insertions(+), 0 deletions(-) diff --git a/functions.c b/functions.c index 8ce2419..36a4d40 100644 --- a/functions.c +++ b/functions.c @@ -107,6 +107,13 @@ char *get_name_by_macstr(char *mac_str, int read_opt) return get_name_by_macaddr(mac_addr, read_opt); } +int file_exists(const char *fpath) +{ + struct stat st; + + return stat(fpath, &st) == 0; +} + static int check_sys_dir(char *dir) { struct stat st; diff --git a/functions.h b/functions.h index fe03dc0..92d6ae5 100644 --- a/functions.h +++ b/functions.h @@ -33,6 +33,7 @@ double end_timer(void); char *ether_ntoa_long(const struct ether_addr *addr); char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt); char *get_name_by_macstr(char *mac_str, int read_opt); +int file_exists(const char *fpath); int read_file(char *dir, char *path, int read_opt, float orig_timeout, float watch_interval); int write_file(char *dir, char *fname, char *arg1, char *arg2); diff --git a/main.h b/main.h index 872a2fe..4819cf4 100644 --- a/main.h +++ b/main.h @@ -28,3 +28,5 @@ #define EXIT_NOSUCCESS 2 #define __packed __attribute((packed)) /* linux kernel compat */ + +extern char module_ver_path[]; diff --git a/sys.c b/sys.c index 0b4cac3..5702c6c 100644 --- a/sys.c +++ b/sys.c @@ -154,6 +154,23 @@ int interface(char *mesh_iface, int argc, char **argv) for (i = 2; i < argc; i++) { snprintf(path_buff, PATH_BUFF_LEN, SYS_MESH_IFACE_FMT, argv[i]); + if (!file_exists(path_buff)) { + snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_DIR, argv[i]); + + if (!file_exists(path_buff)) { + printf("Error - interface does not exist: %s\n", argv[i]); + continue; + } + + if (!file_exists(module_ver_path)) { + printf("Error - batman-adv module has not been loaded\n"); + goto err; + } + + printf("Error - interface type not supported by batman-adv: %s\n", argv[i]); + continue; + } + if (argv[1][0] == 'a') res = write_file("", path_buff, mesh_iface, NULL); else diff --git a/sys.h b/sys.h index 46a1159..f48902e 100644 --- a/sys.h +++ b/sys.h @@ -32,6 +32,7 @@ #define SYS_VIS_MODE "vis_mode" #define SYS_ORIG_INTERVAL "orig_interval" #define SYS_IFACE_PATH "/sys/class/net" +#define SYS_IFACE_DIR SYS_IFACE_PATH"/%s/" #define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" #define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" #define SYS_FRAG "fragmentation" -- 1.7.9.1

1 1

[B.A.T.M.A.N.] filling debian log
by Walter Robert Ditzler 21 Jun '12

21 Jun '12

hey list, how are you today? i just ran into a minor problem with my flashybrid box, debian 6.0.5, batman-adv 2012.1. batman-adv fills up my logs! anyone here who knows how to stop loggin or perhaps only "never to miss stuff"? i tried to set "batctl loglevel none" but with no help in fact. anyway, your help are appreciated :-) thanks walter. here are the logs from kern.log *** Jun 21 22:40:41 srv-ldeb-basic2 kernel: [ 435.582433] mesh0: RX ProbeReq SA=3c:d0:f8:73:ee:d1 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:41 srv-ldeb-basic2 kernel: [ 435.595048] mesh0: RX ProbeReq SA=3c:d0:f8:73:ee:d1 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:41 srv-ldeb-basic2 kernel: [ 435.605731] mesh0: RX ProbeReq SA=3c:d0:f8:73:ee:d1 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:41 srv-ldeb-basic2 kernel: [ 435.615870] mesh0: RX ProbeReq SA=3c:d0:f8:73:ee:d1 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:41 srv-ldeb-basic2 kernel: [ 435.691987] mesh0: RX ProbeReq SA=3c:d0:f8:73:ee:d1 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:41 srv-ldeb-basic2 kernel: [ 435.702311] mesh0: RX ProbeReq SA=3c:d0:f8:73:ee:d1 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:42 srv-ldeb-basic2 kernel: [ 437.190688] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:42 srv-ldeb-basic2 kernel: [ 437.214386] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:42 srv-ldeb-basic2 kernel: [ 437.339164] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:42 srv-ldeb-basic2 kernel: [ 437.502633] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:42 srv-ldeb-basic2 kernel: [ 437.526321] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:43 srv-ldeb-basic2 kernel: [ 438.525654] mesh0: RX ProbeReq SA=04:1e:64:ed:0a:d0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:44 srv-ldeb-basic2 kernel: [ 438.752065] mesh0: RX ProbeReq SA=04:1e:64:ed:0a:d0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:44 srv-ldeb-basic2 kernel: [ 438.775144] mesh0: RX ProbeReq SA=04:1e:64:ed:0a:d0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:47 srv-ldeb-basic2 kernel: [ 441.810516] mesh0: RX ProbeReq SA=04:1e:64:ed:0a:d0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:47 srv-ldeb-basic2 kernel: [ 441.832374] mesh0: RX ProbeReq SA=04:1e:64:ed:0a:d0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:47 srv-ldeb-basic2 kernel: [ 441.995940] mesh0: RX ProbeReq SA=04:1e:64:ed:0a:d0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:47 srv-ldeb-basic2 kernel: [ 442.019572] mesh0: RX ProbeReq SA=04:1e:64:ed:0a:d0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:55 srv-ldeb-basic2 kernel: [ 450.154135] mesh0: RX ProbeReq SA=00:21:6b:9c:d3:e2 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:40:55 srv-ldeb-basic2 kernel: [ 450.154938] mesh0: RX ProbeReq SA=00:21:6b:9c:d3:e2 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:11 srv-ldeb-basic2 kernel: [ 465.990674] mesh0: RX ProbeReq SA=00:1f:e2:c6:80:27 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:12 srv-ldeb-basic2 kernel: [ 466.690831] mesh0: RX ProbeReq SA=08:11:96:94:8c:b8 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:12 srv-ldeb-basic2 kernel: [ 466.691993] mesh0: RX ProbeReq SA=08:11:96:94:8c:b8 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:12 srv-ldeb-basic2 kernel: [ 466.692903] mesh0: RX ProbeReq SA=08:11:96:94:8c:b8 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:15 srv-ldeb-basic2 kernel: [ 469.647544] mesh0: RX ProbeReq SA=c8:bc:c8:dc:4e:d8 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:15 srv-ldeb-basic2 kernel: [ 469.667512] mesh0: RX ProbeReq SA=c8:bc:c8:dc:4e:d8 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:15 srv-ldeb-basic2 kernel: [ 470.111427] mesh0: RX ProbeReq SA=c8:bc:c8:dc:4e:d8 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:15 srv-ldeb-basic2 kernel: [ 470.130484] mesh0: RX ProbeReq SA=c8:bc:c8:dc:4e:d8 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:15 srv-ldeb-basic2 kernel: [ 470.152588] mesh0: RX ProbeReq SA=c8:bc:c8:dc:4e:d8 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 21 22:41:15 srv-ldeb-basic2 kernel: [ 470.172511] mesh0: RX ProbeReq SA=c8:bc:c8:dc:4e:d8 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) *** here are the logs from sys.log *** Jun 18 04:00:55 srv-ldeb-basic2 kernel: [110195.351651] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:56 srv-ldeb-basic2 kernel: [110196.244933] mesh0: RX ProbeReq SA=00:1f:e2:c6:80:27 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:56 srv-ldeb-basic2 kernel: [110196.254086] mesh0: RX ProbeReq SA=00:1f:e2:c6:80:27 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:56 srv-ldeb-basic2 kernel: [110196.264931] mesh0: RX ProbeReq SA=00:1f:e2:c6:80:27 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:56 srv-ldeb-basic2 kernel: [110196.274060] mesh0: RX ProbeReq SA=00:1f:e2:c6:80:27 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:58 srv-ldeb-basic2 kernel: [110198.041195] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:58 srv-ldeb-basic2 kernel: [110198.064947] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:58 srv-ldeb-basic2 kernel: [110198.252067] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:58 srv-ldeb-basic2 kernel: [110198.353159] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:58 srv-ldeb-basic2 kernel: [110198.377029] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) Jun 18 04:00:58 srv-ldeb-basic2 kernel: [110198.540414] mesh0: RX ProbeReq SA=04:1e:64:eb:ef:e0 DA=ff:ff:ff:ff:ff:ff BSSID=ff:ff:ff:ff:ff:ff (tx_last_beacon=0) ***

3 3

[B.A.T.M.A.N.] pull request: batman-adv 2012-06-21
by Antonio Quartulli 21 Jun '12

21 Jun '12

Hello David, here is another set of changes intended for net-next/linux-3.6. >From 1/20 to 19/20 you have our first set of changes aiming to rename the exported symbols, as you suggested some time ago. Patch 20/20 restyles all the comments in our code in order to follow the new guidelines. Thank you, Antonio The following changes since commit 41063e9dd11956f2d285e12e4342e1d232ba0ea2: ipv4: Early TCP socket demux. (2012-06-19 21:22:05 -0700) 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 9cfc7bd608b97463993b4f3e4775d99022253f8d: batman-adv: Reformat multiline comments to consistent style (2012-06-20 22:15:33 +0200) ---------------------------------------------------------------- Included changes: - first set of patches that add the batadv_ prefix to all the exported symbols - restyling of comments ---------------------------------------------------------------- Sven Eckelmann (20): batman-adv: Prefix bat_algo non-static functions with batadv_ batman-adv: Prefix bat_debugfs non-static functions with batadv_ batman-adv: Prefix bat_sysfs non-static functions with batadv_ batman-adv: Prefix bitarray non-static functions with batadv_ batman-adv: Prefix bridge_loop_avoidance non-static functions with batadv_ batman-adv: Prefix gateway-client non-static functions with batadv_ batman-adv: Prefix gateway-common non-static functions with batadv_ batman-adv: Prefix hard-interface non-static functions with batadv_ batman-adv: Prefix hash non-static functions with batadv_ batman-adv: Prefix icmp-socket non-static functions with batadv_ batman-adv: Prefix originator non-static functions with batadv_ batman-adv: Prefix ring_buffer non-static functions with batadv_ batman-adv: Prefix routing non-static functions with batadv_ batman-adv: Prefix send non-static functions with batadv_ batman-adv: Prefix soft-interface non-static functions with batadv_ batman-adv: Prefix translation-table non-static functions with batadv_ batman-adv: Prefix unicast non-static functions with batadv_ batman-adv: Prefix vis non-static functions with batadv_ batman-adv: Prefix main non-static functions with batadv_ batman-adv: Reformat multiline comments to consistent style net/batman-adv/bat_algo.h | 6 +- net/batman-adv/bat_debugfs.c | 35 ++-- net/batman-adv/bat_debugfs.h | 13 +- net/batman-adv/bat_iv_ogm.c | 205 ++++++++++++----------- net/batman-adv/bat_sysfs.c | 53 +++--- net/batman-adv/bat_sysfs.h | 18 +- net/batman-adv/bitarray.c | 25 ++- net/batman-adv/bitarray.h | 14 +- net/batman-adv/bridge_loop_avoidance.c | 113 +++++-------- net/batman-adv/bridge_loop_avoidance.h | 71 ++++---- net/batman-adv/gateway_client.c | 134 +++++++-------- net/batman-adv/gateway_client.h | 30 ++-- net/batman-adv/gateway_common.c | 18 +- net/batman-adv/gateway_common.h | 9 +- net/batman-adv/hard-interface.c | 93 +++++------ net/batman-adv/hard-interface.h | 26 ++- net/batman-adv/hash.c | 8 +- net/batman-adv/hash.h | 30 ++-- net/batman-adv/icmp_socket.c | 27 ++- net/batman-adv/icmp_socket.h | 12 +- net/batman-adv/main.c | 117 ++++++------- net/batman-adv/main.h | 84 +++++----- net/batman-adv/originator.c | 76 +++++---- net/batman-adv/originator.h | 30 ++-- net/batman-adv/packet.h | 21 ++- net/batman-adv/ring_buffer.c | 9 +- net/batman-adv/ring_buffer.h | 9 +- net/batman-adv/routing.c | 282 +++++++++++++++++--------------- net/batman-adv/routing.h | 56 +++---- net/batman-adv/send.c | 60 ++++--- net/batman-adv/send.h | 21 ++- net/batman-adv/soft-interface.c | 87 +++++----- net/batman-adv/soft-interface.h | 17 +- net/batman-adv/translation-table.c | 222 ++++++++++++++----------- net/batman-adv/translation-table.h | 67 ++++---- net/batman-adv/types.h | 29 ++-- net/batman-adv/unicast.c | 59 ++++--- net/batman-adv/unicast.h | 17 +- net/batman-adv/vis.c | 96 ++++++----- net/batman-adv/vis.h | 26 ++- 40 files changed, 1171 insertions(+), 1154 deletions(-)

2 21

[B.A.T.M.A.N.] [PATCH net] batman-adv: fix skb->data assignment
by Antonio Quartulli 19 Jun '12

19 Jun '12

skb_linearize(skb) possibly rearranges the skb internal data and then changes the skb->data pointer value. For this reason any other pointer in the code that was assigned skb->data before invoking skb_linearise(skb) must be re-assigned. In the current tt_query message handling code this is not done and therefore, in case of skb linearization, the pointer used to handle the packet header ends up in pointing to free'd memory. This bug was introduced by a73105b8d4c765d9ebfb664d0a66802127d8e4c7 (batman-adv: improved client announcement mechanism) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Cc: <stable(a)vger.kernel.org> --- This patch has already been merged in net-next. I am sorry about that, but we were missing some knowledge about sending patches for stable. Thank you, Antonio net/batman-adv/routing.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 840e2c6..015471d 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -617,6 +617,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) * changes */ if (skb_linearize(skb) < 0) goto out; + /* skb_linearize() possibly changed skb->data */ + tt_query = (struct tt_query_packet *)skb->data; tt_len = tt_query->tt_data * sizeof(struct tt_change); -- 1.7.9.4

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

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