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 v3 1/2] batman-adv: Remove unused skb_reset_mac_header()
by Linus Lüssing 06 Aug '16

06 Aug '16

During broadcast queueing, the skb_reset_mac_header() sets the skb to a place invalid for a MAC header, pointing right into the batman-adv broadcast packet. Luckily, no one seems to actually use eth_hdr(skb) afterwards until batadv_send_skb_packet() resets the header to a valid position again. Therefore removing this unnecessary, weird skb_reset_mac_header() call. Reviewed-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changes in v3: * none Changes in v2: * none net/batman-adv/send.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 8d4e1f5..97bdb0c 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -586,8 +586,6 @@ int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, bcast_packet = (struct batadv_bcast_packet *)newskb->data; bcast_packet->ttl--; - skb_reset_mac_header(newskb); - forw_packet->skb = newskb; INIT_DELAYED_WORK(&forw_packet->delayed_work, -- 2.1.4

2 2

[B.A.T.M.A.N.] [PATCH v2 1/2] batman-adv: Remove unnecessary lockdep in batadv_mcast_mla_list_free
by Linus Lüssing 06 Aug '16

06 Aug '16

batadv_mcast_mla_list_free() just frees some leftovers of a local feast in batadv_mcast_mla_update(). No lockdep needed as it has nothing to do with bat_priv->mcast.mla_list. Fixes: 5b95c427d187 ("batman-adv: Annotate deleting functions with external lock via lockdep") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Reviewed-by: Sven Eckelmann <sven(a)narfation.org> --- Changes in v2: * none net/batman-adv/multicast.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 13661f4..45757fa 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -231,19 +231,15 @@ out: /** * batadv_mcast_mla_list_free - free a list of multicast addresses - * @bat_priv: the bat priv with all the soft interface information * @mcast_list: the list to free * * Removes and frees all items in the given mcast_list. */ -static void batadv_mcast_mla_list_free(struct batadv_priv *bat_priv, - struct hlist_head *mcast_list) +static void batadv_mcast_mla_list_free(struct hlist_head *mcast_list) { struct batadv_hw_addr *mcast_entry; struct hlist_node *tmp; - lockdep_assert_held(&bat_priv->tt.commit_lock); - hlist_for_each_entry_safe(mcast_entry, tmp, mcast_list, list) { hlist_del(&mcast_entry->list); kfree(mcast_entry); @@ -560,7 +556,7 @@ update: batadv_mcast_mla_tt_add(bat_priv, &mcast_list); out: - batadv_mcast_mla_list_free(bat_priv, &mcast_list); + batadv_mcast_mla_list_free(&mcast_list); } /** -- 2.1.4

2 2

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Don't allow zero and multicast sender address
by Sven Eckelmann 06 Aug '16

06 Aug '16

The routing checks are validating the sender mac address. They reject every sender mac address which is a broadcast. But they also have to reject zero-mac address and multicast mac addresses. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/routing.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 610f2c4..b648caf 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -196,8 +196,8 @@ bool batadv_check_management_packet(struct sk_buff *skb, if (!is_broadcast_ether_addr(ethhdr->h_dest)) return false; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with invalid sender address */ + if (!is_valid_ether_addr(ethhdr->h_source)) return false; /* create a copy of the skb, if needed, to modify it. */ @@ -357,8 +357,8 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, if (is_broadcast_ether_addr(ethhdr->h_dest)) goto out; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with invalid sender address */ + if (!is_valid_ether_addr(ethhdr->h_source)) goto out; /* not for me */ @@ -449,8 +449,8 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv, if (is_broadcast_ether_addr(ethhdr->h_dest)) return -EBADR; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with invalid sender address */ + if (!is_valid_ether_addr(ethhdr->h_source)) return -EBADR; /* not for me */ @@ -1091,8 +1091,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, if (!is_broadcast_ether_addr(ethhdr->h_dest)) goto out; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with invalid sender address */ + if (!is_valid_ether_addr(ethhdr->h_source)) goto out; /* ignore broadcasts sent by myself */ -- 2.8.1

2 6

[B.A.T.M.A.N.] [PATCH v2 1/3] batman-adv: Disallow zero and mcast src address for data frames
by Sven Eckelmann 06 Aug '16

06 Aug '16

The routing checks are validating the source mac address of the outer ethernet header. They reject every source mac address which is a broadcast address. But they also have to reject and multicast mac addresses. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: - clarify in commit message that only the outer ethernet header is affected (thanks Linus) - split in patch 1/2 - Allow zero mac address as source address in outer header as requested by Linus --- net/batman-adv/routing.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 610f2c4..913ab51 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -357,8 +357,8 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, if (is_broadcast_ether_addr(ethhdr->h_dest)) goto out; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with broadcast/multicast sender address */ + if (is_multicast_ether_addr(ethhdr->h_source)) goto out; /* not for me */ @@ -449,8 +449,8 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv, if (is_broadcast_ether_addr(ethhdr->h_dest)) return -EBADR; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with broadcast/multicast sender address */ + if (is_multicast_ether_addr(ethhdr->h_source)) return -EBADR; /* not for me */ @@ -1091,8 +1091,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, if (!is_broadcast_ether_addr(ethhdr->h_dest)) goto out; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with broadcast/multicast sender address */ + if (is_multicast_ether_addr(ethhdr->h_source)) goto out; /* ignore broadcasts sent by myself */ -- 2.8.1

1 2

[B.A.T.M.A.N.] [PATCH 1086/1285] Replace numeric parameter like 0444 with macro
by Baole Ni 02 Aug '16

02 Aug '16

I find that the developers often just specified the numeric value when calling a macro which is defined with a parameter for access permission. As we know, these numeric value for access permission have had the corresponding macro, and that using macro can improve the robustness and readability of the code, thus, I suggest replacing the numeric parameter with the macro. Signed-off-by: Chuansheng Liu <chuansheng.liu(a)intel.com> Signed-off-by: Baole Ni <baolex.ni(a)intel.com> --- net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 5f2974b..25759b9 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -1313,7 +1313,7 @@ static struct kparam_string batadv_param_string_ra = { }; module_param_cb(routing_algo, &batadv_param_ops_ra, &batadv_param_string_ra, - 0644); + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); module_init(batadv_init); module_exit(batadv_exit); -- 2.9.2

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove unnecessary lockdep in batadv_mcast_mla_list_free
by Linus Lüssing 02 Aug '16

02 Aug '16

batadv_mcast_mla_list_free() just frees some leftovers of a local feast in batadv_mcast_mla_update(). No lockdep needed as it has nothing to do with bat_priv->mcast.mla_list. Fixes: 5b95c427d187 ("batman-adv: Annotate deleting functions with external lock via lockdep") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- net/batman-adv/multicast.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 894df60..9c3dd3e 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -231,19 +231,15 @@ out: /** * batadv_mcast_mla_list_free - free a list of multicast addresses - * @bat_priv: the bat priv with all the soft interface information * @mcast_list: the list to free * * Removes and frees all items in the given mcast_list. */ -static void batadv_mcast_mla_list_free(struct batadv_priv *bat_priv, - struct hlist_head *mcast_list) +static void batadv_mcast_mla_list_free(struct hlist_head *mcast_list) { struct batadv_hw_addr *mcast_entry; struct hlist_node *tmp; - lockdep_assert_held(&bat_priv->tt.commit_lock); - hlist_for_each_entry_safe(mcast_entry, tmp, mcast_list, list) { hlist_del(&mcast_entry->list); kfree(mcast_entry); @@ -560,7 +556,7 @@ update: batadv_mcast_mla_tt_add(bat_priv, &mcast_list); out: - batadv_mcast_mla_list_free(bat_priv, &mcast_list); + batadv_mcast_mla_list_free(&mcast_list); } /** -- 2.1.4

2 7

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove unused skb_reset_mac_header()
by Linus Lüssing 01 Aug '16

01 Aug '16

During broadcast queueing, the skb_reset_mac_header() sets the skb to a place invalid for a MAC header, pointing right into the batman-adv broadcast packet. Luckily, no one seems to actually use eth_hdr(skb) afterwards until batadv_send_skb_packet() resets the header to a valid position again. Therefore removing this unnecessary, weird skb_reset_mac_header() call. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- net/batman-adv/send.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 8d4e1f5..97bdb0c 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -586,8 +586,6 @@ int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, bcast_packet = (struct batadv_bcast_packet *)newskb->data; bcast_packet->ttl--; - skb_reset_mac_header(newskb); - forw_packet->skb = newskb; INIT_DELAYED_WORK(&forw_packet->delayed_work, -- 2.1.4

2 4

Re: [B.A.T.M.A.N.] [PATCH] alfred: Externalizing ALFRED_INTERVAL for setting synchronization interval
by Sven Eckelmann 28 Jul '16

28 Jul '16

On Donnerstag, 28. Juli 2016 18:05:59 CEST Jonathan Haws wrote: > I've never used send-email. I'll do some digging, learn it, and > resubmit. I would recommend to use msmtp to communicate with your remote SMTP server. More informations can be found [1] when searching for "git send-email" "sendemail.smtpserver" "msmtp" Btw. you can remove your password from the smtp config (but keep the "password" line without the "my-secret" part) and msmtp will then ask for each mail for your password. The interface of "git send-email" is quite easy. Just specify the name of the patch files as argument of "git send-email" and then it will handle the sending + threading for you. Kind regards, Sven [1] https://git.wiki.kernel.org/index.php/GitTips#Using_msmtp_to_send_your_patc…

1 0

[B.A.T.M.A.N.] [PATCH] alfred: Externalizing ALFRED_INTERVAL for setting synchronization interval
by Jonathan Haws 28 Jul '16

28 Jul '16

ALFRED_INTERVAL is now externalized via the -p option (synchronization period). If specified as option, user supplied interval is used, otherwise the default interval of ALFRED_INTERVAL is used. Signed-off-by: Jonathan Haws <jhaws(a)sdl.usu.edu> --- alfred.h | 1 + main.c | 14 +++++++++++++- man/alfred.8 | 5 +++++ server.c | 4 ++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index a9906c8..5b7e965 100644 --- a/alfred.h +++ b/alfred.h @@ -131,6 +131,7 @@ struct globals { uint16_t changed_data_type_count; /* maximum is 256 */ struct timespec if_check; + struct timespec sync_period; struct hashtable_t *data_hash; struct hashtable_t *transaction_hash; diff --git a/main.c b/main.c index 9cab705..3aa89fd 100644 --- a/main.c +++ b/main.c @@ -59,6 +59,8 @@ static void alfred_usage(void) printf(" -m, --master start up the daemon in master mode, which\n"); printf(" accepts data from slaves and syncs it with\n"); printf(" other masters\n"); + printf(" -p, --sync-period [period] set synchronization period, in seconds\n"); + printf(" fractional seconds are supported (i.e. 0.2 = 5 Hz)\n"); printf("\n"); printf(" -u, --unix-path [path] path to unix socket used for client-server\n"); printf(" communication (default: \""ALFRED_SOCK_PATH_DEFAULT"\")\n"); @@ -156,6 +158,7 @@ out: static struct globals *alfred_init(int argc, char *argv[]) { int opt, opt_ind, i, ret; + double sync_period = 0.0; struct globals *globals; struct option long_options[] = { {"set-data", required_argument, NULL, 's'}, @@ -170,6 +173,7 @@ static struct globals *alfred_init(int argc, char *argv[]) {"update-command", required_argument, NULL, 'c'}, {"version", no_argument, NULL, 'v'}, {"verbose", no_argument, NULL, 'd'}, + {"sync-period", required_argument, NULL, 'p'}, {NULL, 0, NULL, 0}, }; @@ -193,12 +197,14 @@ static struct globals *alfred_init(int argc, char *argv[]) globals->unix_path = ALFRED_SOCK_PATH_DEFAULT; globals->verbose = 0; globals->update_command = NULL; + globals->sync_period.tv_sec = ALFRED_INTERVAL; + globals->sync_period.tv_nsec = 0; INIT_LIST_HEAD(&globals->changed_data_types); globals->changed_data_type_count = 0; time_random_seed(); - while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:", long_options, + while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:p:", long_options, &opt_ind)) != -1) { switch (opt) { case 'r': @@ -265,6 +271,12 @@ static struct globals *alfred_init(int argc, char *argv[]) printf("%s %s\n", argv[0], SOURCE_VERSION); printf("A.L.F.R.E.D. - Almighty Lightweight Remote Fact Exchange Daemon\n"); return NULL; + case 'p': + sync_period = strtod(optarg, NULL); + globals->sync_period.tv_sec = (int) sync_period; + globals->sync_period.tv_nsec = (double)(sync_period - (int)sync_period) * 1e9; + printf(" ** Setting sync interval to: %.9f seconds (%ld.%09ld)\n", sync_period, globals->sync_period.tv_sec, globals->sync_period.tv_nsec); + break; case 'h': default: alfred_usage(); diff --git a/man/alfred.8 b/man/alfred.8 index 49d42bc..df37040 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -118,6 +118,11 @@ overhead). \fB\-c\fP, \fB\-\-update-command\fP \fIcommand\fP Specify command to execute on data change. It will be called with data-type list as arguments. +.TP +\fB\-p\fP, \fB\-\-sync-period\fP \fIperiod\fP +Specify alfred synchronization period, in seconds. If not specified, the default +ALFRED_INTERVAL setting of 10 seconds will be used. Fractional seconds are +supported. . .SH EXAMPLES Start an alfred server listening on bridge br0 (assuming that this bridge diff --git a/server.c b/server.c index 47aee4f..c5df945 100644 --- a/server.c +++ b/server.c @@ -372,7 +372,7 @@ int alfred_server(struct globals *globals) while (1) { clock_gettime(CLOCK_MONOTONIC, &now); - now.tv_sec -= ALFRED_INTERVAL; + time_diff(&now, &globals->sync_period, &now); if (!time_diff(&last_check, &now, &tv)) { tv.tv_sec = 0; tv.tv_nsec = 0; @@ -409,7 +409,7 @@ int alfred_server(struct globals *globals) if (globals->opmode == OPMODE_MASTER) { /* we are a master */ - printf("announce master ...\n"); + printf("[%ld.%09ld] announce master ...\n", last_check.tv_sec, last_check.tv_nsec); announce_master(globals); sync_data(globals); } else { -- 1.9.1

2 1

[B.A.T.M.A.N.] broadcast / flooding
by jorge power 28 Jul '16

28 Jul '16

I am using batman (2012) for a wireless network where we have a polling based or star type network /mac topology. Similar to wifi PCF but proprietary instead of DCF. I have noticed that if i have just 2 nodes and one node sends broadcast data (say video 192.168.1.255) that the other batman node will turn around and also re-transmit the same data back out. So basically i see twice the data on the over the air network which the originating batman node drops since it originated from him. Two Questions: 1) given that there are only two nodes , does BATMAN adv have a way to realize there aren't other nodes wanting to receive the broadcast and since the source of the broadcast is the only other batman node it shouldn't transmit it again? 2) For cases of where batman is used in a more structured network instead of a true mesh/adhoc topology, are there parameters that could be used to limit re-broadcasting data received via wlan interface? -- Thanks Jorge

2 1

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