commits December 2013

commits@lists.open-mesh.org

1 participants
51 discussions

[batctl] next: batctl: fix alignment for batadv_tvlv_tt_change (855f190)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 855f190e7771fd6704dfc32e9410e2932ba3749d Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sun Dec 15 13:26:55 2013 +0100 batctl: fix alignment for batadv_tvlv_tt_change Make struct batadv_tvlv_tt_change a multiple 4 bytes long to avoid padding on any architecture. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 855f190e7771fd6704dfc32e9410e2932ba3749d packet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packet.h b/packet.h index 04cf27c..2dd8f24 100644 --- a/packet.h +++ b/packet.h @@ -484,13 +484,13 @@ struct batadv_tvlv_tt_vlan_data { * struct batadv_tvlv_tt_change - translation table diff data * @flags: status indicators concerning the non-mesh client (see * batadv_tt_client_flags) - * @reserved: reserved field + * @reserved: reserved field - useful for alignment purposes only * @addr: mac address of non-mesh client that triggered this tt change * @vid: VLAN identifier */ struct batadv_tvlv_tt_change { uint8_t flags; - uint8_t reserved; + uint8_t reserved[3]; uint8_t addr[ETH_ALEN]; __be16 vid; };

9 years, 3 months

[batctl] next: batctl: fix size of batadv_bla_claim_dst (2411325)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 24113255a00ef454e2b3a995947dab9b59fc9ce3 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Dec 2 20:38:33 2013 +0100 batctl: fix size of batadv_bla_claim_dst Since this is a mac address and always 48 bit, and we can assume that it is always aligned to 2-byte boundaries, add a pack(2) pragma. Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 24113255a00ef454e2b3a995947dab9b59fc9ce3 packet.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packet.h b/packet.h index 2a857ed..04cf27c 100644 --- a/packet.h +++ b/packet.h @@ -155,6 +155,7 @@ enum batadv_tvlv_type { BATADV_TVLV_ROAM = 0x05, }; +#pragma pack(2) /* the destination hardware field in the ARP frame is used to * transport the claim type and the group id */ @@ -163,6 +164,7 @@ struct batadv_bla_claim_dst { uint8_t type; /* bla_claimframe */ __be16 group; /* group id */ }; +#pragma pack() /** * struct batadv_ogm_packet - ogm (routing protocol) packet

9 years, 3 months

[batctl] next: batctl: fix size of batadv_icmp_header (499d0a2)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 499d0a2b2b76a2646527f628e39ab1aab5c8b474 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Thu Dec 5 15:33:00 2013 +0100 batctl: fix size of batadv_icmp_header struct batadv_icmp_header currently has a size of 17, which will be padded to 20 on some architectures. Fix this by unrolling the header into the parent structures. Moreover keep the ICMP parsing functions as generic as they are now by using a stub icmp_header struct during packet parsing. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 499d0a2b2b76a2646527f628e39ab1aab5c8b474 packet.h | 40 +++++++++++++++++++++++++++++++++++----- ping.c | 18 +++++++++--------- tcpdump.c | 25 ++++++++++--------------- traceroute.c | 28 ++++++++++++++-------------- 4 files changed, 68 insertions(+), 43 deletions(-) diff --git a/packet.h b/packet.h index 175ce7d..2a857ed 100644 --- a/packet.h +++ b/packet.h @@ -191,7 +191,7 @@ struct batadv_ogm_packet { #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * batadv_icmp_header - common ICMP header + * batadv_icmp_header - common members among all the ICMP packets * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header * @ttl: time to live for this packet, part of the genereal header @@ -199,6 +199,11 @@ struct batadv_ogm_packet { * @dst: address of the destination node * @orig: address of the source node * @uid: local ICMP socket identifier + * @align: not used - useful for alignment purposes only + * + * This structure is used for ICMP packets parsing only and it is never sent + * over the wire. The alignment field at the end is there to ensure that + * members are padded the same way as they are in real packets. */ struct batadv_icmp_header { uint8_t packet_type; @@ -208,16 +213,29 @@ struct batadv_icmp_header { uint8_t dst[ETH_ALEN]; uint8_t orig[ETH_ALEN]; uint8_t uid; + uint8_t align[3]; }; /** * batadv_icmp_packet - ICMP packet - * @icmph: common ICMP header + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the genereal header + * @ttl: time to live for this packet, part of the genereal header + * @msg_type: ICMP packet type + * @dst: address of the destination node + * @orig: address of the source node + * @uid: local ICMP socket identifier * @reserved: not used - useful for alignment * @seqno: ICMP sequence number */ struct batadv_icmp_packet { - struct batadv_icmp_header icmph; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; + uint8_t msg_type; /* see ICMP message types above */ + uint8_t dst[ETH_ALEN]; + uint8_t orig[ETH_ALEN]; + uint8_t uid; uint8_t reserved; __be16 seqno; }; @@ -226,13 +244,25 @@ struct batadv_icmp_packet { /** * batadv_icmp_packet_rr - ICMP RouteRecord packet - * @icmph: common ICMP header + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the genereal header + * @ttl: time to live for this packet, part of the genereal header + * @msg_type: ICMP packet type + * @dst: address of the destination node + * @orig: address of the source node + * @uid: local ICMP socket identifier * @rr_cur: number of entries the rr array * @seqno: ICMP sequence number * @rr: route record array */ struct batadv_icmp_packet_rr { - struct batadv_icmp_header icmph; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; + uint8_t msg_type; /* see ICMP message types above */ + uint8_t dst[ETH_ALEN]; + uint8_t orig[ETH_ALEN]; + uint8_t uid; uint8_t rr_cur; __be16 seqno; uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; diff --git a/ping.c b/ping.c index 778e8ae..bce8ea2 100644 --- a/ping.c +++ b/ping.c @@ -176,11 +176,11 @@ int ping(char *mesh_iface, int argc, char **argv) packet_len = sizeof(struct batadv_icmp_packet); - memcpy(&icmp_packet_out.icmph.dst, dst_mac, ETH_ALEN); - icmp_packet_out.icmph.packet_type = BATADV_ICMP; - icmp_packet_out.icmph.version = BATADV_COMPAT_VERSION; - icmp_packet_out.icmph.msg_type = BATADV_ECHO_REQUEST; - icmp_packet_out.icmph.ttl = 50; + memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); + icmp_packet_out.packet_type = BATADV_ICMP; + icmp_packet_out.version = BATADV_COMPAT_VERSION; + icmp_packet_out.msg_type = BATADV_ECHO_REQUEST; + icmp_packet_out.ttl = 50; icmp_packet_out.seqno = 0; if (rr) { @@ -250,13 +250,13 @@ read_packet: if (htons(seq_counter) != icmp_packet_in.seqno) goto read_packet; - switch (icmp_packet_in.icmph.msg_type) { + switch (icmp_packet_in.msg_type) { case BATADV_ECHO_REPLY: time_delta = end_timer(); printf("%zd bytes from %s icmp_seq=%hu ttl=%d time=%.2f ms", read_len, dst_string, ntohs(icmp_packet_in.seqno), - icmp_packet_in.icmph.ttl, + icmp_packet_in.ttl, time_delta); if (read_len == sizeof(struct batadv_icmp_packet_rr)) { @@ -306,12 +306,12 @@ read_packet: break; case BATADV_PARAMETER_PROBLEM: fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.icmph.version, BATADV_COMPAT_VERSION); + icmp_packet_in.version, BATADV_COMPAT_VERSION); printf("Please make sure to use compatible versions!\n"); goto out; default: printf("Unknown message type %d len %zd received\n", - icmp_packet_in.icmph.msg_type, read_len); + icmp_packet_in.msg_type, read_len); break; } diff --git a/tcpdump.c b/tcpdump.c index b2376fd..3c9ece5 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -369,37 +369,32 @@ static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int r print_time(); printf("BAT %s > ", - get_name_by_macaddr((struct ether_addr *)icmp_packet->icmph.orig, - read_opt)); + get_name_by_macaddr((struct ether_addr *)icmp_packet->orig, read_opt)); - name = get_name_by_macaddr((struct ether_addr *)icmp_packet->icmph.dst, - read_opt); + name = get_name_by_macaddr((struct ether_addr *)icmp_packet->dst, read_opt); - switch (icmp_packet->icmph.msg_type) { + switch (icmp_packet->msg_type) { case BATADV_ECHO_REPLY: printf("%s: ICMP echo reply, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", - name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), - icmp_packet->icmph.ttl, - icmp_packet->icmph.version, + name, icmp_packet->uid, ntohs(icmp_packet->seqno), + icmp_packet->ttl, icmp_packet->version, (size_t)buff_len - sizeof(struct ether_header)); break; case BATADV_ECHO_REQUEST: printf("%s: ICMP echo request, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", - name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), - icmp_packet->icmph.ttl, - icmp_packet->icmph.version, + name, icmp_packet->uid, ntohs(icmp_packet->seqno), + icmp_packet->ttl, icmp_packet->version, (size_t)buff_len - sizeof(struct ether_header)); break; case BATADV_TTL_EXCEEDED: printf("%s: ICMP time exceeded in-transit, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", - name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), - icmp_packet->icmph.ttl, - icmp_packet->icmph.version, + name, icmp_packet->uid, ntohs(icmp_packet->seqno), + icmp_packet->ttl, icmp_packet->version, (size_t)buff_len - sizeof(struct ether_header)); break; default: printf("%s: ICMP type %hhu, length %zu\n", - name, icmp_packet->icmph.msg_type, + name, icmp_packet->msg_type, (size_t)buff_len - sizeof(struct ether_header)); break; } diff --git a/traceroute.c b/traceroute.c index 7b0a826..fccd80c 100644 --- a/traceroute.c +++ b/traceroute.c @@ -133,19 +133,19 @@ int traceroute(char *mesh_iface, int argc, char **argv) goto out; } - memcpy(&icmp_packet_out.icmph.dst, dst_mac, ETH_ALEN); - icmp_packet_out.icmph.version = BATADV_COMPAT_VERSION; - icmp_packet_out.icmph.packet_type = BATADV_ICMP; - icmp_packet_out.icmph.msg_type = BATADV_ECHO_REQUEST; + memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); + icmp_packet_out.version = BATADV_COMPAT_VERSION; + icmp_packet_out.packet_type = BATADV_ICMP; + icmp_packet_out.msg_type = BATADV_ECHO_REQUEST; icmp_packet_out.seqno = 0; icmp_packet_out.reserved = 0; printf("traceroute to %s (%s), %d hops max, %zu byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out)); - for (icmp_packet_out.icmph.ttl = 1; - !dst_reached && icmp_packet_out.icmph.ttl < TTL_MAX; - icmp_packet_out.icmph.ttl++) { + for (icmp_packet_out.ttl = 1; + !dst_reached && icmp_packet_out.ttl < TTL_MAX; + icmp_packet_out.ttl++) { return_mac = NULL; bat_host = NULL; @@ -189,7 +189,7 @@ read_packet: if (htons(seq_counter) != icmp_packet_in.seqno) goto read_packet; - switch (icmp_packet_in.icmph.msg_type) { + switch (icmp_packet_in.msg_type) { case BATADV_ECHO_REPLY: dst_reached = 1; /* fall through */ @@ -197,10 +197,10 @@ read_packet: time_delta[i] = end_timer(); if (!return_mac) { - return_mac = ether_ntoa_long((struct ether_addr *)&icmp_packet_in.icmph.orig); + return_mac = ether_ntoa_long((struct ether_addr *)&icmp_packet_in.orig); if (read_opt & USE_BAT_HOSTS) - bat_host = bat_hosts_find_by_mac((char *)&icmp_packet_in.icmph.orig); + bat_host = bat_hosts_find_by_mac((char *)&icmp_packet_in.orig); } break; @@ -209,22 +209,22 @@ read_packet: goto out; case BATADV_PARAMETER_PROBLEM: fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.icmph.version, BATADV_COMPAT_VERSION); + icmp_packet_in.version, BATADV_COMPAT_VERSION); 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.icmph.msg_type, read_len); + icmp_packet_in.msg_type, read_len); break; } } if (!bat_host) - printf("%2hhu: %s", icmp_packet_out.icmph.ttl, + printf("%2hhu: %s", icmp_packet_out.ttl, (return_mac ? return_mac : "*")); else printf("%2hhu: %s (%s)", - icmp_packet_out.icmph.ttl, + icmp_packet_out.ttl, bat_host->name, return_mac); for (i = 0; i < NUM_PACKETS; i++) {

9 years, 3 months

[batctl] next: batctl: fix header alignment by unrolling batadv_header (27aa24c)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 27aa24cad4c90f9399962bb63fbb8c9dce74b417 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Dec 2 20:38:31 2013 +0100 batctl: fix header alignment by unrolling batadv_header The size of the batadv_header of 3 is problematic on some architectures which automatically pad all structures to a 32 bit boundary. To not lose performance by packing this struct, better embed it into the various host structures. Reported-by: Russell King <linux(a)arm.linux.org.uk> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 27aa24cad4c90f9399962bb63fbb8c9dce74b417 packet.h | 74 +++++++++++++++++++++++++++++++++++++++++----------------- ping.c | 11 ++++----- tcpdump.c | 24 +++++++++---------- traceroute.c | 17 +++++++------- 4 files changed, 78 insertions(+), 48 deletions(-) diff --git a/packet.h b/packet.h index 10597a6..175ce7d 100644 --- a/packet.h +++ b/packet.h @@ -164,23 +164,18 @@ struct batadv_bla_claim_dst { __be16 group; /* group id */ }; -struct batadv_header { - uint8_t packet_type; - 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 - */ -}; - /** * struct batadv_ogm_packet - ogm (routing protocol) packet - * @header: common batman packet header + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the genereal header + * @ttl: time to live for this packet, part of the genereal header * @flags: contains routing relevant flags - see enum batadv_iv_flags * @tvlv_len: length of tvlv data following the ogm header */ struct batadv_ogm_packet { - struct batadv_header header; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; uint8_t flags; __be32 seqno; uint8_t orig[ETH_ALEN]; @@ -197,14 +192,18 @@ struct batadv_ogm_packet { /** * batadv_icmp_header - common ICMP header - * @header: common batman header + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the genereal header + * @ttl: time to live for this packet, part of the genereal header * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node * @uid: local ICMP socket identifier */ struct batadv_icmp_header { - struct batadv_header header; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; uint8_t msg_type; /* see ICMP message types above */ uint8_t dst[ETH_ALEN]; uint8_t orig[ETH_ALEN]; @@ -253,8 +252,18 @@ struct batadv_icmp_packet_rr { */ #pragma pack(2) +/** + * struct batadv_unicast_packet - unicast packet for network payload + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the genereal header + * @ttl: time to live for this packet, part of the genereal header + * @ttvn: translation table version number + * @dest: originator destination of the unicast packet + */ struct batadv_unicast_packet { - struct batadv_header header; + uint8_t packet_type; + uint8_t version; + uint8_t ttl; uint8_t ttvn; /* destination translation table version number */ uint8_t dest[ETH_ALEN]; /* "4 bytes boundary + 2 bytes" long to make the payload after the @@ -280,7 +289,9 @@ struct batadv_unicast_4addr_packet { /** * struct batadv_frag_packet - fragmented packet - * @header: common batman packet header with type, compatversion, and ttl + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the genereal header + * @ttl: time to live for this packet, part of the genereal header * @dest: final destination used when routing fragments * @orig: originator of the fragment used when merging the packet * @no: fragment number within this sequence @@ -289,7 +300,9 @@ struct batadv_unicast_4addr_packet { * @total_size: size of the merged packet */ struct batadv_frag_packet { - struct batadv_header header; + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t ttl; #if defined(__BIG_ENDIAN_BITFIELD) uint8_t no:4; uint8_t reserved:4; @@ -305,8 +318,19 @@ struct batadv_frag_packet { __be16 total_size; }; +/** + * struct batadv_bcast_packet - broadcast packet for network payload + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the genereal header + * @ttl: time to live for this packet, part of the genereal header + * @reserved: reserved byte for alignment + * @seqno: sequence identification + * @orig: originator of the broadcast packet + */ struct batadv_bcast_packet { - struct batadv_header header; + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t ttl; uint8_t reserved; __be32 seqno; uint8_t orig[ETH_ALEN]; @@ -317,7 +341,9 @@ struct batadv_bcast_packet { /** * struct batadv_coded_packet - network coded packet - * @header: common batman packet header and ttl of first included packet + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the genereal header + * @ttl: time to live for this packet, part of the genereal header * @reserved: Align following fields to 2-byte boundaries * @first_source: original source of first included packet * @first_orig_dest: original destinal of first included packet @@ -332,7 +358,9 @@ struct batadv_bcast_packet { * @coded_len: length of network coded part of the payload */ struct batadv_coded_packet { - struct batadv_header header; + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t ttl; uint8_t first_ttvn; /* uint8_t first_dest[ETH_ALEN]; - saved in mac header destination */ uint8_t first_source[ETH_ALEN]; @@ -351,7 +379,9 @@ struct batadv_coded_packet { /** * struct batadv_unicast_tvlv - generic unicast packet with tvlv payload - * @header: common batman packet header + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the genereal header + * @ttl: time to live for this packet, part of the genereal header * @reserved: reserved field (for packet alignment) * @src: address of the source * @dst: address of the destination @@ -359,7 +389,9 @@ struct batadv_coded_packet { * @align: 2 bytes to align the header to a 4 byte boundry */ struct batadv_unicast_tvlv_packet { - struct batadv_header header; + uint8_t packet_type; + uint8_t version; /* batman version field */ + uint8_t ttl; uint8_t reserved; uint8_t dst[ETH_ALEN]; uint8_t src[ETH_ALEN]; diff --git a/ping.c b/ping.c index aad13d9..778e8ae 100644 --- a/ping.c +++ b/ping.c @@ -177,10 +177,10 @@ int ping(char *mesh_iface, int argc, char **argv) packet_len = sizeof(struct batadv_icmp_packet); memcpy(&icmp_packet_out.icmph.dst, dst_mac, ETH_ALEN); - icmp_packet_out.icmph.header.packet_type = BATADV_ICMP; - icmp_packet_out.icmph.header.version = BATADV_COMPAT_VERSION; + icmp_packet_out.icmph.packet_type = BATADV_ICMP; + icmp_packet_out.icmph.version = BATADV_COMPAT_VERSION; icmp_packet_out.icmph.msg_type = BATADV_ECHO_REQUEST; - icmp_packet_out.icmph.header.ttl = 50; + icmp_packet_out.icmph.ttl = 50; icmp_packet_out.seqno = 0; if (rr) { @@ -256,7 +256,7 @@ read_packet: printf("%zd bytes from %s icmp_seq=%hu ttl=%d time=%.2f ms", read_len, dst_string, ntohs(icmp_packet_in.seqno), - icmp_packet_in.icmph.header.ttl, + icmp_packet_in.icmph.ttl, time_delta); if (read_len == sizeof(struct batadv_icmp_packet_rr)) { @@ -306,8 +306,7 @@ read_packet: break; case BATADV_PARAMETER_PROBLEM: fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.icmph.header.version, - BATADV_COMPAT_VERSION); + icmp_packet_in.icmph.version, BATADV_COMPAT_VERSION); printf("Please make sure to use compatible versions!\n"); goto out; default: diff --git a/tcpdump.c b/tcpdump.c index 8f39ac0..b2376fd 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -349,7 +349,7 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int printf("OGM IV via neigh %s, seq %u, tq %3d, ttl %2d, v %d, flags [%c%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), ntohl(batman_ogm_packet->seqno), batman_ogm_packet->tq, - batman_ogm_packet->header.ttl, batman_ogm_packet->header.version, + batman_ogm_packet->ttl, batman_ogm_packet->version, (batman_ogm_packet->flags & BATADV_NOT_BEST_NEXT_HOP ? 'N' : '.'), (batman_ogm_packet->flags & BATADV_DIRECTLINK ? 'D' : '.'), (batman_ogm_packet->flags & BATADV_PRIMARIES_FIRST_HOP ? 'F' : '.'), @@ -379,22 +379,22 @@ static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int r case BATADV_ECHO_REPLY: printf("%s: ICMP echo reply, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), - icmp_packet->icmph.header.ttl, - icmp_packet->icmph.header.version, + icmp_packet->icmph.ttl, + icmp_packet->icmph.version, (size_t)buff_len - sizeof(struct ether_header)); break; case BATADV_ECHO_REQUEST: printf("%s: ICMP echo request, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), - icmp_packet->icmph.header.ttl, - icmp_packet->icmph.header.version, + icmp_packet->icmph.ttl, + icmp_packet->icmph.version, (size_t)buff_len - sizeof(struct ether_header)); break; case BATADV_TTL_EXCEEDED: printf("%s: ICMP time exceeded in-transit, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), - icmp_packet->icmph.header.ttl, - icmp_packet->icmph.header.version, + icmp_packet->icmph.ttl, + icmp_packet->icmph.version, (size_t)buff_len - sizeof(struct ether_header)); break; default: @@ -425,7 +425,7 @@ static void dump_batman_ucast(unsigned char *packet_buff, ssize_t buff_len, int printf("%s: UCAST, ttvn %d, ttl %hhu, ", get_name_by_macaddr((struct ether_addr *)unicast_packet->dest, read_opt), - unicast_packet->ttvn, unicast_packet->header.ttl); + unicast_packet->ttvn, unicast_packet->ttl); parse_eth_hdr(packet_buff + ETH_HLEN + sizeof(struct batadv_unicast_packet), buff_len - ETH_HLEN - sizeof(struct batadv_unicast_packet), @@ -480,7 +480,7 @@ static void dump_batman_4addr(unsigned char *packet_buff, ssize_t buff_len, int printf("%s: 4ADDR, subtybe %hhu, ttvn %d, ttl %hhu, ", get_name_by_macaddr((struct ether_addr *)unicast_4addr_packet->u.dest, read_opt), unicast_4addr_packet->subtype, unicast_4addr_packet->u.ttvn, - unicast_4addr_packet->u.header.ttl); + unicast_4addr_packet->u.ttl); parse_eth_hdr(packet_buff + ETH_HLEN + sizeof(struct batadv_unicast_4addr_packet), buff_len - ETH_HLEN - sizeof(struct batadv_unicast_4addr_packet), @@ -512,10 +512,10 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read batman_ogm_packet = (struct batadv_ogm_packet *)(packet_buff + ETH_HLEN); if ((read_opt & COMPAT_FILTER) && - (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION)) + (batman_ogm_packet->version != BATADV_COMPAT_VERSION)) return; - switch (batman_ogm_packet->header.packet_type) { + switch (batman_ogm_packet->packet_type) { case BATADV_IV_OGM: if (dump_level & DUMP_TYPE_BATOGM) dump_batman_iv_ogm(packet_buff, buff_len, read_opt, time_printed); @@ -537,7 +537,7 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read dump_batman_4addr(packet_buff, buff_len, read_opt, time_printed); break; default: - fprintf(stderr, "Warning - packet contains unknown batman packet type: 0x%02x\n", batman_ogm_packet->header.packet_type); + fprintf(stderr, "Warning - packet contains unknown batman packet type: 0x%02x\n", batman_ogm_packet->packet_type); break; } diff --git a/traceroute.c b/traceroute.c index 18e2428..7b0a826 100644 --- a/traceroute.c +++ b/traceroute.c @@ -134,8 +134,8 @@ int traceroute(char *mesh_iface, int argc, char **argv) } memcpy(&icmp_packet_out.icmph.dst, dst_mac, ETH_ALEN); - icmp_packet_out.icmph.header.version = BATADV_COMPAT_VERSION; - icmp_packet_out.icmph.header.packet_type = BATADV_ICMP; + icmp_packet_out.icmph.version = BATADV_COMPAT_VERSION; + icmp_packet_out.icmph.packet_type = BATADV_ICMP; icmp_packet_out.icmph.msg_type = BATADV_ECHO_REQUEST; icmp_packet_out.seqno = 0; icmp_packet_out.reserved = 0; @@ -143,9 +143,9 @@ int traceroute(char *mesh_iface, int argc, char **argv) printf("traceroute to %s (%s), %d hops max, %zu byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out)); - for (icmp_packet_out.icmph.header.ttl = 1; - !dst_reached && icmp_packet_out.icmph.header.ttl < TTL_MAX; - icmp_packet_out.icmph.header.ttl++) { + for (icmp_packet_out.icmph.ttl = 1; + !dst_reached && icmp_packet_out.icmph.ttl < TTL_MAX; + icmp_packet_out.icmph.ttl++) { return_mac = NULL; bat_host = NULL; @@ -209,8 +209,7 @@ read_packet: goto out; case BATADV_PARAMETER_PROBLEM: fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.icmph.header.version, - BATADV_COMPAT_VERSION); + icmp_packet_in.icmph.version, BATADV_COMPAT_VERSION); fprintf(stderr, "Please make sure to use compatible versions!\n"); goto out; default: @@ -221,11 +220,11 @@ read_packet: } if (!bat_host) - printf("%2hhu: %s", icmp_packet_out.icmph.header.ttl, + printf("%2hhu: %s", icmp_packet_out.icmph.ttl, (return_mac ? return_mac : "*")); else printf("%2hhu: %s (%s)", - icmp_packet_out.icmph.header.ttl, + icmp_packet_out.icmph.ttl, bat_host->name, return_mac); for (i = 0; i < NUM_PACKETS; i++) {

9 years, 3 months

[batctl] next: batctl: fix alignment for batadv_coded_packet (fafc181)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit fafc1818166982100921055aa9817063244d8fef Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Dec 2 20:38:30 2013 +0100 batctl: fix alignment for batadv_coded_packet The compiler may decide to pad the structure, and then it does not have the expected size of 46 byte. Fix this by moving it in the pragma pack(2) part of the code. Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- fafc1818166982100921055aa9817063244d8fef packet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packet.h b/packet.h index 207459b..10597a6 100644 --- a/packet.h +++ b/packet.h @@ -315,8 +315,6 @@ struct batadv_bcast_packet { */ }; -#pragma pack() - /** * struct batadv_coded_packet - network coded packet * @header: common batman packet header and ttl of first included packet @@ -349,6 +347,8 @@ struct batadv_coded_packet { __be16 coded_len; }; +#pragma pack() + /** * struct batadv_unicast_tvlv - generic unicast packet with tvlv payload * @header: common batman packet header

9 years, 3 months

[openwrt-feed-alfred] master: alfred: workaround race condition when batmanif is not ready at boot time (0a7457d)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/openwrt-feed-alfred On branch : master >--------------------------------------------------------------- commit 0a7457d02124597182b8e3174561dd2d8a449f93 Author: Gui Iribarren <gui(a)altermundi.net> Date: Fri Dec 13 16:05:26 2013 -0300 alfred: workaround race condition when batmanif is not ready at boot time Wait up to 30 seconds during init.d script on boot, so that batmanif can come up. If the timeout is reached, the init.d script refuses to start alfred and related daemons. This prevents an alfred crash when it would start during early boot, before batmanif is available. Instead, alfred is started as soon as batmanif appears, if that happens during the 30-second window. Signed-off-by: Gui Iribarren <gui(a)altermundi.net> >--------------------------------------------------------------- 0a7457d02124597182b8e3174561dd2d8a449f93 alfred/Makefile | 2 +- alfred/files/alfred.init | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index 0367ebb..3d70246 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=alfred PKG_VERSION:=2013.4.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_REV:=67e0d7e9cad9f1e2143925183da64a14ab28eb0f PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init index b678d4c..b777b53 100755 --- a/alfred/files/alfred.init +++ b/alfred/files/alfred.init @@ -16,6 +16,7 @@ pid_file_alfred="/var/run/alfred.pid" pid_file_vis="/var/run/batadv-vis.pid" enable=0 vis_enable=0 +batmanif="" SERVICE_DAEMONIZE=1 SERVICE_WRITE_PID=1 @@ -23,7 +24,7 @@ alfred_start() { local args="" local section="$1" - local disabled interface mode batmanif + local disabled interface mode # check if section is disabled config_get_bool disabled "$section" disabled 0 @@ -62,6 +63,21 @@ start() if [ "$enable" = "0" ]; then exit 0 fi + + mesh_dir="/sys/class/net/$batmanif/mesh/" + if ! [ -d "$mesh_dir" ] ; then + timeout=30 + echo "${initscript}: waiting $timeout secs for $batmanif interface..." + for i in $(seq $timeout); do + sleep 1 + [ -d "$mesh_dir" ] && break + if [ $i == $timeout ] ; then + echo "${initscript}: $batmanif not detected, alfred not starting." + exit 1 + fi + done + fi + echo "${initscript}: starting alfred" SERVICE_PID_FILE="$pid_file_alfred" service_start /usr/sbin/alfred ${alfred_args}

9 years, 3 months

[openwrt-feed-alfred] master: alfred: fix batadv-vis invocation in init.d script (aee1e4f)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/openwrt-feed-alfred On branch : master >--------------------------------------------------------------- commit aee1e4fe336d71ec963ec5185475bc44b0b094d6 Author: Gui Iribarren <gui(a)altermundi.net> Date: Fri Dec 13 16:03:47 2013 -0300 alfred: fix batadv-vis invocation in init.d script broken (wouldn't start, failing silently) since the following commit: * "renamed vis to batadv-vis to avoid collisions with other vis binaries" which renamed only some instances of the "vis" command Signed-off-by: Gui Iribarren <gui(a)altermundi.net> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- aee1e4fe336d71ec963ec5185475bc44b0b094d6 alfred/Makefile | 2 +- alfred/files/alfred.init | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index 7719dfc..0367ebb 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=alfred PKG_VERSION:=2013.4.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_REV:=67e0d7e9cad9f1e2143925183da64a14ab28eb0f PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init index e52a7bd..b678d4c 100755 --- a/alfred/files/alfred.init +++ b/alfred/files/alfred.init @@ -13,7 +13,7 @@ alfred_args="" vis_args="" facters_dir="/etc/alfred" pid_file_alfred="/var/run/alfred.pid" -pid_file_vis="/var/run/vis.pid" +pid_file_vis="/var/run/batadv-vis.pid" enable=0 vis_enable=0 SERVICE_DAEMONIZE=1 @@ -44,7 +44,7 @@ alfred_start() enable=1 config_get_bool start_vis "$section" start_vis 0 - if [ "$start_vis" = 1 ] && [ -x /usr/sbin/vis ]; then + if [ "$start_vis" = 1 ] && [ -x /usr/sbin/batadv-vis ]; then vis_enable=1 append vis_args "-i $batmanif -s" fi @@ -67,9 +67,9 @@ start() service_start /usr/sbin/alfred ${alfred_args} if [ "$vis_enable" = "1" ]; then - echo "${initscript}: starting vis" + echo "${initscript}: starting batadv-vis" SERVICE_PID_FILE="$pid_file_vis" - service_start /usr/sbin/vis ${vis_args} + service_start /usr/sbin/batadv-vis ${vis_args} fi if [ "$run_facters" = "1" ]; then @@ -87,7 +87,7 @@ stop() SERVICE_PID_FILE="$pid_file_alfred" service_stop /usr/sbin/alfred SERVICE_PID_FILE="$pid_file_vis" - [ -x /usr/sbin/vis ] && service_stop /usr/sbin/vis + [ -x /usr/sbin/batadv-vis ] && service_stop /usr/sbin/batadv-vis sed "\|for file in $facters_dir/\* ; do |d" -i /etc/crontabs/root /etc/init.d/cron restart }

9 years, 3 months

[batman-adv] master: Merge branch 'next' (0fff84d)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0fff84d6b5fcde060cf42e9260840c025ae20b07 Merge: 1587850 6639da5 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Dec 16 22:24:22 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 0fff84d6b5fcde060cf42e9260840c025ae20b07 packet.h | 4 ++-- translation-table.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-)

9 years, 3 months

[batman-adv] master's head updated: Merge branch 'next' (0fff84d)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 6639da5 batman-adv: fix alignment for batadv_tvlv_tt_change 0fff84d Merge branch 'next'

9 years, 3 months

[batman-adv] next: batman-adv: fix alignment for batadv_tvlv_tt_change (6639da5)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 6639da59f7dd3c08c54b0ecab3a709b37d1d1e49 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sun Dec 15 13:26:55 2013 +0100 batman-adv: fix alignment for batadv_tvlv_tt_change Make struct batadv_tvlv_tt_change a multiple 4 bytes long to avoid padding on any architecture. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 6639da59f7dd3c08c54b0ecab3a709b37d1d1e49 packet.h | 4 ++-- translation-table.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packet.h b/packet.h index 04cf27c..2dd8f24 100644 --- a/packet.h +++ b/packet.h @@ -484,13 +484,13 @@ struct batadv_tvlv_tt_vlan_data { * struct batadv_tvlv_tt_change - translation table diff data * @flags: status indicators concerning the non-mesh client (see * batadv_tt_client_flags) - * @reserved: reserved field + * @reserved: reserved field - useful for alignment purposes only * @addr: mac address of non-mesh client that triggered this tt change * @vid: VLAN identifier */ struct batadv_tvlv_tt_change { uint8_t flags; - uint8_t reserved; + uint8_t reserved[3]; uint8_t addr[ETH_ALEN]; __be16 vid; }; diff --git a/translation-table.c b/translation-table.c index 4add57d..ff625fe 100644 --- a/translation-table.c +++ b/translation-table.c @@ -333,7 +333,8 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, return; tt_change_node->change.flags = flags; - tt_change_node->change.reserved = 0; + memset(tt_change_node->change.reserved, 0, + sizeof(tt_change_node->change.reserved)); memcpy(tt_change_node->change.addr, common->addr, ETH_ALEN); tt_change_node->change.vid = htons(common->vid); @@ -2221,7 +2222,8 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, ETH_ALEN); tt_change->flags = tt_common_entry->flags; tt_change->vid = htons(tt_common_entry->vid); - tt_change->reserved = 0; + memset(tt_change->reserved, 0, + sizeof(tt_change->reserved)); tt_num_entries++; tt_change++;

9 years, 3 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2013