commits February 2012

commits@lists.open-mesh.org

1 participants
131 discussions

linux integration; branch, for_sven, deleted. v3.3-rc1-18-g30c741e
by postmaster＠open-mesh.org 16 Feb '12

16 Feb '12

The branch, for_sven has been deleted was 30c741e3120d8b28493d804e9226dca51fddadcc ----------------------------------------------------------------------- 30c741e3120d8b28493d804e9226dca51fddadcc batman-adv: batman-adv: Start new development cycle ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; branch, for_sven, created. v3.3-rc1-18-g30c741e
by postmaster＠open-mesh.org 16 Feb '12

16 Feb '12

The branch, for_sven has been created at 30c741e3120d8b28493d804e9226dca51fddadcc (commit) - Shortlog ------------------------------------------------------------ commit 30c741e3120d8b28493d804e9226dca51fddadcc Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 5 15:23:55 2012 +0100 batman-adv: batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit c4e2f6ec0dc53e70d5cf9e1a5d7592d2454a5399 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jan 12 19:07:00 2012 +0100 batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry Actually the TT_CLIENT_PENDING flag is never set in the tt_global_entry structure, therefore this code is useless and can be removed. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 9798e8c647c64942c36a294a30ef1971901836a8 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Jan 6 21:31:34 2012 +0100 batman-adv: code refactoring - move debug print into tt_local_set_pending Each tt_local_set_pending is always followed by a bat_dbg invocation. This can be simplified by moving the bat_dbg() call. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 9acae94fae31d4cde538277c8f419a3f5bddd59b Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Jan 6 21:31:33 2012 +0100 batman-adv: set TT_CLIENT_NEW flag before invoking hash_add() In case of a new tt_local_entry, the TT_CLIENT_NEW flag has to be set before adding such entry to the hash table. Otherwise, it opens a race condition in which the entry can be found but the flag has not been set. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit fa3695bc0566fc9a1a6c05ecb680c40744077d0f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 1 00:41:38 2012 +0100 batman-adv: Update copyright years Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit ffa047e69d3d5cbc6d7619081a848ff41607e34a Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Tue Dec 27 17:24:07 2011 +0100 batman-adv: convert all times to miliseconds has_timed_out() takes the second argument in miliseconds. The commit "batman-adv: convert time_after instances to has_timed_out" introduced some bugs by confusing seconds and miliseconds. This patch converts all timeouts to miliseconds to be consistent, and also fixes the previously introduced bugs. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit ebedc50b460f993caa8bd888fa2481fa12493b9f Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 22 20:31:12 2011 +0800 batman-adv: refactor tt_global_del() to avoid misalignment Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 664bb42d826811aa599f9d201be0854fa30a1458 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Dec 20 19:30:40 2011 +0800 batman-adv: convert time_after instances to has_timed_out To increase readability the has_timed_out() functions has been introduced. This patch converts existing time_after() calls to use this wrapper function (if applicable). Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 3847ed4b509b8871c6c65fb9b8be799eb93c7709 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Nov 29 00:15:37 2011 +0800 batman-adv: export used routing algorithm via sysfs Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 47ccdbffc14e670017507848401df41fda535f34 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Dec 10 19:45:53 2011 +0800 batman-adv: allowing changing the routing algorithm via module parameter Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit ca7c6b4fc094a2aa854c893928bf8f332e2cd6ff Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 28 21:31:55 2011 +0800 batman-adv: convert batman iv algorithm to use dynamic infrastructure Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit b150690663b6d34a02913a28c685a4f6ca4eab4d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 28 17:40:17 2011 +0800 batman-adv: add infrastructure to change routing algorithm at runtime Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 1a0c9d7d95178f7dbb37d9474585bda447aee225 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Dec 7 18:02:50 2011 +0800 batman-adv: warn if added interface is part of a bridge Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 08b456b5068487cf2d96a18b9259c44879420533 Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Thu Dec 8 13:32:41 2011 +0100 batman-adv: Move is_out_of_time() to main.h for general use Both translation tables and network coding use timeouts to do house keeping, so we might as well share the function used to compare a timestamp+timeout with current time. For readability and simplicity, the function is renamed to has_timed_out() and uses time_is_before_jiffies() instead of time_after(). Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 7bc063a6cc1a1a2efbc1b9469a9da1978b6b6bb5 Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Thu Dec 8 12:48:26 2011 +0100 batman-adv: Rm empty line from is_my_mac() in main.c Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 27351b79f9986c5c2c245259f9a1583c51e874b1 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Dec 5 04:01:51 2011 +0800 batman-adv: simplify bat_ogm_receive API call Most of the values in that call are derived from the skb, so we can hand over the skb instead. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit f4803130f380c57ab38bd4619f7802f0f64bf222 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Nov 20 15:47:38 2011 +0100 batman-adv: Explicitly mark the common header structure All batman-adv packets have a common 3 byte header. It can be used to share some code between different code paths, but it was never explicit stated that this header has to be always the same for all packets. Therefore, new code changes always have the problem that they may accidently introduce regressions by moving some elements around. A new structure is introduced that contains the common header and makes it easier visible that these 3 bytes have to be the same for all on-wire packets. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit d22620ab6ef6b3ead7ea7c22f772c489dff3646b Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 7 16:36:40 2011 +0100 batman-adv: add tt_initialised flag to the orig_node struct (ttvn == 0) is currently used as initial condition. However this is not a good idea because ttvn gets the vale zero each time after reaching the maximum value (wrap around). For this reason a new flag is added in order to define whether a node has an initialised table or not. Moreover, after invoking tt_global_del_orig(), tt_initialised has to be set to false Reported-by: Alexey Fisher <bug-track(a)fisher-privat.net> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Tested-by: Alexey Fisher <bug-track(a)fisher-privat.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> ----------------------------------------------------------------------- -- linux integration

1 0

batctl; branch, master, updated. v2012.0.0-15-g372d1ba
by postmaster＠open-mesh.org 15 Feb '12

15 Feb '12

The following commit has been merged in the master branch: commit 372d1bab30e4ca6aa559f25f5f6bd8c0ae3b5cc5 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:50 2012 +0800 batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN Using BATMAN_OGM_LEN leaves one with the impression that this is the full packet size which is not the case. Therefore the variable is renamed. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/packet.h b/packet.h index db6946a..7971a69 100644 --- a/packet.h +++ b/packet.h @@ -125,7 +125,7 @@ struct batman_ogm_packet { uint16_t tt_crc; } __packed; -#define BATMAN_OGM_LEN sizeof(struct batman_ogm_packet) +#define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet) struct icmp_packet { struct batman_header header; -- batctl

1 0

batctl; branch, master, updated. v2012.0.0-14-g473d8c9
by postmaster＠open-mesh.org 13 Feb '12

13 Feb '12

The following commit has been merged in the master branch: commit 473d8c9f790a326db627c52fb92dbeeaabd49d6d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:51 2012 +0800 batman-adv: mark existing ogm variables as batman iv The coming protocol changes also will have a part called "OGM". That makes it necessary to introduce a distinction in the code base. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/packet.h b/packet.h index caa12fe..db6946a 100644 --- a/packet.h +++ b/packet.h @@ -25,7 +25,7 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_OGM = 0x01, + BAT_IV_OGM = 0x01, BAT_ICMP = 0x02, BAT_UNICAST = 0x03, BAT_BCAST = 0x04, @@ -38,7 +38,7 @@ enum bat_packettype { /* this file is included by batctl which needs these defines */ #define COMPAT_VERSION 14 -enum batman_flags { +enum batman_iv_flags { PRIMARIES_FIRST_HOP = 1 << 4, VIS_SERVER = 1 << 5, DIRECTLINK = 1 << 6 diff --git a/tcpdump.c b/tcpdump.c index b37b7ec..771e4f0 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -315,12 +315,12 @@ static void dump_batman_roam(unsigned char *packet_buff, ssize_t buff_len, int r (size_t)buff_len - sizeof(struct ether_header)); } -static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) +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; struct batman_ogm_packet *batman_ogm_packet; - LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batman_ogm_packet), "BAT OGM"); + LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batman_ogm_packet), "BAT IV OGM"); ether_header = (struct ether_header *)packet_buff; batman_ogm_packet = (struct batman_ogm_packet *)(packet_buff + sizeof(struct ether_header)); @@ -331,7 +331,7 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_ogm_packet->orig, read_opt)); - printf("OGM 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, ttvn %d, ttcrc %hu, 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, @@ -491,9 +491,9 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read batman_ogm_packet = (struct batman_ogm_packet *)(packet_buff + ETH_HLEN); switch (batman_ogm_packet->header.packet_type) { - case BAT_OGM: + case BAT_IV_OGM: if (dump_level & DUMP_TYPE_BATOGM) - dump_batman_ogm(packet_buff, buff_len, read_opt, time_printed); + dump_batman_iv_ogm(packet_buff, buff_len, read_opt, time_printed); break; case BAT_ICMP: if (dump_level & DUMP_TYPE_BATICMP) -- batctl

1 0

batman-adv; branch, master, updated. v2012.0.0-65-gfc320c7
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit fc320c7fe95be4e5e14b0dce4e438112a6b41cf5 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:51 2012 +0800 batman-adv: mark existing ogm variables as batman iv The coming protocol changes also will have a part called "OGM". That makes it necessary to introduce a distinction in the code base. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index da93525..caa67e4 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -47,7 +47,7 @@ static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) goto out; batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff; - batman_ogm_packet->header.packet_type = BAT_OGM; + batman_ogm_packet->header.packet_type = BAT_IV_OGM; batman_ogm_packet->header.version = COMPAT_VERSION; batman_ogm_packet->header.ttl = 2; batman_ogm_packet->flags = NO_FLAGS; @@ -942,7 +942,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, * packet in an aggregation. Here we expect that the padding * is always zero (or not 0x01) */ - if (batman_ogm_packet->header.packet_type != BAT_OGM) + if (batman_ogm_packet->header.packet_type != BAT_IV_OGM) return; /* could be changed by schedule_own_packet() */ diff --git a/hard-interface.c b/hard-interface.c index 2a435ec..30b1c07 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -617,7 +617,7 @@ static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, switch (batman_ogm_packet->header.packet_type) { /* batman originator packet */ - case BAT_OGM: + case BAT_IV_OGM: ret = recv_bat_ogm_packet(skb, hard_iface); break; diff --git a/packet.h b/packet.h index ed16ec3..7971a69 100644 --- a/packet.h +++ b/packet.h @@ -25,7 +25,7 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_OGM = 0x01, + BAT_IV_OGM = 0x01, BAT_ICMP = 0x02, BAT_UNICAST = 0x03, BAT_BCAST = 0x04, @@ -38,7 +38,7 @@ enum bat_packettype { /* this file is included by batctl which needs these defines */ #define COMPAT_VERSION 14 -enum batman_flags { +enum batman_iv_flags { PRIMARIES_FIRST_HOP = 1 << 4, VIS_SERVER = 1 << 5, DIRECTLINK = 1 << 6 -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-64-g76cdf0e
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit 76cdf0e0c1b5f666c07d9834043b7bdce45c4c7c Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:50 2012 +0800 batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN Using BATMAN_OGM_LEN leaves one with the impression that this is the full packet size which is not the case. Therefore the variable is renamed. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index b82a772..da93525 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -40,7 +40,7 @@ static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) get_random_bytes(&random_seqno, sizeof(unsigned long)); atomic_set(&hard_iface->seqno, (uint32_t)random_seqno); - hard_iface->packet_len = BATMAN_OGM_LEN; + hard_iface->packet_len = BATMAN_OGM_HLEN; hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC); if (!hard_iface->packet_buff) @@ -112,7 +112,7 @@ static uint8_t hop_penalty(uint8_t tq, const struct bat_priv *bat_priv) static int bat_iv_ogm_aggr_packet(int buff_pos, int packet_len, int tt_num_changes) { - int next_buff_pos = buff_pos + BATMAN_OGM_LEN + tt_len(tt_num_changes); + int next_buff_pos = buff_pos + BATMAN_OGM_HLEN + tt_len(tt_num_changes); return (next_buff_pos <= packet_len) && (next_buff_pos <= MAX_AGGREGATION_BYTES); @@ -163,7 +163,7 @@ static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet, batman_ogm_packet->ttvn, hard_iface->net_dev->name, hard_iface->net_dev->dev_addr); - buff_pos += BATMAN_OGM_LEN + + buff_pos += BATMAN_OGM_HLEN + tt_len(batman_ogm_packet->tt_num_changes); packet_num++; batman_ogm_packet = (struct batman_ogm_packet *) @@ -544,7 +544,7 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, batman_ogm_packet->flags &= ~DIRECTLINK; bat_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet, - BATMAN_OGM_LEN + tt_len(tt_num_changes), + BATMAN_OGM_HLEN + tt_len(tt_num_changes), if_incoming, 0, bat_iv_ogm_fwd_send_time()); } @@ -1184,12 +1184,12 @@ static void bat_iv_ogm_receive(struct hard_iface *if_incoming, batman_ogm_packet->seqno = ntohl(batman_ogm_packet->seqno); batman_ogm_packet->tt_crc = ntohs(batman_ogm_packet->tt_crc); - tt_buff = packet_buff + buff_pos + BATMAN_OGM_LEN; + tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN; bat_iv_ogm_process(ethhdr, batman_ogm_packet, tt_buff, if_incoming); - buff_pos += BATMAN_OGM_LEN + + buff_pos += BATMAN_OGM_HLEN + tt_len(batman_ogm_packet->tt_num_changes); batman_ogm_packet = (struct batman_ogm_packet *) diff --git a/packet.h b/packet.h index caa12fe..ed16ec3 100644 --- a/packet.h +++ b/packet.h @@ -125,7 +125,7 @@ struct batman_ogm_packet { uint16_t tt_crc; } __packed; -#define BATMAN_OGM_LEN sizeof(struct batman_ogm_packet) +#define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet) struct icmp_packet { struct batman_header header; diff --git a/routing.c b/routing.c index 7b7fcbe..92fe20b 100644 --- a/routing.c +++ b/routing.c @@ -254,7 +254,7 @@ int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface) struct ethhdr *ethhdr; /* drop packet if it has not necessary minimum size */ - if (unlikely(!pskb_may_pull(skb, BATMAN_OGM_LEN))) + if (unlikely(!pskb_may_pull(skb, BATMAN_OGM_HLEN))) return NET_RX_DROP; ethhdr = (struct ethhdr *)skb_mac_header(skb); diff --git a/send.c b/send.c index 4137580..36e1d27 100644 --- a/send.c +++ b/send.c @@ -87,7 +87,7 @@ static void realloc_packet_buffer(struct hard_iface *hard_iface, /* keep old buffer if kmalloc should fail */ if (new_buff) { memcpy(new_buff, hard_iface->packet_buff, - BATMAN_OGM_LEN); + BATMAN_OGM_HLEN); kfree(hard_iface->packet_buff); hard_iface->packet_buff = new_buff; @@ -101,13 +101,13 @@ static int prepare_packet_buffer(struct bat_priv *bat_priv, { int new_len; - new_len = BATMAN_OGM_LEN + + new_len = BATMAN_OGM_HLEN + tt_len((uint8_t)atomic_read(&bat_priv->tt_local_changes)); /* if we have too many changes for one packet don't send any * and wait for the tt table request which will be fragmented */ if (new_len > hard_iface->soft_iface->mtu) - new_len = BATMAN_OGM_LEN; + new_len = BATMAN_OGM_HLEN; realloc_packet_buffer(hard_iface, new_len); @@ -117,14 +117,14 @@ static int prepare_packet_buffer(struct bat_priv *bat_priv, atomic_set(&bat_priv->tt_ogm_append_cnt, TT_OGM_APPEND_MAX); return tt_changes_fill_buffer(bat_priv, - hard_iface->packet_buff + BATMAN_OGM_LEN, - hard_iface->packet_len - BATMAN_OGM_LEN); + hard_iface->packet_buff + BATMAN_OGM_HLEN, + hard_iface->packet_len - BATMAN_OGM_HLEN); } static int reset_packet_buffer(struct bat_priv *bat_priv, struct hard_iface *hard_iface) { - realloc_packet_buffer(hard_iface, BATMAN_OGM_LEN); + realloc_packet_buffer(hard_iface, BATMAN_OGM_HLEN); return 0; } -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-63-g0b751f1
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit 0b751f137c2dfad20a74558b61f98b2f9734d037 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:49 2012 +0800 batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index d944a0b..b82a772 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -67,7 +67,7 @@ static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface) hard_iface->packet_buff = NULL; } -static void bat_iv_ogm_init_primary(struct hard_iface *hard_iface) +static void bat_iv_ogm_primary_iface_set(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; @@ -1202,7 +1202,7 @@ static struct bat_algo_ops batman_iv __read_mostly = { .name = "BATMAN IV", .bat_iface_enable = bat_iv_ogm_iface_enable, .bat_iface_disable = bat_iv_ogm_iface_disable, - .bat_ogm_init_primary = bat_iv_ogm_init_primary, + .bat_primary_iface_set = bat_iv_ogm_primary_iface_set, .bat_ogm_update_mac = bat_iv_ogm_update_mac, .bat_ogm_schedule = bat_iv_ogm_schedule, .bat_ogm_emit = bat_iv_ogm_emit, diff --git a/hard-interface.c b/hard-interface.c index d6b25e0..2a435ec 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -146,7 +146,7 @@ static void primary_if_select(struct bat_priv *bat_priv, if (!new_hard_iface) goto out; - bat_priv->bat_algo_ops->bat_ogm_init_primary(new_hard_iface); + bat_priv->bat_algo_ops->bat_primary_iface_set(new_hard_iface); primary_if_update_addr(bat_priv, curr_hard_iface); out: diff --git a/main.c b/main.c index c4a9b2b..87b75a9 100644 --- a/main.c +++ b/main.c @@ -210,7 +210,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops) /* all algorithms must implement all ops (for now) */ if (!bat_algo_ops->bat_iface_enable || !bat_algo_ops->bat_iface_disable || - !bat_algo_ops->bat_ogm_init_primary || + !bat_algo_ops->bat_primary_iface_set || !bat_algo_ops->bat_ogm_update_mac || !bat_algo_ops->bat_ogm_schedule || !bat_algo_ops->bat_ogm_emit || diff --git a/types.h b/types.h index dd78023..4d93aad 100644 --- a/types.h +++ b/types.h @@ -381,8 +381,8 @@ struct bat_algo_ops { int (*bat_iface_enable)(struct hard_iface *hard_iface); /* de-init routing info when hard-interface is disabled */ void (*bat_iface_disable)(struct hard_iface *hard_iface); - /* init primary OGM when primary interface is selected */ - void (*bat_ogm_init_primary)(struct hard_iface *hard_iface); + /* called when primary interface is selected / changed */ + void (*bat_primary_iface_set)(struct hard_iface *hard_iface); /* init mac addresses of the OGM belonging to this hard-interface */ void (*bat_ogm_update_mac)(struct hard_iface *hard_iface); /* prepare a new outgoing OGM for the send queue */ -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-62-g13cbee1
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit 13cbee11e423213ba5048b2a04b40cb87b4290b3 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:48 2012 +0800 batman-adv: handle routing code initialization properly Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 98c41f5..d944a0b 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -30,10 +30,11 @@ #include "send.h" #include "bat_algo.h" -static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) +static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; unsigned long random_seqno; + int res = -1; /* randomize initial seqno to avoid collision */ get_random_bytes(&random_seqno, sizeof(unsigned long)); @@ -42,6 +43,9 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) hard_iface->packet_len = BATMAN_OGM_LEN; hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC); + if (!hard_iface->packet_buff) + goto out; + batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff; batman_ogm_packet->header.packet_type = BAT_OGM; batman_ogm_packet->header.version = COMPAT_VERSION; @@ -50,6 +54,11 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) batman_ogm_packet->tq = TQ_MAX_VALUE; batman_ogm_packet->tt_num_changes = 0; batman_ogm_packet->ttvn = 0; + + res = 0; + +out: + return res; } static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface) diff --git a/hard-interface.c b/hard-interface.c index ec2f478..d6b25e0 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -310,21 +310,17 @@ int hardif_enable_interface(struct hard_iface *hard_iface, pr_err("Can't create batman mesh interface %s: " "already exists as regular interface\n", soft_iface->name); - dev_put(soft_iface); ret = -EINVAL; - goto err; + goto err_dev; } hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); - bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); - - if (!hard_iface->packet_buff) { - bat_err(hard_iface->soft_iface, "Can't add interface packet " - "(%s): out of memory\n", hard_iface->net_dev->name); + ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); + if (ret < 0) { ret = -ENOMEM; - goto err; + goto err_dev; } hard_iface->if_num = bat_priv->num_ifaces; @@ -375,6 +371,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface, out: return 0; +err_dev: + dev_put(soft_iface); err: hardif_free_ref(hard_iface); return ret; diff --git a/types.h b/types.h index b034cf2..dd78023 100644 --- a/types.h +++ b/types.h @@ -378,7 +378,7 @@ struct bat_algo_ops { struct hlist_node list; char *name; /* init routing info when hard-interface is enabled */ - void (*bat_iface_enable)(struct hard_iface *hard_iface); + int (*bat_iface_enable)(struct hard_iface *hard_iface); /* de-init routing info when hard-interface is disabled */ void (*bat_iface_disable)(struct hard_iface *hard_iface); /* init primary OGM when primary interface is selected */ -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-61-g4348aad
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit 4348aade64699ddf67f383a0841e0d0042675178 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:47 2012 +0800 batman-adv: add iface_disable() callback to routing API Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 4ac2d1d..98c41f5 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -52,6 +52,12 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) batman_ogm_packet->ttvn = 0; } +static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface) +{ + kfree(hard_iface->packet_buff); + hard_iface->packet_buff = NULL; +} + static void bat_iv_ogm_init_primary(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; @@ -1186,6 +1192,7 @@ static void bat_iv_ogm_receive(struct hard_iface *if_incoming, static struct bat_algo_ops batman_iv __read_mostly = { .name = "BATMAN IV", .bat_iface_enable = bat_iv_ogm_iface_enable, + .bat_iface_disable = bat_iv_ogm_iface_disable, .bat_ogm_init_primary = bat_iv_ogm_init_primary, .bat_ogm_update_mac = bat_iv_ogm_update_mac, .bat_ogm_schedule = bat_iv_ogm_schedule, diff --git a/hard-interface.c b/hard-interface.c index 4052444..ec2f478 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -409,8 +409,7 @@ void hardif_disable_interface(struct hard_iface *hard_iface) hardif_free_ref(new_if); } - kfree(hard_iface->packet_buff); - hard_iface->packet_buff = NULL; + bat_priv->bat_algo_ops->bat_iface_disable(hard_iface); hard_iface->if_status = IF_NOT_IN_USE; /* delete all references to this hard_iface */ diff --git a/main.c b/main.c index 8bc27e1..c4a9b2b 100644 --- a/main.c +++ b/main.c @@ -209,6 +209,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops) /* all algorithms must implement all ops (for now) */ if (!bat_algo_ops->bat_iface_enable || + !bat_algo_ops->bat_iface_disable || !bat_algo_ops->bat_ogm_init_primary || !bat_algo_ops->bat_ogm_update_mac || !bat_algo_ops->bat_ogm_schedule || diff --git a/types.h b/types.h index 4b92248..b034cf2 100644 --- a/types.h +++ b/types.h @@ -379,6 +379,8 @@ struct bat_algo_ops { char *name; /* init routing info when hard-interface is enabled */ void (*bat_iface_enable)(struct hard_iface *hard_iface); + /* de-init routing info when hard-interface is disabled */ + void (*bat_iface_disable)(struct hard_iface *hard_iface); /* init primary OGM when primary interface is selected */ void (*bat_ogm_init_primary)(struct hard_iface *hard_iface); /* init mac addresses of the OGM belonging to this hard-interface */ -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-60-g852b9dc
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit 852b9dcc54d6dc7886c4babe47d8d3f854cd9920 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:46 2012 +0800 batman-adv: randomize initial seqno to avoid collision Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 3eff7f0..4ac2d1d 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -33,6 +33,11 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; + unsigned long random_seqno; + + /* randomize initial seqno to avoid collision */ + get_random_bytes(&random_seqno, sizeof(unsigned long)); + atomic_set(&hard_iface->seqno, (uint32_t)random_seqno); hard_iface->packet_len = BATMAN_OGM_LEN; hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC); -- batman-adv

1 0

← Newer
1
2
3
4
5
6
7
8
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2012