commits September 2016

commits@lists.open-mesh.org

1 participants
42 discussions

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20160914, created. batadv-net-for-davem-20160914
by postmaster＠open-mesh.org 14 Sep '16

14 Sep '16

The annotated tag, batadv-net-for-davem-20160914 has been created at 76962271b1bc72be9730f1c0489e17e1dc447c81 (tag) tagging 1e5d343b8f23770e8ac5d31f5c439826bdb35148 (commit) replaces v4.7 tagged by Simon Wunderlich on Wed Sep 14 14:18:14 2016 +0200 - Shortlog ------------------------------------------------------------ Here are two batman-adv bugfix patches: - Fix reference counting for last_bonding_candidate, by Sven Eckelmann - Fix head room reservation for ELP packets, by Linus Luessing -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdBQJX2UCwFhxzd0BzaW1vbnd1bmRlcmxpY2guZGUACgkQoSvjmEKS nqHp+w/+MGG87sjUfObJKrSTmsIDgWHl2VSQwKBivbkvIuBm9gxIhFblaBQEJd5A 88Z5LOGWpnxh2rfFIPurTLxkYAZyARpIxWOLVtmPE3TdfMi4savTsvkOywd0ZHqE kXZH1QHE/Y3CQBf9FaM5cgTiwAXjZ+KWr5kRg3WNmH0oQUepndUBb5AAbjpD2G3f Gt4TsfunplXCmA/5uJMISOjKiub8usUhXVXBHVpxR+ZItdoIolwN197wDzXT8pWK FJe+Flqrvxi3n0kNFknUzCDdt09TFLms4m0AEu+8f4P6t1mR7v+YHNM4IlBx8BX0 6Kwiz009h9+5JFZvOSTCy6tkrodn5cAk9LNNsam5uPTWXeY76gFOzegdHIcIaBxq MLEqnTUgONqOakZs+4NopUz0HUvtJXDGYJcy7SDLYIYEwhaHP7seyuPkjA+xap2p uPZR3dTYESdeNGs/uPTEGVh1q8w6xXqXe9IRzP1KvGAOsg5IXCboLvJHpVMc25aT 4CT9qz5H94sVqdR6d5pBb+0CLoxnhbl+4IjKnHwMBzVM/0LVDJZRmx9qgiNHJ+0f PGQeQEbAfrihORRn2jCEq0YLCHKhjvLw9O7GVj353wmiVkvvuR+MQEv+bcDgu0DE mH9maOpcOahud6S+x+m9of3f3ytwWR4UO2Qk5t1RdIuVRSD7sXM= =mHPX -----END PGP SIGNATURE----- Andrew Lunn (2): batman-adv: Set skb priority in fragments batman-adv: Include frame priority in fragment header Antonio Quartulli (7): batman-adv: statically print gateway table header batman-adv: remove ogm_emit and ogm_schedule API calls batman-adv: remove useless inline attribute for sysfs helper function batman-adv: move GW mode and selection class to private data structure batman-adv: return netdev status in the TX path batman-adv: throughput meter implementation batman-adv: split routing API data structure in subobjects David S. Miller (4): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-merge Merge tag 'batadv-next-for-davem-20160704' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Florian Westphal (1): sched: remove NET_XMIT_POLICED Linus Lüssing (5): batman-adv: Always flood IGMP/MLD reports batman-adv: Add multicast optimization support for bridged setups batman-adv: Adding logging of mcast flag changes batman-adv: Add debugfs table for mcast flags batman-adv: fix elp packet data reservation Marek Lindner (3): batman-adv: refactor batadv_neigh_node_* functions to follow common style batman-adv: remove unused callback from batadv_algo_ops struct batman-adv: init ELP tweaking options only once Markus Pargmann (1): batman-adv: split tvlv into a separate file Matthias Schiffer (2): batman-adv: add generic netlink family for batman-adv batman-adv: add netlink command to query generic mesh information files Simon Wunderlich (2): batman-adv: Start new development cycle batman-adv: remove unused vid local variable in tt seq print Sven Eckelmann (6): batman-adv: Include main.h in bat_v_ogm.h batman-adv: Keep includes ordered by filename batman-adv: move bat_algo functions into a separate file batman-adv: Consolidate logging related functions batman-adv: Fix bat_(iv|v) function declaration header batman-adv: Add missing refcnt for last_candidate ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] master: alfred: Externalized synchronization interval (99a3945)
by postmaster＠open-mesh.org 14 Sep '16

14 Sep '16

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 99a3945e9d560481968d1be5c43e19411290d05d Author: Jonathan Haws <jhaws(a)sdl.usu.edu> Date: Tue Sep 13 07:19:19 2016 -0600 alfred: Externalized synchronization interval 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> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 99a3945e9d560481968d1be5c43e19411290d05d alfred.h | 1 + main.c | 14 +++++++++++++- man/alfred.8 | 5 +++++ server.c | 12 ++++++++++-- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index 6c8a32b..3c66819 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..f1bc9a5 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..5936e64 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..3a0ad8d 100644 --- a/server.c +++ b/server.c @@ -372,7 +372,15 @@ int alfred_server(struct globals *globals) while (1) { clock_gettime(CLOCK_MONOTONIC, &now); - now.tv_sec -= ALFRED_INTERVAL; + + /* subtract the synchronization period from the current time + * NOTE: this is an atypical usage of time_diff as it ignores the return + * value and store the result back into now, essentially performing the + * operation: + * now -= globals->sync_period; + */ + time_diff(&now, &globals->sync_period, &now); + if (!time_diff(&last_check, &now, &tv)) { tv.tv_sec = 0; tv.tv_nsec = 0; @@ -409,7 +417,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 0

[alfred] master: alfred: Start new development cycle (b9c22bf)
by postmaster＠open-mesh.org 14 Sep '16

14 Sep '16

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit b9c22bfa8d85149e59a4adf253501b4ae2f4df03 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Sep 1 16:22:46 2016 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- b9c22bfa8d85149e59a4adf253501b4ae2f4df03 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 a9906c8..6c8a32b 100644 --- a/alfred.h +++ b/alfred.h @@ -20,7 +20,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.3" +#define SOURCE_VERSION "2016.4" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index ed28df9..e1a258b 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -38,7 +38,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.3" +#define SOURCE_VERSION "2016.4" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index dd35ce3..04618c4 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -27,7 +27,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.3" +#define SOURCE_VERSION "2016.4" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[linux-merge]linux integration; annotated tag, v4.8-rc6, created. v4.8-rc6
by postmaster＠open-mesh.org 12 Sep '16

12 Sep '16

The annotated tag, v4.8-rc6 has been created at b77977e498a9cf49f86103b34f8f90d8b02bca0f (tag) tagging 9395452b4aab7bc2475ef8935b4a4fb99d778d70 (commit) replaces v4.8-rc5 tagged by Linus Torvalds on Sun Sep 11 20:02:33 2016 -0700 - Shortlog ------------------------------------------------------------ Linux 4.8-rc6 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJX1hrJAAoJEHm+PkMAQRiGdk8H/3MAkMUbOcQe7BBPGzbUwnA3 oH1Rnp3deUFt1UpDTLeHMM06wrvUAX6v4Bmn1D7QOq6QzEaiB6nJaiyaeHMHYbnm Awe1pDFkSwYGky1lrX2+XBM7mkny2wIanSuXOnrBxhWjfo+APlVvAhujWqedEqaS NEBVUKIfZ29/iWYkC85Y8lxQaceXnPKWXU+594p+eWvma6iTqzEzeCNWDgUVOlbY l/njz3SgReOye3AvuvrADvXeQnKVzgMeomL+c9Gn0ZxdQ7/90QWNbG3y1I8PLqtE 5xl5Ti0WsJ+AOY/opDdh+bQfsbYOrL7WfttXn//bLUBQIF6lUrGCMLruoMOkIDY= =NfJ0 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.8-rc5, created. v4.8-rc5
by postmaster＠open-mesh.org 04 Sep '16

04 Sep '16

The annotated tag, v4.8-rc5 has been created at d03ec7f4fa91aab68d1744ca8be5be98e2e03b11 (tag) tagging c6935931c1894ff857616ff8549b61236a19148f (commit) replaces v4.8-rc4 tagged by Linus Torvalds on Sun Sep 4 14:31:57 2016 -0700 - Shortlog ------------------------------------------------------------ Linux 4.8-rc5 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJXzJLNAAoJEHm+PkMAQRiGdOIH/3Y2Tl+YG5JxLZzE8Xzu2Y2K +fHrLzCCrqWiLxUdlz/Rikw4+FmMR2YU2dDJsw+8QeWJ4dHl9kAgMmix5b/cS7nG GwutWdVq2A0n0zeMkj9bJwswzmobz/pi6HgXs9aMTdp8k9WRtPZp2iyNBC962sTH E+W4UiBEaMAuRZGCJgBt/0m+FVnWUYsY0GxLv2caxUe0X0t45oD7u9pmijnfq7YY 8ZUdEXM4IILCXiNQqMiCiICja10c21XtwE4+6vlyyRTx38icdxXc2SDz69AUqTKb VH6f0SvJUFIAX0BA7YKGOj+KFzcXcuGCcBAGu0gliD7t+lixLxu8lU+TPzq9iXA= =ZIve -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] tag 'v2016.3' created
by postmaster＠open-mesh.org 01 Sep '16

01 Sep '16

Repository : ssh://git@open-mesh.org/batctl New tag : v2016.3 Referencing: 293f85e58b0d77d5844982db1743fc99c19e0b23

1 0

[batctl] maint, master, next: batctl: Add CHANGELOG for upcoming release (a6f3c9b)
by postmaster＠open-mesh.org 01 Sep '16

01 Sep '16

Repository : ssh://git@open-mesh.org/batctl On branches: maint,master,next >--------------------------------------------------------------- commit a6f3c9bf7bec577d60acfac4f9514bb3578f4c35 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Sep 1 16:18:58 2016 +0200 batctl: Add CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- a6f3c9bf7bec577d60acfac4f9514bb3578f4c35 CHANGELOG | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..7d3c726 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,9 @@ +batctl 2016.3 + + * synchronize common headers with batman-adv + * support multicast logging and debug table + * split tcpdump OGM packet filter in OGM and OGMv2 filter + * add infrastructure to communicate with batadv netlink family + * integrate command to control new kernel throughput meter + + -- Thu, 01 Sep 2016 16:18:35 +0200

1 0

[batctl] master, next: batctl: Start new development cycle (ad4d85c)
by postmaster＠open-mesh.org 01 Sep '16

01 Sep '16

Repository : ssh://git@open-mesh.org/batctl On branches: master,next >--------------------------------------------------------------- commit ad4d85c1eaa93709cf05854110d4f875dbf4675b Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Sep 1 16:20:00 2016 +0200 batctl: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- ad4d85c1eaa93709cf05854110d4f875dbf4675b main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 01f70e8..6365cdb 100644 --- a/main.h +++ b/main.h @@ -25,7 +25,7 @@ #include <stdint.h> #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.3" +#define SOURCE_VERSION "2016.4" #endif #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket"

1 0

[batctl] master,next: Merge branch 'next' (c821115)
by postmaster＠open-mesh.org 01 Sep '16

01 Sep '16

Repository : ssh://git@open-mesh.org/batctl On branches: master,next >--------------------------------------------------------------- commit c821115dc2d04d3f154318d7af677ae700124e33 Merge: 5401c71 ad4d85c Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Sep 1 17:32:50 2016 +0200 Merge branch 'next' >--------------------------------------------------------------- c821115dc2d04d3f154318d7af677ae700124e33 CHANGELOG | 9 +++++++++ main.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[batctl] tag 'v2016.3' deleted
by postmaster＠open-mesh.org 01 Sep '16

01 Sep '16

Repository : ssh://git@open-mesh.org/batctl Deleted tag: v2016.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2016