B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4309 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: fix typo in kernel doc
by Antonio Quartulli 28 May '13

28 May '13

From: Antonio Quartulli <antonio(a)open-mesh.com> Introduced by 8405301b979466610a726b7d595b6bfee5306cf7 ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- packet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packet.h b/packet.h index 2a73ebd..21254a4 100644 --- a/packet.h +++ b/packet.h @@ -388,7 +388,7 @@ struct batadv_tvlv_gateway_data { }; /** - * struct tvlv_tt_data - tt data propagated through the tt tvlv container + * struct batadv_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: crc32 checksum of the local translation table -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: fix num_changes type to uint16_t
by Antonio Quartulli 28 May '13

28 May '13

Since the introduction of the tvlv_tt_data struct variables storing the number of TT changes are always declared as uint16_t, however some of them were not changed. Switch them al to uint16_t. Introduced by 8405301b979466610a726b7d595b6bfee5306cf7 ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- patches based on top of: ("batman-adv: correctly align the tt_tvlv_data struct") translation-table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translation-table.c b/translation-table.c index 44e7789..f6b96cb 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1486,7 +1486,7 @@ static void batadv_tt_req_list_free(struct batadv_priv *bat_priv) static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *tt_buff, - uint8_t tt_num_changes) + uint16_t tt_num_changes) { uint16_t tt_buff_len = batadv_tt_len(tt_num_changes); @@ -2407,8 +2407,8 @@ out: static void batadv_tt_update_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *tt_buff, - uint8_t tt_num_changes, - uint8_t ttvn, uint32_t tt_crc) + uint16_t tt_num_changes, uint8_t ttvn, + uint32_t tt_crc) { uint8_t orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); bool full_table = true; -- 1.8.1.5

1 3

[B.A.T.M.A.N.] [PATCHv2] batman-adv: create common header for ICMP packets
by Antonio Quartulli 26 May '13

26 May '13

From: Antonio Quartulli <antonio(a)open-mesh.com> the icmp and the icmp_rr packets share the same initial fields since they use the same code to be processed and forwarded. Extract the common fields and put them into a separate struct so that future ICMP packets can be easily added without bloating the packet definition. However, keep the seqno field outside of the newly created common header because future ICMP types may require a bigger sequence number space. This change breaks compatibility due to fields reordering in the ICMP headers. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- v2: - merge of [PATCH 1/2] batman-adv: simplify ICMP packet structures and [PATCH 2/2] batman-adv: move seqno field outside of the common ICMP header - reword commit subject and message - rename the new member from "ih" to "icmph" icmp_socket.c | 22 +++++++++++----------- main.c | 4 ++-- packet.h | 38 ++++++++++++++++++++++++++++---------- routing.c | 40 +++++++++++++++++++++------------------- 4 files changed, 62 insertions(+), 42 deletions(-) diff --git a/icmp_socket.c b/icmp_socket.c index b27508b..512efcc 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -191,25 +191,25 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, goto free_skb; } - if (icmp_packet->header.packet_type != BATADV_ICMP) { + if (icmp_packet->icmph.header.packet_type != BATADV_ICMP) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n"); len = -EINVAL; goto free_skb; } - if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) { + if (icmp_packet->icmph.msg_type != BATADV_ECHO_REQUEST) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n"); len = -EINVAL; goto free_skb; } - icmp_packet->uid = socket_client->index; + icmp_packet->icmph.uid = socket_client->index; - if (icmp_packet->header.version != BATADV_COMPAT_VERSION) { - icmp_packet->msg_type = BATADV_PARAMETER_PROBLEM; - icmp_packet->header.version = BATADV_COMPAT_VERSION; + if (icmp_packet->icmph.header.version != BATADV_COMPAT_VERSION) { + icmp_packet->icmph.msg_type = BATADV_PARAMETER_PROBLEM; + icmp_packet->icmph.header.version = BATADV_COMPAT_VERSION; batadv_socket_add_packet(socket_client, icmp_packet, packet_len); goto free_skb; @@ -218,7 +218,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dst_unreach; - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.dst); if (!orig_node) goto dst_unreach; @@ -232,7 +232,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (neigh_node->if_incoming->if_status != BATADV_IF_ACTIVE) goto dst_unreach; - memcpy(icmp_packet->orig, + memcpy(icmp_packet->icmph.orig, primary_if->net_dev->dev_addr, ETH_ALEN); if (packet_len == sizeof(struct batadv_icmp_packet_rr)) @@ -243,7 +243,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, goto out; dst_unreach: - icmp_packet->msg_type = BATADV_DESTINATION_UNREACHABLE; + icmp_packet->icmph.msg_type = BATADV_DESTINATION_UNREACHABLE; batadv_socket_add_packet(socket_client, icmp_packet, packet_len); free_skb: kfree_skb(skb); @@ -317,7 +317,7 @@ static void batadv_socket_add_packet(struct batadv_socket_client *socket_client, /* while waiting for the lock the socket_client could have been * deleted */ - if (!batadv_socket_client_hash[icmp_packet->uid]) { + if (!batadv_socket_client_hash[icmp_packet->icmph.uid]) { spin_unlock_bh(&socket_client->lock); kfree(socket_packet); return; @@ -346,7 +346,7 @@ void batadv_socket_receive_packet(struct batadv_icmp_packet_rr *icmp_packet, { struct batadv_socket_client *hash; - hash = batadv_socket_client_hash[icmp_packet->uid]; + hash = batadv_socket_client_hash[icmp_packet->icmph.uid]; if (hash) batadv_socket_add_packet(hash, icmp_packet, icmp_len); } diff --git a/main.c b/main.c index af89c09..8d4fac5 100644 --- a/main.c +++ b/main.c @@ -344,8 +344,8 @@ static void batadv_recv_handler_init(void) 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); + BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, icmph.dst) != 4); + BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, icmph.dst) != 4); /* broadcast packet */ batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet; diff --git a/packet.h b/packet.h index 7d45890..ac1e0b0 100644 --- a/packet.h +++ b/packet.h @@ -192,29 +192,47 @@ struct batadv_ogm_packet { #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) -struct batadv_icmp_packet { +/** + * batadc_icmp_header - common ICMP header + * @header: common batman 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 msg_type; /* see ICMP message types above */ uint8_t dst[ETH_ALEN]; uint8_t orig[ETH_ALEN]; - __be16 seqno; uint8_t uid; +}; + +/** + * batadv_icmp_packet - ICMP packet + * @icmph: common ICMP header + * @reserved: not used - useful for alignment + * @seqno: ICMP sequence number + */ +struct batadv_icmp_packet { + struct batadv_icmp_header icmph; uint8_t reserved; + __be16 seqno; }; #define BATADV_RR_LEN 16 -/* icmp_packet_rr must start with all fields from imcp_packet - * as this is assumed by code that handles ICMP packets +/** + * batadv_icmp_packet_rr - ICMP RouteRecord packet + * @icmph: common ICMP header + * @rr_cur: number of entries the rr array + * @seqno: ICMP sequence number + * @rr: route record array */ struct batadv_icmp_packet_rr { - struct batadv_header header; - uint8_t msg_type; /* see ICMP message types above */ - uint8_t dst[ETH_ALEN]; - uint8_t orig[ETH_ALEN]; - __be16 seqno; - uint8_t uid; + struct batadv_icmp_header icmph; uint8_t rr_cur; + __be16 seqno; uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; }; diff --git a/routing.c b/routing.c index 7c372f1..7d87142 100644 --- a/routing.c +++ b/routing.c @@ -258,7 +258,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; /* add data to device queue */ - if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) { + if (icmp_packet->icmph.msg_type != BATADV_ECHO_REQUEST) { batadv_socket_receive_packet(icmp_packet, icmp_len); goto out; } @@ -269,7 +269,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, /* answer echo request (ping) */ /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.orig); if (!orig_node) goto out; @@ -279,10 +279,11 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; - memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); - memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN); - icmp_packet->msg_type = BATADV_ECHO_REPLY; - icmp_packet->header.ttl = BATADV_TTL; + memcpy(icmp_packet->icmph.dst, icmp_packet->icmph.orig, ETH_ALEN); + memcpy(icmp_packet->icmph.orig, primary_if->net_dev->dev_addr, + ETH_ALEN); + icmp_packet->icmph.msg_type = BATADV_ECHO_REPLY; + icmp_packet->icmph.header.ttl = BATADV_TTL; if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP) ret = NET_RX_SUCCESS; @@ -306,9 +307,9 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet *)skb->data; /* send TTL exceeded if packet is an echo request (traceroute) */ - if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) { + if (icmp_packet->icmph.msg_type != BATADV_ECHO_REQUEST) { pr_debug("Warning - can't forward icmp packet from %pM to %pM: ttl exceeded\n", - icmp_packet->orig, icmp_packet->dst); + icmp_packet->icmph.orig, icmp_packet->icmph.dst); goto out; } @@ -317,7 +318,7 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, goto out; /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.orig); if (!orig_node) goto out; @@ -327,10 +328,11 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet *)skb->data; - memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); - memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN); - icmp_packet->msg_type = BATADV_TTL_EXCEEDED; - icmp_packet->header.ttl = BATADV_TTL; + memcpy(icmp_packet->icmph.dst, icmp_packet->icmph.orig, ETH_ALEN); + memcpy(icmp_packet->icmph.orig, primary_if->net_dev->dev_addr, + ETH_ALEN); + icmp_packet->icmph.msg_type = BATADV_TTL_EXCEEDED; + icmp_packet->icmph.header.ttl = BATADV_TTL; if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP) ret = NET_RX_SUCCESS; @@ -379,8 +381,8 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; /* add record route information if not full */ - if ((icmp_packet->msg_type == BATADV_ECHO_REPLY || - icmp_packet->msg_type == BATADV_ECHO_REQUEST) && + if ((icmp_packet->icmph.msg_type == BATADV_ECHO_REPLY || + icmp_packet->icmph.msg_type == BATADV_ECHO_REQUEST) && (hdr_size == sizeof(struct batadv_icmp_packet_rr)) && (icmp_packet->rr_cur < BATADV_RR_LEN)) { memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]), @@ -389,15 +391,15 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, } /* packet for me */ - if (batadv_is_my_mac(bat_priv, icmp_packet->dst)) + if (batadv_is_my_mac(bat_priv, icmp_packet->icmph.dst)) return batadv_recv_my_icmp_packet(bat_priv, skb, hdr_size); /* TTL exceeded */ - if (icmp_packet->header.ttl < 2) + if (icmp_packet->icmph.header.ttl < 2) return batadv_recv_icmp_ttl_exceeded(bat_priv, skb); /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.dst); if (!orig_node) goto out; @@ -408,7 +410,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; /* decrement ttl */ - icmp_packet->header.ttl--; + icmp_packet->icmph.header.ttl--; /* route it */ if (batadv_send_skb_to_orig(skb, orig_node, recv_if) != NET_XMIT_DROP) -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Add dummy soft-interface rx mode handler
by Linus Lüssing 25 May '13

25 May '13

We do not actually need to set any rx filters for the virtual batman soft interface. However a dummy handler enables a user to set static multicast listeners for instance. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- * Fixes issue #171 soft-interface.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index 2bad57f..e40e74f 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -137,6 +137,10 @@ static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu) return 0; } +static void batadv_interface_set_rx_mode(struct net_device *dev) +{ +} + static int batadv_interface_tx(struct sk_buff *skb, struct net_device *soft_iface) { @@ -572,6 +576,7 @@ static const struct net_device_ops batadv_netdev_ops = { .ndo_get_stats = batadv_interface_stats, .ndo_set_mac_address = batadv_interface_set_mac_addr, .ndo_change_mtu = batadv_interface_change_mtu, + .ndo_set_rx_mode = batadv_interface_set_rx_mode, .ndo_start_xmit = batadv_interface_tx, .ndo_validate_addr = eth_validate_addr, .ndo_add_slave = batadv_softif_slave_add, -- 1.7.10.4

3 2

[B.A.T.M.A.N.] [PATCHv2 0/7] make the Translation Table component VLAN-aware
by Antonio Quartulli 24 May '13

24 May '13

Hello people, with this patchset I want to introduce a new feature in the TT code which makes it VLAN aware. This means that now clients belonging to different VLANs created on top of a generic bat0 are treated differently. This change gives the possibility to: - enable AP isolation only on a selected VLAN rather than on all the traffic - make DAT work correctly when the same IP subnet is used on different VLANs - leave the possibility to future developers to implement more VLAN specific attributes This patchset is based on top of: "batman-adv: use htons when possible" This is version v2, and this are the changes from v1: - improved kernel doc - created batadv_get_vid() function - improved documentation for CRC computation - added compat code for kfree_rcu (struct batadv_priv_vlan) Cheers, Antonio Quartulli (7): batman-adv: add the VLAN ID attribute to the TT entry batman-adv: use vid when computing local and global TT CRC batman-adv: print the VID together with the TT entries batman-adv: make the GW module correctly talk to the new VLAN-TT batman-adv: make the Distributed ARP Table vlan aware batman-adv: add per VLAN interface attribute framework batman-adv: make the AP isolation attribute VLAN specific bridge_loop_avoidance.c | 37 ++--- compat.c | 9 ++ distributed-arp-table.c | 125 +++++++++++------ gateway_client.c | 18 ++- main.c | 74 +++++++++- main.h | 12 +- packet.h | 12 ++ routing.c | 28 ++-- send.c | 8 +- send.h | 16 ++- soft-interface.c | 114 ++++++++++++--- sysfs.c | 140 +++++++++++++++++++ sysfs.h | 10 ++ translation-table.c | 364 ++++++++++++++++++++++++++++++++++++------------ translation-table.h | 21 +-- types.h | 27 ++++ 16 files changed, 810 insertions(+), 205 deletions(-) -- 1.8.1.5

2 9

[B.A.T.M.A.N.] [PATCHv4] batman-adv: use htons when possible
by Antonio Quartulli 24 May '13

24 May '13

When comparing a network ordered value with a constant, it is better to convert the constant at compile time by means of htons() instead of converting the value at runtime using ntohs(). This refactoring may slightly improve the code performance. Moreover substitute __constant_htons() with htons() since the latter increase readability and it is smart enough to be as efficient as the former Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - patch rebased on top of "batman-adv: use VLAN_ETH_HLEN instead of sizeof(struct vlan_eth_hdr)" v3: - use __constant* for vlan_insert_tag() argument v4: - use htons instead of __constant_htons bridge_loop_avoidance.c | 12 ++++++------ gateway_client.c | 14 +++++++------- hard-interface.c | 2 +- send.c | 4 ++-- soft-interface.c | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 9e691b0..ab537ec 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -863,25 +863,25 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, struct arphdr *arphdr; uint8_t *hw_src, *hw_dst; struct batadv_bla_claim_dst *bla_dst; - uint16_t proto; + __be16 proto; int headlen; unsigned short vid = BATADV_NO_FLAGS; int ret; ethhdr = eth_hdr(skb); - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (ethhdr->h_proto == htons(ETH_P_8021Q)) { vhdr = (struct vlan_ethhdr *)ethhdr; vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK; vid |= BATADV_VLAN_HAS_TAG; - proto = ntohs(vhdr->h_vlan_encapsulated_proto); + proto = vhdr->h_vlan_encapsulated_proto; headlen = sizeof(*vhdr); } else { - proto = ntohs(ethhdr->h_proto); + proto = ethhdr->h_proto; headlen = ETH_HLEN; } - if (proto != ETH_P_ARP) + if (proto != htons(ETH_P_ARP)) return 0; /* not a claim frame */ /* this must be a ARP frame. check if it is a claim. */ @@ -1375,7 +1375,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, ethhdr = (struct ethhdr *)(((uint8_t *)skb->data) + hdr_size); - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (ethhdr->h_proto == htons(ETH_P_8021Q)) { if (!pskb_may_pull(skb, hdr_size + VLAN_ETH_HLEN)) return 0; diff --git a/gateway_client.c b/gateway_client.c index 3a27408..131136f 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -637,7 +637,7 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) *header_len += ETH_HLEN; /* check for initial vlan header */ - if (proto == __constant_htons(ETH_P_8021Q)) { + if (proto == htons(ETH_P_8021Q)) { if (!pskb_may_pull(skb, *header_len + VLAN_HLEN)) return false; @@ -648,7 +648,7 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) /* check for ip header */ switch (proto) { - case __constant_htons(ETH_P_IP): + case htons(ETH_P_IP): if (!pskb_may_pull(skb, *header_len + sizeof(*iphdr))) return false; iphdr = (struct iphdr *)(skb->data + *header_len); @@ -659,7 +659,7 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) return false; break; - case __constant_htons(ETH_P_IPV6): + case htons(ETH_P_IPV6): if (!pskb_may_pull(skb, *header_len + sizeof(*ipv6hdr))) return false; ipv6hdr = (struct ipv6hdr *)(skb->data + *header_len); @@ -680,12 +680,12 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) *header_len += sizeof(*udphdr); /* check for bootp port */ - if ((proto == __constant_htons(ETH_P_IP)) && - (ntohs(udphdr->dest) != 67)) + if ((proto == htons(ETH_P_IP)) && + (udphdr->dest != htons(67))) return false; - if ((proto == __constant_htons(ETH_P_IPV6)) && - (ntohs(udphdr->dest) != 547)) + if ((proto == htons(ETH_P_IPV6)) && + (udphdr->dest != htons(547))) return false; return true; diff --git a/hard-interface.c b/hard-interface.c index 9746600..5edbe52 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -379,7 +379,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, { struct batadv_priv *bat_priv; struct net_device *soft_iface, *master; - __be16 ethertype = __constant_htons(ETH_P_BATMAN); + __be16 ethertype = htons(ETH_P_BATMAN); int ret; if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) diff --git a/send.c b/send.c index 23c7f79..f2ec99c 100644 --- a/send.c +++ b/send.c @@ -63,11 +63,11 @@ int batadv_send_skb_packet(struct sk_buff *skb, ethhdr = eth_hdr(skb); memcpy(ethhdr->h_source, hard_iface->net_dev->dev_addr, ETH_ALEN); memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN); - ethhdr->h_proto = __constant_htons(ETH_P_BATMAN); + ethhdr->h_proto = htons(ETH_P_BATMAN); skb_set_network_header(skb, ETH_HLEN); skb->priority = TC_PRIO_CONTROL; - skb->protocol = __constant_htons(ETH_P_BATMAN); + skb->protocol = htons(ETH_P_BATMAN); skb->dev = hard_iface->net_dev; diff --git a/soft-interface.c b/soft-interface.c index a6ab9e4..4696142 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -147,7 +147,7 @@ static int batadv_interface_tx(struct sk_buff *skb, struct batadv_hard_iface *primary_if = NULL; struct batadv_bcast_packet *bcast_packet; struct vlan_ethhdr *vhdr; - __be16 ethertype = __constant_htons(ETH_P_BATMAN); + __be16 ethertype = htons(ETH_P_BATMAN); static const uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; static const uint8_t ectp_addr[ETH_ALEN] = {0xCF, 0x00, 0x00, 0x00, @@ -304,7 +304,7 @@ void batadv_interface_rx(struct net_device *soft_iface, struct vlan_ethhdr *vhdr; struct batadv_header *batadv_header = (struct batadv_header *)skb->data; unsigned short vid __maybe_unused = BATADV_NO_FLAGS; - __be16 ethertype = __constant_htons(ETH_P_BATMAN); + __be16 ethertype = htons(ETH_P_BATMAN); bool is_bcast; is_bcast = (batadv_header->packet_type == BATADV_BCAST); -- 1.8.1.5

3 2

[B.A.T.M.A.N.] [RFC 0/7] add network wide multi interface optimization
by Simon Wunderlich 23 May '13

23 May '13

From: Simon Wunderlich <simon(a)open-mesh.com> This patchset adds the network wide multi interface optimization as proposed in our wiki [1] for BATMAN IV. The main purpose is to do interface alternating and bonding by considering multi interface capabilities globally and not just for the (next) link, otherwise non-optimal links may be chosen. This patchset needs to change a lot of core data structures and routing, please review it carefully. It is based on the current master plus the "batman-adv: forward late OGMs from best next hop" patch. A local development branch exists on the public git repo [2]. Things to discuss from my end are: * are there any metric proposals for the wifi half duplex penalty? I've just used "half" for now, but this makes the TQ degrade very quickly over the links. * Note also that this change will generally change the TQ propagation behaviour even for single interface networks, i.e. the TQ will degrade fast in any case in this networks after this change. This is inevitable if we want to mix single/multi interface devices * anything to consider for network coding? * this code was used in my virtual VMs only, I'd like to test it on multi-interface devices if the direction I go here can be confirmed. :) As always, any comments are appreciated! Thanks, Simon [1] http://www.open-mesh.org/projects/batman-adv/wiki/network-wide-multi-link-o… [2] http://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/simon/network-w… Simon Wunderlich (7): batman-adv: remove useless find_router look up batman-adv: remove bonding and interface alternating batman-adv: split tq information in neigh_node struct batman-adv: split out router from orig_node batman-adv: add WiFi penalty batman-adv: consider outgoing interface in OGM sending batman-adv: add bonding again bat_iv_ogm.c | 654 +++++++++++++++++++++++++++++++---------------- distributed-arp-table.c | 3 +- gateway_client.c | 78 ++++-- hard-interface.c | 2 +- hard-interface.h | 1 + icmp_socket.c | 2 +- network-coding.c | 9 +- originator.c | 324 ++++++++++++++++++++--- originator.h | 14 +- routing.c | 413 ++++++++++-------------------- routing.h | 11 +- send.c | 42 ++- translation-table.c | 14 +- types.h | 79 ++++-- 14 files changed, 1037 insertions(+), 609 deletions(-) -- 1.7.10.4

1 7

[B.A.T.M.A.N.] [PATCHv4 0/3] Fragmentation version 2
by Martin Hundebøll 23 May '13

23 May '13

This is the fourth revision of a few patches to remove the current fragmentation code and replace it with a new version that supports more packet types and more fragments per packet, thus allowing bigger payloads. The patches are based on current master and are meant for the next big bump in compat number. Revision 4 is changed according to Antonios latest review. Martin Hundebøll (3): batman-adv: Remove old fragmentation code batman-adv: Receive fragmented packets and merge batman-adv: Fragment and send skbs larger than mtu Makefile.kbuild | 2 +- distributed-arp-table.c | 11 +- fragmentation.c | 485 ++++++++++++++++++++++++++++++++++++++++++++++++ fragmentation.h | 50 +++++ hard-interface.c | 1 - main.c | 8 +- main.h | 9 + originator.c | 19 +- packet.h | 41 ++-- routing.c | 145 ++++++--------- routing.h | 4 +- send.c | 195 ++++++++++++++++++- send.h | 36 ++++ soft-interface.c | 15 +- types.h | 63 +++++-- unicast.c | 478 ----------------------------------------------- unicast.h | 92 --------- 17 files changed, 936 insertions(+), 718 deletions(-) create mode 100644 fragmentation.c create mode 100644 fragmentation.h delete mode 100644 unicast.c delete mode 100644 unicast.h -- 1.8.2.3

2 6

[B.A.T.M.A.N.] [PATCH] batman-adv: forward late OGMs from best next hop
by Simon Wunderlich 23 May '13

23 May '13

From: Simon Wunderlich <simon(a)open-mesh.com> When a packet is received from another node first and later from the best next hop, this packet is dropped. However the first OGM was sent with the BATADV_NOT_BEST_NEXT_HOP flag and thus dropped by neighbors. The late OGM from the best neighbor is then dropped because it is a duplicate. If this situation happens constantly, a node might end up not forwarding the "valid" OGMs anymore, and nodes behind will starve from not getting valid OGMs. Fix this by changing the is_duplicate behaviour: It will only mark duplicates which are received for the same neighbor. OGMs which are not from the best next hop will be dropped within batadv_iv_ogm_forward() anyway. Therefore, late OGMs are forwarded now and not dropped as duplicates. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bat_iv_ogm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 8d87f87..bcd2527 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -948,7 +948,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct batadv_orig_node *orig_node; struct batadv_neigh_node *tmp_neigh_node; - int is_duplicate = 0; + int is_dup = 0; int32_t seq_diff; int need_update = 0; int set_mark, ret = -1; @@ -972,16 +972,16 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, rcu_read_lock(); hlist_for_each_entry_rcu(tmp_neigh_node, &orig_node->neigh_list, list) { - is_duplicate |= batadv_test_bit(tmp_neigh_node->real_bits, - orig_node->last_real_seqno, - seqno); - neigh_addr = tmp_neigh_node->addr; if (batadv_compare_eth(neigh_addr, ethhdr->h_source) && - tmp_neigh_node->if_incoming == if_incoming) + tmp_neigh_node->if_incoming == if_incoming) { + is_dup |= batadv_test_bit(tmp_neigh_node->real_bits, + orig_node->last_real_seqno, + seqno); set_mark = 1; - else + } else { set_mark = 0; + } /* if the window moved, set the update flag. */ need_update |= batadv_bit_get_packet(bat_priv, @@ -1001,7 +1001,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, orig_node->last_real_seqno = seqno; } - ret = is_duplicate; + ret = is_dup; out: spin_unlock_bh(&orig_node->ogm_cnt_lock); -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCHv3 0/3] Fragmentation version 2
by Martin Hundebøll 23 May '13

23 May '13

These are the second revision of a few patches to remove the current fragmentation code and replace it with a new version that supports more packet types and more fragments per packet, thus allowing bigger payloads. The patches are based on current master and are meant for the next big bump in compat number. Revision 3 is changed according to Antonios review. Martin Hundebøll (3): batman-adv: Remove old fragmentation code batman-adv: Receive fragmented packets and merge batman-adv: Fragment and send skbs larger than mtu Makefile.kbuild | 2 +- distributed-arp-table.c | 11 +- fragmentation.c | 485 ++++++++++++++++++++++++++++++++++++++++++++++++ fragmentation.h | 50 +++++ hard-interface.c | 1 - main.c | 8 +- main.h | 9 + originator.c | 19 +- packet.h | 41 ++-- routing.c | 145 ++++++--------- routing.h | 4 +- send.c | 195 ++++++++++++++++++- send.h | 36 ++++ soft-interface.c | 15 +- types.h | 63 +++++-- unicast.c | 478 ----------------------------------------------- unicast.h | 92 --------- 17 files changed, 936 insertions(+), 718 deletions(-) create mode 100644 fragmentation.c create mode 100644 fragmentation.h delete mode 100644 unicast.c delete mode 100644 unicast.h -- 1.8.2.3

2 10

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N