B.A.T.M.A.N December 2012

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

19 participants
40 discussions

[B.A.T.M.A.N.] [PATCHv2] batman-adv: postpone OGM preparation to sending time
by Antonio Quartulli 15 Dec '12

15 Dec '12

OGMs are currently prepared 1 originator interval in advance then the time they are used to be sent. This means that once in the air they carry old information (like TT announcements and possibly other flags). To fix this, postpone the OGM creation to the same time of sending, in this way the OGM is first created and then immediately sent. This patch also removes a "magic" -2 operation that was introduced in the past to address the fact that batman-adv was sending "delayed OGM" plus the fact that the OGM seqno was increased right after having sent a new packet. Since this change is removing both the behaviours, the "magic" operation is not needed anymore. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: * added kernel doc * fixed sending time computation: previously msecs were summed to jiffies and max_aggregation_time was wrongly summed twice bat_iv_ogm.c | 133 ++++++++++++++++++++++++++++++++++++----------------------- types.h | 1 + 2 files changed, 83 insertions(+), 51 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index ff56fd5..16472d6 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -54,39 +54,6 @@ out: return neigh_node; } -static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) -{ - struct batadv_ogm_packet *batadv_ogm_packet; - unsigned char *ogm_buff; - uint32_t random_seqno; - int res = -ENOMEM; - - /* randomize initial seqno to avoid collision */ - get_random_bytes(&random_seqno, sizeof(random_seqno)); - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno); - - hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; - ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); - if (!ogm_buff) - goto out; - - hard_iface->bat_iv.ogm_buff = ogm_buff; - - batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; - batadv_ogm_packet->header.packet_type = BATADV_IV_OGM; - batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION; - batadv_ogm_packet->header.ttl = 2; - batadv_ogm_packet->flags = BATADV_NO_FLAGS; - batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; - batadv_ogm_packet->tt_num_changes = 0; - batadv_ogm_packet->ttvn = 0; - - res = 0; - -out: - return res; -} - static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface) { kfree(hard_iface->bat_iv.ogm_buff); @@ -116,16 +83,22 @@ batadv_iv_ogm_primary_iface_set(struct batadv_hard_iface *hard_iface) batadv_ogm_packet->header.ttl = BATADV_TTL; } -/* when do we schedule our own ogm to be sent */ +/** + * batadv_iv_ogm_emit_wait_time - compute the OGM preparation waiting time + * @bat_priv: the bat priv with all the soft interface information + * + * Returns the amount of jiffies to wait before preparing and sending the next + * own OGM + */ static unsigned long -batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) +batadv_iv_ogm_emit_wait_time(const struct batadv_priv *bat_priv) { unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; msecs += (random32() % 2 * BATADV_JITTER); - return jiffies + msecs_to_jiffies(msecs); + return msecs_to_jiffies(msecs); } /* when do we schedule a ogm packet to be sent */ @@ -459,7 +432,8 @@ out: /* aggregate a new packet into the existing ogm packet */ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, const unsigned char *packet_buff, - int packet_len, bool direct_link) + int packet_len, bool direct_link, + int own_packet) { unsigned char *skb_buff; unsigned long new_direct_link_flag; @@ -468,6 +442,7 @@ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, memcpy(skb_buff, packet_buff, packet_len); forw_packet_aggr->packet_len += packet_len; forw_packet_aggr->num_packets++; + forw_packet_aggr->own |= own_packet; /* save packet direct link flag status */ if (direct_link) { @@ -498,8 +473,7 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv, /* find position for the packet in the forward queue */ spin_lock_bh(&bat_priv->forw_bat_list_lock); - /* own packets are not to be aggregated */ - if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) { + if ((atomic_read(&bat_priv->aggregated_ogms))) { hlist_for_each_entry(forw_packet_pos, tmp_node, &bat_priv->forw_bat_list, list) { if (batadv_iv_ogm_can_aggregate(batadv_ogm_packet, @@ -532,7 +506,7 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv, if_incoming, own_packet); } else { batadv_iv_ogm_aggregate(forw_packet_aggr, packet_buff, - packet_len, direct_link); + packet_len, direct_link, own_packet); spin_unlock_bh(&bat_priv->forw_bat_list_lock); } } @@ -593,14 +567,33 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - unsigned char **ogm_buff = &hard_iface->bat_iv.ogm_buff; + + queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_iv.work, + batadv_iv_ogm_emit_wait_time(bat_priv)); +} + +static void batadv_iv_ogm_send(struct work_struct *work) +{ + struct delayed_work *delayed_work; + struct batadv_hard_iface_bat_iv *bat_iv; + struct batadv_hard_iface *primary_if, *hard_iface; + struct batadv_priv *bat_priv; + unsigned char **ogm_buff; struct batadv_ogm_packet *batadv_ogm_packet; - struct batadv_hard_iface *primary_if; - int *ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; + int *ogm_buff_len; int vis_server, tt_num_changes = 0; uint32_t seqno; uint8_t bandwidth; + delayed_work = container_of(work, struct delayed_work, work); + bat_iv = container_of(delayed_work, struct batadv_hard_iface_bat_iv, + work); + hard_iface = container_of(bat_iv, struct batadv_hard_iface, bat_iv); + + bat_priv = netdev_priv(hard_iface->soft_iface); + ogm_buff = &hard_iface->bat_iv.ogm_buff; + ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; + vis_server = atomic_read(&bat_priv->vis_mode); primary_if = batadv_primary_if_get_selected(bat_priv); @@ -611,10 +604,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff); + seqno = (uint32_t)atomic_add_return(1, &hard_iface->bat_iv.ogm_seqno); /* change sequence number to network order */ - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->seqno = htonl(seqno); - atomic_inc(&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn); batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc); @@ -637,12 +629,55 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_slide_own_bcast_window(hard_iface); batadv_iv_ogm_queue_add(bat_priv, hard_iface->bat_iv.ogm_buff, hard_iface->bat_iv.ogm_buff_len, hard_iface, 1, - batadv_iv_ogm_emit_send_time(bat_priv)); + batadv_iv_ogm_fwd_send_time()); if (primary_if) batadv_hardif_free_ref(primary_if); } +/** + * batadv_iv_ogm_iface_enable - initialize protocol specific hard_iface members + * @hard_iface: the interface getting enabled + * + * Returns 0 on success and a negative value representing the error in case of + * failure + * + */ +static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) +{ + struct batadv_ogm_packet *batadv_ogm_packet; + unsigned char *ogm_buff; + uint32_t random_seqno; + int res = -ENOMEM; + + /* randomize initial seqno to avoid collision */ + get_random_bytes(&random_seqno, sizeof(random_seqno)); + atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno); + + hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; + ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); + if (!ogm_buff) + goto out; + + hard_iface->bat_iv.ogm_buff = ogm_buff; + + batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; + batadv_ogm_packet->header.packet_type = BATADV_IV_OGM; + batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION; + batadv_ogm_packet->header.ttl = 2; + batadv_ogm_packet->flags = BATADV_NO_FLAGS; + batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; + batadv_ogm_packet->tt_num_changes = 0; + batadv_ogm_packet->ttvn = 0; + + INIT_DELAYED_WORK(&hard_iface->bat_iv.work, batadv_iv_ogm_send); + + res = 0; + +out: + return res; +} + static void batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, @@ -998,7 +1033,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, bool is_single_hop_neigh = false; bool is_from_best_next_hop = false; int is_duplicate, sameseq, simlar_ttl; - uint32_t if_incoming_seqno; uint8_t *prev_sender; /* Silently drop when the batman packet is actually not a @@ -1016,9 +1050,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, if (batadv_ogm_packet->header.packet_type != BATADV_IV_OGM) return; - /* could be changed by schedule_own_packet() */ - if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno); - if (batadv_ogm_packet->flags & BATADV_DIRECTLINK) has_directlink_flag = 1; else @@ -1108,7 +1139,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, spin_lock_bh(&orig_neigh_node->ogm_cnt_lock); word = &(orig_neigh_node->bcast_own[offset]); - bit_pos = if_incoming_seqno - 2; + bit_pos = atomic_read(&if_incoming->bat_iv.ogm_seqno); bit_pos -= ntohl(batadv_ogm_packet->seqno); batadv_set_bit(word, bit_pos); weight = &orig_neigh_node->bcast_own_sum[if_num]; diff --git a/types.h b/types.h index 030ce41..978381a 100644 --- a/types.h +++ b/types.h @@ -49,6 +49,7 @@ struct batadv_hard_iface_bat_iv { unsigned char *ogm_buff; int ogm_buff_len; atomic_t ogm_seqno; + struct delayed_work work; }; struct batadv_hard_iface { -- 1.8.0.2

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: postpone OGM preparation to sending time
by Antonio Quartulli 15 Dec '12

15 Dec '12

OGMs are currently prepared 1 originator interval in advance then the time they are used to be sent. This means that once in the air they carry old information (like TT announcements and possibly other flags). To fix this, postpone the OGM creation to the same time of sending, in this way the OGM is first created and then immediately sent. This patch also removes a "magic" -2 operation that was introduced in the past to address the fact that batman-adv was sending "delayed OGM" plus the fact that the OGM seqno was increased right after having sent a new packet. Since this change is removing both the behaviours, the "magic" operation is not needed anymore. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bat_iv_ogm.c | 119 ++++++++++++++++++++++++++++++++++------------------------- types.h | 1 + 2 files changed, 70 insertions(+), 50 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 83dfcb4..9f890d5 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -54,39 +54,6 @@ out: return neigh_node; } -static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) -{ - struct batadv_ogm_packet *batadv_ogm_packet; - unsigned char *ogm_buff; - uint32_t random_seqno; - int res = -ENOMEM; - - /* randomize initial seqno to avoid collision */ - get_random_bytes(&random_seqno, sizeof(random_seqno)); - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno); - - hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; - ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); - if (!ogm_buff) - goto out; - - hard_iface->bat_iv.ogm_buff = ogm_buff; - - batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; - batadv_ogm_packet->header.packet_type = BATADV_IV_OGM; - batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION; - batadv_ogm_packet->header.ttl = 2; - batadv_ogm_packet->flags = BATADV_NO_FLAGS; - batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; - batadv_ogm_packet->tt_num_changes = 0; - batadv_ogm_packet->ttvn = 0; - - res = 0; - -out: - return res; -} - static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface) { kfree(hard_iface->bat_iv.ogm_buff); @@ -118,14 +85,14 @@ batadv_iv_ogm_primary_iface_set(struct batadv_hard_iface *hard_iface) /* when do we schedule our own ogm to be sent */ static unsigned long -batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) +batadv_iv_ogm_emit_wait_time(const struct batadv_priv *bat_priv) { unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; msecs += (random32() % 2 * BATADV_JITTER); - return jiffies + msecs_to_jiffies(msecs); + return msecs_to_jiffies(msecs); } /* when do we schedule a ogm packet to be sent */ @@ -459,7 +426,8 @@ out: /* aggregate a new packet into the existing ogm packet */ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, const unsigned char *packet_buff, - int packet_len, bool direct_link) + int packet_len, bool direct_link, + int own_packet) { unsigned char *skb_buff; unsigned long new_direct_link_flag; @@ -468,6 +436,7 @@ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, memcpy(skb_buff, packet_buff, packet_len); forw_packet_aggr->packet_len += packet_len; forw_packet_aggr->num_packets++; + forw_packet_aggr->own |= own_packet; /* save packet direct link flag status */ if (direct_link) { @@ -498,8 +467,7 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv, /* find position for the packet in the forward queue */ spin_lock_bh(&bat_priv->forw_bat_list_lock); - /* own packets are not to be aggregated */ - if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) { + if ((atomic_read(&bat_priv->aggregated_ogms))) { hlist_for_each_entry(forw_packet_pos, tmp_node, &bat_priv->forw_bat_list, list) { if (batadv_iv_ogm_can_aggregate(batadv_ogm_packet, @@ -532,7 +500,7 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv, if_incoming, own_packet); } else { batadv_iv_ogm_aggregate(forw_packet_aggr, packet_buff, - packet_len, direct_link); + packet_len, direct_link, own_packet); spin_unlock_bh(&bat_priv->forw_bat_list_lock); } } @@ -593,13 +561,33 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - unsigned char **ogm_buff = &hard_iface->bat_iv.ogm_buff; + + queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_iv.work, + batadv_iv_ogm_emit_wait_time(bat_priv)); +} + +static void batadv_iv_ogm_send(struct work_struct *work) +{ + struct delayed_work *delayed_work; + struct batadv_hard_iface_bat_iv *bat_iv; + struct batadv_hard_iface *primary_if, *hard_iface; + struct batadv_priv *bat_priv; + unsigned char **ogm_buff; struct batadv_ogm_packet *batadv_ogm_packet; - struct batadv_hard_iface *primary_if; - int *ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; + int *ogm_buff_len; int vis_server, tt_num_changes = 0; uint32_t seqno; uint8_t bandwidth; + unsigned long send_time; + + delayed_work = container_of(work, struct delayed_work, work); + bat_iv = container_of(delayed_work, struct batadv_hard_iface_bat_iv, + work); + hard_iface = container_of(bat_iv, struct batadv_hard_iface, bat_iv); + + bat_priv = netdev_priv(hard_iface->soft_iface); + ogm_buff = &hard_iface->bat_iv.ogm_buff; + ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; vis_server = atomic_read(&bat_priv->vis_mode); primary_if = batadv_primary_if_get_selected(bat_priv); @@ -611,10 +599,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff); + seqno = (uint32_t)atomic_add_return(1, &hard_iface->bat_iv.ogm_seqno); /* change sequence number to network order */ - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->seqno = htonl(seqno); - atomic_inc(&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn); batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc); @@ -635,14 +622,50 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) } batadv_slide_own_bcast_window(hard_iface); + send_time = BATADV_MAX_AGGREGATION_MS + batadv_iv_ogm_fwd_send_time(); batadv_iv_ogm_queue_add(bat_priv, hard_iface->bat_iv.ogm_buff, hard_iface->bat_iv.ogm_buff_len, hard_iface, 1, - batadv_iv_ogm_emit_send_time(bat_priv)); + send_time); if (primary_if) batadv_hardif_free_ref(primary_if); } +static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) +{ + struct batadv_ogm_packet *batadv_ogm_packet; + unsigned char *ogm_buff; + uint32_t random_seqno; + int res = -ENOMEM; + + /* randomize initial seqno to avoid collision */ + get_random_bytes(&random_seqno, sizeof(random_seqno)); + atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno); + + hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; + ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); + if (!ogm_buff) + goto out; + + hard_iface->bat_iv.ogm_buff = ogm_buff; + + batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; + batadv_ogm_packet->header.packet_type = BATADV_IV_OGM; + batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION; + batadv_ogm_packet->header.ttl = 2; + batadv_ogm_packet->flags = BATADV_NO_FLAGS; + batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; + batadv_ogm_packet->tt_num_changes = 0; + batadv_ogm_packet->ttvn = 0; + + INIT_DELAYED_WORK(&hard_iface->bat_iv.work, batadv_iv_ogm_send); + + res = 0; + +out: + return res; +} + static void batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, @@ -998,7 +1021,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, bool is_single_hop_neigh = false; bool is_from_best_next_hop = false; int is_duplicate, sameseq, simlar_ttl; - uint32_t if_incoming_seqno; uint8_t *prev_sender; /* Silently drop when the batman packet is actually not a @@ -1016,9 +1038,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, if (batadv_ogm_packet->header.packet_type != BATADV_IV_OGM) return; - /* could be changed by schedule_own_packet() */ - if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno); - if (batadv_ogm_packet->flags & BATADV_DIRECTLINK) has_directlink_flag = 1; else @@ -1108,7 +1127,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, spin_lock_bh(&orig_neigh_node->ogm_cnt_lock); word = &(orig_neigh_node->bcast_own[offset]); - bit_pos = if_incoming_seqno - 2; + bit_pos = atomic_read(&if_incoming->bat_iv.ogm_seqno); bit_pos -= ntohl(batadv_ogm_packet->seqno); batadv_set_bit(word, bit_pos); weight = &orig_neigh_node->bcast_own_sum[if_num]; diff --git a/types.h b/types.h index 030ce41..978381a 100644 --- a/types.h +++ b/types.h @@ -49,6 +49,7 @@ struct batadv_hard_iface_bat_iv { unsigned char *ogm_buff; int ogm_buff_len; atomic_t ogm_seqno; + struct delayed_work work; }; struct batadv_hard_iface { -- 1.8.0.2

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix typo in debug message
by Antonio Quartulli 15 Dec '12

15 Dec '12

in bat_iv_ogm.c a debug message should print "tq" instead of "td" Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 2efc50f..55857c2 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1050,7 +1050,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, is_single_hop_neigh = true; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %#.4x, changes %u, td %d, TTL %d, V %d, IDF %d)\n", + "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %#.4x, changes %u, tq %d, TTL %d, V %d, IDF %d)\n", ethhdr->h_source, if_incoming->net_dev->name, if_incoming->net_dev->dev_addr, batadv_ogm_packet->orig, batadv_ogm_packet->prev_sender, -- 1.8.0

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: use the const qualifier in hash functions
by Antonio Quartulli 15 Dec '12

15 Dec '12

From: Antonio Quartulli <antonio(a)open-mesh.com> The data argument in each hash function should carry the "const" qualifier as it is never modified. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- bridge_loop_avoidance.c | 2 +- hash.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 724adf0..5e834c1 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -57,7 +57,7 @@ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size) static inline uint32_t batadv_choose_backbone_gw(const void *data, uint32_t size) { - struct batadv_claim *claim = (struct batadv_claim *)data; + const struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr)); diff --git a/hash.h b/hash.h index e053339..ea02148 100644 --- a/hash.h +++ b/hash.h @@ -89,7 +89,7 @@ static inline void batadv_hash_delete(struct batadv_hashtable *hash, * * Returns the new hash value. */ -static inline uint32_t batadv_hash_bytes(uint32_t hash, void *data, +static inline uint32_t batadv_hash_bytes(uint32_t hash, const void *data, uint32_t size) { const unsigned char *key = data; -- 1.8.0

2 1

[B.A.T.M.A.N.] [PATCH] batctl: indicate successful termination when -h is used
by Moritz Warning 15 Dec '12

15 Dec '12

The return value of batctl -h indicates failure while it should indicate a successful execution. Signed-off-by: Moritz Warning <moritzwarning(a)web.de> --- From: Moritz Warning <moritzwarning(a)web.de> Subject: [PATCH] batctl: change return value to indicate successful termination when -h is used --- main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index 0a979bd..ea83bbf 100644 --- a/main.c +++ b/main.c @@ -114,8 +114,10 @@ int main(int argc, char **argv) goto err; } - if (strcmp(argv[1], "-h") == 0) - goto err; + if (strcmp(argv[1], "-h") == 0) { + print_usage(); + exit(EXIT_SUCCESS); + } if (strcmp(argv[1], "-v") == 0) { printf("batctl %s [batman-adv: ", SOURCE_VERSION);

2 1

[B.A.T.M.A.N.] [PATCHv2] batctl: output errors to stderr
by Moritz Warning 15 Dec '12

15 Dec '12

batctl outputs many errors to stdout instead of stderr. This patch corrects this behavior by redirecting errors and the usage texts to stderr. Signed-off-by: Moritz Warning <moritzwarning(a)web.de> --- From: Moritz Warning <moritzwarning(a)web.de> Subject: [PATCH] batctl: output errors to stderr Context: http://www.open-mesh.org/issues/167 --- bisect_iv.c | 34 ++++++++++++------------- debug.c | 36 +++++++++++++------------- debugfs.c | 2 +- functions.c | 18 ++++++------- ioctl.c | 10 ++++---- main.c | 62 ++++++++++++++++++++++----------------------- ping.c | 30 +++++++++++----------- sys.c | 80 +++++++++++++++++++++++++++++----------------------------- tcpdump.c | 34 ++++++++++++------------- traceroute.c | 28 ++++++++++---------- translate.c | 2 +- vis.c | 8 +++--- 12 files changed, 172 insertions(+), 172 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index 09171fb..49fcb9e 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -37,15 +37,15 @@ static struct bat_node *curr_bat_node = NULL; static void bisect_iv_usage(void) { - printf("Usage: batctl bisect_iv [parameters] <file1> <file2> .. <fileN>\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -l run a loop detection of given mac address or bat-host (default)\n"); - printf(" \t -n don't convert addresses to bat-host names\n"); - printf(" \t -o only display orig events that affect given mac address or bat-host\n"); - printf(" \t -r print routing tables of given mac address or bat-host\n"); - printf(" \t -s seqno range to limit the output\n"); - printf(" \t -t trace seqnos of given mac address or bat-host\n"); + fprintf(stderr, "Usage: batctl bisect_iv [parameters] <file1> <file2> .. <fileN>\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -l run a loop detection of given mac address or bat-host (default)\n"); + fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); + fprintf(stderr, " \t -o only display orig events that affect given mac address or bat-host\n"); + fprintf(stderr, " \t -r print routing tables of given mac address or bat-host\n"); + fprintf(stderr, " \t -s seqno range to limit the output\n"); + fprintf(stderr, " \t -t trace seqnos of given mac address or bat-host\n"); } static int compare_name(void *data1, void *data2) @@ -1425,7 +1425,7 @@ static int get_orig_addr(char *orig_name, char *orig_addr) orig_mac = ether_aton(orig_name_tmp); if (!orig_mac) { - printf("Error - the originator is not a mac address or bat-host name: %s\n", orig_name); + fprintf(stderr, "Error - the originator is not a mac address or bat-host name: %s\n", orig_name); goto err; } @@ -1509,7 +1509,7 @@ int bisect_iv(int argc, char **argv) } if (argc <= found_args + 1) { - printf("Error - need at least 2 log files to compare\n"); + fprintf(stderr, "Error - need at least 2 log files to compare\n"); bisect_iv_usage(); goto err; } @@ -1517,7 +1517,7 @@ int bisect_iv(int argc, char **argv) node_hash = hash_new(64, compare_name, choose_name); if (!node_hash) { - printf("Error - could not create node hash table\n"); + fprintf(stderr, "Error - could not create node hash table\n"); goto err; } @@ -1525,13 +1525,13 @@ int bisect_iv(int argc, char **argv) num_parsed_files = 0; if ((rt_orig_ptr) && (trace_orig_ptr)) { - printf("Error - the 'print routing table' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'print routing table' option can't be used together with the the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (trace_orig_ptr)) { - printf("Error - the 'loop detection' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (rt_orig_ptr)) { - printf("Error - the 'loop detection' option can't be used together with the the 'print routing table' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'print routing table' option\n"); goto err; } else if (rt_orig_ptr) { res = get_orig_addr(rt_orig_ptr, orig); @@ -1555,7 +1555,7 @@ int bisect_iv(int argc, char **argv) seqno_max = seqno_min; if (seqno_min > seqno_max) { - printf("Error - the sequence range minimum (%lli) should be smaller than the maximum (%lli)\n", + fprintf(stderr, "Error - the sequence range minimum (%lli) should be smaller than the maximum (%lli)\n", seqno_min, seqno_max); goto err; } @@ -1577,7 +1577,7 @@ int bisect_iv(int argc, char **argv) } if (num_parsed_files < 2) { - printf("Error - need at least 2 log files to compare\n"); + fprintf(stderr, "Error - need at least 2 log files to compare\n"); goto err; } diff --git a/debug.c b/debug.c index 260448b..cdcbd39 100644 --- a/debug.c +++ b/debug.c @@ -80,16 +80,16 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { void debug_table_usage(int debug_table) { - printf("Usage: batctl [options] %s|%s [parameters]\n", + fprintf(stderr, "Usage: batctl [options] %s|%s [parameters]\n", batctl_debug_tables[debug_table].opt_long, batctl_debug_tables[debug_table].opt_short); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't replace mac addresses with bat-host names\n"); - printf(" \t -H don't show the header\n"); - printf(" \t -w [interval] watch mode - refresh the table continuously\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); + fprintf(stderr, " \t -H don't show the header\n"); + fprintf(stderr, " \t -w [interval] watch mode - refresh the table continuously\n"); if (debug_table == BATCTL_TABLE_ORIGINATORS) - printf(" \t -t timeout interval - don't print originators not seen for x.y seconds \n"); + fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n"); } int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) @@ -117,20 +117,20 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) } if (!sscanf(optarg, "%f", &watch_interval)) { - printf("Error - provided argument of '-%c' is not a number\n", optchar); + fprintf(stderr, "Error - provided argument of '-%c' is not a number\n", optchar); return EXIT_FAILURE; } break; case 't': if (debug_table != BATCTL_TABLE_ORIGINATORS) { - printf("Error - unrecognised option '-%c'\n", optchar); + fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); debug_table_usage(debug_table); return EXIT_FAILURE; } read_opt |= NO_OLD_ORIGS; if (!sscanf(optarg, "%f", &orig_timeout)) { - printf("Error - provided argument of '-%c' is not a number\n", optchar); + fprintf(stderr, "Error - provided argument of '-%c' is not a number\n", optchar); return EXIT_FAILURE; } break; @@ -139,14 +139,14 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) break; case '?': if (optopt == 't') - printf("Error - option '-t' needs a number as argument\n"); + fprintf(stderr, "Error - option '-t' needs a number as argument\n"); else if (optopt == 'w') { read_opt |= CLR_CONT_READ; break; } else - printf("Error - unrecognised option: '-%c'\n", optopt); + fprintf(stderr, "Error - unrecognised option: '-%c'\n", optopt); return EXIT_FAILURE; default: @@ -157,7 +157,7 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); return EXIT_FAILURE; } @@ -169,10 +169,10 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) static void log_usage(void) { - printf("Usage: batctl [options] log [parameters]\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't replace mac addresses with bat-host names\n"); + fprintf(stderr, "Usage: batctl [options] log [parameters]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); } int log_print(char *mesh_iface, int argc, char **argv) @@ -197,7 +197,7 @@ int log_print(char *mesh_iface, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); return EXIT_FAILURE; } diff --git a/debugfs.c b/debugfs.c index 9fc6f42..bfedcfe 100644 --- a/debugfs.c +++ b/debugfs.c @@ -85,7 +85,7 @@ const char *debugfs_find_mountpoint(void) /* give up and parse /proc/mounts */ fp = fopen("/proc/mounts", "r"); if (fp == NULL) { - printf("Error - can't open /proc/mounts for read: %s\n", + fprintf(stderr, "Error - can't open /proc/mounts for read: %s\n", strerror(errno)); return NULL; } diff --git a/functions.c b/functions.c index 57c2bba..516d29f 100644 --- a/functions.c +++ b/functions.c @@ -130,20 +130,20 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) if (strstr(dir, "/sys/")) { if (stat("/sys/", &st) != 0) { - printf("Error - the folder '/sys/' was not found on the system\n"); - printf("Please make sure that the sys filesystem is properly mounted\n"); + fprintf(stderr, "Error - the folder '/sys/' was not found on the system\n"); + fprintf(stderr, "Please make sure that the sys filesystem is properly mounted\n"); return; } } if (!file_exists(module_ver_path)) { - printf("Error - batman-adv module has not been loaded\n"); + fprintf(stderr, "Error - batman-adv module has not been loaded\n"); return; } if (!file_exists(dir)) { - printf("Error - mesh has not been enabled yet\n"); - printf("Activate your mesh by adding interfaces to batman-adv\n"); + fprintf(stderr, "Error - mesh has not been enabled yet\n"); + fprintf(stderr, "Activate your mesh by adding interfaces to batman-adv\n"); return; } @@ -154,10 +154,10 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) break; } - printf("Error - can't open file '%s': %s\n", full_path, strerror(errno)); + fprintf(stderr, "Error - can't open file '%s': %s\n", full_path, strerror(errno)); if (*ptr) { - printf("The option you called seems not to be compiled into your batman-adv kernel module.\n"); - printf("Consult the README if you wish to learn more about compiling options into batman-adv.\n"); + fprintf(stderr, "The option you called seems not to be compiled into your batman-adv kernel module.\n"); + fprintf(stderr, "Consult the README if you wish to learn more about compiling options into batman-adv.\n"); } } @@ -318,7 +318,7 @@ int write_file(char *dir, char *fname, char *arg1, char *arg2) write_len = write(fd, arg1, strlen(arg1) + 1); if (write_len < 0) { - printf("Error - can't write to file '%s': %s\n", full_path, strerror(errno)); + fprintf(stderr, "Error - can't write to file '%s': %s\n", full_path, strerror(errno)); goto out; } diff --git a/ioctl.c b/ioctl.c index 5056d2f..4347c20 100644 --- a/ioctl.c +++ b/ioctl.c @@ -50,7 +50,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (caddr_t)&drvinfo; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - printf("Error - can't open driver information: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't open driver information: %s\n", strerror(errno)); goto out; } @@ -64,7 +64,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) strings = calloc(1, sz_str + sizeof(struct ethtool_gstrings)); stats = calloc(1, sz_stats + sizeof(struct ethtool_stats)); if (!strings || !stats) { - printf("Error - out of memory\n"); + fprintf(stderr, "Error - out of memory\n"); goto out; } @@ -74,7 +74,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (caddr_t)strings; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - printf("Error - can't get stats strings information: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't get stats strings information: %s\n", strerror(errno)); goto out; } @@ -83,7 +83,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (caddr_t) stats; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - printf("Error - can't get stats information: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't get stats information: %s\n", strerror(errno)); goto out; } @@ -111,7 +111,7 @@ int ioctl_statistics_get(char *mesh_iface) fd = socket(AF_INET, SOCK_DGRAM, 0); if (fd < 0) { - printf("Error - can't open socket: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't open socket: %s\n", strerror(errno)); goto out; } diff --git a/main.c b/main.c index 5d85d8b..0a979bd 100644 --- a/main.c +++ b/main.c @@ -48,47 +48,47 @@ void print_usage(void) { int i, opt_indent; - printf("Usage: batctl [options] command|debug table [parameters]\n"); - printf("options:\n"); - printf(" \t-m mesh interface (default 'bat0')\n"); - printf(" \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n"); - printf(" \t-v print version\n"); - printf("\n"); - - printf("commands:\n"); - printf(" \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); + fprintf(stderr, "Usage: batctl [options] command|debug table [parameters]\n"); + fprintf(stderr, "options:\n"); + fprintf(stderr, " \t-m mesh interface (default 'bat0')\n"); + fprintf(stderr, " \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n"); + fprintf(stderr, " \t-v print version\n"); + fprintf(stderr, "\n"); + + fprintf(stderr, "commands:\n"); + fprintf(stderr, " \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { - printf(" \t%s|%s", batctl_settings[i].opt_long, batctl_settings[i].opt_short); + fprintf(stderr, " \t%s|%s", batctl_settings[i].opt_long, batctl_settings[i].opt_short); opt_indent = strlen(batctl_settings[i].opt_long) + strlen(batctl_settings[i].opt_short); if (batctl_settings[i].params == sysfs_param_enable) - printf("%*s display or modify %s setting\n", + fprintf(stderr, "%*s display or modify %s setting\n", 31 - opt_indent, "[0|1]", batctl_settings[i].opt_long); else if (batctl_settings[i].params == sysfs_param_server) - printf("%*s display or modify %s setting\n", + fprintf(stderr, "%*s display or modify %s setting\n", 41 - opt_indent, "[client|server]", batctl_settings[i].opt_long); else - printf(" display or modify %s setting\n", + fprintf(stderr, " display or modify %s setting\n", batctl_settings[i].opt_long); } - printf(" \tloglevel|ll [level] \tdisplay or modify the log level\n"); - printf(" \tlog|l \tread the log produced by the kernel module\n"); - printf(" \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); - printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); - printf("\n"); + fprintf(stderr, " \tloglevel|ll [level] \tdisplay or modify the log level\n"); + fprintf(stderr, " \tlog|l \tread the log produced by the kernel module\n"); + fprintf(stderr, " \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); + fprintf(stderr, " \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); + fprintf(stderr, "\n"); - printf("debug tables: \tdisplay the corresponding debug table\n"); + fprintf(stderr, "debug tables: \tdisplay the corresponding debug table\n"); for (i = 0; i < BATCTL_TABLE_NUM; i++) - printf(" \t%s|%s\n", batctl_debug_tables[i].opt_long, batctl_debug_tables[i].opt_short); - - printf("\n"); - printf(" \tstatistics|s \tprint mesh statistics\n"); - printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); - printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); - printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); - printf(" \ttranslate|t <destination> \ttranslate a destination to the originator responsible for it\n"); + fprintf(stderr, " \t%s|%s\n", batctl_debug_tables[i].opt_long, batctl_debug_tables[i].opt_short); + + fprintf(stderr, "\n"); + fprintf(stderr, " \tstatistics|s \tprint mesh statistics\n"); + fprintf(stderr, " \tping|p <destination> \tping another batman adv host via layer 2\n"); + fprintf(stderr, " \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); + fprintf(stderr, " \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); + fprintf(stderr, " \ttranslate|t <destination> \ttranslate a destination to the originator responsible for it\n"); #ifdef BATCTL_BISECT - printf(" \tbisect_iv <file1> .. <fileN>\tanalyze given batman iv log files for routing stability\n"); + fprintf(stderr, " \tbisect_iv <file1> .. <fileN>\tanalyze given batman iv log files for routing stability\n"); #endif } @@ -99,7 +99,7 @@ int main(int argc, char **argv) if ((argc > 1) && (strcmp(argv[1], "-m") == 0)) { if (argc < 3) { - printf("Error - the option '-m' needs a parameter\n"); + fprintf(stderr, "Error - the option '-m' needs a parameter\n"); goto err; } @@ -110,7 +110,7 @@ int main(int argc, char **argv) } if (argc < 2) { - printf("Error - no command specified\n"); + fprintf(stderr, "Error - no command specified\n"); goto err; } @@ -206,7 +206,7 @@ int main(int argc, char **argv) goto out; } - printf("Error - no valid command or debug table specified: %s\n", argv[1]); + fprintf(stderr, "Error - no valid command or debug table specified: %s\n", argv[1]); print_usage(); } diff --git a/ping.c b/ping.c index 51d18e8..4f52c66 100644 --- a/ping.c +++ b/ping.c @@ -44,14 +44,14 @@ char is_aborted = 0; void ping_usage(void) { - printf("Usage: batctl [options] ping [parameters] mac|bat-host|host_name|IPv4_address \n"); - printf("parameters:\n"); - printf(" \t -c ping packet count \n"); - printf(" \t -h print this help\n"); - printf(" \t -i interval in seconds\n"); - printf(" \t -t timeout in seconds\n"); - printf(" \t -R record route\n"); - printf(" \t -T don't try to translate mac to originator address\n"); + fprintf(stderr, "Usage: batctl [options] ping [parameters] mac|bat-host|host_name|IPv4_address \n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -c ping packet count \n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -i interval in seconds\n"); + fprintf(stderr, " \t -t timeout in seconds\n"); + fprintf(stderr, " \t -R record route\n"); + fprintf(stderr, " \t -T don't try to translate mac to originator address\n"); } void sig_handler(int sig) @@ -124,7 +124,7 @@ int ping(char *mesh_iface, int argc, char **argv) } if (argc <= found_args) { - printf("Error - target mac address or bat-host name not specified\n"); + fprintf(stderr, "Error - target mac address or bat-host name not specified\n"); ping_usage(); return EXIT_FAILURE; } @@ -140,7 +140,7 @@ int ping(char *mesh_iface, int argc, char **argv) dst_mac = resolve_mac(dst_string); if (!dst_mac) { - printf("Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); + fprintf(stderr, "Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); goto out; } } @@ -154,7 +154,7 @@ int ping(char *mesh_iface, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); goto out; } @@ -163,7 +163,7 @@ int ping(char *mesh_iface, int argc, char **argv) ping_fd = open(icmp_socket, O_RDWR); if (ping_fd < 0) { - printf("Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", + fprintf(stderr, "Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", icmp_socket, strerror(errno)); printf("Check whether the module is loaded and active.\n"); goto out; @@ -203,7 +203,7 @@ int ping(char *mesh_iface, int argc, char **argv) icmp_packet_out.seqno = htons(++seq_counter); if (write(ping_fd, (char *)&icmp_packet_out, packet_len) < 0) { - printf("Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); goto sleep; } @@ -231,7 +231,7 @@ read_packet: read_len = read(ping_fd, (char *)&icmp_packet_in, packet_len); if (read_len < 0) { - printf("Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); goto sleep; } @@ -298,7 +298,7 @@ read_packet: printf("From %s: Time to live exceeded (icmp_seq %hu)\n", dst_string, ntohs(icmp_packet_in.seqno)); break; case BATADV_PARAMETER_PROBLEM: - printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", + fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", icmp_packet_in.header.version, BATADV_COMPAT_VERSION); printf("Please make sure to use compatible versions!\n"); goto out; diff --git a/sys.c b/sys.c index e4112b7..f628363 100644 --- a/sys.c +++ b/sys.c @@ -103,9 +103,9 @@ const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { static void interface_usage(void) { - printf("Usage: batctl [options] interface [parameters] [add|del iface(s)]\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); + fprintf(stderr, "Usage: batctl [options] interface [parameters] [add|del iface(s)]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); } static int print_interfaces(char *mesh_iface) @@ -116,21 +116,21 @@ static int print_interfaces(char *mesh_iface) int res; if (!file_exists(module_ver_path)) { - printf("Error - batman-adv module has not been loaded\n"); + fprintf(stderr, "Error - batman-adv module has not been loaded\n"); goto err; } path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { - printf("Error - could not allocate path buffer: out of memory ?\n"); + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); goto err; } iface_base_dir = opendir(SYS_IFACE_PATH); if (!iface_base_dir) { - printf("Error - the directory '%s' could not be read: %s\n", + fprintf(stderr, "Error - the directory '%s' could not be read: %s\n", SYS_IFACE_PATH, strerror(errno)); - printf("Is the batman-adv module loaded and sysfs mounted ?\n"); + fprintf(stderr, "Is the batman-adv module loaded and sysfs mounted ?\n"); goto err_buff; } @@ -157,7 +157,7 @@ static int print_interfaces(char *mesh_iface) path_buff[PATH_BUFF_LEN - 1] = '\0'; res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) { - printf("<error reading status>\n"); + fprintf(stderr, "<error reading status>\n"); continue; } @@ -199,20 +199,20 @@ int interface(char *mesh_iface, int argc, char **argv) if ((strcmp(argv[1], "add") != 0) && (strcmp(argv[1], "a") != 0) && (strcmp(argv[1], "del") != 0) && (strcmp(argv[1], "d") != 0)) { - printf("Error - unknown argument specified: %s\n", argv[1]); + fprintf(stderr, "Error - unknown argument specified: %s\n", argv[1]); interface_usage(); goto err; } if (argc == 2) { - printf("Error - missing interface name(s) after '%s'\n", argv[1]); + fprintf(stderr, "Error - missing interface name(s) after '%s'\n", argv[1]); interface_usage(); goto err; } path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { - printf("Error - could not allocate path buffer: out of memory ?\n"); + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); goto err; } @@ -225,16 +225,16 @@ int interface(char *mesh_iface, int argc, char **argv) path_buff[PATH_BUFF_LEN - 1] = '\0'; if (!file_exists(path_buff)) { - printf("Error - interface does not exist: %s\n", argv[i]); + fprintf(stderr, "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"); + fprintf(stderr, "Error - batman-adv module has not been loaded\n"); goto err; } - printf("Error - interface type not supported by batman-adv: %s\n", argv[i]); + fprintf(stderr, "Error - interface type not supported by batman-adv: %s\n", argv[i]); continue; } @@ -258,17 +258,17 @@ err: static void log_level_usage(void) { - printf("Usage: batctl [options] loglevel [parameters] [level[ level[ level]]...]\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf("levels:\n"); - printf(" \t none Debug logging is disabled\n"); - printf(" \t all Print messages from all below\n"); - printf(" \t batman Messages related to routing / flooding / broadcasting\n"); - printf(" \t routes Messages related to route added / changed / deleted\n"); - printf(" \t tt Messages related to translation table operations\n"); - printf(" \t bla Messages related to bridge loop avoidance\n"); - printf(" \t dat Messages related to arp snooping and distributed arp table\n"); + fprintf(stderr, "Usage: batctl [options] loglevel [parameters] [level[ level[ level]]...]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, "levels:\n"); + fprintf(stderr, " \t none Debug logging is disabled\n"); + fprintf(stderr, " \t all Print messages from all below\n"); + fprintf(stderr, " \t batman Messages related to routing / flooding / broadcasting\n"); + fprintf(stderr, " \t routes Messages related to route added / changed / deleted\n"); + fprintf(stderr, " \t tt Messages related to translation table operations\n"); + fprintf(stderr, " \t bla Messages related to bridge loop avoidance\n"); + fprintf(stderr, " \t dat Messages related to arp snooping and distributed arp table\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -352,18 +352,18 @@ out: static void settings_usage(int setting) { - printf("Usage: batctl [options] %s|%s [parameters]", + fprintf(stderr, "Usage: batctl [options] %s|%s [parameters]", (char *)batctl_settings[setting].opt_long, (char *)batctl_settings[setting].opt_short); if (batctl_settings[setting].params == sysfs_param_enable) - printf(" [0|1]\n"); + fprintf(stderr, " [0|1]\n"); else if (batctl_settings[setting].params == sysfs_param_server) - printf(" [client|server]\n"); + fprintf(stderr, " [client|server]\n"); else - printf("\n"); + fprintf(stderr, "\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); } int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) @@ -404,12 +404,12 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) ptr++; } - printf("Error - the supplied argument is invalid: %s\n", argv[1]); - printf("The following values are allowed:\n"); + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + fprintf(stderr, "The following values are allowed:\n"); ptr = batctl_settings[setting].params; while (*ptr) { - printf(" * %s\n", *ptr); + fprintf(stderr, " * %s\n", *ptr); ptr++; } @@ -426,9 +426,9 @@ out: static void gw_mode_usage(void) { - printf("Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); - printf("options:\n"); - printf(" \t -h print this help\n"); + fprintf(stderr, "Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); + fprintf(stderr, "options:\n"); + fprintf(stderr, " \t -h print this help\n"); } int handle_gw_setting(char *mesh_iface, int argc, char **argv) @@ -533,12 +533,12 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) goto out; opt_err: - printf("Error - the supplied argument is invalid: %s\n", argv[1]); - printf("The following values are allowed:\n"); + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + fprintf(stderr, "The following values are allowed:\n"); ptr = sysfs_param_server; while (*ptr) { - printf(" * %s\n", *ptr); + fprintf(stderr, " * %s\n", *ptr); ptr++; } diff --git a/tcpdump.c b/tcpdump.c index 4424dfd..d9aa6a8 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -62,23 +62,23 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read static void tcpdump_usage(void) { - printf("Usage: batctl tcpdump [parameters] interface [interface]\n"); - printf("parameters:\n"); - printf(" \t -c compat filter - only display packets matching own compat version (%i)\n", BATADV_COMPAT_VERSION); - printf(" \t -h print this help\n"); - printf(" \t -n don't convert addresses to bat-host names\n"); - printf(" \t -p dump specific packet type\n"); - printf(" \t -x dump all packet types except specified\n"); - printf("packet types:\n"); - printf(" \t\t%3d - batman ogm packets\n", DUMP_TYPE_BATOGM); - printf(" \t\t%3d - batman icmp packets\n", DUMP_TYPE_BATICMP); - printf(" \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); - printf(" \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); - printf(" \t\t%3d - batman vis packets\n", DUMP_TYPE_BATVIS); - printf(" \t\t%3d - batman fragmented packets\n", DUMP_TYPE_BATFRAG); - printf(" \t\t%3d - batman tt / roaming packets\n", DUMP_TYPE_BATTT); - printf(" \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); - printf(" \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); + fprintf(stderr, "Usage: batctl tcpdump [parameters] interface [interface]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -c compat filter - only display packets matching own compat version (%i)\n", BATADV_COMPAT_VERSION); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); + fprintf(stderr, " \t -p dump specific packet type\n"); + fprintf(stderr, " \t -x dump all packet types except specified\n"); + fprintf(stderr, "packet types:\n"); + fprintf(stderr, " \t\t%3d - batman ogm packets\n", DUMP_TYPE_BATOGM); + fprintf(stderr, " \t\t%3d - batman icmp packets\n", DUMP_TYPE_BATICMP); + fprintf(stderr, " \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); + fprintf(stderr, " \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); + fprintf(stderr, " \t\t%3d - batman vis packets\n", DUMP_TYPE_BATVIS); + fprintf(stderr, " \t\t%3d - batman fragmented packets\n", DUMP_TYPE_BATFRAG); + fprintf(stderr, " \t\t%3d - batman tt / roaming packets\n", DUMP_TYPE_BATTT); + fprintf(stderr, " \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); + fprintf(stderr, " \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); } static int print_time(void) diff --git a/traceroute.c b/traceroute.c index ac2f1fa..9da9bf6 100644 --- a/traceroute.c +++ b/traceroute.c @@ -43,11 +43,11 @@ void traceroute_usage(void) { - printf("Usage: batctl [options] traceroute [parameters] mac|bat-host|host_name|IPv4_address \n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't convert addresses to bat-host names\n"); - printf(" \t -T don't try to translate mac to originator address\n"); + fprintf(stderr, "Usage: batctl [options] traceroute [parameters] mac|bat-host|host_name|IPv4_address \n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); + fprintf(stderr, " \t -T don't try to translate mac to originator address\n"); } int traceroute(char *mesh_iface, int argc, char **argv) @@ -86,7 +86,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) } if (argc <= found_args) { - printf("Error - target mac address or bat-host name not specified\n"); + fprintf(stderr, "Error - target mac address or bat-host name not specified\n"); traceroute_usage(); return EXIT_FAILURE; } @@ -102,7 +102,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) dst_mac = resolve_mac(dst_string); if (!dst_mac) { - printf("Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); + fprintf(stderr, "Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); goto out; } } @@ -114,7 +114,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); goto out; } @@ -123,9 +123,9 @@ int traceroute(char *mesh_iface, int argc, char **argv) trace_fd = open(icmp_socket, O_RDWR); if (trace_fd < 0) { - printf("Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", + fprintf(stderr, "Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", icmp_socket, strerror(errno)); - printf("Check whether the module is loaded and active.\n"); + fprintf(stderr, "Check whether the module is loaded and active.\n"); goto out; } @@ -148,7 +148,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) time_delta[i] = 0.0; if (write(trace_fd, (char *)&icmp_packet_out, sizeof(icmp_packet_out)) < 0) { - printf("Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); continue; } @@ -169,7 +169,7 @@ read_packet: read_len = read(trace_fd, (char *)&icmp_packet_in, sizeof(icmp_packet_in)); if (read_len < 0) { - printf("Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); continue; } @@ -202,9 +202,9 @@ read_packet: printf("%s: Destination Host Unreachable\n", dst_string); goto out; case BATADV_PARAMETER_PROBLEM: - printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", + fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", icmp_packet_in.header.version, BATADV_COMPAT_VERSION); - printf("Please make sure to use compatible versions!\n"); + fprintf(stderr, "Please make sure to use compatible versions!\n"); goto out; default: printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); diff --git a/translate.c b/translate.c index 2d6ede9..bf33e90 100644 --- a/translate.c +++ b/translate.c @@ -31,7 +31,7 @@ static void translate_usage(void) { - printf("Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); + fprintf(stderr, "Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); } int translate(char *mesh_iface, int argc, char **argv) diff --git a/vis.c b/vis.c index b040497..f42d85a 100644 --- a/vis.c +++ b/vis.c @@ -58,9 +58,9 @@ static bool with_names = true; static void usage(void) { - printf("batctl vis_data dot {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); - printf("or\n"); - printf("batctl vis_data json {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); + fprintf(stderr, "batctl vis_data dot {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); + fprintf(stderr, "or\n"); + fprintf(stderr, "batctl vis_data json {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); } static void dot_print_tq(char *orig, char *from, const long tq) @@ -171,7 +171,7 @@ static FILE *open_vis(char *mesh_iface) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); return NULL; }

2 1

[B.A.T.M.A.N.] [RFC] batman-adv: postpone OGM preparation to sending time
by Antonio Quartulli 13 Dec '12

13 Dec '12

OGMs are currently prepared 1 originator interval in advance then the time they are used to be sent. This means that once in the air they carry old information (e.g. TT announcements). To fix this, postpone the OGM creation to the same time of sending, in this way the OGM is first created and then immediately sent. This patch also removes an insane "-2" that was introduced with 4d30670880c84071dba4b220f595e64d6c01d1ba ("batman-adv: accept delayed rebroadcasts to avoid bogus routing under heavy load") in the OGM seqno validation code that was put there to fix a possible heavy loaded scenario. First that operation shown to be completely not valid and consequently it was creating problem to the new behaviour introduced by this patch Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- I am not sure, but this patch may be merged in some other BIG upcoming change :) Cheers, bat_iv_ogm.c | 116 +++++++++++++++++++++++++++++++++++------------------------ types.h | 1 + 2 files changed, 70 insertions(+), 47 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 83dfcb4..37d856a 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -54,39 +54,6 @@ out: return neigh_node; } -static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) -{ - struct batadv_ogm_packet *batadv_ogm_packet; - unsigned char *ogm_buff; - uint32_t random_seqno; - int res = -ENOMEM; - - /* randomize initial seqno to avoid collision */ - get_random_bytes(&random_seqno, sizeof(random_seqno)); - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno); - - hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; - ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); - if (!ogm_buff) - goto out; - - hard_iface->bat_iv.ogm_buff = ogm_buff; - - batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; - batadv_ogm_packet->header.packet_type = BATADV_IV_OGM; - batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION; - batadv_ogm_packet->header.ttl = 2; - batadv_ogm_packet->flags = BATADV_NO_FLAGS; - batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; - batadv_ogm_packet->tt_num_changes = 0; - batadv_ogm_packet->ttvn = 0; - - res = 0; - -out: - return res; -} - static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface) { kfree(hard_iface->bat_iv.ogm_buff); @@ -118,20 +85,21 @@ batadv_iv_ogm_primary_iface_set(struct batadv_hard_iface *hard_iface) /* when do we schedule our own ogm to be sent */ static unsigned long -batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) +batadv_iv_ogm_emit_wait_time(const struct batadv_priv *bat_priv) { unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; msecs += (random32() % 2 * BATADV_JITTER); - return jiffies + msecs_to_jiffies(msecs); + return msecs_to_jiffies(msecs); } /* when do we schedule a ogm packet to be sent */ static unsigned long batadv_iv_ogm_fwd_send_time(void) { - return jiffies + msecs_to_jiffies(random32() % (BATADV_JITTER / 2)); + return jiffies + BATADV_MAX_AGGREGATION_MS + + msecs_to_jiffies(random32() % (BATADV_JITTER / 2)); } /* apply hop penalty for a normal link */ @@ -459,7 +427,8 @@ out: /* aggregate a new packet into the existing ogm packet */ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, const unsigned char *packet_buff, - int packet_len, bool direct_link) + int packet_len, bool direct_link, + int own_packet) { unsigned char *skb_buff; unsigned long new_direct_link_flag; @@ -468,6 +437,7 @@ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, memcpy(skb_buff, packet_buff, packet_len); forw_packet_aggr->packet_len += packet_len; forw_packet_aggr->num_packets++; + forw_packet_aggr->own |= own_packet; /* save packet direct link flag status */ if (direct_link) { @@ -498,8 +468,7 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv, /* find position for the packet in the forward queue */ spin_lock_bh(&bat_priv->forw_bat_list_lock); - /* own packets are not to be aggregated */ - if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) { + if ((atomic_read(&bat_priv->aggregated_ogms))) { hlist_for_each_entry(forw_packet_pos, tmp_node, &bat_priv->forw_bat_list, list) { if (batadv_iv_ogm_can_aggregate(batadv_ogm_packet, @@ -532,7 +501,7 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv, if_incoming, own_packet); } else { batadv_iv_ogm_aggregate(forw_packet_aggr, packet_buff, - packet_len, direct_link); + packet_len, direct_link, own_packet); spin_unlock_bh(&bat_priv->forw_bat_list_lock); } } @@ -593,14 +562,33 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - unsigned char **ogm_buff = &hard_iface->bat_iv.ogm_buff; + + queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_iv.work, + batadv_iv_ogm_emit_wait_time(bat_priv)); +} + +static void batadv_iv_ogm_send(struct work_struct *work) +{ + struct delayed_work *delayed_work; + struct batadv_hard_iface_bat_iv *bat_iv; + struct batadv_hard_iface *primary_if, *hard_iface; + struct batadv_priv *bat_priv; + unsigned char **ogm_buff; struct batadv_ogm_packet *batadv_ogm_packet; - struct batadv_hard_iface *primary_if; - int *ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; + int *ogm_buff_len; int vis_server, tt_num_changes = 0; uint32_t seqno; uint8_t bandwidth; + delayed_work = container_of(work, struct delayed_work, work); + bat_iv = container_of(delayed_work, struct batadv_hard_iface_bat_iv, + work); + hard_iface = container_of(bat_iv, struct batadv_hard_iface, bat_iv); + + bat_priv = netdev_priv(hard_iface->soft_iface); + ogm_buff = &hard_iface->bat_iv.ogm_buff; + ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; + vis_server = atomic_read(&bat_priv->vis_mode); primary_if = batadv_primary_if_get_selected(bat_priv); @@ -611,10 +599,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff); + seqno = (uint32_t)atomic_add_return(1, &hard_iface->bat_iv.ogm_seqno); /* change sequence number to network order */ - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->seqno = htonl(seqno); - atomic_inc(&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn); batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc); @@ -637,12 +624,47 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_slide_own_bcast_window(hard_iface); batadv_iv_ogm_queue_add(bat_priv, hard_iface->bat_iv.ogm_buff, hard_iface->bat_iv.ogm_buff_len, hard_iface, 1, - batadv_iv_ogm_emit_send_time(bat_priv)); + batadv_iv_ogm_fwd_send_time()); if (primary_if) batadv_hardif_free_ref(primary_if); } +static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) +{ + struct batadv_ogm_packet *batadv_ogm_packet; + unsigned char *ogm_buff; + uint32_t random_seqno; + int res = -ENOMEM; + + /* randomize initial seqno to avoid collision */ + get_random_bytes(&random_seqno, sizeof(random_seqno)); + atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno); + + hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; + ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); + if (!ogm_buff) + goto out; + + hard_iface->bat_iv.ogm_buff = ogm_buff; + + batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; + batadv_ogm_packet->header.packet_type = BATADV_IV_OGM; + batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION; + batadv_ogm_packet->header.ttl = 2; + batadv_ogm_packet->flags = BATADV_NO_FLAGS; + batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; + batadv_ogm_packet->tt_num_changes = 0; + batadv_ogm_packet->ttvn = 0; + + INIT_DELAYED_WORK(&hard_iface->bat_iv.work, batadv_iv_ogm_send); + + res = 0; + +out: + return res; +} + static void batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, @@ -1108,7 +1130,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, spin_lock_bh(&orig_neigh_node->ogm_cnt_lock); word = &(orig_neigh_node->bcast_own[offset]); - bit_pos = if_incoming_seqno - 2; + bit_pos = if_incoming_seqno; bit_pos -= ntohl(batadv_ogm_packet->seqno); batadv_set_bit(word, bit_pos); weight = &orig_neigh_node->bcast_own_sum[if_num]; diff --git a/types.h b/types.h index 030ce41..978381a 100644 --- a/types.h +++ b/types.h @@ -49,6 +49,7 @@ struct batadv_hard_iface_bat_iv { unsigned char *ogm_buff; int ogm_buff_len; atomic_t ogm_seqno; + struct delayed_work work; }; struct batadv_hard_iface { -- 1.8.0

2 2

[B.A.T.M.A.N.] [RFC] batman-adv: postpone sysfs removal when unregistering
by Simon Wunderlich 13 Dec '12

13 Dec '12

When processing the unregister notify for a hard interface, removing the sysfs files may lead to a circular deadlock (rtnl mutex <-> s_active). To overcome this problem, postpone the sysfs removal in a worker. Reported-by: Sasha Levin <sasha.levin(a)oracle.com> Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- Postponing the sysfs removal for the hardif unregister is easier than other alternatives involving deferring. This should bring us to the same level to the bridge code, which also messes with sysfs in the notifier processing function, and uses rtnl_trylock when called from within sysfs. As far as I could understand the net/core code, only the unregister case is the critical one, so the original bug should hopefully be fixed. Anyway, I might overlook something so I'm sending this as RFC. --- hard-interface.c | 18 ++++++++++++++++-- types.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index f1d37cd..075cb27 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -506,6 +506,19 @@ out: return NULL; } +static void batadv_hardif_remove_interface_finish(struct work_struct *work) +{ + struct delayed_work *delayed_work; + struct batadv_hard_iface *hard_iface; + + delayed_work = container_of(work, struct delayed_work, work); + hard_iface = container_of(delayed_work, struct batadv_hard_iface, + cleanup_work); + + batadv_sysfs_del_hardif(&hard_iface->hardif_obj); + batadv_hardif_free_ref(hard_iface); +} + static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) { ASSERT_RTNL(); @@ -518,8 +531,9 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) return; hard_iface->if_status = BATADV_IF_TO_BE_REMOVED; - batadv_sysfs_del_hardif(&hard_iface->hardif_obj); - batadv_hardif_free_ref(hard_iface); + INIT_DELAYED_WORK(&hard_iface->cleanup_work, + batadv_hardif_remove_interface_finish); + queue_work(batadv_event_workqueue, &hard_iface->cleanup_work); } void batadv_hardif_remove_interfaces(void) diff --git a/types.h b/types.h index 030ce41..6e9746a 100644 --- a/types.h +++ b/types.h @@ -63,6 +63,7 @@ struct batadv_hard_iface { struct net_device *soft_iface; struct rcu_head rcu; struct batadv_hard_iface_bat_iv bat_iv; + struct delayed_work cleanup_work; }; /** -- 1.7.10.4

2 2

[B.A.T.M.A.N.] [RFC] batman-adv boot setup scheme on OpenWRT
by Gui Iribarren 10 Dec '12

10 Dec '12

Hello Marek and folks, chasing a race condition, I might have delved a little too deep into openwrt boot sequence :( AFAICU, currently there's a /etc/hotplug.d/net/99-batman-adv script which tries to configure both bat0 , and any interfaces coming up that might have to be included there. Problem is, hotplug.d/net scripts are called when interface is "added" but not necessarilly brought up yet. So there's a "sleep 3s" that works in most cases as a window for slow hardware bring up the interface. ...in most cases :( on an old nanoloco2, creating 2 wifi-ifaces in ap mode and 1 in ibss mode, managed with batman-adv, the sleep 3s is not enough. A 6s timeout works around it, but maybe there's a better solution? I've divided the script, putting the "add candidate interfaces to bat0" into /etc/hotplug.d/*iface*/99-batman-adv , which gets called precisely after an interface is actually brought up. This works as expected, and i could even eliminate the original 3s sleep. hotplug.d/iface script adds candidate interfaces to batX after they are brought up hotplug.d/net script configures batX as they appear, Would that work in general? Or was the single hotplug.d/net implemented that way, for a reason i'm missing? Thanks! Gui

6 12

[B.A.T.M.A.N.] net, batman: lockdep circular dependency warning
by Sasha Levin 05 Dec '12

05 Dec '12

Hi all, While fuzzing with trinity inside a KVM tools (lkvm) guest running latest -next kernel, I've stumbled on the following: [ 1002.969392] ====================================================== [ 1002.971639] [ INFO: possible circular locking dependency detected ] [ 1002.975805] 3.7.0-rc5-next-20121112-sasha-00018-g2f4ce0e #127 Tainted: G W [ 1002.983691] ------------------------------------------------------- [ 1002.983691] trinity-child18/8149 is trying to acquire lock: [ 1002.983691] (s_active#313){++++.+}, at: [<ffffffff812f9941>] sysfs_addrm_finish+0x31/0x60 [ 1002.983691] [ 1002.983691] but task is already holding lock: [ 1002.983691] (rtnl_mutex){+.+.+.}, at: [<ffffffff834fcc62>] rtnl_lock+0x12/0x20 [ 1002.983691] [ 1002.983691] which lock already depends on the new lock. [ 1002.983691] [ 1002.983691] [ 1002.983691] the existing dependency chain (in reverse order) is: [ 1002.983691] -> #1 (rtnl_mutex){+.+.+.}: [ 1002.983691] [<ffffffff81180d0a>] check_prevs_add+0xba/0x1a0 [ 1002.983691] [<ffffffff81181490>] validate_chain.isra.23+0x6a0/0x7b0 [ 1002.983691] [<ffffffff81183e3b>] __lock_acquire+0x9db/0xa90 [ 1002.983691] [<ffffffff8118635a>] lock_acquire+0x1ca/0x270 [ 1002.983691] [<ffffffff83bf647a>] __mutex_lock_common+0x5a/0x550 [ 1002.983691] [<ffffffff83bf69af>] mutex_lock_nested+0x3f/0x50 [ 1002.983691] [<ffffffff834fcc62>] rtnl_lock+0x12/0x20 [ 1002.983691] [<ffffffff834eeb3c>] netdev_run_todo+0x7c/0x180 [ 1002.983691] [<ffffffff834fcfa9>] rtnl_unlock+0x9/0x10 [ 1002.983691] [<ffffffff839d7da1>] batadv_store_mesh_iface+0x121/0x160 [ 1002.983691] [<ffffffff819d303f>] kobj_attr_store+0xf/0x30 [ 1002.983691] [<ffffffff812f7d41>] sysfs_write_file+0x101/0x170 [ 1002.983691] [<ffffffff8127ac58>] vfs_write+0xb8/0x180 [ 1002.983691] [<ffffffff8127af57>] sys_pwrite64+0x67/0x90 [ 1002.983691] [<ffffffff83bfafd8>] tracesys+0xe1/0xe6 [ 1002.983691] -> #0 (s_active#313){++++.+}: [ 1002.983691] [<ffffffff81180725>] check_prev_add+0x115/0x640 [ 1002.983691] [<ffffffff81180d0a>] check_prevs_add+0xba/0x1a0 [ 1002.983691] [<ffffffff81181490>] validate_chain.isra.23+0x6a0/0x7b0 [ 1002.983691] [<ffffffff81183e3b>] __lock_acquire+0x9db/0xa90 [ 1002.983691] [<ffffffff8118635a>] lock_acquire+0x1ca/0x270 [ 1002.983691] [<ffffffff812f8eaa>] sysfs_deactivate+0x11a/0x190 [ 1002.983691] [<ffffffff812f9941>] sysfs_addrm_finish+0x31/0x60 [ 1002.983691] [<ffffffff812f9a0a>] __sysfs_remove_dir+0x9a/0xd0 [ 1002.983691] [<ffffffff812f9f2f>] sysfs_remove_dir+0x3f/0x50 [ 1002.983691] [<ffffffff819d3806>] kobject_del+0x16/0x40 [ 1002.983691] [<ffffffff819d3930>] kobject_cleanup+0x100/0x190 [ 1002.983691] [<ffffffff819d39cd>] kobject_release+0xd/0x10 [ 1002.983691] [<ffffffff819d33cc>] kobject_put+0x4c/0x60 [ 1002.983691] [<ffffffff839d8134>] batadv_sysfs_del_hardif+0x14/0x30 [ 1002.983691] [<ffffffff839cdacd>] batadv_hardif_remove_interface+0x5d/0x90 [ 1002.983691] [<ffffffff839cdba1>] batadv_hard_if_event+0xa1/0x2f0 [ 1002.983691] [<ffffffff8114271e>] notifier_call_chain+0xee/0x130 [ 1002.983691] [<ffffffff81142d31>] raw_notifier_call_chain+0x11/0x20 [ 1002.983691] [<ffffffff834e8dc2>] call_netdevice_notifiers+0x52/0x60 [ 1002.983691] [<ffffffff834ef4cd>] rollback_registered_many+0x14d/0x210 [ 1002.983691] [<ffffffff834ef5bc>] rollback_registered+0x2c/0x40 [ 1002.983691] [<ffffffff834ef650>] unregister_netdevice_queue+0x70/0xa0 [ 1002.983691] [<ffffffff834ef7bb>] unregister_netdev+0x1b/0x30 [ 1002.983691] [<ffffffff82a51fcc>] usbnet_disconnect+0x8c/0xf0 [ 1002.983691] [<ffffffff82b0aca7>] usb_unbind_interface+0x67/0x160 [ 1002.983691] [<ffffffff81e580a1>] __device_release_driver+0x81/0xe0 [ 1002.983691] [<ffffffff81e581f9>] device_release_driver+0x29/0x40 [ 1002.983691] [<ffffffff81e56c98>] bus_remove_device+0x138/0x150 [ 1002.983691] [<ffffffff81e54e8d>] device_del+0x13d/0x1a0 [ 1002.983691] [<ffffffff82b08459>] usb_disable_device+0xd9/0x270 [ 1002.983691] [<ffffffff82b08f38>] usb_set_configuration+0x268/0x7b0 [ 1002.983691] [<ffffffff82b0e5e3>] usb_remove_store+0x43/0x80 [ 1002.983691] [<ffffffff81e536c3>] dev_attr_store+0x13/0x30 [ 1002.983691] [<ffffffff812f7d41>] sysfs_write_file+0x101/0x170 [ 1002.983691] [<ffffffff8127ac58>] vfs_write+0xb8/0x180 [ 1002.983691] [<ffffffff8127ae10>] sys_write+0x50/0xa0 [ 1002.983691] [<ffffffff83bfafd8>] tracesys+0xe1/0xe6 [ 1002.983691] [ 1002.983691] other info that might help us debug this: [ 1002.983691] [ 1002.983691] Possible unsafe locking scenario: [ 1002.983691] [ 1002.983691] CPU0 CPU1 [ 1002.983691] ---- ---- [ 1002.983691] lock(rtnl_mutex); [ 1002.983691] lock(s_active#313); [ 1002.983691] lock(rtnl_mutex); [ 1002.983691] lock(s_active#313); [ 1002.983691] [ 1002.983691] *** DEADLOCK *** [ 1002.983691] [ 1002.983691] 4 locks held by trinity-child18/8149: [ 1002.983691] #0: (&buffer->mutex){+.+.+.}, at: [<ffffffff812f7c7f>] sysfs_write_file+0x3f/0x170 [ 1002.983691] #1: (&__lockdep_no_validate__){......}, at: [<ffffffff82b0e5c8>] usb_remove_store+0x28/0x80 [ 1002.983691] #2: (&__lockdep_no_validate__){......}, at: [<ffffffff81e581f1>] device_release_driver+0x21/0x40 [ 1002.983691] #3: (rtnl_mutex){+.+.+.}, at: [<ffffffff834fcc62>] rtnl_lock+0x12/0x20 [ 1002.983691] [ 1002.983691] stack backtrace: [ 1002.983691] Pid: 8149, comm: trinity-child18 Tainted: G W 3.7.0-rc5-next-20121112-sasha-00018-g2f4ce0e #127 [ 1002.983691] Call Trace: [ 1002.983691] [<ffffffff83b322b9>] print_circular_bug+0xd3/0xe4 [ 1002.983691] [<ffffffff81180725>] check_prev_add+0x115/0x640 [ 1002.983691] [<ffffffff81180d0a>] check_prevs_add+0xba/0x1a0 [ 1002.983691] [<ffffffff8117e134>] ? graph_unlock+0xa4/0xb0 [ 1002.983691] [<ffffffff81181490>] validate_chain.isra.23+0x6a0/0x7b0 [ 1002.983691] [<ffffffff81183e3b>] __lock_acquire+0x9db/0xa90 [ 1002.983691] [<ffffffff81181ce9>] ? mark_held_locks+0xf9/0x130 [ 1002.983691] [<ffffffff811844af>] ? lockdep_init_map+0xcf/0x5e0 [ 1002.983691] [<ffffffff8118635a>] lock_acquire+0x1ca/0x270 [ 1002.983691] [<ffffffff812f9941>] ? sysfs_addrm_finish+0x31/0x60 [ 1002.983691] [<ffffffff812f8eaa>] sysfs_deactivate+0x11a/0x190 [ 1002.983691] [<ffffffff812f9941>] ? sysfs_addrm_finish+0x31/0x60 [ 1002.983691] [<ffffffff812f9941>] sysfs_addrm_finish+0x31/0x60 [ 1002.983691] [<ffffffff812f9a0a>] __sysfs_remove_dir+0x9a/0xd0 [ 1002.983691] [<ffffffff812f9f2f>] sysfs_remove_dir+0x3f/0x50 [ 1002.983691] [<ffffffff819d3806>] kobject_del+0x16/0x40 [ 1002.983691] [<ffffffff819d3930>] kobject_cleanup+0x100/0x190 [ 1002.983691] [<ffffffff819d39cd>] kobject_release+0xd/0x10 [ 1002.983691] [<ffffffff819d33cc>] kobject_put+0x4c/0x60 [ 1002.983691] [<ffffffff839d8134>] batadv_sysfs_del_hardif+0x14/0x30 [ 1002.983691] [<ffffffff839cd040>] ? batadv_primary_if_update_addr+0x280/0x280 [ 1002.983691] [<ffffffff839cdacd>] batadv_hardif_remove_interface+0x5d/0x90 [ 1002.983691] [<ffffffff839cdba1>] batadv_hard_if_event+0xa1/0x2f0 [ 1002.983691] [<ffffffff8114271e>] notifier_call_chain+0xee/0x130 [ 1002.983691] [<ffffffff81142d31>] raw_notifier_call_chain+0x11/0x20 [ 1002.983691] [<ffffffff834e8dc2>] call_netdevice_notifiers+0x52/0x60 [ 1002.983691] [<ffffffff834ef4cd>] rollback_registered_many+0x14d/0x210 [ 1002.983691] [<ffffffff834ef5bc>] rollback_registered+0x2c/0x40 [ 1002.983691] [<ffffffff834ef650>] unregister_netdevice_queue+0x70/0xa0 [ 1002.983691] [<ffffffff834ef7bb>] unregister_netdev+0x1b/0x30 [ 1002.983691] [<ffffffff82a51fcc>] usbnet_disconnect+0x8c/0xf0 [ 1002.983691] [<ffffffff82b0aca7>] usb_unbind_interface+0x67/0x160 [ 1002.983691] [<ffffffff81e580a1>] __device_release_driver+0x81/0xe0 [ 1002.983691] [<ffffffff81e581f9>] device_release_driver+0x29/0x40 [ 1002.983691] [<ffffffff81e56c98>] bus_remove_device+0x138/0x150 [ 1002.983691] [<ffffffff81e54e8d>] device_del+0x13d/0x1a0 [ 1002.983691] [<ffffffff82b08459>] usb_disable_device+0xd9/0x270 [ 1002.983691] [<ffffffff82b08f38>] usb_set_configuration+0x268/0x7b0 [ 1002.983691] [<ffffffff82b0e5c8>] ? usb_remove_store+0x28/0x80 [ 1002.983691] [<ffffffff82b0e5e3>] usb_remove_store+0x43/0x80 [ 1002.983691] [<ffffffff81e536c3>] dev_attr_store+0x13/0x30 [ 1002.983691] [<ffffffff812f7d41>] sysfs_write_file+0x101/0x170 [ 1002.983691] [<ffffffff8127ac58>] vfs_write+0xb8/0x180 [ 1002.983691] [<ffffffff8127ae10>] sys_write+0x50/0xa0 [ 1002.983691] [<ffffffff83bfafd8>] tracesys+0xe1/0xe6 Thanks, Sasha

4 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N December 2012