commits November 2012

commits@lists.open-mesh.org

1 participants
86 discussions

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

11 Nov '12

The annotated tag, v3.7-rc5 has been created at 167e404cd31e98ab4fa56d8a4d774e4d9fdb5191 (tag) tagging 77b67063bb6bce6d475e910d3b886a606d0d91f7 (commit) replaces v3.7-rc4 tagged by Linus Torvalds on Sun Nov 11 13:44:42 2012 +0100 - Shortlog ------------------------------------------------------------ Linux 3.7-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJQn526AAoJEHm+PkMAQRiGQJoH/RAk2zmryS6wEpsdp7kl0pez DA7iI0lkBD/2s6gb3xbgqiuLpYoj8FZsNfKia8G9gcMo+BxL7tO46J4seki7UUZc Zt219olN6bfTlBToVtUsPPA758aMQ7SDJqe6ZPm3Znj8Zwcp8KodszJ6h5oeuPkj rkglyZwTxmbkFWu7TddIKVs4Gcb0CGuCx4gx6IWdYomgblwhZCnmFgHKmuiFXz2Z 0PonP2ANBnUeihZYENTrpJFc0iBeA6HUVdTMeHqEeSGg5jyp3kYHhSj8NLKx16Xl CvI8d4kGpH6CPL7VCJo8BUh0DuR1MXdS++YpjPHasC2DkwatXQ7FLjmYs8RIJ3A= =dZwT -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master's head updated: Merge branch 'next' (68639a8)
by postmaster＠open-mesh.org 09 Nov '12

09 Nov '12

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: a845b83 batctl: Mark correctly aligned headers not as __packed d348f8c batctl: Use packing of 2 for all headers before an ethernet header aa7d948 batctl: Fix alignment for payload after batadv_unicast_4addr_packet 68639a8 Merge branch 'next'

1 0

[batctl] master: Merge branch 'next' (68639a8)
by postmaster＠open-mesh.org 09 Nov '12

09 Nov '12

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 68639a8b3869363327a5d5fb16950d29329a468f Merge: a5ead71 aa7d948 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Nov 9 14:38:19 2012 +0800 Merge branch 'next' >--------------------------------------------------------------- 68639a8b3869363327a5d5fb16950d29329a468f packet.h | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-)

1 0

[batctl] next: batctl: Fix alignment for payload after batadv_unicast_4addr_packet (aa7d948)
by postmaster＠open-mesh.org 09 Nov '12

09 Nov '12

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit aa7d948369df87e0ba8767458959af84354d73ec Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 5 10:15:24 2012 +0100 batctl: 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> >--------------------------------------------------------------- aa7d948369df87e0ba8767458959af84354d73ec packet.h | 6 +++++- 1 file changed, 5 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;

1 0

[batctl] next: batctl: Use packing of 2 for all headers before an ethernet header (d348f8c)
by postmaster＠open-mesh.org 09 Nov '12

09 Nov '12

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit d348f8cb9d3dc45d92a8ab9bdd616cd82a5f589a Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 5 21:25:27 2012 +0100 batctl: 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> >--------------------------------------------------------------- d348f8cb9d3dc45d92a8ab9bdd616cd82a5f589a 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

[batctl] next: batctl: Mark correctly aligned headers not as __packed (a845b83)
by postmaster＠open-mesh.org 09 Nov '12

09 Nov '12

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit a845b83beba02dbeb92724cf9b49b6f0547b6fe9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 5 21:25:26 2012 +0100 batctl: 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> >--------------------------------------------------------------- a845b83beba02dbeb92724cf9b49b6f0547b6fe9 packet.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/packet.h b/packet.h index aa3e63a..55e6935 100644 --- a/packet.h +++ b/packet.h @@ -121,13 +121,16 @@ 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 +155,7 @@ struct batadv_icmp_packet { __be16 seqno; uint8_t uid; uint8_t reserved; -} __packed; +}; #define BATADV_RR_LEN 16 @@ -168,13 +171,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 +209,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 +223,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] master's head updated: batman-adv: fix kernel-doc for batadv_reroute_unicast_packet() (bc91a4a)
by postmaster＠open-mesh.org 08 Nov '12

08 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: bc91a4a batman-adv: fix kernel-doc for batadv_reroute_unicast_packet()

1 0

[batman-adv] next: batman-adv: fix kernel-doc for batadv_reroute_unicast_packet() (bc91a4a)
by postmaster＠open-mesh.org 08 Nov '12

08 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit bc91a4a7e00c9610dd6285e5ca8bea9cb208cbe7 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Nov 7 21:07:35 2012 +0100 batman-adv: fix kernel-doc for batadv_reroute_unicast_packet() This was introduced by ("batman-adv: substitute tt_poss_change with a per-tt_entry flag") Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- bc91a4a7e00c9610dd6285e5ca8bea9cb208cbe7 routing.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/routing.c b/routing.c index 63ff456..1aa1722 100644 --- a/routing.c +++ b/routing.c @@ -877,11 +877,10 @@ out: * @bat_priv: the bat priv with all the soft interface information * @unicast_packet: the unicast header to be updated * @dst_addr: the payload destination - * @msg: the message to print explaining the reason of the requested re-route * - * Search the global translation table for dst_addr and update the unicast - * header with the new corresponding information (originator address where the - * destination client currently is and its known TTVN) + * Search the translation table for dst_addr and update the unicast header with + * the new corresponding information (originator address where the destination + * client currently is and its known TTVN) * * Returns true if the packet header has been updated, false otherwise */

1 0

[batman-adv] master's head updated: Merge branch 'maint' into next (79dc2c2)
by postmaster＠open-mesh.org 08 Nov '12

08 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: fa614fd batman-adv: fix tt_global_entries flags update d46bf9e batman-adv: correctly pass the client flag on tt_response 79dc2c2 Merge branch 'maint' into next

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (79dc2c2)
by postmaster＠open-mesh.org 08 Nov '12

08 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: fa614fd batman-adv: fix tt_global_entries flags update d46bf9e batman-adv: correctly pass the client flag on tt_response 79dc2c2 Merge branch 'maint' into next

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