commits April 2015

commits@lists.open-mesh.org

1 participants
69 discussions

[batctl] next's head updated: Merge branch 'next' (cabde87)
by postmaster＠open-mesh.org 28 Apr '15

28 Apr '15

Repository : ssh://git@open-mesh.org/batctl Branch 'next' now includes: fb51f72 batctl: Add required includes to all files 6423e3e batctl: use netinet/if_ether.h instead of linux/if_ether.h 2fca825 Merge branch 'next' 23df39c Merge branch 'next' 8b670b1 batctl: Start new development cycle cabde87 Merge branch 'next'

1 0

[batctl] master: Merge branch 'next' (cabde87)
by postmaster＠open-mesh.org 28 Apr '15

28 Apr '15

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit cabde874ec12f2d96cc5592b42c163bf715faace Merge: 23df39c 8b670b1 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Apr 28 20:49:20 2015 +0200 Merge branch 'next' >--------------------------------------------------------------- cabde874ec12f2d96cc5592b42c163bf715faace main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[batctl] master: batctl: Start new development cycle (8b670b1)
by postmaster＠open-mesh.org 28 Apr '15

28 Apr '15

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 8b670b15b5d3f5275c7951090f4ca1b9057eb16c Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Apr 28 20:36:25 2015 +0200 batctl: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 8b670b15b5d3f5275c7951090f4ca1b9057eb16c main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index d96ce94..6bf301a 100644 --- a/main.h +++ b/main.h @@ -23,7 +23,7 @@ #define _BATCTL_MAIN_H #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2015.0" +#define SOURCE_VERSION "2015.1" #endif #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket"

1 0

[alfred] master: alfred: fix version numbers for release (6ffa009)
by postmaster＠open-mesh.org 28 Apr '15

28 Apr '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 6ffa009183cf5a223bf2198f7711b143b1e80109 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Apr 28 20:44:03 2015 +0200 alfred: fix version numbers for release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 6ffa009183cf5a223bf2198f7711b143b1e80109 alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index 621805d..594447c 100644 --- a/alfred.h +++ b/alfred.h @@ -20,7 +20,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2014.5" +#define SOURCE_VERSION "2015.0" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 297f4e4..04c579a 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -38,7 +38,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2014.5" +#define SOURCE_VERSION "2015.0" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index a23dc83..275754d 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -27,7 +27,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2014.5" +#define SOURCE_VERSION "2015.0" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[alfred] master: alfred: Start new development cycle (169a979)
by postmaster＠open-mesh.org 28 Apr '15

28 Apr '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 169a979ae646e59f7fa2ae82bc5ecad0dbda1894 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Apr 28 20:44:36 2015 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 169a979ae646e59f7fa2ae82bc5ecad0dbda1894 alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index 594447c..df1655c 100644 --- a/alfred.h +++ b/alfred.h @@ -20,7 +20,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2015.0" +#define SOURCE_VERSION "2015.1" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 04c579a..76fd6c6 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -38,7 +38,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2015.0" +#define SOURCE_VERSION "2015.1" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 275754d..3504626 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -27,7 +27,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2015.0" +#define SOURCE_VERSION "2015.1" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (188d076)
by postmaster＠open-mesh.org 28 Apr '15

28 Apr '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 188d07675dc2ad2e907d2237a9816477f04bad13 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Apr 28 20:42:40 2015 +0200 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 188d07675dc2ad2e907d2237a9816477f04bad13 CHANGELOG | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2b0b043..a34cfbd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,16 @@ +alfred 2015.0: + + * add support to call commands after data was updated + * automatic reduction of process capabilities when not needed anymore + * allow printing of the data version number in the alfred client mode + * various code cleanups + * bugs squashed: + - update of the version number when data was updated with different + version number + - tighten size check on received packet + + -- Tue, 28 Apr 2015 20:39:51 +0200 + alfred 2014.4.0: * add support for multiple interfaces per master

1 0

[linux-merge]linux integration; annotated tag, v4.1-rc1, created. v4.1-rc1
by postmaster＠open-mesh.org 27 Apr '15

27 Apr '15

The annotated tag, v4.1-rc1 has been created at 0ff6850711723750817e8f28d60d6555f32f2a4d (tag) tagging b787f68c36d49bb1d9236f403813641efa74a031 (commit) replaces v4.0 tagged by Linus Torvalds on Sun Apr 26 17:59:21 2015 -0700 - Shortlog ------------------------------------------------------------ Linux 4.1-rc1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVPYnpAAoJEHm+PkMAQRiGVucH/2AIvaMTlYYvD62Ayk0BBKi1 WYnePuy9+t05pNyG103Xvaqsuuw3JZA+5BL1ezbxXcSdvdroDVbFdRgF0D23O6U0 rm/jec6Cd/Wf8bPvo8weka0IjBSIYXCrnatJPlc4W3jOxin4a9y6XeF3rUTXAsF+ AxnImYrFKNy4ZAZ7tLGA4I5ZHolYtO5RrbZmgAtSybobppcmkwTErAbRCk1GHLTg Mf+3UTU/4aFM1Ui32MYioESTrhURBQ5gZ5nAU+48hSgW3FEqK40tniuzjrNA+oBT KOs59yjNzWnwJ8wfETLT6CUrOZJwks3WyGbGXVfDoG3ThHl6NgtqpjR4S6qSHs4= =qIAb -----END PGP SIGNATURE----- Joe Perches (2): batman-adv: Remove uses of return value of seq_printf batman-adv: Fix use of seq_has_overflowed() Nicolas Dichtel (1): dev: introduce dev_get_iflink() ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Remove unused post-VLAN ethhdr in batadv_gw_dhcp_recipient_get (e944023)
by postmaster＠open-mesh.org 26 Apr '15

26 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e94402357d724e854adc1405f11ce82b26c5d744 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 23 18:22:25 2015 +0200 batman-adv: Remove unused post-VLAN ethhdr in batadv_gw_dhcp_recipient_get Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e94402357d724e854adc1405f11ce82b26c5d744 net/batman-adv/gateway_client.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 14f0a22..bb01586 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -753,11 +753,6 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len, if (!pskb_may_pull(skb, *header_len + sizeof(*udphdr))) return BATADV_DHCP_NO; - /* skb->data might have been reallocated by pskb_may_pull() */ - ethhdr = eth_hdr(skb); - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) - ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN); - udphdr = (struct udphdr *)(skb->data + *header_len); *header_len += sizeof(*udphdr);

1 0

[batman-adv] master: batman-adv: Clarify calculation precedence for '&' and '?' (e9d11c6)
by postmaster＠open-mesh.org 26 Apr '15

26 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e9d11c64d590634aa27355b54de9fafaf3a66dfb Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 23 18:22:24 2015 +0200 batman-adv: Clarify calculation precedence for '&' and '?' Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e9d11c64d590634aa27355b54de9fafaf3a66dfb net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/main.h | 2 +- net/batman-adv/translation-table.c | 42 ++++++++++++++++++------------------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 9adbc61..753383c 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -479,7 +479,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, batadv_ogm_packet->orig, ntohl(batadv_ogm_packet->seqno), batadv_ogm_packet->tq, batadv_ogm_packet->ttl, - (batadv_ogm_packet->flags & BATADV_DIRECTLINK ? + ((batadv_ogm_packet->flags & BATADV_DIRECTLINK) ? "on" : "off"), hard_iface->net_dev->name, hard_iface->net_dev->dev_addr); diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 4cb77ed..3c981d0 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -182,7 +182,7 @@ struct batadv_ogm_packet; struct seq_file; struct sk_buff; -#define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ +#define BATADV_PRINT_VID(vid) ((vid & BATADV_VLAN_HAS_TAG) ? \ (int)(vid & VLAN_VID_MASK) : -1) extern char batadv_routing_algo[]; diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0611c58..b482495 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -973,17 +973,17 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) " * %pM %4i [%c%c%c%c%c%c] %3u.%03u (%#.8x)\n", tt_common_entry->addr, BATADV_PRINT_VID(tt_common_entry->vid), - (tt_common_entry->flags & - BATADV_TT_CLIENT_ROAM ? 'R' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_ROAM) ? 'R' : '.'), no_purge ? 'P' : '.', - (tt_common_entry->flags & - BATADV_TT_CLIENT_NEW ? 'N' : '.'), - (tt_common_entry->flags & - BATADV_TT_CLIENT_PENDING ? 'X' : '.'), - (tt_common_entry->flags & - BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - (tt_common_entry->flags & - BATADV_TT_CLIENT_ISOLA ? 'I' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_NEW) ? 'N' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_PENDING) ? 'X' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_WIFI) ? 'W' : '.'), + ((tt_common_entry->flags & + BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), no_purge ? 0 : last_seen_secs, no_purge ? 0 : last_seen_msecs, vlan->tt.crc); @@ -1547,10 +1547,10 @@ batadv_tt_global_print_entry(struct batadv_priv *bat_priv, BATADV_PRINT_VID(tt_global_entry->common.vid), best_entry->ttvn, best_entry->orig_node->orig, last_ttvn, vlan->tt.crc, - (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), - (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - (flags & BATADV_TT_CLIENT_ISOLA ? 'I' : '.'), - (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.')); + ((flags & BATADV_TT_CLIENT_ROAM) ? 'R' : '.'), + ((flags & BATADV_TT_CLIENT_WIFI) ? 'W' : '.'), + ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), + ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.')); batadv_orig_node_vlan_free_ref(vlan); } @@ -1579,10 +1579,10 @@ print_list: BATADV_PRINT_VID(tt_global_entry->common.vid), orig_entry->ttvn, orig_entry->orig_node->orig, last_ttvn, vlan->tt.crc, - (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), - (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - (flags & BATADV_TT_CLIENT_ISOLA ? 'I' : '.'), - (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.')); + ((flags & BATADV_TT_CLIENT_ROAM) ? 'R' : '.'), + ((flags & BATADV_TT_CLIENT_WIFI) ? 'W' : '.'), + ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), + ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.')); batadv_orig_node_vlan_free_ref(vlan); } @@ -2548,7 +2548,7 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Received TT_REQUEST from %pM for ttvn: %u (%pM) [%c]\n", req_src, tt_data->ttvn, req_dst, - (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.')); + ((tt_data->flags & BATADV_TT_FULL_TABLE) ? 'F' : '.')); /* Let's get the orig node of the REAL destination */ req_dst_orig_node = batadv_orig_hash_find(bat_priv, req_dst); @@ -2679,7 +2679,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Received TT_REQUEST from %pM for ttvn: %u (me) [%c]\n", req_src, tt_data->ttvn, - (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.')); + ((tt_data->flags & BATADV_TT_FULL_TABLE) ? 'F' : '.')); spin_lock_bh(&bat_priv->tt.commit_lock); @@ -2918,7 +2918,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Received TT_RESPONSE from %pM for ttvn %d t_size: %d [%c]\n", resp_src, tt_data->ttvn, num_entries, - (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.')); + ((tt_data->flags & BATADV_TT_FULL_TABLE) ? 'F' : '.')); orig_node = batadv_orig_hash_find(bat_priv, resp_src); if (!orig_node)

1 0

[batman-adv] master: batman-adv: Add link to kernel README (098c0f1)
by postmaster＠open-mesh.org 26 Apr '15

26 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 098c0f1f0b9a7933e78b73033d951bf90e69d004 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Apr 21 12:45:08 2015 +0200 batman-adv: Add link to kernel README The batman-adv out-of-tree module provided a README in the root folder. But the kernel stores the same readme as Documentation/networking/batman-adv.txt. Just link to the kernel README to avoid having the same readme twice. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 098c0f1f0b9a7933e78b73033d951bf90e69d004 README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README new file mode 120000 index 0000000..209342f --- /dev/null +++ b/README @@ -0,0 +1 @@ +Documentation/networking/batman-adv.txt \ No newline at end of file

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2015