commits May 2013

commits@lists.open-mesh.org

1 participants
91 discussions

[batman-adv] master: Merge branch 'next' (bf140c3)
by postmaster＠open-mesh.org 09 May '13

09 May '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit bf140c39fa3890e167e024082e897ac3fe38f29b Merge: 469d4b4 3269ba9 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu May 9 17:02:32 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- bf140c39fa3890e167e024082e897ac3fe38f29b distributed-arp-table.c | 13 +++++++++++++ network-coding.c | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (3269ba9)
by postmaster＠open-mesh.org 09 May '13

09 May '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: d22ebef batman-adv: check return value of pskb_trim_rcsum() d6bd8b3 batman-adv: make DAT drop ARP requests targeting local clients 3269ba9 Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (3269ba9)
by postmaster＠open-mesh.org 09 May '13

09 May '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 3269ba99e75101104bddc3200fec33a3c1011748 Merge: 4e564b0 d6bd8b3 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu May 9 17:01:39 2013 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 3269ba99e75101104bddc3200fec33a3c1011748 distributed-arp-table.c | 13 +++++++++++++ network-coding.c | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)

1 0

[batman-adv] maint: batman-adv: make DAT drop ARP requests targeting local clients (d6bd8b3)
by postmaster＠open-mesh.org 09 May '13

09 May '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit d6bd8b36fa1f3d72a6fd5942a6e9bde6ddafcd0d Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu May 9 09:35:45 2013 +0200 batman-adv: make DAT drop ARP requests targeting local clients In the outgoing ARP request snooping routine in DAT, ARP Request sent by local clients which are supposed to be replied by other local clients can be silently dropped. The destination host will reply by itself through the LAN and therefore there is no need to involve DAT. Reported-by: Carlos Quijano <carlos(a)crqgestion.es> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Tested-by: Carlos Quijano <carlos(a)crqgestion.es> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- d6bd8b36fa1f3d72a6fd5942a6e9bde6ddafcd0d distributed-arp-table.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 8e15d96..2399920 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -837,6 +837,19 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, dat_entry = batadv_dat_entry_hash_find(bat_priv, ip_dst); if (dat_entry) { + /* If the ARP request is destined for a local client the local + * client will answer itself. DAT would only generate a + * duplicate packet. + * + * Moreover, if the soft-interface is enslaved into a bridge, an + * additional DAT answer may trigger kernel warnings about + * a packet coming from the wrong port. + */ + if (batadv_is_my_client(bat_priv, dat_entry->mac_addr)) { + ret = true; + goto out; + } + skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, bat_priv->soft_iface, ip_dst, hw_src, dat_entry->mac_addr, hw_src);

1 0

[batman-adv] maint: batman-adv: check return value of pskb_trim_rcsum() (d22ebef)
by postmaster＠open-mesh.org 09 May '13

09 May '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit d22ebef1431aab13099370b89afa4ba55eb95c35 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue May 7 19:25:02 2013 +0800 batman-adv: check return value of pskb_trim_rcsum() Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Martin Hundebøll <martin(a)hundeboll.net> >--------------------------------------------------------------- d22ebef1431aab13099370b89afa4ba55eb95c35 network-coding.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/network-coding.c b/network-coding.c index f7c5430..e84629e 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1514,6 +1514,7 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, struct ethhdr *ethhdr, ethhdr_tmp; uint8_t *orig_dest, ttl, ttvn; unsigned int coding_len; + int err; /* Save headers temporarily */ memcpy(&coded_packet_tmp, skb->data, sizeof(coded_packet_tmp)); @@ -1568,8 +1569,11 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, coding_len); /* Resize decoded skb if decoded with larger packet */ - if (nc_packet->skb->len > coding_len + h_size) - pskb_trim_rcsum(skb, coding_len + h_size); + if (nc_packet->skb->len > coding_len + h_size) { + err = pskb_trim_rcsum(skb, coding_len + h_size); + if (err) + return NULL; + } /* Create decoded unicast packet */ unicast_packet = (struct batadv_unicast_packet *)skb->data;

1 0

[batctl] master: batctl: Add CFLAGS to the linker step (b80d07f)
by postmaster＠open-mesh.org 08 May '13

08 May '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit b80d07fbf5fb8f0e3d6d5fc1b3ae45bdb72b3b79 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue May 7 14:51:02 2013 +0200 batctl: Add CFLAGS to the linker step The GCC manual states for different parameters that the options for compilation must also be used when linking. The options for compilation are stored in CFLAGS and added to LINK.o to fix the behavior. Option which need this are for example -fPIC/-fPIE or -flto. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- b80d07fbf5fb8f0e3d6d5fc1b3ae45bdb72b3b79 Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 61b24c6..1961298 100755 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ RM ?= rm -f INSTALL ?= install MKDIR ?= mkdir -p COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) +LINK.o = $(Q_LD)$(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH) # standard install paths PREFIX = /usr/local

1 0

[batman-adv] master: batman-adv: remove batadv_tt_global_add_orig declaration (469d4b4)
by postmaster＠open-mesh.org 06 May '13

06 May '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 469d4b406edd7b33fb88faaee95a1c81660a4092 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun May 5 14:37:56 2013 +0200 batman-adv: remove batadv_tt_global_add_orig declaration batadv_tt_global_add_orig is neither used nor implemented anymore, therefore it is possible to remove its declaration Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 469d4b406edd7b33fb88faaee95a1c81660a4092 translation-table.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/translation-table.h b/translation-table.h index fb710c5..015d8b9 100644 --- a/translation-table.h +++ b/translation-table.h @@ -27,9 +27,6 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, const uint8_t *addr, const char *message, bool roaming); int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset); -void batadv_tt_global_add_orig(struct batadv_priv *bat_priv, - struct batadv_orig_node *orig_node, - const unsigned char *tt_buff, int tt_buff_len); int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node,

1 0

[batman-adv] master: batman-adv: make tt_global_add static and return bool (be7e115)
by postmaster＠open-mesh.org 06 May '13

06 May '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit be7e115f2ffcf0a6bcffeba7479c39087cacf6f3 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun May 5 19:32:38 2013 +0200 batman-adv: make tt_global_add static and return bool batadv_tt_global_add is not used anymore outside of the TT code thanks to the TVLV implementation. It can therefore be declared as static Last user has been removed by 3de4e64df0f1326db7cc0ef25f5af8522850252d ("batman-adv: tvlv - convert roaming adv packet to use tvlv unicast packets") Moreover make it return bool since its result can be either 0 or 1. 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> >--------------------------------------------------------------- be7e115f2ffcf0a6bcffeba7479c39087cacf6f3 translation-table.c | 14 ++++++++------ translation-table.h | 4 ---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/translation-table.c b/translation-table.c index 48e1ca9..df6b5cd 100644 --- a/translation-table.c +++ b/translation-table.c @@ -805,15 +805,17 @@ out: * If a TT local entry exists for this non-mesh client remove it. * * The caller must hold orig_node refcount. + * + * Return true if the new entry has been added, false otherwise */ -int batadv_tt_global_add(struct batadv_priv *bat_priv, - struct batadv_orig_node *orig_node, - const unsigned char *tt_addr, uint16_t flags, - uint8_t ttvn) +static bool batadv_tt_global_add(struct batadv_priv *bat_priv, + struct batadv_orig_node *orig_node, + const unsigned char *tt_addr, uint16_t flags, + uint8_t ttvn) { struct batadv_tt_global_entry *tt_global_entry; struct batadv_tt_local_entry *tt_local_entry; - int ret = 0; + bool ret = false; int hash_added; struct batadv_tt_common_entry *common; uint16_t local_flags; @@ -914,7 +916,7 @@ add_orig_entry: batadv_dbg(BATADV_DBG_TT, bat_priv, "Creating new global tt entry: %pM (via %pM)\n", common->addr, orig_node->orig); - ret = 1; + ret = true; out_remove: diff --git a/translation-table.h b/translation-table.h index b4b6dea..fb710c5 100644 --- a/translation-table.h +++ b/translation-table.h @@ -30,10 +30,6 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset); void batadv_tt_global_add_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *tt_buff, int tt_buff_len); -int batadv_tt_global_add(struct batadv_priv *bat_priv, - struct batadv_orig_node *orig_node, - const unsigned char *addr, uint16_t flags, - uint8_t ttvn); int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node,

1 0

[alfred] master: alfred: typos and improvements in the README (834655d)
by postmaster＠open-mesh.org 05 May '13

05 May '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 834655d9a836b84cabff70c3e2bab98918145229 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun May 5 16:21:00 2013 +0200 alfred: typos and improvements in the README Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> >--------------------------------------------------------------- 834655d9a836b84cabff70c3e2bab98918145229 README | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/README b/README index d72d4ba..a9013f4 100644 --- a/README +++ b/README @@ -15,10 +15,10 @@ visualization (vis), you may distribute hostnames, phone books, administration information, DNS information, the local weather forecast ... alfred runs as daemon in the background of the system. A user may insert -information by using the alfred binary in client mode, or use special programs -to communicate with alfred (done via unix sockets). alfred then takes care of -distributing the local infomration to other alfred servers on other nodes. -This is done via IPv6 link-local multicast, and does not require any +information by using the alfred binary on the command line, or use special +programs to communicate with alfred (done via unix sockets). alfred then takes +care of distributing the local information to other alfred servers on other +nodes. This is done via IPv6 link-local multicast, and does not require any configuration. A user can request data from alfred, and will receive the information available from all alfred servers in the network. @@ -47,11 +47,12 @@ If you don't want to compile vis, add the directive CONFIG_ALFRED_VIS=n: Usage ----- -First, alfred must run as server to be used. This can either be done by some -init-scripts from your distribution (if you have received alfred as a package -with your distribution). Please see their documentation how to configure alfred -in this case. In any case, you can still run alfred from the command line. The -relevant options are: +First, alfred must run as daemon (server) in background to be used. This can +either be done by some init-scripts from your distribution (if you have +received alfred as a package with your distribution). Please see their +documentation how to configure alfred in this case. In any event, you can +still run alfred from the command line. The relevant options are (for a full +list of options, run alfred -h): -i, --interface specify the interface to listen on -b specify the batman-adv interface configured on @@ -64,7 +65,7 @@ relevant options are: The -b option is optional, and only needed if you run alfred on a batman-adv interface not called bat0, or if you don't use batman-adv at all (use '-b none'). In this case, alfred will still work but will not be able to -find the best next server based on metrics. +find the best next master server based on metrics. alfred servers may either run as master or slave in the network. Masters will announce their status via broadcast, so that slaves can find them. Slaves will @@ -82,15 +83,16 @@ To put it together, let us start alfred in master mode on our bridge br0 $ alfred -i br0 -m Now that the server is running, let us input some data. This can be done by -using the alfred binary in client mode: +using the alfred binary in client mode from the command line: $ cat /etc/hostname | alfred -s 64 -This will set the hostname as data for datatype 64. Note that 0 - 63 are reserved -(please send us an e-mail if you want to register a datatype), and can not be -used on the commandline. We skip the version paramter here, where you could -specify which version this data has and filter for it. Skipping the parameter -is as setting the parameter to 0 ('-V 0'). +This will set the hostname as data for datatype 64. Note that 0 - 63 are +reserved (please send us an e-mail if you want to register a datatype), and can +not be used on the commandline. We skipped the version parameter allowing you +to assign a version to your data which can be filtered by other alfred users. +Skipping the parameter entirely has the same effect as setting the parameter +to 0 ('-V 0'). After the hostname has been set on a few alfred hosts, the can be retrieved again: @@ -102,6 +104,12 @@ After the hostname has been set on a few alfred hosts, the can be retrieved agai Note that the information must be periodically written again to alfred, otherwise it will timeout and alfred will forget about it (after 10 minutes). +One final remark on terminology: If we talk about "servers" and "clients" in +alfred, we mean the local processes on one machine which talk to each other via +unix sockets (client connects and talks to servers). On the other hand, "slaves" +and "masters" are the roles alfred can take over in the network between different +machines (slaves send information to masters). + Vis --- @@ -110,8 +118,8 @@ information and local client table and distributes this information via alfred in the network. By gathering this local information, any vis node can get the whole picture of the network. -Vis, similar to to alfred, combines server and client functionality in the 'vis' -binary. The vis server must be started to let vis work: +Vis, similar to to alfred, combines server (daemon) and client functionality in +the 'vis' binary. The vis server must be started to let vis work: $ vis -i bat0 -s

1 0

[alfred] master: alfred: use $(MAKE) instead of make (6a3592e)
by postmaster＠open-mesh.org 05 May '13

05 May '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 6a3592e1acf21f8edd3541e98881751fdcb33ff9 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun May 5 15:40:59 2013 +0200 alfred: use $(MAKE) instead of make otherwise we might call the wrong make or don't forward the flags Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> >--------------------------------------------------------------- 6a3592e1acf21f8edd3541e98881751fdcb33ff9 Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5f6dc68..268a156 100644 --- a/Makefile +++ b/Makefile @@ -82,13 +82,13 @@ install: $(BINARY_NAME) $(VIS_INSTALL) $(INSTALL) -m 0755 $(BINARY_NAME) $(DESTDIR)$(SBINDIR) vis-install: - make -C vis install + $(MAKE) -C vis install vis-all: - make -C vis all + $(MAKE) -C vis all vis-clean: - make -C vis clean + $(MAKE) -C vis clean # load dependencies DEP = $(OBJ:.o=.d)

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 2013