commits May 2012

commits@lists.open-mesh.org

1 participants
95 discussions

batman-adv; branch, next, updated. v2012.1.0-93-gcb93868
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the next branch: commit cb9386840f46acc640885b98352c63c448afd7a7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu May 10 12:51:40 2012 +0800 batman-adv: change comment style for David Should be merged with f76d019194e0a88c57371df169ecc979690a04c2 Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 96ce556..bcaa818 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -518,13 +518,12 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, } if (!is_from_best_next_hop) { - /** - * Mark the forwarded packet when it is not coming from our best - * next hop. We still need to forward the packet for our neighbor - * link quality detection to work in case the packet originated - * from a single hop neighbor. Otherwise we can simply drop the - * ogm. - */ + /* Mark the forwarded packet when it is not coming from our + * best next hop. We still need to forward the packet for our + * neighbor link quality detection to work in case the packet + * originated from a single hop neighbor. Otherwise we can + * simply drop the ogm. + */ if (is_single_hop_neigh) batman_ogm_packet->flags |= NOT_BEST_NEXT_HOP; else -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-92-g4bb1640
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the next branch: commit 4bb16404e566b8dbd06be3de66c8494acf6fdf5b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu May 10 12:54:03 2012 +0800 batman-adv: change comment style for David Should be merged with bd83b4cfaeff6a78440b955598afccafad081dbe Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/types.h b/types.h index 15f538a..6474324 100644 --- a/types.h +++ b/types.h @@ -399,7 +399,8 @@ struct bat_algo_ops { /* de-init routing info when hard-interface is disabled */ void (*bat_iface_disable)(struct hard_iface *hard_iface); /* (re-)init mac addresses of the protocol information - * belonging to this hard-interface */ + * belonging to this hard-interface + */ void (*bat_iface_update_mac)(struct hard_iface *hard_iface); /* called when primary interface is selected / changed */ void (*bat_primary_iface_set)(struct hard_iface *hard_iface); -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-91-g8a463e4
by postmaster＠open-mesh.org 11 May '12

11 May '12

The following commit has been merged in the next branch: commit 8a463e4c89a56ba388036146181d558f0933e866 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu May 10 12:54:02 2012 +0800 batman-adv: change comment style for David Should be merged with c9619b5e07a756af43c196874e9e9e91e3251154 Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 2a1845e..96ce556 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1200,7 +1200,8 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, return NET_RX_DROP; /* did we receive a B.A.T.M.A.N. IV OGM packet on an interface - * that does not have B.A.T.M.A.N. IV enabled ? */ + * that does not have B.A.T.M.A.N. IV enabled ? + */ if (bat_priv->bat_algo_ops->bat_ogm_emit != bat_iv_ogm_emit) return NET_RX_DROP; -- batman-adv

1 0

linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 09 May '12

09 May '12

The annotated tag, batman-adv-for-davem has been updated to b37885c686236be60cfa0933330b2fe0c5d0c17e (tag) from 0177649f776ef82b4b4ceb73d5e7b926b24e5af1 (which is now obsolete) tagging ab74e43c05964efe75472b5433ede8800ecbfc43 (commit) replaces v3.4-rc5 tagged by Antonio Quartulli on Wed May 9 10:11:30 2012 +0200 - Shortlog ------------------------------------------------------------ Included changes: * fix a little bug in the DHCP packet snooping introduced so far * minor fixes and cleanups * minor routing protocol API cleanups * add a new contributor name to translation-table.{c,h} * update copyright years in file headers -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJPqia5AAoJEFMQTLzJFOZFly8H/R+PwT2zi5B1Ns4Vcim3peWT kY+uupG1xQlexT/JPlFNbuh70TevoXxvRXmJ3cOE3IaXa0d9ml4+Becg15kwK5Q2 cWFYba6CCcLGdaygIQ/s4rLF59iU5YYmFQUzdkQV5Q7sqUcJnAS6Stm9Zo+FIXR3 ZxtfMejBeu1TL2c4IoscD8eCg5g8n9dOtrsaeej/fXCBe/6FbHsqQKNUZ2C6wcJQ xPqcoXEyWPy0qWQ0GOnAMOoQh++QFSJss3FFMk2S66x9NIxJQJZDbeWQzKHwuB9L FtoG8YjzT4xdYm7lgEKIfGS5nbeuKXfdINhd7m25jWMEzmQUDGIrhRgwGfxBUbU= =c9eT -----END PGP SIGNATURE----- Antonio Quartulli (10): batman-adv: clean up Kconfig batman-adv: use ETH_ALEN instead of hardcoded numeric constants batman-adv: convert the tt_crc to network order batman-adv: remove duplicated line in comment batman-adv: use ETH_HLEN instead of sizeof(struct ethhdr) batman-adv: print OGM seq numbers as unsigned int batman-adv: skip the window protection test when the originator has no neighbours batman-adv: fix wrong dhcp option list browsing batman-adv: update copyright years batman-adv: add contributor name Eric Dumazet (1): net: cleanup unsigned to unsigned int Linus Luessing (1): batman-adv: Adding hard_iface specific sysfs wrapper macros for UINT Marek Lindner (19): batman-adv: encourage batman to take shorter routes by changing the default hop penalty batman-adv: move ogm initialization into the proper function batman-adv: refactoring API: find generalized name for bat_ogm_init callback batman-adv: randomize initial seqno to avoid collision batman-adv: add iface_disable() callback to routing API batman-adv: handle routing code initialization properly batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN batman-adv: mark existing ogm variables as batman iv batman-adv: introduce is_single_hop_neigh variable to increase readability batman-adv: introduce packet type handler array for incoming packets batman-adv: register batman ogm receive function during protocol init batman-adv: rename last_valid to last_seen batman-adv: replace HZ calculations with jiffies_to_msecs() batman-adv: split neigh_new function into generic and batman iv specific parts batman-adv: ignore protocol packets if the interface did not enable this protocol batman-adv: refactoring API: find generalized name for bat_ogm_update_mac callback batman-adv: rename sysfs macros to reflect the soft-interface dependency batman-adv: fix checkpatch string complaint Simon Wunderlich (10): batman-adv: remove old bridge loop avoidance code batman-adv: add basic bridge loop avoidance code batman-adv: make bridge loop avoidance switchable batman-adv: export claim tables through debugfs batman-adv: allow multiple entries in tt_global_entries batman-adv: don't let backbone gateways exchange tt entries batman-adv: add broadcast duplicate check batman-adv: drop STP over batman batman-adv: form groups in the bridge loop avoidance batman-adv: add bridge loop avoidance compile option Sven Eckelmann (2): batman-adv: Replace bitarray operations with bitmap batman-adv: Remove declaration of only locally used functions ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, v3.4-rc6, created. v3.4-rc6
by postmaster＠open-mesh.org 07 May '12

07 May '12

The annotated tag, v3.4-rc6 has been created at 2b1e9fec303b3f2f138edcefc5f048d666e56166 (tag) tagging d48b97b403d23f6df0b990cee652bdf9a52337a3 (commit) replaces v3.4-rc5 tagged by Linus Torvalds on Sun May 6 15:07:50 2012 -0700 - Shortlog ------------------------------------------------------------ Linux 3.4-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPpvY9AAoJEHm+PkMAQRiGpEoIAJgbu+Y8gITnBK/wh9O6zy3S 5jie5KK4YWdbJsvO58WbNr3CyVIwGIqQ2dUZLiU59aBVLarlGw8xor0MmW+cZwhp 6fBHaf0qDYAV0MZjD+mnnExOiCRyISa2lPmsfu9dAWywh5KGe6/oAP6/qcXIyok3 KZyl3qQf4ENpaZPHwZPXCEkUvtuyHgNiszN+QXEadA3s19Ot4VGe9A3VGw+GNrSm JqFIq3acQAbKa5BYaqf7TQC02v2FI7//eqt6QHxTqbE6a7LGbTvLfX3HlJ2mnfqa 1R6QHhM4y4OZDHbaMT2raHZ8WuLXzhehJzhP8Co7AHFOKwVKOb5XbcUr2RrukMU= =HkMd -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2012.1.0-116-g73cc762
by postmaster＠open-mesh.org 07 May '12

07 May '12

The following commit has been merged in the master branch: commit 73cc7626aba1e2d35e2ad9a0a161e8bba187cba1 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Sat May 5 17:51:53 2012 +0200 batman-adv: fix visualization output without neighbors on the primary interface The primary entry and the corresponding secondary entries are missing when there are no neighbors on the primary interface. This also causes the TT entries to miss and makes nodes with multiply secondary interface fall apart since there is no way to see they are related without a primary entry. Fix this by always emitting a primary entry. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> diff --git a/vis.c b/vis.c index 411c0e1..01d5da5 100644 --- a/vis.c +++ b/vis.c @@ -207,7 +207,6 @@ int vis_seq_print_text(struct seq_file *seq, void *offset) int vis_server = atomic_read(&bat_priv->vis_mode); size_t buff_pos, buf_size; char *buff; - int compare; primary_if = primary_if_get_selected(bat_priv); if (!primary_if) @@ -228,14 +227,18 @@ int vis_seq_print_text(struct seq_file *seq, void *offset) entries = (struct vis_info_entry *) ((char *)packet + sizeof(*packet)); + vis_data_insert_interface(packet->vis_orig, + &vis_if_list, true); + for (j = 0; j < packet->entries; j++) { if (entries[j].quality == 0) continue; - compare = - compare_eth(entries[j].src, packet->vis_orig); + if (compare_eth(entries[j].src, + packet->vis_orig)) + continue; vis_data_insert_interface(entries[j].src, &vis_if_list, - compare); + false); } hlist_for_each_entry(entry, pos, &vis_if_list, list) { @@ -276,14 +279,18 @@ int vis_seq_print_text(struct seq_file *seq, void *offset) entries = (struct vis_info_entry *) ((char *)packet + sizeof(*packet)); + vis_data_insert_interface(packet->vis_orig, + &vis_if_list, true); + for (j = 0; j < packet->entries; j++) { if (entries[j].quality == 0) continue; - compare = - compare_eth(entries[j].src, packet->vis_orig); + if (compare_eth(entries[j].src, + packet->vis_orig)) + continue; vis_data_insert_interface(entries[j].src, &vis_if_list, - compare); + false); } hlist_for_each_entry(entry, pos, &vis_if_list, list) { -- batman-adv

1 0

batctl; branch, master, updated. v2012.1.0-24-g4584d1b
by postmaster＠open-mesh.org 06 May '12

06 May '12

The following commit has been merged in the master branch: commit 4584d1b17c666dc191d9337bb15fd28fe9d3298b Author: Al Viro <viro(a)ZenIV.linux.org.uk> Date: Sun Apr 22 07:45:29 2012 +0100 batctl: don't bother flipping ->tt_crc Keep it net-endian Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk> diff --git a/packet.h b/packet.h index 41044a5..eb4fdf6 100644 --- a/packet.h +++ b/packet.h @@ -132,7 +132,7 @@ struct batman_ogm_packet { uint8_t tq; uint8_t tt_num_changes; uint8_t ttvn; /* translation table version number */ - uint16_t tt_crc; + __be16 tt_crc; } __packed; #define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet) -- batctl

1 0

batctl; branch, master, updated. v2012.1.0-23-g4e318d1
by postmaster＠open-mesh.org 06 May '12

06 May '12

The following commit has been merged in the master branch: commit 4e318d177060ba811cb2d2ab80e040579ff25045 Author: Al Viro <viro(a)ZenIV.linux.org.uk> Date: Sun Apr 22 07:44:27 2012 +0100 batman-adv: don't bother flipping ->tt_data just keep it net-endian all along Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk> [lindner_marek(a)yahoo.de: fix checkpatch warnings] Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/packet.h b/packet.h index f39556b..41044a5 100644 --- a/packet.h +++ b/packet.h @@ -220,7 +220,7 @@ struct tt_query_packet { * if TT_REQUEST: crc associated with the * ttvn * if TT_RESPONSE: table_size */ - uint16_t tt_data; + __be16 tt_data; } __packed; struct roam_adv_packet { -- batctl

1 0

batman-adv; branch, master, updated. v2012.1.0-115-gad7713b
by postmaster＠open-mesh.org 06 May '12

06 May '12

The following commit has been merged in the master branch: commit ad7713b04bcf5f4fe12d99b1c17a10d43c1b825b Author: Al Viro <viro(a)ZenIV.linux.org.uk> Date: Sun Apr 22 07:45:29 2012 +0100 batman-adv: don't bother flipping ->tt_crc Keep it net-endian Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 8b3b77b..bde28c3 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -547,8 +547,6 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, "Forwarding packet: tq: %i, ttl: %i\n", batman_ogm_packet->tq, batman_ogm_packet->header.ttl); - batman_ogm_packet->tt_crc = htons(batman_ogm_packet->tt_crc); - /* switch of primaries first hop flag when forwarding */ batman_ogm_packet->flags &= ~PRIMARIES_FIRST_HOP; if (is_single_hop_neigh) @@ -724,7 +722,7 @@ update_tt: tt_update_orig(bat_priv, orig_node, tt_buff, batman_ogm_packet->tt_num_changes, batman_ogm_packet->ttvn, - batman_ogm_packet->tt_crc); + ntohs(batman_ogm_packet->tt_crc)); if (orig_node->gw_flags != batman_ogm_packet->gw_flags) gw_node_update(bat_priv, orig_node, @@ -972,7 +970,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, ethhdr->h_source, if_incoming->net_dev->name, if_incoming->net_dev->dev_addr, batman_ogm_packet->orig, batman_ogm_packet->prev_sender, ntohl(batman_ogm_packet->seqno), - batman_ogm_packet->ttvn, batman_ogm_packet->tt_crc, + batman_ogm_packet->ttvn, ntohs(batman_ogm_packet->tt_crc), batman_ogm_packet->tt_num_changes, batman_ogm_packet->tq, batman_ogm_packet->header.ttl, batman_ogm_packet->header.version, has_directlink_flag); @@ -1217,10 +1215,6 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, /* unpack the aggregated packets and process them one by one */ do { - /* network to host order for our 32bit seqno and the - orig_interval */ - batman_ogm_packet->tt_crc = ntohs(batman_ogm_packet->tt_crc); - tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN; bat_iv_ogm_process(ethhdr, batman_ogm_packet, diff --git a/packet.h b/packet.h index 41044a5..eb4fdf6 100644 --- a/packet.h +++ b/packet.h @@ -132,7 +132,7 @@ struct batman_ogm_packet { uint8_t tq; uint8_t tt_num_changes; uint8_t ttvn; /* translation table version number */ - uint16_t tt_crc; + __be16 tt_crc; } __packed; #define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet) -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.1.0-114-g3a6c660
by postmaster＠open-mesh.org 06 May '12

06 May '12

The following commit has been merged in the master branch: commit 3a6c660632ae7970f36708fe0ef11d11ad9f2ca0 Author: Al Viro <viro(a)ZenIV.linux.org.uk> Date: Sun Apr 22 07:44:27 2012 +0100 batman-adv: don't bother flipping ->tt_data just keep it net-endian all along Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk> [lindner_marek(a)yahoo.de: fix checkpatch warnings] Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/packet.h b/packet.h index f39556b..41044a5 100644 --- a/packet.h +++ b/packet.h @@ -220,7 +220,7 @@ struct tt_query_packet { * if TT_REQUEST: crc associated with the * ttvn * if TT_RESPONSE: table_size */ - uint16_t tt_data; + __be16 tt_data; } __packed; struct roam_adv_packet { diff --git a/routing.c b/routing.c index f7ee5ff..9beb2e2 100644 --- a/routing.c +++ b/routing.c @@ -573,7 +573,7 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) { struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct tt_query_packet *tt_query; - uint16_t tt_len; + uint16_t tt_size; struct ethhdr *ethhdr; /* drop packet if it has not necessary minimum size */ @@ -596,8 +596,6 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) tt_query = (struct tt_query_packet *)skb->data; - tt_query->tt_data = ntohs(tt_query->tt_data); - switch (tt_query->flags & TT_QUERY_TYPE_MASK) { case TT_REQUEST: inc_counter(bat_priv, BAT_CNT_TT_REQUEST_RX); @@ -609,7 +607,6 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) "Routing TT_REQUEST to %pM [%c]\n", tt_query->dst, (tt_query->flags & TT_FULL_TABLE ? 'F' : '.')); - tt_query->tt_data = htons(tt_query->tt_data); return route_unicast_packet(skb, recv_if); } break; @@ -622,11 +619,11 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) if (skb_linearize(skb) < 0) goto out; - tt_len = tt_query->tt_data * sizeof(struct tt_change); + tt_size = tt_len(ntohs(tt_query->tt_data)); /* Ensure we have all the claimed data */ if (unlikely(skb_headlen(skb) < - sizeof(struct tt_query_packet) + tt_len)) + sizeof(struct tt_query_packet) + tt_size)) goto out; handle_tt_response(bat_priv, tt_query); @@ -635,7 +632,6 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) "Routing TT_RESPONSE to %pM [%c]\n", tt_query->dst, (tt_query->flags & TT_FULL_TABLE ? 'F' : '.')); - tt_query->tt_data = htons(tt_query->tt_data); return route_unicast_packet(skb, recv_if); } break; diff --git a/translation-table.c b/translation-table.c index 6743a66..4155918 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1418,7 +1418,7 @@ static bool send_other_tt_response(struct bat_priv *bat_priv, /* I don't have the requested data */ if (orig_ttvn != req_ttvn || - tt_request->tt_data != req_dst_orig_node->tt_crc) + tt_request->tt_data != htons(req_dst_orig_node->tt_crc)) goto out; /* If the full table has been explicitly requested */ @@ -1678,7 +1678,7 @@ static void tt_fill_gtable(struct bat_priv *bat_priv, _tt_update_changes(bat_priv, orig_node, (struct tt_change *)(tt_response + 1), - tt_response->tt_data, tt_response->ttvn); + ntohs(tt_response->tt_data), tt_response->ttvn); spin_lock_bh(&orig_node->tt_buff_lock); kfree(orig_node->tt_buff); @@ -1733,7 +1733,8 @@ void handle_tt_response(struct bat_priv *bat_priv, bat_dbg(DBG_TT, bat_priv, "Received TT_RESPONSE from %pM for ttvn %d t_size: %d [%c]\n", - tt_response->src, tt_response->ttvn, tt_response->tt_data, + tt_response->src, tt_response->ttvn, + ntohs(tt_response->tt_data), (tt_response->flags & TT_FULL_TABLE ? 'F' : '.')); /* we should have never asked a backbone gw */ @@ -1747,7 +1748,8 @@ void handle_tt_response(struct bat_priv *bat_priv, if (tt_response->flags & TT_FULL_TABLE) tt_fill_gtable(bat_priv, tt_response); else - tt_update_changes(bat_priv, orig_node, tt_response->tt_data, + tt_update_changes(bat_priv, orig_node, + ntohs(tt_response->tt_data), tt_response->ttvn, (struct tt_change *)(tt_response + 1)); -- batman-adv

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2012