commits June 2011

commits@lists.open-mesh.org

1 participants
58 discussions

batman-adv; branch, master, updated. v2011.1.0-157-g54bd925
by postmaster＠open-mesh.org 15 Jun '11

15 Jun '11

The following commit has been merged in the master branch: commit 54bd925230ad35a74f8541225f18b6dd06643054 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 15 15:08:59 2011 +0200 batman-adv: Move compare_orig to originator.c compare_orig is only used in context of orig_node which is managed inside originator.c. It is not necessary to keep that function inside the header originator.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/originator.c b/originator.c index 62d8196..338b3c5 100644 --- a/originator.c +++ b/originator.c @@ -37,6 +37,14 @@ static void start_purge_timer(struct bat_priv *bat_priv) queue_delayed_work(bat_event_workqueue, &bat_priv->orig_work, 1 * HZ); } +/* returns 1 if they are the same originator */ +static int compare_orig(const struct hlist_node *node, const void *data2) +{ + const void *data1 = container_of(node, struct orig_node, hash_entry); + + return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); +} + int originator_init(struct bat_priv *bat_priv) { if (bat_priv->orig_hash) diff --git a/originator.h b/originator.h index 8e307af..cfc1f60 100644 --- a/originator.h +++ b/originator.h @@ -40,14 +40,6 @@ int orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num); int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num); -/* returns 1 if they are the same originator */ -static inline int compare_orig(const struct hlist_node *node, const void *data2) -{ - const void *data1 = container_of(node, struct orig_node, hash_entry); - - return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); -} - /* hashfunction to choose an entry in a hash table of given size */ /* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ static inline int choose_orig(const void *data, int32_t size) -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-156-g58fc8de
by postmaster＠open-mesh.org 15 Jun '11

15 Jun '11

The following commit has been merged in the master branch: commit 58fc8def043e6fd432a055dcdfd38890ad3323ca Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 15 09:41:37 2011 +0200 batman-adv: Reduce usage of char char was used in different places to store information without really using the characteristics of that data type or by ignoring the fact that char has not a well defined signedness. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/aggregation.c b/aggregation.c index ede0a56..c583e04 100644 --- a/aggregation.c +++ b/aggregation.c @@ -190,7 +190,7 @@ static void aggregate(struct forw_packet *forw_packet_aggr, void add_bat_packet_to_list(struct bat_priv *bat_priv, unsigned char *packet_buff, int packet_len, - struct hard_iface *if_incoming, char own_packet, + struct hard_iface *if_incoming, int own_packet, unsigned long send_time) { /** diff --git a/aggregation.h b/aggregation.h index 2b7b852..216337b 100644 --- a/aggregation.h +++ b/aggregation.h @@ -37,7 +37,7 @@ static inline int aggregated_packet(int buff_pos, int packet_len, void add_bat_packet_to_list(struct bat_priv *bat_priv, unsigned char *packet_buff, int packet_len, - struct hard_iface *if_incoming, char own_packet, + struct hard_iface *if_incoming, int own_packet, unsigned long send_time); void receive_aggr_bat_packet(const struct ethhdr *ethhdr, unsigned char *packet_buff, int packet_len, diff --git a/bitarray.c b/bitarray.c index 3659a25..c1f4bfc 100644 --- a/bitarray.c +++ b/bitarray.c @@ -127,8 +127,8 @@ static void bit_reset_window(unsigned long *seq_bits) * 1 if the window was moved (either new or very old) * 0 if the window was not moved/shifted. */ -char bit_get_packet(void *priv, unsigned long *seq_bits, - int32_t seq_num_diff, int8_t set_mark) +int bit_get_packet(void *priv, unsigned long *seq_bits, + int32_t seq_num_diff, int set_mark) { struct bat_priv *bat_priv = priv; diff --git a/bitarray.h b/bitarray.h index 277c037..9c04422 100644 --- a/bitarray.h +++ b/bitarray.h @@ -35,8 +35,8 @@ void bit_mark(unsigned long *seq_bits, int32_t n); /* receive and process one packet, returns 1 if received seq_num is considered * new, 0 if old */ -char bit_get_packet(void *priv, unsigned long *seq_bits, - int32_t seq_num_diff, int8_t set_mark); +int bit_get_packet(void *priv, unsigned long *seq_bits, + int32_t seq_num_diff, int set_mark); /* count the hamming weight, how many good packets did we receive? */ int bit_packet_count(const unsigned long *seq_bits); diff --git a/gateway_client.c b/gateway_client.c index d90463a..8b25b52 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -396,7 +396,7 @@ void gw_node_purge(struct bat_priv *bat_priv) struct gw_node *gw_node, *curr_gw; struct hlist_node *node, *node_tmp; unsigned long timeout = 2 * PURGE_TIMEOUT * HZ; - char do_deselect = 0; + int do_deselect = 0; curr_gw = gw_get_selected_gw_node(bat_priv); diff --git a/gateway_common.c b/gateway_common.c index e74307b..18661af 100644 --- a/gateway_common.c +++ b/gateway_common.c @@ -61,9 +61,9 @@ static void kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class) /* returns the up and downspeeds in kbit, calculated from the class */ void gw_bandwidth_to_kbit(uint8_t gw_srv_class, int *down, int *up) { - char sbit = (gw_srv_class & 0x80) >> 7; - char dpart = (gw_srv_class & 0x78) >> 3; - char upart = (gw_srv_class & 0x07); + int sbit = (gw_srv_class & 0x80) >> 7; + int dpart = (gw_srv_class & 0x78) >> 3; + int upart = (gw_srv_class & 0x07); if (!gw_srv_class) { *down = 0; diff --git a/main.h b/main.h index 059866c..f3fe9f4 100644 --- a/main.h +++ b/main.h @@ -174,7 +174,7 @@ int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) __printf(2, 3); while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ __printf(3, 4) -static inline void bat_dbg(char type __always_unused, +static inline void bat_dbg(int type __always_unused, struct bat_priv *bat_priv __always_unused, const char *fmt __always_unused, ...) { diff --git a/routing.c b/routing.c index dc639db..2222288 100644 --- a/routing.c +++ b/routing.c @@ -184,7 +184,7 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct neigh_node *neigh_node = NULL, *tmp_neigh_node; struct hlist_node *node; - unsigned char total_count; + uint8_t total_count; uint8_t orig_eq_count, neigh_rq_count, tq_own; int tq_asym_penalty, ret = 0; @@ -622,9 +622,9 @@ void receive_bat_packet(const struct ethhdr *ethhdr, struct orig_node *orig_neigh_node, *orig_node; struct neigh_node *router = NULL, *router_router = NULL; struct neigh_node *orig_neigh_router = NULL; - char has_directlink_flag; - char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; - char is_broadcast = 0, is_bidirectional, is_single_hop_neigh; + int has_directlink_flag; + int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; + int is_broadcast = 0, is_bidirectional, is_single_hop_neigh; int is_duplicate; uint32_t if_incoming_seqno; diff --git a/send.c b/send.c index a150c7c..7a2f082 100644 --- a/send.c +++ b/send.c @@ -165,7 +165,7 @@ static void send_packet(struct forw_packet *forw_packet) struct bat_priv *bat_priv; struct batman_packet *batman_packet = (struct batman_packet *)(forw_packet->skb->data); - unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0); + int directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0); if (!forw_packet->if_incoming) { pr_err("Error - can't forward packet: incoming iface not " @@ -352,12 +352,12 @@ void schedule_own_packet(struct hard_iface *hard_iface) void schedule_forward_packet(struct orig_node *orig_node, const struct ethhdr *ethhdr, struct batman_packet *batman_packet, - uint8_t directlink, + int directlink, struct hard_iface *if_incoming) { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct neigh_node *router; - unsigned char in_tq, in_ttl, tq_avg = 0; + uint8_t in_tq, in_ttl, tq_avg = 0; unsigned long send_time; uint8_t tt_num_changes; diff --git a/send.h b/send.h index bd5ab77..633224a 100644 --- a/send.h +++ b/send.h @@ -28,7 +28,7 @@ void schedule_own_packet(struct hard_iface *hard_iface); void schedule_forward_packet(struct orig_node *orig_node, const struct ethhdr *ethhdr, struct batman_packet *batman_packet, - uint8_t directlink, + int directlink, struct hard_iface *if_outgoing); int add_bcast_packet_to_list(struct bat_priv *bat_priv, const struct sk_buff *skb); diff --git a/soft-interface.c b/soft-interface.c index 7aeed0d..ab420ea 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -381,7 +381,7 @@ void softif_neigh_purge(struct bat_priv *bat_priv) struct softif_neigh *softif_neigh, *curr_softif_neigh; struct softif_neigh_vid *softif_neigh_vid; struct hlist_node *node, *node_tmp, *node_tmp2; - char do_deselect; + int do_deselect; rcu_read_lock(); hlist_for_each_entry_rcu(softif_neigh_vid, node, -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-155-gfdc8438
by postmaster＠open-mesh.org 15 Jun '11

15 Jun '11

The following commit has been merged in the master branch: commit fdc8438e00328eb19cc5d48e181d8f628a5256ee Author: David Howells <dhowells(a)redhat.com> Date: Wed Jun 15 09:41:36 2011 +0200 batman-adv: count_real_packets() in batman-adv assumes char is signed count_real_packets() in batman-adv assumes char is signed, and returns -1 through it: net/batman-adv/routing.c: In function 'receive_bat_packet': net/batman-adv/routing.c:739: warning: comparison is always false due to limited range of data type Use int instead. Signed-off-by: David Howells <dhowells(a)redhat.com> cc: Marek Lindner <lindner_marek(a)yahoo.de> cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> cc: Sven Eckelmann <sven(a)narfation.org> cc: b.a.t.m.a.n(a)lists.open-mesh.org cc: netdev(a)vger.kernel.org Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bitarray.c b/bitarray.c index 700ee4f..3659a25 100644 --- a/bitarray.c +++ b/bitarray.c @@ -26,8 +26,8 @@ /* returns true if the corresponding bit in the given seq_bits indicates true * and curr_seqno is within range of last_seqno */ -uint8_t get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno, - uint32_t curr_seqno) +int get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno, + uint32_t curr_seqno) { int32_t diff, word_offset, word_num; diff --git a/bitarray.h b/bitarray.h index e32eb2d..277c037 100644 --- a/bitarray.h +++ b/bitarray.h @@ -26,8 +26,8 @@ /* returns true if the corresponding bit in the given seq_bits indicates true * and curr_seqno is within range of last_seqno */ -uint8_t get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno, - uint32_t curr_seqno); +int get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno, + uint32_t curr_seqno); /* turn corresponding bit on, so we can remember that we got the packet */ void bit_mark(unsigned long *seq_bits, int32_t n); diff --git a/routing.c b/routing.c index 3f52ceb..dc639db 100644 --- a/routing.c +++ b/routing.c @@ -381,7 +381,7 @@ static void update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, const struct ethhdr *ethhdr, const struct batman_packet *batman_packet, struct hard_iface *if_incoming, - const unsigned char *tt_buff, char is_duplicate) + const unsigned char *tt_buff, int is_duplicate) { struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL; struct neigh_node *router = NULL; @@ -548,7 +548,7 @@ static int window_protected(struct bat_priv *bat_priv, * -1 the packet is old and has been received while the seqno window * was protected. Caller should drop it. */ -static char count_real_packets(const struct ethhdr *ethhdr, +static int count_real_packets(const struct ethhdr *ethhdr, const struct batman_packet *batman_packet, const struct hard_iface *if_incoming) { @@ -556,7 +556,7 @@ static char count_real_packets(const struct ethhdr *ethhdr, struct orig_node *orig_node; struct neigh_node *tmp_neigh_node; struct hlist_node *node; - char is_duplicate = 0; + int is_duplicate = 0; int32_t seq_diff; int need_update = 0; int set_mark, ret = -1; @@ -625,7 +625,7 @@ void receive_bat_packet(const struct ethhdr *ethhdr, char has_directlink_flag; char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; char is_broadcast = 0, is_bidirectional, is_single_hop_neigh; - char is_duplicate; + int is_duplicate; uint32_t if_incoming_seqno; /* Silently drop when the batman packet is actually not a -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-154-gd21f32a
by postmaster＠open-mesh.org 15 Jun '11

15 Jun '11

The following commit has been merged in the master branch: commit d21f32afe668cbced33d2c2f2a844490990db3f3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 15 09:41:35 2011 +0200 batman-adv: Fix line over 80 characters This regression was introduced in 02585b0b59becfbf14749f08069862f120000bdf. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/routing.c b/routing.c index 30d0f73..3f52ceb 100644 --- a/routing.c +++ b/routing.c @@ -1231,7 +1231,7 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) } break; case TT_RESPONSE: - /* packet needs to be linearised to access the TT changes records */ + /* packet needs to be linearised to access the TT changes */ if (skb_linearize(skb) < 0) goto out; -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-153-g6872456
by postmaster＠open-mesh.org 15 Jun '11

15 Jun '11

The following commit has been merged in the master branch: commit 68724569c68c1287a511548ac2b46d6de6b19661 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Jun 14 17:58:27 2011 +0200 batman-adv: the skb has not to be freed in recv_tt_query() In recv_tt_query(), in case of error the skb is freed and then NET_RX_DROP is returned. This makes the caller function wrongly invoke kfree_skb() again. To avoid this double free recv_tt_query() has to always return NET_RX_DROP and not to free the skb. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/routing.c b/routing.c index 3a3cfb8..30d0f73 100644 --- a/routing.c +++ b/routing.c @@ -1194,7 +1194,6 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct tt_query_packet *tt_query; struct ethhdr *ethhdr; - int ret = NET_RX_DROP; /* drop packet if it has not necessary minimum size */ if (unlikely(!pskb_may_pull(skb, sizeof(struct tt_query_packet)))) @@ -1248,11 +1247,10 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) } break; } - ret = NET_RX_SUCCESS; out: - kfree_skb(skb); - return ret; + /* returning NET_RX_DROP will make the caller function kfree the skb */ + return NET_RX_DROP; } int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if) -- batman-adv

1 0

batctl; branch, master, updated. v2011.1.0-32-g5e42d99
by postmaster＠open-mesh.org 15 Jun '11

15 Jun '11

The following commit has been merged in the master branch: commit 5e42d990f203fdb11e7409cb04b6be4fd9d64a09 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Jun 14 16:19:36 2011 +0200 batctl: tcpdump - cleanup tt_query packet parser Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/tcpdump.c b/tcpdump.c index 4e09274..5500899 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -254,6 +254,7 @@ static void dump_vlan(unsigned char *packet_buff, ssize_t buff_len, int read_opt static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct tt_query_packet *tt_query_packet; + char *tt_desc, *tt_data, tt_type; LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct tt_query_packet), "BAT TT"); @@ -262,17 +263,32 @@ static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int rea if (!time_printed) print_time(); + switch (tt_query_packet->flags & TT_QUERY_TYPE_MASK) { + case TT_REQUEST: + tt_desc = "request"; + tt_data = "crc"; + tt_type = 'Q'; + break; + case TT_RESPONSE: + tt_desc = "response"; + tt_data = "entries"; + tt_type = 'P'; + break; + default: + tt_desc = "unknown"; + tt_data = "unknown"; + tt_type = '?'; + break; + } + printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)tt_query_packet->src, read_opt)); - printf("%s: TT %s, ttvn %d, %s %d, ttl %2d, v %d, flags [%c%c%c], length %zu\n", + printf("%s: TT %s, ttvn %d, %s %d, ttl %2d, v %d, flags [%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)tt_query_packet->dst, read_opt), - tt_query_packet->flags & TT_RESPONSE ? "response" : "request", - tt_query_packet->ttvn, tt_query_packet->flags & TT_RESPONSE ? "entries" : "crc", - ntohs(tt_query_packet->tt_data), tt_query_packet->ttl, tt_query_packet->version, - (tt_query_packet->flags & TT_REQUEST ? 'Q' : '.'), - (tt_query_packet->flags & TT_RESPONSE ? 'P' : '.'), - (tt_query_packet->flags & TT_FULL_TABLE ? 'F' : '.'), + tt_desc, tt_query_packet->ttvn, tt_data, ntohs(tt_query_packet->tt_data), + tt_query_packet->ttl, tt_query_packet->version, + tt_type, (tt_query_packet->flags & TT_FULL_TABLE ? 'F' : '.'), (size_t)buff_len - sizeof(struct ether_header)); } -- batctl

1 0

linux integration; annotated tag, v3.0-rc3, created. v3.0-rc3
by postmaster＠open-mesh.org 14 Jun '11

14 Jun '11

The annotated tag, v3.0-rc3 has been created at a73e7344f7a7712628f40f851fa835ea82025d7b (tag) tagging 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (commit) replaces v3.0-rc2 tagged by Linus Torvalds on Mon Jun 13 15:30:14 2011 -0700 - Shortlog ------------------------------------------------------------ Linux 3.0-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) iEYEABECAAYFAk32j34ACgkQF3YsRnbiHLuyigCfRttTqXLqdV1AAnc3PxFFOHDy i/sAnj7M9ZFzoZPimo5mPEFMVAvioAdU =jXgM -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

batctl; branch, master, updated. v2011.1.0-31-gf706dce
by postmaster＠open-mesh.org 14 Jun '11

14 Jun '11

The following commit has been merged in the master branch: commit f706dcec516d213ffeea336d9c2c8bb575a7c532 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Jun 13 22:51:40 2011 +0200 batman-adv: clean up the tt_query flags field The tt_query subtype is represented by the two leading bits (lsb) of the tt_query->flags field. Therefore it cannot be handled by simple "flags" but by two bits wide integer. The TT_QUERY_TYPE_MASK is used to extract the relevant bits that can be compared to the related enum values (TT_RESPONSE, TT_REQUEST) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index ef7476f..c5f081d 100644 --- a/packet.h +++ b/packet.h @@ -65,10 +65,16 @@ enum unicast_frag_flags { UNI_FRAG_LARGETAIL = 1 << 1 }; +/* TT_QUERY subtypes */ +#define TT_QUERY_TYPE_MASK 0x3 + +enum tt_query_packettype { + TT_REQUEST = 0, + TT_RESPONSE = 1 +}; + /* TT_QUERY flags */ enum tt_query_flags { - TT_RESPONSE = 1 << 0, - TT_REQUEST = 1 << 1, TT_FULL_TABLE = 1 << 2 }; -- batctl

1 0

batman-adv; branch, master, updated. v2011.1.0-152-g02585b0
by postmaster＠open-mesh.org 14 Jun '11

14 Jun '11

The following commit has been merged in the master branch: commit 02585b0b59becfbf14749f08069862f120000bdf Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Jun 13 22:51:40 2011 +0200 batman-adv: clean up the tt_query flags field The tt_query subtype is represented by the two leading bits (lsb) of the tt_query->flags field. Therefore it cannot be handled by simple "flags" but by two bits wide integer. The TT_QUERY_TYPE_MASK is used to extract the relevant bits that can be compared to the related enum values (TT_RESPONSE, TT_REQUEST) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index ef7476f..c5f081d 100644 --- a/packet.h +++ b/packet.h @@ -65,10 +65,16 @@ enum unicast_frag_flags { UNI_FRAG_LARGETAIL = 1 << 1 }; +/* TT_QUERY subtypes */ +#define TT_QUERY_TYPE_MASK 0x3 + +enum tt_query_packettype { + TT_REQUEST = 0, + TT_RESPONSE = 1 +}; + /* TT_QUERY flags */ enum tt_query_flags { - TT_RESPONSE = 1 << 0, - TT_REQUEST = 1 << 1, TT_FULL_TABLE = 1 << 2 }; diff --git a/routing.c b/routing.c index 7f458e9..3a3cfb8 100644 --- a/routing.c +++ b/routing.c @@ -1218,7 +1218,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) tt_query->tt_data = ntohs(tt_query->tt_data); - if (tt_query->flags & TT_REQUEST) { + switch (tt_query->flags & TT_QUERY_TYPE_MASK) { + case TT_REQUEST: /* If we cannot provide an answer the tt_request is * forwarded */ if (!send_tt_response(bat_priv, tt_query)) { @@ -1229,22 +1230,23 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) tt_query->tt_data = htons(tt_query->tt_data); return route_unicast_packet(skb, recv_if); } - ret = NET_RX_SUCCESS; - goto out; - } - /* packet needs to be linearised to access the TT changes records */ - if (skb_linearize(skb) < 0) - goto out; + break; + case TT_RESPONSE: + /* packet needs to be linearised to access the TT changes records */ + if (skb_linearize(skb) < 0) + goto out; - if (is_my_mac(tt_query->dst)) - handle_tt_response(bat_priv, tt_query); - else { - bat_dbg(DBG_TT, bat_priv, - "Routing TT_RESPONSE to %pM [%c]\n", - tt_query->dst, - (tt_query->flags & TT_FULL_TABLE ? 'F' : '.')); - tt_query->tt_data = htons(tt_query->tt_data); - return route_unicast_packet(skb, recv_if); + if (is_my_mac(tt_query->dst)) + handle_tt_response(bat_priv, tt_query); + else { + bat_dbg(DBG_TT, bat_priv, + "Routing TT_RESPONSE to %pM [%c]\n", + tt_query->dst, + (tt_query->flags & TT_FULL_TABLE ? 'F' : '.')); + tt_query->tt_data = htons(tt_query->tt_data); + return route_unicast_packet(skb, recv_if); + } + break; } ret = NET_RX_SUCCESS; -- batman-adv

1 0

batctl; branch, master, updated. v2011.1.0-30-g4f4c471
by postmaster＠open-mesh.org 12 Jun '11

12 Jun '11

The following commit has been merged in the master branch: commit 4f4c471678077617bb72098cd13140308baad25d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 12 11:10:38 2011 +0200 batctl: Force packed placment of tt_change Every data structure which is used to send data over the wire must be fixed in layout to prevent incompatibility between different architectures. Those incompatibilities could be generated by extra bytes between members and at the end of the structure. tt_changes_fill_buffer and tt_len use that structure to copy the correct amount of data from an internal structure to the actual packet. We must ensure that this packet buffer only has data which can be interpreted by any architecture. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index 0c3e44d..ef7476f 100644 --- a/packet.h +++ b/packet.h @@ -202,6 +202,6 @@ struct roam_adv_packet { struct tt_change { uint8_t flags; uint8_t addr[ETH_ALEN]; -}; +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- batctl

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2011