commits November 2012

commits@lists.open-mesh.org

1 participants
86 discussions

[batman-adv] next: batman-adv: fix TT packet rerouting (3bd73df)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 3bd73df4874a2f73e8630caba7025910e437c803 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Nov 6 12:05:19 2012 +0100 batman-adv: fix TT packet rerouting When the node checks for a packet to be re-routed or not, first it should consider whether the destination is a local client. Only after this check, the node can eventually search the global table. This was introduced by ("batman-adv: substitute tt_poss_change with a per-tt_entry flag") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 3bd73df4874a2f73e8630caba7025910e437c803 routing.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/routing.c b/routing.c index d5a01d1..c190c73 100644 --- a/routing.c +++ b/routing.c @@ -890,22 +890,37 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, struct batadv_unicast_packet *unicast_packet, uint8_t *dst_addr) { - struct batadv_orig_node *orig_node; + struct batadv_orig_node *orig_node = NULL; + struct batadv_hard_iface *primary_if = NULL; bool ret = false; + uint8_t *orig_addr, orig_ttvn; - orig_node = batadv_transtable_search(bat_priv, NULL, dst_addr); - if (!orig_node) - goto out; + if (batadv_is_my_client(bat_priv, dst_addr)) { + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if) + goto out; + orig_addr = primary_if->net_dev->dev_addr; + orig_ttvn = (uint8_t)atomic_read(&bat_priv->tt.vn); + } else { + orig_node = batadv_transtable_search(bat_priv, NULL, dst_addr); + if (!orig_node) + goto out; - if (batadv_compare_eth(orig_node->orig, unicast_packet->dest)) - goto out; + if (batadv_compare_eth(orig_node->orig, unicast_packet->dest)) + goto out; + + orig_addr = orig_node->orig; + orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); + } /* update the packet header */ - memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN); - unicast_packet->ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); + memcpy(unicast_packet->dest, orig_addr, ETH_ALEN); + unicast_packet->ttvn = orig_ttvn; ret = true; out: + if (primary_if) + batadv_hardif_free_ref(primary_if); if (orig_node) batadv_orig_node_free_ref(orig_node);

1 0

[batman-adv] next: batman-adv: Fix alignment for payload after batadv_unicast_4addr_packet (cc9fb91)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit cc9fb912f01cf8069b1e4f131f2f93db52289b2d Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 5 10:15:24 2012 +0100 batman-adv: Fix alignment for payload after batadv_unicast_4addr_packet batadv_unicast_4addr_packet created an odd aligned ethernet header and a not 4 bytes boundary aligned IP header. Adding an extra reserved bytes avoids this problem. This problem was introduced in 78fc6bbe0aca868b65b92723b1e259e7ef7b35c0 ("batman-adv: add UNICAST_4ADDR packet type") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- cc9fb912f01cf8069b1e4f131f2f93db52289b2d packet.h | 6 +++++- unicast.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packet.h b/packet.h index cef1b3f..1c5454d 100644 --- a/packet.h +++ b/packet.h @@ -204,7 +204,11 @@ struct batadv_unicast_4addr_packet { struct batadv_unicast_packet u; uint8_t src[ETH_ALEN]; uint8_t subtype; -} __packed; + uint8_t reserved; + /* "4 bytes boundary + 2 bytes" long to make the payload after the + * following ethernet header again 4 bytes boundary aligned + */ +}; struct batadv_unicast_frag_packet { struct batadv_header header; diff --git a/unicast.c b/unicast.c index 9416136..10aff49 100644 --- a/unicast.c +++ b/unicast.c @@ -374,6 +374,7 @@ bool batadv_unicast_4addr_prepare_skb(struct batadv_priv *bat_priv, memcpy(unicast_4addr_packet->src, primary_if->net_dev->dev_addr, ETH_ALEN); unicast_4addr_packet->subtype = packet_subtype; + unicast_4addr_packet->reserved = 0; ret = true; out:

1 0

[batman-adv] next: batman-adv: fix ROAM flag de-selection (846815f)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 846815f0af43bdc2c58cb5e1b64c158edefda16e Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 5 16:34:34 2012 +0100 batman-adv: fix ROAM flag de-selection In tt_global_add() the ROAM flag is improperly unset. This makes the next check fail and so preventing emptying the old originator_list for the involved tt_global_entry This was introduced by ("batman-adv: roaming handling mechanism redesign") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Reported-by: Mike Burmeister-Brown <mike(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 846815f0af43bdc2c58cb5e1b64c158edefda16e translation-table.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/translation-table.c b/translation-table.c index c731050..0bdf980 100644 --- a/translation-table.c +++ b/translation-table.c @@ -860,14 +860,6 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, */ common->flags &= ~BATADV_TT_CLIENT_TEMP; - /* if this is a normal add, possibly unset the ROAM flag. This - * flag could have been set before because the client was - * roaming, but now that the node got the ADD event, the flag - * can be unset - */ - if (!(flags & BATADV_TT_CLIENT_ROAM)) - common->flags &= ~BATADV_TT_CLIENT_ROAM; - /* 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.

1 0

[batman-adv] next: batman-adv: Use packing of 2 for all headers before an ethernet header (52f79c4)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 52f79c4ec1ca6255ff13284bf3c628e894e25f45 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 5 21:25:27 2012 +0100 batman-adv: Use packing of 2 for all headers before an ethernet header All packet headers in front of an ethernet header have to be completely divisible by 2 but not by 4 to make the payload after the ethernet header again 4 bytes boundary aligned. A packing of 2 is necessary to avoid extra padding at the end of the struct caused by a structure member which is larger than two bytes. Otherwise the structure would not fulfill the previously mentioned rule to avoid the misalignment of the payload after the ethernet header. It may also lead to leakage of information when the padding it not initialized before sending. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 52f79c4ec1ca6255ff13284bf3c628e894e25f45 packet.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packet.h b/packet.h index 55e6935..cef1b3f 100644 --- a/packet.h +++ b/packet.h @@ -173,6 +173,18 @@ struct batadv_icmp_packet_rr { uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; }; +/* All packet headers in front of an ethernet header have to be completely + * divisible by 2 but not by 4 to make the payload after the ethernet + * header again 4 bytes boundary aligned. + * + * A packing of 2 is necessary to avoid extra padding at the end of the struct + * caused by a structure member which is larger than two bytes. Otherwise + * the structure would not fulfill the previously mentioned rule to avoid the + * misalignment of the payload after the ethernet header. It may also lead to + * leakage of information when the padding it not initialized before sending. + */ +#pragma pack(2) + struct batadv_unicast_packet { struct batadv_header header; uint8_t ttvn; /* destination translation table version number */ @@ -212,7 +224,9 @@ struct batadv_bcast_packet { /* "4 bytes boundary + 2 bytes" long to make the payload after the * following ethernet header again 4 bytes boundary aligned */ -} __packed; +}; + +#pragma pack() struct batadv_vis_packet { struct batadv_header header;

1 0

[batman-adv] next: batman-adv: fix david compatibility regression (48ff5dc)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 48ff5dcceeb4ee96825f4552f73eef0e1bc1c1e0 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Nov 7 23:01:35 2012 +0800 batman-adv: fix david compatibility regression This was introduced by ("batman-adv: Mark correctly aligned headers not as __packed") Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 48ff5dcceeb4ee96825f4552f73eef0e1bc1c1e0 packet.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packet.h b/packet.h index 28699f1..55e6935 100644 --- a/packet.h +++ b/packet.h @@ -128,7 +128,8 @@ struct batadv_header { uint8_t version; /* batman version field */ uint8_t ttl; /* the parent struct has to add a byte after the header to make - * everything 4 bytes aligned again */ + * everything 4 bytes aligned again + */ }; struct batadv_ogm_packet {

1 0

[batman-adv] next: batman-adv: Mark correctly aligned headers not as __packed (e754ea0)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit e754ea05decb4593e52eb6bfae63b734eda421b9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 5 21:25:26 2012 +0100 batman-adv: Mark correctly aligned headers not as __packed Headers which are already perfectly aligned and create a 4 byte boundary non-ethernet header payload can have the __packed attribute removed. The __packed attribute doesn't change the appeareance of the packet for these headers because no extra padding is necessary to align the data members. The compiler will also create slightly faster code for loads of multi-byte members. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- e754ea05decb4593e52eb6bfae63b734eda421b9 packet.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packet.h b/packet.h index aa3e63a..28699f1 100644 --- a/packet.h +++ b/packet.h @@ -121,13 +121,15 @@ struct batadv_bla_claim_dst { uint8_t magic[3]; /* FF:43:05 */ uint8_t type; /* bla_claimframe */ __be16 group; /* group id */ -} __packed; +}; struct batadv_header { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t ttl; -} __packed; + /* the parent struct has to add a byte after the header to make + * everything 4 bytes aligned again */ +}; struct batadv_ogm_packet { struct batadv_header header; @@ -152,7 +154,7 @@ struct batadv_icmp_packet { __be16 seqno; uint8_t uid; uint8_t reserved; -} __packed; +}; #define BATADV_RR_LEN 16 @@ -168,13 +170,16 @@ struct batadv_icmp_packet_rr { uint8_t uid; uint8_t rr_cur; uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; -} __packed; +}; struct batadv_unicast_packet { struct batadv_header header; uint8_t ttvn; /* destination translation table version number */ uint8_t dest[ETH_ALEN]; -} __packed; + /* "4 bytes boundary + 2 bytes" long to make the payload after the + * following ethernet header again 4 bytes boundary aligned + */ +}; /** * struct batadv_unicast_4addr_packet - extended unicast packet @@ -203,6 +208,9 @@ struct batadv_bcast_packet { uint8_t reserved; __be32 seqno; uint8_t orig[ETH_ALEN]; + /* "4 bytes boundary + 2 bytes" long to make the payload after the + * following ethernet header again 4 bytes boundary aligned + */ } __packed; struct batadv_vis_packet { @@ -214,7 +222,7 @@ struct batadv_vis_packet { uint8_t vis_orig[ETH_ALEN]; /* originator reporting its neighbors */ uint8_t target_orig[ETH_ALEN]; /* who should receive this packet */ uint8_t sender_orig[ETH_ALEN]; /* who sent or forwarded this packet */ -} __packed; +}; struct batadv_tt_query_packet { struct batadv_header header;

1 0

[batman-adv] next: batman-adv: Reserve extra bytes in skb for better alignment (7f91790)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 7f91790974c258e71a62f6dee8cb1dbe5dff36c3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Nov 4 17:11:45 2012 +0100 batman-adv: Reserve extra bytes in skb for better alignment The ethernet header is 14 bytes long. Therefore, the data after it is not 4 byte aligned and may cause problems on systems without unaligned data access. Reserving NET_IP_ALIGN more byes can fix the misalignment of the ethernet header. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 7f91790974c258e71a62f6dee8cb1dbe5dff36c3 bat_iv_ogm.c | 8 +++++--- icmp_socket.c | 4 ++-- translation-table.c | 20 ++++++++++---------- vis.c | 9 +++++---- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 75403a4..9f3925a 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -411,9 +411,11 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, if ((atomic_read(&bat_priv->aggregated_ogms)) && (packet_len < BATADV_MAX_AGGREGATION_BYTES)) - skb_size = BATADV_MAX_AGGREGATION_BYTES + ETH_HLEN; + skb_size = BATADV_MAX_AGGREGATION_BYTES; else - skb_size = packet_len + ETH_HLEN; + skb_size = packet_len; + + skb_size += ETH_HLEN + NET_IP_ALIGN; forw_packet_aggr->skb = dev_alloc_skb(skb_size); if (!forw_packet_aggr->skb) { @@ -422,7 +424,7 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, kfree(forw_packet_aggr); goto out; } - skb_reserve(forw_packet_aggr->skb, ETH_HLEN); + skb_reserve(forw_packet_aggr->skb, ETH_HLEN + NET_IP_ALIGN); INIT_HLIST_NODE(&forw_packet_aggr->list); diff --git a/icmp_socket.c b/icmp_socket.c index 5874c0e..87ca809 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -177,13 +177,13 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (len >= sizeof(struct batadv_icmp_packet_rr)) packet_len = sizeof(struct batadv_icmp_packet_rr); - skb = dev_alloc_skb(packet_len + ETH_HLEN); + skb = dev_alloc_skb(packet_len + ETH_HLEN + NET_IP_ALIGN); if (!skb) { len = -ENOMEM; goto out; } - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len); if (copy_from_user(icmp_packet, buff, packet_len)) { diff --git a/translation-table.c b/translation-table.c index 6fecb94..c731050 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1594,11 +1594,11 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, tt_tot = tt_len / sizeof(struct batadv_tt_change); len = tt_query_size + tt_len; - skb = dev_alloc_skb(len + ETH_HLEN); + skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto out; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); tt_response = (struct batadv_tt_query_packet *)skb_put(skb, len); tt_response->ttvn = ttvn; @@ -1659,11 +1659,11 @@ static int batadv_send_tt_request(struct batadv_priv *bat_priv, if (!tt_req_node) goto out; - skb = dev_alloc_skb(sizeof(*tt_request) + ETH_HLEN); + skb = dev_alloc_skb(sizeof(*tt_request) + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto out; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); tt_req_len = sizeof(*tt_request); tt_request = (struct batadv_tt_query_packet *)skb_put(skb, tt_req_len); @@ -1761,11 +1761,11 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, tt_tot = tt_len / sizeof(struct batadv_tt_change); len = sizeof(*tt_response) + tt_len; - skb = dev_alloc_skb(len + ETH_HLEN); + skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto unlock; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); packet_pos = skb_put(skb, len); tt_response = (struct batadv_tt_query_packet *)packet_pos; tt_response->ttvn = req_ttvn; @@ -1880,11 +1880,11 @@ batadv_send_my_tt_response(struct batadv_priv *bat_priv, tt_tot = tt_len / sizeof(struct batadv_tt_change); len = sizeof(*tt_response) + tt_len; - skb = dev_alloc_skb(len + ETH_HLEN); + skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto unlock; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); packet_pos = skb_put(skb, len); tt_response = (struct batadv_tt_query_packet *)packet_pos; tt_response->ttvn = req_ttvn; @@ -2211,11 +2211,11 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, if (!batadv_tt_check_roam_count(bat_priv, client)) goto out; - skb = dev_alloc_skb(sizeof(*roam_adv_packet) + ETH_HLEN); + skb = dev_alloc_skb(sizeof(*roam_adv_packet) + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto out; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); roam_adv_packet = (struct batadv_roam_adv_packet *)skb_put(skb, len); diff --git a/vis.c b/vis.c index 79589a3..0f65a9d 100644 --- a/vis.c +++ b/vis.c @@ -396,12 +396,12 @@ batadv_add_packet(struct batadv_priv *bat_priv, return NULL; len = sizeof(*packet) + vis_info_len; - info->skb_packet = dev_alloc_skb(len + ETH_HLEN); + info->skb_packet = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN); if (!info->skb_packet) { kfree(info); return NULL; } - skb_reserve(info->skb_packet, ETH_HLEN); + skb_reserve(info->skb_packet, ETH_HLEN + NET_IP_ALIGN); packet = (struct batadv_vis_packet *)skb_put(info->skb_packet, len); kref_init(&info->refcount); @@ -856,12 +856,13 @@ int batadv_vis_init(struct batadv_priv *bat_priv) if (!bat_priv->vis.my_info) goto err; - len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE + ETH_HLEN; + len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE; + len += ETH_HLEN + NET_IP_ALIGN; bat_priv->vis.my_info->skb_packet = dev_alloc_skb(len); if (!bat_priv->vis.my_info->skb_packet) goto free_info; - skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN); + skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN + NET_IP_ALIGN); tmp_skb = bat_priv->vis.my_info->skb_packet; packet = (struct batadv_vis_packet *)skb_put(tmp_skb, sizeof(*packet));

1 0

[batctl] master: batctl: Guarantee delimiter after snprintf (a5ead71)
by postmaster＠open-mesh.org 05 Nov '12

05 Nov '12

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit a5ead719b6a6cce0bb15f0f89167c467931d24d5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 31 10:52:29 2012 +0100 batctl: Guarantee delimiter after snprintf snprintf doesn't add a \0 delimiter when the size of the buffer is not big enough. The caller has to fix it manually to avoid crashes. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a5ead719b6a6cce0bb15f0f89167c467931d24d5 bisect_iv.c | 10 ++++++---- debugfs.c | 1 + sys.c | 8 ++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index c4c06c2..09171fb 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -639,9 +639,9 @@ static int print_rt_path_at_seqno(struct bat_node *src_node, struct bat_node *ds struct rt_hist *rt_hist; char curr_loop_magic[LOOP_MAGIC_LEN]; - memset(curr_loop_magic, 0, LOOP_MAGIC_LEN); - snprintf(curr_loop_magic, LOOP_MAGIC_LEN, "%s%s%lli%lli", src_node->name, + snprintf(curr_loop_magic, sizeof(curr_loop_magic), "%s%s%lli%lli", src_node->name, dst_node->name, seqno, seqno_rand); + curr_loop_magic[sizeof(curr_loop_magic) - 1] = '\0'; printf("Path towards %s (seqno %lli ", get_name_by_macstr(dst_node->name, read_opt), seqno); @@ -719,10 +719,10 @@ static int find_rt_table_change(struct bat_node *src_node, struct bat_node *dst_ return 0; } - memset(curr_loop_magic, 0, LOOP_MAGIC_LEN); - snprintf(curr_loop_magic, LOOP_MAGIC_LEN, "%s%s%lli%lli", + snprintf(curr_loop_magic, sizeof(curr_loop_magic), "%s%s%lli%lli", src_node->name, dst_node->name, seqno_min_tmp, seqno_rand); + curr_loop_magic[sizeof(curr_loop_magic) - 1] = '\0'; orig_event = orig_event_get_by_ptr(curr_node, dst_node); if (!orig_event) @@ -979,6 +979,7 @@ static void seqno_trace_print_neigh(struct seqno_trace_neigh *seqno_trace_neigh, (strlen(head) > 1 ? head : num_sisters == 0 ? " " : head), (strlen(head) == 1 ? " " : num_sisters == 0 ? " " : "| ")); + new_head[sizeof(new_head) - 1] = '\0'; seqno_trace_print_neigh(seqno_trace_neigh->seqno_trace_neigh[i], seqno_trace_neigh->seqno_event, seqno_trace_neigh->num_neighbors - i - 1, new_head, read_opt); @@ -1024,6 +1025,7 @@ static void seqno_trace_print(struct list_head_first *trace_list, char *trace_or snprintf(head, sizeof(head), "%c", (seqno_trace->seqno_trace_neigh.num_neighbors == i + 1 ? '\\' : '|')); + head[sizeof(head) - 1] = '\0'; seqno_trace_print_neigh(seqno_trace->seqno_trace_neigh.seqno_trace_neigh[i], NULL, diff --git a/debugfs.c b/debugfs.c index 549546c..9fc6f42 100644 --- a/debugfs.c +++ b/debugfs.c @@ -56,6 +56,7 @@ int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size) return len+1; snprintf(buffer, size-1, fmt, debugfs_mountpoint, mesh_iface); + buffer[size - 1] = '\0'; return 0; } diff --git a/sys.c b/sys.c index 9591416..e4112b7 100644 --- a/sys.c +++ b/sys.c @@ -136,6 +136,7 @@ static int print_interfaces(char *mesh_iface) while ((iface_dir = readdir(iface_base_dir)) != NULL) { snprintf(path_buff, PATH_BUFF_LEN, SYS_MESH_IFACE_FMT, iface_dir->d_name); + path_buff[PATH_BUFF_LEN - 1] = '\0'; res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) continue; @@ -153,6 +154,7 @@ static int print_interfaces(char *mesh_iface) line_ptr = NULL; snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, iface_dir->d_name); + 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"); @@ -216,9 +218,11 @@ 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]); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (!file_exists(path_buff)) { snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_DIR, argv[i]); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (!file_exists(path_buff)) { printf("Error - interface does not exist: %s\n", argv[i]); @@ -288,6 +292,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (argc != 1) { for (i = 1; i < argc; i++) { @@ -314,6 +319,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) } snprintf(str, sizeof(str), "%i", log_level); + str[sizeof(str) - 1] = '\0'; res = write_file(path_buff, SYS_LOG_LEVEL, str, NULL); goto out; } @@ -379,6 +385,7 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (argc == 1) { res = read_file(path_buff, (char *)batctl_settings[setting].sysfs_name, @@ -443,6 +450,7 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (argc == 1) { res = read_file(path_buff, SYS_GW_MODE, USE_READ_BUFF, 0, 0, 0);

1 0

[linux-merge]linux integration; annotated tag, v3.7-rc4, created. v3.7-rc4
by postmaster＠open-mesh.org 04 Nov '12

04 Nov '12

The annotated tag, v3.7-rc4 has been created at cf5c3c9cee716beddb7f2539a7f7bc0415239ce6 (tag) tagging 3d70f8c617a436c7146ecb81df2265b4626dfe89 (commit) replaces v3.7-rc3 tagged by Linus Torvalds on Sun Nov 4 11:07:49 2012 -0800 - Shortlog ------------------------------------------------------------ Linux 3.7-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQlr0MAAoJEHm+PkMAQRiGLVQH/171fUorGn+u2k7dNhSWJXHB pPy6MbZhuBWepgRZGS0ffiC5tBvQaf9iK9Fh/9aqrDDw2aELk0CLPqQcfAUF/Jzf USPdBSIMNikgZtlWhabxuj/zKdaw8UuiJpCf3rMyIRmjQgmZyw/53TEqF54xTv0I Y4Y21vTSVXilQwvwYvcsCEBFrTZqXjLWQ60Hk+QRS9GV7a9m2LFcdiPOtRv17gbd CBDuiMHN9R04l2bB+5WHHsu+TNNf5uy3wAgEskDTftneXWjW44R4UR8O0rQh1ezQ Pa5WpCyJRRG8UOtPKTS6LEbljBwLLIoVI2JRoJrWoy3OkT63wyowFXyLGWCCrHY= =qAGi -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: upgrade to latest master (db75a39)
by postmaster＠open-mesh.org 04 Nov '12

04 Nov '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit db75a39f61d1d58e44013015edf72420d8244091 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Nov 4 20:08:50 2012 +0800 batman-adv-devel: upgrade to latest master * add DAT compile & config script support * auto-select crc32c dependency Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- db75a39f61d1d58e44013015edf72420d8244091 batman-adv-devel/Config.in | 13 +++++++++++-- batman-adv-devel/Makefile | 3 ++- batman-adv-devel/files/etc/config/batman-adv | 1 + batman-adv-devel/files/lib/batman-adv/config.sh | 6 ++++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 78bc5a7..d7404fb 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -3,10 +3,17 @@ config KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG bool "enable verbose debug logging" depends PACKAGE_kmod-batman-adv-devel default n + config KMOD_BATMAN_ADV_DEVEL_BLA bool "enable bridge loop avoidance" depends PACKAGE_kmod-batman-adv-devel default y + +config KMOD_BATMAN_ADV_DEVEL_DAT + bool "enable distributed arp table" + depends PACKAGE_kmod-batman-adv-devel + default y + config KMOD_BATMAN_ADV_DEVEL_BATCTL bool "enable batctl" depends PACKAGE_kmod-batman-adv-devel @@ -19,7 +26,8 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL config KMOD_BATMAN_ADV_DEVEL_BATMAN_REV string prompt "batman-adv git revision to build package with" - default "3fdeaa6" + depends PACKAGE_kmod-batman-adv-devel + default "59f8434" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches @@ -28,7 +36,8 @@ config KMOD_BATMAN_ADV_DEVEL_BATMAN_REV config KMOD_BATMAN_ADV_DEVEL_BATCTL_REV string prompt "batctl git revision to build package with" - default "acd06db" + depends PACKAGE_kmod-batman-adv-devel + default "d81bf38" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index db58b99..c57c327 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -33,7 +33,7 @@ define KernelPackage/batman-adv-devel URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner <lindner_marek(a)yahoo.de> SUBMENU:=Network Support - DEPENDS:=+kmod-lib-crc16 +libc + DEPENDS:=+kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) @@ -60,6 +60,7 @@ MAKE_BATMAN_ADV_ARGS += \ LINUX_VERSION="$(LINUX_VERSION)" \ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),y,n) \ CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BLA),y,n) \ + CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DAT),y,n) \ REVISION="$(PKG_BATMAN_SHORTREV)" all MAKE_BATCTL_ARGS += \ diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 766d949..6ec9e03 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -12,6 +12,7 @@ config 'mesh' 'bat0' option 'orig_interval' option 'vis_mode' option 'bridge_loop_avoidance' + option 'distributed_arp_table' option 'hop_penalty' # yet another batX instance diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 295b543..0917462 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -11,13 +11,14 @@ bat_load_module() bat_config() { local mesh="$1" - local aggregated_ogms ap_isolation bonding bridge_loop_avoidance fragmentation gw_bandwidth - local gw_mode gw_sel_class hop_penalty log_level orig_interval vis_mode + local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation + local gw_bandwidth gw_mode gw_sel_class hop_penalty log_level orig_interval vis_mode config_get aggregated_ogms "$mesh" aggregated_ogms config_get ap_isolation "$mesh" ap_isolation config_get bonding "$mesh" bonding config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance + config_get distributed_arp_table "$mesh" distributed_arp_table config_get fragmentation "$mesh" fragmentation config_get gw_bandwidth "$mesh" gw_bandwidth config_get gw_mode "$mesh" gw_mode @@ -33,6 +34,7 @@ bat_config() [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance + [ -n "$distributed_arp_table" ] && echo $distributed_arp_table > /sys/class/net/$mesh/mesh/distributed_arp_table [ -n "$fragmentation" ] && echo $fragmentation > /sys/class/net/$mesh/mesh/fragmentation [ -n "$gw_bandwidth" ] && echo $gw_bandwidth > /sys/class/net/$mesh/mesh/gw_bandwidth [ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2012