B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: generalise size in bitarray API
by Antonio Quartulli 05 Jul '12

05 Jul '12

The current bitarray library assumes that the windows are always BATADV_TQ_LOCAL_WINDOW_SIZE long. If we want to reuse the same library in other contexts we need to make it general enough. This patch enables such the bitarray library to handle windows of any size. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bat_iv_ogm.c | 9 ++++++--- bitarray.c | 31 ++++++++++++++++--------------- bitarray.h | 11 ++++++----- routing.c | 9 ++++++--- 4 files changed, 34 insertions(+), 26 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index e877af8..f8e4c0e 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -910,6 +910,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, int set_mark, ret = -1; uint32_t seqno = ntohl(batadv_ogm_packet->seqno); uint8_t *neigh_addr; + int win_size = BATADV_TQ_LOCAL_WINDOW_SIZE; orig_node = batadv_get_orig_node(bat_priv, batadv_ogm_packet->orig); if (!orig_node) @@ -930,7 +931,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, is_duplicate |= batadv_test_bit(tmp_neigh_node->real_bits, orig_node->last_real_seqno, - seqno); + seqno, win_size); neigh_addr = tmp_neigh_node->addr; if (batadv_compare_eth(neigh_addr, ethhdr->h_source) && @@ -942,7 +943,8 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, /* if the window moved, set the update flag. */ need_update |= batadv_bit_get_packet(bat_priv, tmp_neigh_node->real_bits, - seq_diff, set_mark); + seq_diff, set_mark, + win_size); tmp_neigh_node->real_packet_count = bitmap_weight(tmp_neigh_node->real_bits, @@ -1093,7 +1095,8 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, word = &(orig_neigh_node->bcast_own[offset]); bit_pos = if_incoming_seqno - 2; bit_pos -= ntohl(batadv_ogm_packet->seqno); - batadv_set_bit(word, bit_pos); + batadv_set_bit(word, bit_pos, + BATADV_TQ_LOCAL_WINDOW_SIZE); weight = &orig_neigh_node->bcast_own_sum[if_num]; *weight = bitmap_weight(word, BATADV_TQ_LOCAL_WINDOW_SIZE); diff --git a/bitarray.c b/bitarray.c index aea174c..b46a81e 100644 --- a/bitarray.c +++ b/bitarray.c @@ -23,12 +23,13 @@ #include <linux/bitops.h> /* shift the packet array by n places. */ -static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) +static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n, + int size) { - if (n <= 0 || n >= BATADV_TQ_LOCAL_WINDOW_SIZE) + if (n <= 0 || n >= size) return; - bitmap_shift_left(seq_bits, seq_bits, n, BATADV_TQ_LOCAL_WINDOW_SIZE); + bitmap_shift_left(seq_bits, seq_bits, n, size); } @@ -39,39 +40,39 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) * 0 if the window was not moved/shifted. */ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, - int32_t seq_num_diff, int set_mark) + int32_t seq_num_diff, int set_mark, int size) { struct batadv_priv *bat_priv = priv; /* sequence number is slightly older. We already got a sequence number * higher than this one, so we just mark it. */ - if (seq_num_diff <= 0 && seq_num_diff > -BATADV_TQ_LOCAL_WINDOW_SIZE) { + if (seq_num_diff <= 0 && seq_num_diff > -size) { if (set_mark) - batadv_set_bit(seq_bits, -seq_num_diff); + batadv_set_bit(seq_bits, -seq_num_diff, size); return 0; } /* sequence number is slightly newer, so we shift the window and * set the mark if required */ - if (seq_num_diff > 0 && seq_num_diff < BATADV_TQ_LOCAL_WINDOW_SIZE) { - batadv_bitmap_shift_left(seq_bits, seq_num_diff); + if (seq_num_diff > 0 && seq_num_diff < size) { + batadv_bitmap_shift_left(seq_bits, seq_num_diff, size); if (set_mark) - batadv_set_bit(seq_bits, 0); + batadv_set_bit(seq_bits, 0, size); return 1; } /* sequence number is much newer, probably missed a lot of packets */ - if (seq_num_diff >= BATADV_TQ_LOCAL_WINDOW_SIZE && + if (seq_num_diff >= size && seq_num_diff < BATADV_EXPECTED_SEQNO_RANGE) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "We missed a lot of packets (%i) !\n", seq_num_diff - 1); - bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE); + bitmap_zero(seq_bits, size); if (set_mark) - batadv_set_bit(seq_bits, 0); + batadv_set_bit(seq_bits, 0, size); return 1; } @@ -80,15 +81,15 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, * packet should be dropped without calling this function if the * seqno window is protected. */ - if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE || + if (seq_num_diff <= -size || seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Other host probably restarted!\n"); - bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE); + bitmap_zero(seq_bits, size); if (set_mark) - batadv_set_bit(seq_bits, 0); + batadv_set_bit(seq_bits, 0, size); return 1; } diff --git a/bitarray.h b/bitarray.h index a081ce1..830d5bd 100644 --- a/bitarray.h +++ b/bitarray.h @@ -24,22 +24,23 @@ * and curr_seqno is within range of last_seqno */ static inline int batadv_test_bit(const unsigned long *seq_bits, - uint32_t last_seqno, uint32_t curr_seqno) + uint32_t last_seqno, uint32_t curr_seqno, + int size) { int32_t diff; diff = last_seqno - curr_seqno; - if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE) + if (diff < 0 || diff >= size) return 0; else return test_bit(diff, seq_bits); } /* turn corresponding bit on, so we can remember that we got the packet */ -static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n) +static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n, int size) { /* if too old, just drop it */ - if (n < 0 || n >= BATADV_TQ_LOCAL_WINDOW_SIZE) + if (n < 0 || n >= size) return; set_bit(n, seq_bits); /* turn the position on */ @@ -49,6 +50,6 @@ static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n) * new, 0 if old */ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, - int32_t seq_num_diff, int set_mark); + int32_t seq_num_diff, int set_mark, int size); #endif /* _NET_BATMAN_ADV_BITARRAY_H_ */ diff --git a/routing.c b/routing.c index bc2b88b..ec68df0 100644 --- a/routing.c +++ b/routing.c @@ -53,7 +53,8 @@ void batadv_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) word_index = hard_iface->if_num * BATADV_NUM_WORDS; word = &(orig_node->bcast_own[word_index]); - batadv_bit_get_packet(bat_priv, word, 1, 0); + batadv_bit_get_packet(bat_priv, word, 1, 0, + BATADV_TQ_LOCAL_WINDOW_SIZE); w = &orig_node->bcast_own_sum[hard_iface->if_num]; *w = bitmap_weight(word, BATADV_TQ_LOCAL_WINDOW_SIZE); spin_unlock_bh(&orig_node->ogm_cnt_lock); @@ -1118,7 +1119,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, /* check whether the packet is a duplicate */ if (batadv_test_bit(orig_node->bcast_bits, orig_node->last_bcast_seqno, - ntohl(bcast_packet->seqno))) + ntohl(bcast_packet->seqno), + BATADV_TQ_LOCAL_WINDOW_SIZE)) goto spin_unlock; seq_diff = ntohl(bcast_packet->seqno) - orig_node->last_bcast_seqno; @@ -1131,7 +1133,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, /* mark broadcast in flood history, update window position * if required. */ - if (batadv_bit_get_packet(bat_priv, orig_node->bcast_bits, seq_diff, 1)) + if (batadv_bit_get_packet(bat_priv, orig_node->bcast_bits, seq_diff, 1, + BATADV_TQ_LOCAL_WINDOW_SIZE)) orig_node->last_bcast_seqno = ntohl(bcast_packet->seqno); spin_unlock_bh(&orig_node->bcast_seqno_lock); -- 1.7.9.4

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: check batadv_orig_hash_add_if() return code
by Simon Wunderlich 05 Jul '12

05 Jul '12

If this call fails, some of the orig_nodes spaces may have been resized for the increased number of interface, and some may not. If we would just continue with the larger number of interfaces, this would lead to access to not allocated memory later. We better check the return code, and don't add the interface if no memory is available. OTOH, keeping some of the orig_nodes with too much memory allocated should hurt no one (except for a few too many bytes allocated). Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- hard-interface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hard-interface.c b/hard-interface.c index 282bf6e..2d7f4f2 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -313,7 +313,12 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, hard_iface->if_num = bat_priv->num_ifaces; bat_priv->num_ifaces++; hard_iface->if_status = BATADV_IF_INACTIVE; - batadv_orig_hash_add_if(hard_iface, bat_priv->num_ifaces); + ret = batadv_orig_hash_add_if(hard_iface, bat_priv->num_ifaces); + if (ret < 0) { + bat_priv->bat_algo_ops->bat_iface_disable(hard_iface); + bat_priv->num_ifaces--; + goto err_dev; + } hard_iface->batman_adv_ptype.type = ethertype; hard_iface->batman_adv_ptype.func = batadv_batman_skb_recv; -- 1.7.10

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix typos in comments
by Antonio Quartulli 05 Jul '12

05 Jul '12

the word millisecond is misspelled in several comments. This patch fixes it. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.h | 8 ++++---- vis.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main.h b/main.h index 6dca9c4..0c6903c 100644 --- a/main.h +++ b/main.h @@ -41,13 +41,13 @@ * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE */ #define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */ -#define BATADV_TT_LOCAL_TIMEOUT 3600000 /* in miliseconds */ -#define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in miliseconds */ +#define BATADV_TT_LOCAL_TIMEOUT 3600000 /* in milliseconds */ +#define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in milliseconds */ /* sliding packet range of received originator messages in sequence numbers * (should be a multiple of our word size) */ #define BATADV_TQ_LOCAL_WINDOW_SIZE 64 -/* miliseconds we have to keep pending tt_req */ +/* milliseconds we have to keep pending tt_req */ #define BATADV_TT_REQUEST_TIMEOUT 3000 #define BATADV_TQ_GLOBAL_WINDOW_SIZE 5 @@ -59,7 +59,7 @@ #define BATADV_TT_OGM_APPEND_MAX 3 /* Time in which a client can roam at most ROAMING_MAX_COUNT times in - * miliseconds + * milliseconds */ #define BATADV_ROAMING_MAX_TIME 20000 #define BATADV_ROAMING_MAX_COUNT 5 diff --git a/vis.h b/vis.h index 84e716e..873282f 100644 --- a/vis.h +++ b/vis.h @@ -20,7 +20,7 @@ #ifndef _NET_BATMAN_ADV_VIS_H_ #define _NET_BATMAN_ADV_VIS_H_ -/* timeout of vis packets in miliseconds */ +/* timeout of vis packets in milliseconds */ #define BATADV_VIS_TIMEOUT 200000 int batadv_vis_seq_print_text(struct seq_file *seq, void *offset); -- 1.7.9.4

2 1

[B.A.T.M.A.N.] [PATCHv4 0/3] new feature: Speedy Join 2012-07-01b
by Antonio Quartulli 05 Jul '12

05 Jul '12

Hello people, this is the fourth version of the Speedy Join patchset below Changes history: v1 -> v2: - indentation and style has been fixed taking into consideration Sven's suggestions - Old patch 4 has been removed. TT flags do not really need to be carry along with the tt_entry in a roaming_adv packet. (at least this is not needed for the purpose of this feature). A roaming client will be marked as ROAM on the new mesh node and therefore it will be already purged if nobody claims it v2 -> v3: - patch 1 and 2 have been merged in 1/3. Changes were all related to the new refcounting mechanism. ..orig_entry_find() function has been improved as well as ..orig_entry_add() (it does internally check if the orig_entry already exists or not) and ..has_orig() (now it does use ..orig_entry_find()). - patch 2/3 has been modified to take into consideration the change above - temp timeout changed to an absolute value instead of being computed as product of the local orig_interval times a constant factor. v3 -> v4: - fixed some minor style issues - renamed batadv_orig_list_entry_free_ref() to batadv_tt_orig_list_entry_free_ref() - improved comment in patch 2/3 Thank you, Antonio Antonio Quartulli (3): batman-adv: add reference counting for type batadv_tt_orig_list_entry batman-adv: detect not yet announced clients batman-adv: change interface_rx to get orig node main.h | 1 + packet.h | 1 + routing.c | 10 +-- soft-interface.c | 6 +- soft-interface.h | 5 +- translation-table.c | 194 +++++++++++++++++++++++++++++++++++++-------------- translation-table.h | 4 +- types.h | 2 + 8 files changed, 163 insertions(+), 60 deletions(-) -- 1.7.9.4

2 4

[B.A.T.M.A.N.] [PATCH] batctl: more detailed error messages when file can't be opened
by Marek Lindner 05 Jul '12

05 Jul '12

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- functions.c | 75 +++++++++++++++++++++++++++++------------------------------ sys.c | 11 ++++++++ 2 files changed, 48 insertions(+), 38 deletions(-) diff --git a/functions.c b/functions.c index d08c7a0..c78e408 100644 --- a/functions.c +++ b/functions.c @@ -36,15 +36,18 @@ #include "functions.h" #include "bat-hosts.h" #include "sys.h" +#include "debug.h" static struct timeval start_time; static char *host_name; char *line_ptr = NULL; -const char *sysfs_compile_out_param[] = { +const char *fs_compile_out_param[] = { SYS_LOG, SYS_LOG_LEVEL, batctl_settings[BATCTL_SETTINGS_BLA].sysfs_name, + batctl_debug_tables[BATCTL_TABLE_BLA_CLAIMS].debugfs_name, + batctl_debug_tables[BATCTL_TABLE_BLA_BACKBONES].debugfs_name, NULL, }; @@ -114,23 +117,42 @@ int file_exists(const char *fpath) return stat(fpath, &st) == 0; } -static int check_sys_dir(char *dir) +static void file_open_problem_dbg(char *dir, char *fname, char *full_path) { + const char **ptr; struct stat st; - if (stat("/sys/", &st) != 0) { - printf("Error - the folder '/sys/' was not found on the system\n"); - printf("Please make sure that the sys filesystem is properly mounted\n"); - return EXIT_FAILURE; + if (strstr(dir, "/sys/")) { + if (stat("/sys/", &st) != 0) { + printf("Error - the folder '/sys/' was not found on the system\n"); + printf("Please make sure that the sys filesystem is properly mounted\n"); + return; + } + } + + if (!file_exists(module_ver_path)) { + printf("Error - batman-adv module has not been loaded\n"); + return; + } + + if (!file_exists(dir)) { + printf("Error - mesh has not been enabled yet\n"); + printf("Activate your mesh by adding interfaces to batman-adv\n"); + return; } - if (stat(dir, &st) == 0) - return EXIT_SUCCESS; + for (ptr = fs_compile_out_param; *ptr; ptr++) { + if (strcmp(*ptr, fname) != 0) + continue; + + break; + } - printf("Error - the folder '%s' was not found within the sys filesystem\n", dir); - printf("Please make sure that the batman-adv kernel module is loaded and\n"); - printf("that you have activated your mesh by adding interfaces to batman-adv\n"); - return EXIT_FAILURE; + printf("Error - can't open file '%s': %s\n", full_path, strerror(errno)); + if (*ptr) { + printf("The option you called seems not to be compiled into your batman-adv kernel module.\n"); + printf("Consult the README if you wish to learn more about compiling options into batman-adv.\n"); + } } int read_file(char *dir, char *fname, int read_opt, @@ -140,7 +162,6 @@ int read_file(char *dir, char *fname, int read_opt, struct bat_host *bat_host; int res = EXIT_FAILURE; float last_seen; - const char **ptr; char full_path[500], *buff_ptr, *space_ptr, extra_char; size_t len = 0; FILE *fp = NULL; @@ -148,11 +169,6 @@ int read_file(char *dir, char *fname, int read_opt, if (read_opt & USE_BAT_HOSTS) bat_hosts_init(read_opt); - if (strstr(dir, "/sys/")) { - if (check_sys_dir(dir) != EXIT_SUCCESS) - goto out; - } - strncpy(full_path, dir, strlen(dir)); full_path[strlen(dir)] = '\0'; strncat(full_path, fname, sizeof(full_path) - strlen(full_path)); @@ -161,20 +177,8 @@ open: fp = fopen(full_path, "r"); if (!fp) { - if (!(read_opt & SILENCE_ERRORS)) { - for (ptr = sysfs_compile_out_param; *ptr; ptr++) { - if (strcmp(*ptr, fname) != 0) - continue; - - break; - } - - printf("Error - can't open file '%s': %s\n", full_path, strerror(errno)); - if (*ptr) { - printf("The option you called seems not to be compiled into your batman-adv kernel module.\n"); - printf("Consult the README if you wish to learn more about compiling options into batman-adv.\n"); - } - } + if (!(read_opt & SILENCE_ERRORS)) + file_open_problem_dbg(dir, fname, full_path); goto out; } @@ -285,11 +289,6 @@ int write_file(char *dir, char *fname, char *arg1, char *arg2) char full_path[500]; ssize_t write_len; - if (strstr(dir, "/sys/")) { - if (check_sys_dir(dir) != EXIT_SUCCESS) - goto out; - } - strncpy(full_path, dir, strlen(dir)); full_path[strlen(dir)] = '\0'; strncat(full_path, fname, sizeof(full_path) - strlen(full_path)); @@ -297,7 +296,7 @@ int write_file(char *dir, char *fname, char *arg1, char *arg2) fd = open(full_path, O_WRONLY); if (fd < 0) { - printf("Error - can't open file '%s': %s\n", full_path, strerror(errno)); + file_open_problem_dbg(dir, fname, full_path); goto out; } diff --git a/sys.c b/sys.c index 5b728a8..9787875 100644 --- a/sys.c +++ b/sys.c @@ -109,6 +109,11 @@ static int print_interfaces(char *mesh_iface) char *path_buff; int res; + if (!file_exists(module_ver_path)) { + printf("Error - batman-adv module has not been loaded\n"); + goto err; + } + path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { printf("Error - could not allocate path buffer: out of memory ?\n"); @@ -191,6 +196,12 @@ int interface(char *mesh_iface, int argc, char **argv) goto err; } + if (argc == 2) { + printf("Error - missing interface name(s) after '%s'\n", argv[1]); + interface_usage(); + goto err; + } + path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { printf("Error - could not allocate path buffer: out of memory ?\n"); -- 1.7.9.1

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: remove a misleading comment
by Jonathan Corbet 05 Jul '12

05 Jul '12

As much as I'm happy to see LWN links sprinkled through the kernel by the dozen, this one in particular reflects a very old state of reality; the associated comment is now incorrect. So just delete it. Signed-off-by: Jonathan Corbet <corbet(a)lwn.net> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 083a299..c91f35b 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -57,9 +57,6 @@ static int __init batman_init(void) recv_handler_init(); bat_iv_init(); - - /* the name should not be longer than 10 chars - see - * http://lwn.net/Articles/23634/ */ bat_event_workqueue = create_singlethread_workqueue("bat_events"); if (!bat_event_workqueue)

2 1

[B.A.T.M.A.N.] [RFC] batman-adv: create a unique entry point for unicast packets
by Antonio Quartulli 05 Jul '12

05 Jul '12

Right now in batman-adv we have several unicast packets 'subtypes' (UNICAST, UNICAST_FRAG, TT_QUERY and ROAM_ADV) that in the initial part of the rx path need the same treatment (e.g. size check, destination check, is_for_me? check, etc.). For this reason we would like to propose to unify the rx paths in this early stage. This change would reduce code duplication and avoid introducing bugs (e.g. it is easy to add a check for the TT_QUERY and forget to do the same for the UNICAST packet). It could be the case that to better address this issue we would need to slightly redesign packet format. So we would probably need to wait until the next (and hopefully last needed) compatibility breakage. But for now you get this a proposal :-) Reported-by: Martin Hundebøll <martin(a)hundeboll.net> Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.c | 17 +++++++++----- routing.c | 74 ++++++++++++++++++++++++++++++++----------------------------- routing.h | 10 ++------- 3 files changed, 52 insertions(+), 49 deletions(-) diff --git a/main.c b/main.c index 13c88b2..da1b728 100644 --- a/main.c +++ b/main.c @@ -277,18 +277,23 @@ static void batadv_recv_handler_init(void) /* batman icmp packet */ batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_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; /* vis packet */ batadv_rx_handler[BATADV_VIS] = batadv_recv_vis_packet; + + /* all the unicast packets have now a single entry point that will make + * all the common checks on the packets. It will then invoke the proper + * parser function based on the real packet type + */ + /* unicast packet */ + batadv_rx_handler[BATADV_UNICAST] = batadv_recv_generic_unicast; + /* fragmented unicast packet */ + batadv_rx_handler[BATADV_UNICAST_FRAG] = batadv_recv_generic_unicast; /* Translation table query (request or response) */ - batadv_rx_handler[BATADV_TT_QUERY] = batadv_recv_tt_query; + batadv_rx_handler[BATADV_TT_QUERY] = batadv_recv_generic_unicast; /* Roaming advertisement */ - batadv_rx_handler[BATADV_ROAM_ADV] = batadv_recv_roam_adv; + batadv_rx_handler[BATADV_ROAM_ADV] = batadv_recv_generic_unicast; } int diff --git a/routing.c b/routing.c index bc2b88b..25ee461 100644 --- a/routing.c +++ b/routing.c @@ -579,12 +579,12 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig, return router; } -int batadv_recv_tt_query(struct sk_buff *skb, struct batadv_hard_iface *recv_if) +static int batadv_recv_tt_query(struct sk_buff *skb, + struct batadv_hard_iface *recv_if) { struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct batadv_tt_query_packet *tt_query; uint16_t tt_size; - struct ethhdr *ethhdr; char tt_flag; size_t packet_size; @@ -597,16 +597,6 @@ int batadv_recv_tt_query(struct sk_buff *skb, struct batadv_hard_iface *recv_if) if (skb_cow(skb, sizeof(struct batadv_tt_query_packet)) < 0) goto out; - ethhdr = (struct ethhdr *)skb_mac_header(skb); - - /* packet with unicast indication but broadcast recipient */ - if (is_broadcast_ether_addr(ethhdr->h_dest)) - goto out; - - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) - goto out; - tt_query = (struct batadv_tt_query_packet *)skb->data; switch (tt_query->flags & BATADV_TT_QUERY_TYPE_MASK) { @@ -669,28 +659,18 @@ out: return NET_RX_DROP; } -int batadv_recv_roam_adv(struct sk_buff *skb, struct batadv_hard_iface *recv_if) +static int batadv_recv_roam_adv(struct sk_buff *skb, + struct batadv_hard_iface *recv_if) { struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct batadv_roam_adv_packet *roam_adv_packet; struct batadv_orig_node *orig_node; - struct ethhdr *ethhdr; /* drop packet if it has not necessary minimum size */ if (unlikely(!pskb_may_pull(skb, sizeof(struct batadv_roam_adv_packet)))) goto out; - ethhdr = (struct ethhdr *)skb_mac_header(skb); - - /* packet with unicast indication but broadcast recipient */ - if (is_broadcast_ether_addr(ethhdr->h_dest)) - goto out; - - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) - goto out; - batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX); roam_adv_packet = (struct batadv_roam_adv_packet *)skb->data; @@ -1008,21 +988,17 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, return 1; } -int batadv_recv_unicast_packet(struct sk_buff *skb, - struct batadv_hard_iface *recv_if) +static int batadv_recv_unicast_packet(struct sk_buff *skb, + struct batadv_hard_iface *recv_if) { struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct batadv_unicast_packet *unicast_packet; int hdr_size = sizeof(*unicast_packet); - - if (batadv_check_unicast_packet(skb, hdr_size) < 0) - return NET_RX_DROP; + unicast_packet = (struct batadv_unicast_packet *)skb->data; if (!batadv_check_unicast_ttvn(bat_priv, skb)) return NET_RX_DROP; - unicast_packet = (struct batadv_unicast_packet *)skb->data; - /* packet for me */ if (batadv_is_my_mac(unicast_packet->dest)) { batadv_interface_rx(recv_if->soft_iface, skb, recv_if, @@ -1033,8 +1009,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, return batadv_route_unicast_packet(skb, recv_if); } -int batadv_recv_ucast_frag_packet(struct sk_buff *skb, - struct batadv_hard_iface *recv_if) +static int batadv_recv_ucast_frag_packet(struct sk_buff *skb, + struct batadv_hard_iface *recv_if) { struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct batadv_unicast_frag_packet *unicast_packet; @@ -1042,10 +1018,10 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb, struct sk_buff *new_skb = NULL; int ret; - if (batadv_check_unicast_packet(skb, hdr_size) < 0) + if (!batadv_check_unicast_ttvn(bat_priv, skb)) return NET_RX_DROP; - if (!batadv_check_unicast_ttvn(bat_priv, skb)) + if (unlikely(!pskb_may_pull(skb, hdr_size))) return NET_RX_DROP; unicast_packet = (struct batadv_unicast_frag_packet *)skb->data; @@ -1211,3 +1187,31 @@ int batadv_recv_vis_packet(struct sk_buff *skb, */ return NET_RX_DROP; } + +int batadv_recv_generic_unicast(struct sk_buff *skb, + struct batadv_hard_iface *recv_if) +{ + struct batadv_unicast_packet *unicast_packet; + int to_pull = sizeof(*unicast_packet); + + /* pull only what we need to check the common fields in each unicast + * packet + */ + if (batadv_check_unicast_packet(skb, to_pull) < 0) + return NET_RX_DROP; + + unicast_packet = (struct batadv_unicast_packet *)skb->data; + + switch (unicast_packet->header.packet_type) { + case BATADV_UNICAST: + return batadv_recv_unicast_packet(skb, recv_if); + case BATADV_UNICAST_FRAG: + return batadv_recv_ucast_frag_packet(skb, recv_if); + case BATADV_TT_QUERY: + return batadv_recv_tt_query(skb, recv_if); + case BATADV_ROAM_ADV: + return batadv_recv_roam_adv(skb, recv_if); + } + /* did we get an unknown unicast packet ? */ + return NET_RX_DROP; +} diff --git a/routing.h b/routing.h index 9262279..2e7e1fe 100644 --- a/routing.h +++ b/routing.h @@ -29,18 +29,12 @@ void batadv_update_route(struct batadv_priv *bat_priv, struct batadv_neigh_node *neigh_node); int batadv_recv_icmp_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if); -int batadv_recv_unicast_packet(struct sk_buff *skb, - struct batadv_hard_iface *recv_if); -int batadv_recv_ucast_frag_packet(struct sk_buff *skb, - struct batadv_hard_iface *recv_if); int batadv_recv_bcast_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if); int batadv_recv_vis_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if); -int batadv_recv_tt_query(struct sk_buff *skb, - struct batadv_hard_iface *recv_if); -int batadv_recv_roam_adv(struct sk_buff *skb, - struct batadv_hard_iface *recv_if); +int batadv_recv_generic_unicast(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.7.9.4

2 1

[B.A.T.M.A.N.] tt log
by Martin Hundebøll 04 Jul '12

04 Jul '12

Hi Antonio I encountered the tt loop in kvm this evening, so I captured some tiny logs for you. The topology is a small chain: n1 <-> n2 <-> n3 <-> n4 The nodes run clean batman-adv from master (5deb69f60f388055982a1da6dce876049f86841d) with no catwoman or whatever compiled in :) -- Kind Regards Martin Hundebøll Frederiks Allé 99A, 1.th 8000 Aarhus C Denmark +45 61 65 54 61 martin(a)hundeboll.net

1 1

[B.A.T.M.A.N.] [B.A.T.M.A.N] OGM problem and documentation
by Arthur Lambert 04 Jul '12

04 Jul '12

Hi, I am testing Batman Advance (Batman release 2012 1.0) and I am trying to measure signaling on some topology of VMs. I have 81 nodes (Debian, 3.0.9) with KVM virtualization. My topology is something like this : http://imgur.com/Xh1gM I have a topology with an adjacency matrix of maximum 4 as you can see on my screenshot. I record on each VM signaling received and sent. On some VM, my node send OGM at each "orig_interval" but does not receive any OGM at all. Is it normal ? Moreover, I have found a wonderful documention here : http://gitorious.org/batman-adv-doc. Unfortunatly, it is not maintened since two years. I have also found some papers which describe your protocol, but most of the time, the paper are too old or not correct in the protocol description. At this moment, my first source of information is the code. Can you advise me a good paper or documentation on the architecture and features of Batman Advance set apart your twiki. Kind regards, my apology for my English. -- Arthur

3 5

[B.A.T.M.A.N.] pull request: batman-adv 2012-07-01
by Antonio Quartulli 02 Jul '12

02 Jul '12

Hello David, this should be our last planned pull request intended for net-next/linux-3.6 :-) In this batch you have patch 15/16 that fixes a variable declaration in the ethtool support code; patch 16/16 that fixes a non-critical bug which makes nodes send unicast packets with an uninitialised header field. The rest is the last part of our namespace renaming operation plus a couple of style fixes. Please let me know if there are problems! Thank you very much, Antonio The following changes since commit a59a4d1921664da63d801ba477950114c71c88c9: phy: add the EEE support and the way to access to the MMD registers. (2012-07-01 03:34:50 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 162d549c6905485262635fe594db337efb2828b5: batman-adv: Don't leak information through uninitialized packet fields (2012-07-01 22:47:24 +0200) ---------------------------------------------------------------- Included changes: - The last batch of patches aimed to clean the batman-adv namespace - a couple of style fixes - a fix for the ethtool support - a fix to prevent sending unicast packets with an uninitialised header field ---------------------------------------------------------------- Marek Lindner (1): batman-adv: fix counter summary length Sven Eckelmann (15): batman-adv: Prefix gateway enum with BATADV_ batman-adv: Prefix hard-interface enum with BATADV_ batman-adv: Prefix types enum with BATADV_ batman-adv: Prefix packet enum with BATADV_ batman-adv: Prefix main enum with BATADV_ batman-adv: Prefix local debugfs structs with batadv_ batman-adv: Prefix hash struct and typedef with batadv_ batman-adv: Prefix local sysfs struct with batadv_ batman-adv: Prefix packet structs with batadv_ batman-adv: Prefix types structs with batadv_ batman-adv: Transform BATADV_LOG_BUFF(idx) into function batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h} batman-adv: Remove space before semicolon batman-adv: Fix alignment after opened parentheses batman-adv: Don't leak information through uninitialized packet fields net/batman-adv/Makefile | 4 +- net/batman-adv/bat_iv_ogm.c | 459 +++++++-------- net/batman-adv/bitarray.c | 6 +- net/batman-adv/bridge_loop_avoidance.c | 302 +++++----- net/batman-adv/bridge_loop_avoidance.h | 48 +- net/batman-adv/{bat_debugfs.c => debugfs.c} | 76 ++- net/batman-adv/{bat_debugfs.h => debugfs.h} | 0 net/batman-adv/gateway_client.c | 127 +++-- net/batman-adv/gateway_client.h | 24 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/gateway_common.h | 8 +- net/batman-adv/hard-interface.c | 125 +++-- net/batman-adv/hard-interface.h | 28 +- net/batman-adv/hash.c | 12 +- net/batman-adv/hash.h | 33 +- net/batman-adv/icmp_socket.c | 81 +-- net/batman-adv/icmp_socket.h | 4 +- net/batman-adv/main.c | 82 +-- net/batman-adv/main.h | 63 ++- net/batman-adv/originator.c | 151 ++--- net/batman-adv/originator.h | 37 +- net/batman-adv/packet.h | 132 ++--- net/batman-adv/routing.c | 300 +++++----- net/batman-adv/routing.h | 52 +- net/batman-adv/send.c | 75 +-- net/batman-adv/send.h | 12 +- net/batman-adv/soft-interface.c | 55 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/{bat_sysfs.c => sysfs.c} | 134 +++-- net/batman-adv/{bat_sysfs.h => sysfs.h} | 6 +- net/batman-adv/translation-table.c | 808 ++++++++++++++------------- net/batman-adv/translation-table.h | 43 +- net/batman-adv/types.h | 154 ++--- net/batman-adv/unicast.c | 95 ++-- net/batman-adv/unicast.h | 19 +- net/batman-adv/vis.c | 284 +++++----- net/batman-adv/vis.h | 12 +- 37 files changed, 2011 insertions(+), 1844 deletions(-) rename net/batman-adv/{bat_debugfs.c => debugfs.c} (81%) rename net/batman-adv/{bat_debugfs.h => debugfs.h} (100%) rename net/batman-adv/{bat_sysfs.c => sysfs.c} (85%) rename net/batman-adv/{bat_sysfs.h => sysfs.h} (89%)

2 17

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