commits April 2013

commits@lists.open-mesh.org

1 participants
115 discussions

[batman-adv] master: batman-adv: reorder batadv_iv_flags (11bf500)
by postmaster＠open-mesh.org 27 Apr '13

27 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 11bf50091dddbe4674e425c84b421fad1caa3df2 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Thu Apr 25 10:37:25 2013 +0200 batman-adv: reorder batadv_iv_flags The vis flag is not needed anymore, and since we do a compat bump we can start with the first bit again Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 11bf50091dddbe4674e425c84b421fad1caa3df2 packet.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/packet.h b/packet.h index 82ac0dd..58fe4eb 100644 --- a/packet.h +++ b/packet.h @@ -67,11 +67,20 @@ enum batadv_subtype { /* this file is included by batctl which needs these defines */ #define BATADV_COMPAT_VERSION 15 +/** + * enum batadv_iv_flags - flags used in B.A.T.M.A.N. IV OGM packets + * @BATADV_NOT_BEST_NEXT_HOP: flag is set when ogm packet is forwarded and was + * previously received from someone else than the best neighbor. + * @BATADV_PRIMARIES_FIRST_HOP: flag is set when the primary interface address + * is used, and the packet travels its first hop. + * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a + * one hop neighbor on the interface where it was originally received. + */ enum batadv_iv_flags { - BATADV_NOT_BEST_NEXT_HOP = BIT(3), - BATADV_PRIMARIES_FIRST_HOP = BIT(4), - BATADV_DIRECTLINK = BIT(6), -}; + BATADV_NOT_BEST_NEXT_HOP = BIT(0), + BATADV_PRIMARIES_FIRST_HOP = BIT(1), + BATADV_DIRECTLINK = BIT(2), + }; /* ICMP message types */ enum batadv_icmp_packettype { @@ -164,11 +173,12 @@ struct batadv_header { /** * struct batadv_ogm_packet - ogm (routing protocol) packet * @header: common batman packet 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 flags; /* 0x40: DIRECTLINK flag ... */ + uint8_t flags; __be32 seqno; uint8_t orig[ETH_ALEN]; uint8_t prev_sender[ETH_ALEN];

1 0

[batman-adv] master: batman-adv: remove packed from batadv_ogm_packet (85cc6b9)
by postmaster＠open-mesh.org 27 Apr '13

27 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 85cc6b9361fc988f4e3b9f103ba60ee23a93bbce Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Thu Apr 25 10:37:24 2013 +0200 batman-adv: remove packed from batadv_ogm_packet As we decreased the struct size from 26 to 24 byte, we can remove __packed as the compiler will not add any more padding. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 85cc6b9361fc988f4e3b9f103ba60ee23a93bbce packet.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packet.h b/packet.h index 3cdefb9..82ac0dd 100644 --- a/packet.h +++ b/packet.h @@ -175,7 +175,10 @@ struct batadv_ogm_packet { uint8_t reserved; uint8_t tq; __be16 tvlv_len; -} __packed; + /* __packed is not needed as the struct size is divisible by 4, + * and the largest data type in this struct has a size of 4. + */ +}; #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet)

1 0

[batman-adv] master: batman-adv: reorder packet types (3bcf1e1)
by postmaster＠open-mesh.org 27 Apr '13

27 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 3bcf1e15714b78e8581ccbf4724cda9e20ac4aa4 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Thu Apr 25 10:37:23 2013 +0200 batman-adv: reorder packet types Reordering the packet type numbers allows us to handle unicast packets in a general way - even if we don't know the specific packet type, we can still forward it. There was already code handling this for a couple of unicast packets, and this is the more generalized version to do that. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 3bcf1e15714b78e8581ccbf4724cda9e20ac4aa4 main.c | 20 +++++++++++++++----- packet.h | 33 ++++++++++++++++++++++++--------- routing.c | 28 ++++++++++++++++++++++++++++ routing.h | 2 ++ 4 files changed, 69 insertions(+), 14 deletions(-) diff --git a/main.c b/main.c index 6b2cfb5..8a8fd00 100644 --- a/main.c +++ b/main.c @@ -328,6 +328,9 @@ static void batadv_recv_handler_init(void) for (i = 0; i < ARRAY_SIZE(batadv_rx_handler); i++) batadv_rx_handler[i] = batadv_recv_unhandled_packet; + for (i = BATADV_UNICAST_MIN; i <= BATADV_UNICAST_MAX; i++) + batadv_rx_handler[i] = batadv_recv_unhandled_unicast_packet; + /* compile time checks for struct member offsets */ BUILD_BUG_ON(offsetof(struct batadv_unicast_4addr_packet, src) != 10); BUILD_BUG_ON(offsetof(struct batadv_unicast_packet, dest) != 4); @@ -336,18 +339,20 @@ static void batadv_recv_handler_init(void) BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, dst) != 4); BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, dst) != 4); - /* batman icmp packet */ - batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_packet; + /* broadcast packet */ + batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet; + + /* unicast packets ... */ /* unicast with 4 addresses packet */ batadv_rx_handler[BATADV_UNICAST_4ADDR] = batadv_recv_unicast_packet; /* unicast packet */ batadv_rx_handler[BATADV_UNICAST] = batadv_recv_unicast_packet; /* fragmented unicast packet */ batadv_rx_handler[BATADV_UNICAST_FRAG] = batadv_recv_ucast_frag_packet; - /* broadcast packet */ - batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet; /* unicast tvlv packet */ batadv_rx_handler[BATADV_UNICAST_TVLV] = batadv_recv_unicast_tvlv; + /* batman icmp packet */ + batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_packet; } int @@ -355,7 +360,12 @@ batadv_recv_handler_register(uint8_t packet_type, int (*recv_handler)(struct sk_buff *, struct batadv_hard_iface *)) { - if (batadv_rx_handler[packet_type] != &batadv_recv_unhandled_packet) + int (*curr)(struct sk_buff *, + struct batadv_hard_iface *); + curr = batadv_rx_handler[packet_type]; + + if ((curr != batadv_recv_unhandled_packet) && + (curr != batadv_recv_unhandled_unicast_packet)) return -EBUSY; batadv_rx_handler[packet_type] = recv_handler; diff --git a/packet.h b/packet.h index cda77c2..3cdefb9 100644 --- a/packet.h +++ b/packet.h @@ -22,17 +22,32 @@ /** * enum batadv_packettype - types for batman-adv encapsulated packets + * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV + * @BATADV_BCAST: broadcast packets carrying broadcast payload + * @BATADV_CODED: network coded packets + * + * @BATADV_UNICAST: unicast packets carrying unicast payload traffic + * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original + * payload packet + * @BATADV_UNICAST_4ADDR: unicast packet including the originator address of + * the sender + * @BATADV_ICMP: unicast packet like IP ICMP used for ping or traceroute * @BATADV_UNICAST_TVLV: unicast packet carrying TVLV containers */ -enum batadv_packettype { - BATADV_IV_OGM = 0x01, - BATADV_ICMP = 0x02, - BATADV_UNICAST = 0x03, - BATADV_BCAST = 0x04, - BATADV_UNICAST_FRAG = 0x06, - BATADV_UNICAST_4ADDR = 0x09, - BATADV_CODED = 0x0a, - BATADV_UNICAST_TVLV = 0x0b, + enum batadv_packettype { + /* 0x00 - 0x3f: local packets or special rules for handling */ + BATADV_IV_OGM = 0x00, + BATADV_BCAST = 0x01, + BATADV_CODED = 0x02, + /* 0x40 - 0x7f: unicast */ +#define BATADV_UNICAST_MIN 0x40 + BATADV_UNICAST = 0x40, + BATADV_UNICAST_FRAG = 0x41, + BATADV_UNICAST_4ADDR = 0x42, + BATADV_ICMP = 0x43, + BATADV_UNICAST_TVLV = 0x44, +#define BATADV_UNICAST_MAX 0x7f + /* 0x80 - 0xff: reserved */ }; /** diff --git a/routing.c b/routing.c index e3040a2..3f5802c 100644 --- a/routing.c +++ b/routing.c @@ -895,6 +895,34 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, return 1; } +/** + * batadv_recv_unhandled_unicast_packet - receive and process packets which + * are in the unicast number space but not yet known to the implementation + * @skb: unicast tvlv packet to process + * @recv_if: pointer to interface this packet was received on + * + * Returns NET_RX_SUCCESS if the packet has been consumed or NET_RX_DROP + * otherwise. + */ +int batadv_recv_unhandled_unicast_packet(struct sk_buff *skb, + struct batadv_hard_iface *recv_if) +{ + struct batadv_unicast_packet *unicast_packet; + struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); + int check, hdr_size = sizeof(*unicast_packet); + + check = batadv_check_unicast_packet(bat_priv, skb, hdr_size); + if (check < 0) + return NET_RX_DROP; + + /* we don't know about this type, drop it. */ + unicast_packet = (struct batadv_unicast_packet *)skb->data; + if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) + return NET_RX_DROP; + + return batadv_route_unicast_packet(skb, recv_if); +} + int batadv_recv_unicast_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if) { diff --git a/routing.h b/routing.h index b3f53d4..ea15fa6 100644 --- a/routing.h +++ b/routing.h @@ -40,6 +40,8 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struct batadv_hard_iface *recv_if); int batadv_recv_unicast_tvlv(struct sk_buff *skb, struct batadv_hard_iface *recv_if); +int batadv_recv_unhandled_unicast_packet(struct sk_buff *skb, + struct batadv_hard_iface *recv_if); struct batadv_neigh_node * batadv_find_router(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node,

1 0

[batman-adv] master: batman-adv: add build check macros for packet member offset (a36f66e)
by postmaster＠open-mesh.org 27 Apr '13

27 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a36f66e669ecfbb8f701d15ce317cdf2e39e092a Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Thu Apr 25 10:37:22 2013 +0200 batman-adv: add build check macros for packet member offset Since we removed the __packed from most of the packets, we should make sure that the offset generated by the compiler are correct for sent/received data. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a36f66e669ecfbb8f701d15ce317cdf2e39e092a main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/main.c b/main.c index 2a14722..6b2cfb5 100644 --- a/main.c +++ b/main.c @@ -328,6 +328,14 @@ static void batadv_recv_handler_init(void) for (i = 0; i < ARRAY_SIZE(batadv_rx_handler); i++) batadv_rx_handler[i] = batadv_recv_unhandled_packet; + /* compile time checks for struct member offsets */ + BUILD_BUG_ON(offsetof(struct batadv_unicast_4addr_packet, src) != 10); + BUILD_BUG_ON(offsetof(struct batadv_unicast_packet, dest) != 4); + BUILD_BUG_ON(offsetof(struct batadv_unicast_frag_packet, dest) != 4); + BUILD_BUG_ON(offsetof(struct batadv_unicast_tvlv_packet, dst) != 4); + BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, dst) != 4); + BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, dst) != 4); + /* batman icmp packet */ batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_packet; /* unicast with 4 addresses packet */

1 0

[batman-adv] master: batman-adv: remove vis functionality (ccdf02f)
by postmaster＠open-mesh.org 27 Apr '13

27 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ccdf02f09cd9440f1ede3771509cbf0dce32e860 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Thu Apr 25 11:57:42 2013 +0200 batman-adv: remove vis functionality This is replaced by a userspace program, we don't need this functionality to bloat the kernel. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- Makefile.kbuild | 1 - README | 50 +-- bat_iv_ogm.c | 8 - debugfs.c | 9 - hard-interface.c | 9 - main.c | 11 - main.h | 2 - packet.h | 21 +- routing.c | 51 --- routing.h | 2 - send.c | 1 - soft-interface.c | 1 - sysfs-class-net-mesh | 11 - sysfs.c | 72 ---- types.h | 84 ----- vis.c | 936 -------------------------------------------------- vis.h | 36 -- 17 files changed, 3 insertions(+), 1302 deletions(-) Diff suppressed because of size. To see it, use: git diff-tree --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ccdf02f09cd9440f1ede3771509cbf0dce32e860

1 0

[batctl] master: batctl: use CRC32C instead of CRC16 in TT code (ec13901)
by postmaster＠open-mesh.org 26 Apr '13

26 Apr '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit ec13901705ce0ecc156632b5c711d179d59e5b4c Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Apr 24 16:37:51 2013 +0200 batctl: use CRC32C instead of CRC16 in TT code CRC32C has to be preferred to CRC16 because of its possible HW native support and because of the reduced collision probability. With this change the Translation Table component now uses CRC32C to compute the local and global table checksum. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- ec13901705ce0ecc156632b5c711d179d59e5b4c packet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packet.h b/packet.h index f4e02a2..aee6b96 100644 --- a/packet.h +++ b/packet.h @@ -371,12 +371,12 @@ struct batadv_tvlv_gateway_data { * struct tvlv_tt_data - tt data propagated through the tt tvlv container * @flags: translation table flags (see batadv_tt_data_flags) * @ttvn: translation table version number - * @crc: crc16 checksum of the local translation table + * @crc: crc32 checksum of the local translation table */ struct batadv_tvlv_tt_data { uint8_t flags; uint8_t ttvn; - __be16 crc; + __be32 crc; }; /**

1 0

[batctl] master: batctl: move BATADV_TT_CLIENT_TEMP to higher bit (3438de2)
by postmaster＠open-mesh.org 26 Apr '13

26 Apr '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 3438de2c25251e0b5ab4f1e73e93e26fb746a3a5 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Apr 24 16:37:52 2013 +0200 batctl: move BATADV_TT_CLIENT_TEMP to higher bit Client flags from bit 0 to 7 are sent over the wire. BATADV_TT_CLIENT_TEMP is a local flag and is not supposed to be sent to the network. Therefore it has occupy a higher bit. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 3438de2c25251e0b5ab4f1e73e93e26fb746a3a5 packet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packet.h b/packet.h index c4653a5..f4e02a2 100644 --- a/packet.h +++ b/packet.h @@ -106,10 +106,10 @@ enum batadv_tt_client_flags { BATADV_TT_CLIENT_DEL = BIT(0), BATADV_TT_CLIENT_ROAM = BIT(1), BATADV_TT_CLIENT_WIFI = BIT(2), - BATADV_TT_CLIENT_TEMP = BIT(3), BATADV_TT_CLIENT_NOPURGE = BIT(8), BATADV_TT_CLIENT_NEW = BIT(9), BATADV_TT_CLIENT_PENDING = BIT(10), + BATADV_TT_CLIENT_TEMP = BIT(11), }; /* claim frame types for the bridge loop avoidance */

1 0

[batctl] master: batctl: tvlv - convert roaming adv packet to use tvlv unicast packets (3f935ce)
by postmaster＠open-mesh.org 25 Apr '13

25 Apr '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 3f935ce651afe15d5e5ace2a25035e8770d9e3db Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 23 21:40:03 2013 +0800 batctl: tvlv - convert roaming adv packet to use tvlv unicast packets Instead of generating roaming specific packets the TVLV unicast API is used to send roaming information. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 3f935ce651afe15d5e5ace2a25035e8770d9e3db packet.h | 19 ++++++++++--------- tcpdump.c | 30 +----------------------------- tcpdump.h | 1 - 3 files changed, 11 insertions(+), 39 deletions(-) diff --git a/packet.h b/packet.h index 4675dc4..c4653a5 100644 --- a/packet.h +++ b/packet.h @@ -31,7 +31,6 @@ enum batadv_packettype { BATADV_BCAST = 0x04, BATADV_VIS = 0x05, BATADV_UNICAST_FRAG = 0x06, - BATADV_ROAM_ADV = 0x08, BATADV_UNICAST_4ADDR = 0x09, BATADV_CODED = 0x0a, BATADV_UNICAST_TVLV = 0x0b, @@ -127,12 +126,14 @@ enum batadv_bla_claimframe { * @BATADV_TVLV_DAT: distributed arp table tvlv * @BATADV_TVLV_NC: network coding tvlv * @BATADV_TVLV_TT: translation table tvlv + * @BATADV_TVLV_ROAM: roaming advertisement tvlv */ enum batadv_tvlv_type { BATADV_TVLV_GW = 0x01, BATADV_TVLV_DAT = 0x02, BATADV_TVLV_NC = 0x03, BATADV_TVLV_TT = 0x04, + BATADV_TVLV_ROAM = 0x05, }; /* the destination hardware field in the ARP frame is used to @@ -267,14 +268,6 @@ struct batadv_vis_packet { uint8_t sender_orig[ETH_ALEN]; /* who sent or forwarded this packet */ }; -struct batadv_roam_adv_packet { - struct batadv_header header; - uint8_t reserved; - uint8_t dst[ETH_ALEN]; - uint8_t src[ETH_ALEN]; - uint8_t client[ETH_ALEN]; -} __packed; - /** * struct batadv_coded_packet - network coded packet * @header: common batman packet header and ttl of first included packet @@ -399,4 +392,12 @@ struct batadv_tvlv_tt_change { uint8_t addr[ETH_ALEN]; }; +/** + * struct batadv_tvlv_roam_adv - roaming advertisement + * @client: mac address of roaming client + */ +struct batadv_tvlv_roam_adv { + uint8_t client[ETH_ALEN]; +}; + #endif /* _NET_BATMAN_ADV_PACKET_H_ */ diff --git a/tcpdump.c b/tcpdump.c index aa02c0e..4eae324 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -55,7 +55,7 @@ if ((size_t)(buff_len) < (check_len)) { \ } static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATICMP | DUMP_TYPE_BATUCAST | - DUMP_TYPE_BATBCAST | DUMP_TYPE_BATVIS | DUMP_TYPE_BATFRAG | DUMP_TYPE_BATTT | DUMP_TYPE_NONBAT; + DUMP_TYPE_BATBCAST | DUMP_TYPE_BATVIS | DUMP_TYPE_BATFRAG | DUMP_TYPE_NONBAT; static unsigned short dump_level; static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed); @@ -76,7 +76,6 @@ static void tcpdump_usage(void) fprintf(stderr, " \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); fprintf(stderr, " \t\t%3d - batman vis packets\n", DUMP_TYPE_BATVIS); fprintf(stderr, " \t\t%3d - batman fragmented packets\n", DUMP_TYPE_BATFRAG); - fprintf(stderr, " \t\t%3d - batman tt / roaming packets\n", DUMP_TYPE_BATTT); fprintf(stderr, " \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); fprintf(stderr, " \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); } @@ -325,29 +324,6 @@ static void dump_vlan(unsigned char *packet_buff, ssize_t buff_len, int read_opt parse_eth_hdr(packet_buff + 4, buff_len - 4, read_opt, time_printed); } -static void dump_batman_roam(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) -{ - struct batadv_roam_adv_packet *roam_adv_packet; - - LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batadv_roam_adv_packet), "BAT ROAM"); - - roam_adv_packet = (struct batadv_roam_adv_packet *)(packet_buff + sizeof(struct ether_header)); - - if (!time_printed) - print_time(); - - printf("BAT %s > ", - get_name_by_macaddr((struct ether_addr *)roam_adv_packet->src, read_opt)); - - printf("%s: ROAM, ", - get_name_by_macaddr((struct ether_addr *)roam_adv_packet->dst, read_opt)); - - printf("client %s, ttl %2d, v %d, length %zu\n", - get_name_by_macaddr((struct ether_addr *)roam_adv_packet->client, read_opt), - roam_adv_packet->header.ttl, roam_adv_packet->header.version, - (size_t)buff_len - sizeof(struct ether_header)); -} - static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct ether_header *ether_header; @@ -581,10 +557,6 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read if (dump_level & DUMP_TYPE_BATFRAG) dump_batman_frag(packet_buff, buff_len, read_opt, time_printed); break; - case BATADV_ROAM_ADV: - if (dump_level & DUMP_TYPE_BATTT) - dump_batman_roam(packet_buff, buff_len, read_opt, time_printed); - break; case BATADV_UNICAST_4ADDR: if (dump_level & DUMP_TYPE_BATUCAST) dump_batman_4addr(packet_buff, buff_len, read_opt, time_printed); diff --git a/tcpdump.h b/tcpdump.h index 719f998..7698ec7 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -38,7 +38,6 @@ #define DUMP_TYPE_BATBCAST 8 #define DUMP_TYPE_BATVIS 16 #define DUMP_TYPE_BATFRAG 32 -#define DUMP_TYPE_BATTT 64 #define DUMP_TYPE_NONBAT 128 #define IEEE80211_FCTL_FTYPE 0x0c00

1 0

[batctl] master: batctl: tvlv - convert tt query packet to use tvlv unicast packets (a561b02)
by postmaster＠open-mesh.org 25 Apr '13

25 Apr '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit a561b02508ef7d34eae4e10ec21213f19c7e541a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 23 21:40:02 2013 +0800 batctl: tvlv - convert tt query packet to use tvlv unicast packets Instead of generating TT specific packets the TVLV unicast API is used to send translation table data. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a561b02508ef7d34eae4e10ec21213f19c7e541a packet.h | 33 --------------------------------- tcpdump.c | 45 --------------------------------------------- 2 files changed, 78 deletions(-) diff --git a/packet.h b/packet.h index c976ffe..4675dc4 100644 --- a/packet.h +++ b/packet.h @@ -31,7 +31,6 @@ enum batadv_packettype { BATADV_BCAST = 0x04, BATADV_VIS = 0x05, BATADV_UNICAST_FRAG = 0x06, - BATADV_TT_QUERY = 0x07, BATADV_ROAM_ADV = 0x08, BATADV_UNICAST_4ADDR = 0x09, BATADV_CODED = 0x0a, @@ -83,9 +82,6 @@ enum batadv_unicast_frag_flags { BATADV_UNI_FRAG_LARGETAIL = BIT(1), }; -/* TT_QUERY subtypes */ -#define BATADV_TT_QUERY_TYPE_MASK 0x3 - /* tt data subtypes */ #define BATADV_TT_DATA_TYPE_MASK 0x0F @@ -271,30 +267,6 @@ struct batadv_vis_packet { uint8_t sender_orig[ETH_ALEN]; /* who sent or forwarded this packet */ }; -struct batadv_tt_query_packet { - struct batadv_header header; - /* the flag field is a combination of: - * - TT_REQUEST or TT_RESPONSE - * - TT_FULL_TABLE - */ - uint8_t flags; - uint8_t dst[ETH_ALEN]; - uint8_t src[ETH_ALEN]; - /* the ttvn field is: - * if TT_REQUEST: ttvn that triggered the - * request - * if TT_RESPONSE: new ttvn for the src - * orig_node - */ - uint8_t ttvn; - /* tt_data field is: - * if TT_REQUEST: crc associated with the - * ttvn - * if TT_RESPONSE: table_size - */ - __be16 tt_data; -} __packed; - struct batadv_roam_adv_packet { struct batadv_header header; uint8_t reserved; @@ -303,11 +275,6 @@ struct batadv_roam_adv_packet { uint8_t client[ETH_ALEN]; } __packed; -struct batadv_tt_change { - uint8_t flags; - uint8_t addr[ETH_ALEN]; -} __packed; - /** * struct batadv_coded_packet - network coded packet * @header: common batman packet header and ttl of first included packet diff --git a/tcpdump.c b/tcpdump.c index 9ef19f2..aa02c0e 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -325,47 +325,6 @@ static void dump_vlan(unsigned char *packet_buff, ssize_t buff_len, int read_opt parse_eth_hdr(packet_buff + 4, buff_len - 4, read_opt, time_printed); } -static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) -{ - struct batadv_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 batadv_tt_query_packet), "BAT TT"); - - tt_query_packet = (struct batadv_tt_query_packet *)(packet_buff + sizeof(struct ether_header)); - - if (!time_printed) - print_time(); - - switch (tt_query_packet->flags & BATADV_TT_QUERY_TYPE_MASK) { - case BATADV_TT_REQUEST: - tt_desc = "request"; - tt_data = "crc"; - tt_type = 'Q'; - break; - case BATADV_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 %u, ttl %2d, v %d, flags [%c%c], length %zu\n", - get_name_by_macaddr((struct ether_addr *)tt_query_packet->dst, read_opt), - tt_desc, tt_query_packet->ttvn, tt_data, ntohs(tt_query_packet->tt_data), - tt_query_packet->header.ttl, tt_query_packet->header.version, - tt_type, (tt_query_packet->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'), - (size_t)buff_len - sizeof(struct ether_header)); -} - static void dump_batman_roam(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct batadv_roam_adv_packet *roam_adv_packet; @@ -622,10 +581,6 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read if (dump_level & DUMP_TYPE_BATFRAG) dump_batman_frag(packet_buff, buff_len, read_opt, time_printed); break; - case BATADV_TT_QUERY: - if (dump_level & DUMP_TYPE_BATTT) - dump_batman_tt(packet_buff, buff_len, read_opt, time_printed); - break; case BATADV_ROAM_ADV: if (dump_level & DUMP_TYPE_BATTT) dump_batman_roam(packet_buff, buff_len, read_opt, time_printed);

1 0

[batctl] master: batctl: tvlv - convert tt data sent within OGMs (799ff4d)
by postmaster＠open-mesh.org 25 Apr '13

25 Apr '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 799ff4d2efbecd279e41082cf0b0703784d88aa2 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 23 21:40:01 2013 +0800 batctl: tvlv - convert tt data sent within OGMs The translation table meta data (version number, crc checksum, etc) as well as the translation table diff propgated within OGMs now uses the newly introduced tvlv infrastructure. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 799ff4d2efbecd279e41082cf0b0703784d88aa2 packet.h | 51 +++++++++++++++++++++++++++++++++++++++++---------- tcpdump.c | 6 +++--- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/packet.h b/packet.h index 526af61..c976ffe 100644 --- a/packet.h +++ b/packet.h @@ -86,14 +86,21 @@ enum batadv_unicast_frag_flags { /* TT_QUERY subtypes */ #define BATADV_TT_QUERY_TYPE_MASK 0x3 -enum batadv_tt_query_packettype { - BATADV_TT_REQUEST = 0, - BATADV_TT_RESPONSE = 1, -}; +/* tt data subtypes */ +#define BATADV_TT_DATA_TYPE_MASK 0x0F -/* TT_QUERY flags */ -enum batadv_tt_query_flags { - BATADV_TT_FULL_TABLE = BIT(2), +/** + * enum batadv_tt_data_flags - flags for tt data tvlv + * @BATADV_TT_OGM_DIFF: TT diff propagated through OGM + * @BATADV_TT_REQUEST: TT request message + * @BATADV_TT_RESPONSE: TT response message + * @BATADV_TT_FULL_TABLE: contains full table to replace existing table + */ +enum batadv_tt_data_flags { + BATADV_TT_OGM_DIFF = BIT(0), + BATADV_TT_REQUEST = BIT(1), + BATADV_TT_RESPONSE = BIT(2), + BATADV_TT_FULL_TABLE = BIT(4), }; /* BATADV_TT_CLIENT flags. @@ -123,11 +130,13 @@ enum batadv_bla_claimframe { * @BATADV_TVLV_GW: gateway tvlv * @BATADV_TVLV_DAT: distributed arp table tvlv * @BATADV_TVLV_NC: network coding tvlv + * @BATADV_TVLV_TT: translation table tvlv */ enum batadv_tvlv_type { BATADV_TVLV_GW = 0x01, BATADV_TVLV_DAT = 0x02, BATADV_TVLV_NC = 0x03, + BATADV_TVLV_TT = 0x04, }; /* the destination hardware field in the ARP frame is used to @@ -161,9 +170,6 @@ struct batadv_ogm_packet { uint8_t prev_sender[ETH_ALEN]; uint8_t reserved; uint8_t tq; - uint8_t tt_num_changes; - uint8_t ttvn; /* translation table version number */ - __be16 tt_crc; __be16 tvlv_len; } __packed; @@ -401,4 +407,29 @@ struct batadv_tvlv_gateway_data { uint32_t bandwidth_up; }; +/** + * struct tvlv_tt_data - tt data propagated through the tt tvlv container + * @flags: translation table flags (see batadv_tt_data_flags) + * @ttvn: translation table version number + * @crc: crc16 checksum of the local translation table + */ +struct batadv_tvlv_tt_data { + uint8_t flags; + uint8_t ttvn; + __be16 crc; +}; + +/** + * 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 + * @addr: mac address of non-mesh client that triggered this tt change + */ +struct batadv_tvlv_tt_change { + uint8_t flags; + uint8_t reserved; + uint8_t addr[ETH_ALEN]; +}; + #endif /* _NET_BATMAN_ADV_PACKET_H_ */ diff --git a/tcpdump.c b/tcpdump.c index 0bf21d3..9ef19f2 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -405,10 +405,10 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_ogm_packet->orig, read_opt)); - printf("OGM IV via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %hu, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", + printf("OGM IV via neigh %s, seq %u, tq %3d, ttl %2d, v %d, flags [%c%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->ttvn, - ntohs(batman_ogm_packet->tt_crc), batman_ogm_packet->header.ttl, batman_ogm_packet->header.version, + ntohl(batman_ogm_packet->seqno), batman_ogm_packet->tq, + batman_ogm_packet->header.ttl, batman_ogm_packet->header.version, (batman_ogm_packet->flags & BATADV_NOT_BEST_NEXT_HOP ? 'N' : '.'), (batman_ogm_packet->flags & BATADV_DIRECTLINK ? 'D' : '.'), (batman_ogm_packet->flags & BATADV_VIS_SERVER ? 'V' : '.'),

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2013