commits

commits@lists.open-mesh.org

1 participants
12421 discussions

[linux-merge]linux integration; annotated tag, v4.19.26, created. v4.19.26
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v4.19.26 has been created at f8ec22ee493094505db66ddfb5d4f4685b0f6bcc (tag) tagging 51ea85abe794450e24352b970c33ed12f0e13a4c (commit) replaces v4.19.13 tagged by Greg Kroah-Hartman on Wed Feb 27 10:09:03 2019 +0100 - Shortlog ------------------------------------------------------------ This is the 4.19.26 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlx2U68ACgkQONu9yGCS aT6rHA/+PGrMAAzSp193bme2rap7P/EzDD0JF0aQOLwizdit5A4zIYSZApVVSaw5 U8KIQg+fcwIjTvzBmkHddDVVJBEv/VdE8Xkf0EOIOidIQNqMoRQN7ctU1bnKfUyC 20/xZBlc78BEU4TB4JpNiKkzD3bsl/Gsb2A3VenhHe0H8dbj4oJYyNWWY99/433y u1SNmTogLJ0p64+1XWMCTqPJA2xkUIOciFSLiO7d51MfpbguMwcW+T9XSwYat3tp uTdfvZYKc4iGPa4pZCZmZY7+Lrxne2OjMhp3bUlp0coKrjlNO848X+kG7gsVZ7EN MA7YOXUj/Ngjl+E9EilNY5gybY2hK0IzaaV8W9TRVYvPBjgSwe5Mj9/EXYO0L8q0 Arla5HsJdRhLX7HDJ41w8BIngko87hetAaTZVCct+F+nnMYGrrMsle+BgYYbnd7r NYWB8HwZZ3krkWmAZb+Phpleo3Oj7beum5MLoydSH4pXhTVft5D/V8K2fwLmZtgP FsIC1J09jDvXJ5qHTFBY4ugTq8l21YZ2oMPdwcB6X8hBIKji4XydQ0HPrdMyAtXB tqUkzyLZlP1uzm9T3E+hyATWeM4ue7qLFacp7cX5LokDWIxlWi7tcIqBHqRZez+y S7un8/Lmz8ZvzC674JTZl1iXSHuuK6TFLrwI3mw/CVhg2qRvZtk= =EDHP -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_interface_tx() Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.14.104, created. v4.14.104
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v4.14.104 has been created at 85971cb5a100fce32573592646e0eab9389bce0d (tag) tagging 30921fc1e5fcf904f9afddeece1288f5b16ba017 (commit) replaces v4.14.91 tagged by Greg Kroah-Hartman on Wed Feb 27 10:08:09 2019 +0100 - Shortlog ------------------------------------------------------------ This is the 4.14.104 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlx2U3kACgkQONu9yGCS aT6ocg//RY5zNiVm1frgw1M6HrUUfPO0nXMs67X93sIZ+Iwym5gUBWAK9wfyLn/h 7G5bGnKya9IS1ltU1Z2fwaIt+N7Wnih3sMk/6ypmf4VdDVE2mGrML0D3nPW7fO3A iiXzdixDQlt/VHNB2CXg/z0a7cvtw6ZNF+69QR+plHEGgy40tNvIYPbeCMgfKBAk hkv1BjN3SdHzM0CbIDBx/Wq/kFP/pUEcmVJ0gafdZiYAQM69nkQvFcoSslASfbP4 /VP1vlXO0EINgGn8u6/C+iGoGbPYCXOcwafUXEFVh2bQML4IfOiX1mGE3ve5Pe5Z ooYbbhsyKfEtclNfBKUjuTfdrkHBedyoeohkEhzDzpQBpeoW3yp5y/1sTdIMHeHs j4L1qmgX3QfWrJXyaBWKaHOQjK+rpZPfbt+pfxE9l8+M+6jzHtnmabVdjxZ70LNn YySa4eCW57HIV3Z3aMDL9fWNEAYxsXNtfc0h9rh0Byery44HNDAAeBaVSDsZFcbI uLslCcKWNyJ/52Z+XkFWKzSYKHdpe2TvPzsDllokE7OpCRF35Wsdsf6V0LJrOXRO t5O4t6rimhCF/Icd1oJmyV/SmDd8yrw3tE9JBdzZEmlBZpKDP0UCx8fMsQNPgE8y NmKeDp0L4w44PBeTjqSrE8Q3o6BdtWsZEXz3x+zmkLyiZ7N6mzc= =ODN3 -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_interface_tx() Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.9.161, created. v4.9.161
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v4.9.161 has been created at c284508af57a12ce6cd3758b9b22676a194c974f (tag) tagging 5507839a723e4edeed4efda2fa2249c4713fe0bb (commit) replaces v4.9.148 tagged by Greg Kroah-Hartman on Wed Feb 27 10:07:12 2019 +0100 - Shortlog ------------------------------------------------------------ This is the 4.9.161 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlx2U0AACgkQONu9yGCS aT6W1g//fNWwDub0IGC1rDim+yd40rvgSXz7JkZLi+vog90ucwmogIbK9BOMqZcn y1Sz6M43EpUOxP039tbVVah+ay6nN6v/Y/PZXLtBHjk6OqRfaY6RNvmsdrej8Trj cgVmsh9gohGLy3hcNz0hIcNrnOL4vAUvp2el56kOlkAZo1iascsuDKXFynlGsx9r d/RhNr5MnjdDCjOTTdVaoSnLCdmeFZSKvnPrvHYqYlLzJ5/SeGMqRK5i+SYkveHG OVL/OpadIwxTnCdwJLeYafSj4AL0nnhjDN9rTvrU4FWL6GKjCESBMaaMJA+e/Na7 l/PdytwJlHzr7PZYDvKZo3Rxq0R3+seUr1JxaUsBEJSuqNStEFG1RGwvm2JYW6M5 8NhFYDjHAtkZlTFUxEioku4Dy1UyvgaCHKMdUTUXMm3EMx8GKkeg0JBZwQqSvR4m xxCx1clekmGf9linQ2tg6iZQaH9r64sLER/kH3fqrhiMR2e70/C1tjLejochNsl7 pmrMtrmgq7r5UdBiGeROGuSV4iB9mLW+DpbmBmkS1aBBDz9l//AW2EXb5dbedPjQ HyMrZKyaDLxXcK0TF4s2qJI6+nzV6j9OAL9js8Ra+/AZO0ZGc19C4H2BJRh8yjcv r3RILeRySERFgyVS6SAmHdp4XDiN0FfZE8AFIMqf9PjSzAWTyj4= =LpSD -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_interface_tx() Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.4.176, created. v4.4.176
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v4.4.176 has been created at bf00f8166d0b07e7ca11c0c84cca77413242b6dc (tag) tagging af13f43f01a3e4a11686f5fa4de42ecec8ed71b1 (commit) replaces v4.4.169 tagged by Greg Kroah-Hartman on Sat Feb 23 09:05:15 2019 +0100 - Shortlog ------------------------------------------------------------ This is the 4.4.176 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlxw/rsACgkQONu9yGCS aT4+axAAoCAo7YeLWpNklC5FQyNpvRTjFrYQB8pkOX1u3dv/7HNyvw7zO54G/eeD h2qDY1pUPk7TieQ6hgt+wuIScTgk7rKaP7tPE6avOYh24BKiArN7o7wbBlQkGTDs HE+dnm2v6j5iQN5m7qjUSVpr9TsGVlfIBcgwXOjwB/d/UaNK5lnUlAxjyWe6Ciee GTz8mXaPwtEmC8rTeetlH/IM1Ts5B0/rH03Ag8AzWbNZ52Wpq1RKFytzrSFxCeBr QWtADU3jtuUE58sKrWntlyzpHzo8KtVi2R99/YriUq3lJJs3Dnq5jKuT3uAngWh0 N0suo6ix9k3xLI0ABdhrtyuwL8r61vggCxk+lI5n8Tj3E51FiTJ/KlZ9vR4lmDng 08IWrAzcATsssKIWHoymOKYGUMwoqtHjtzqr22Y6pK0i0vKMS+D/R0V4iWTu3h+7 ZpiZltJtTLexUM+8OC1sCmkzodJUY2Zlm0xC0rJGwIDf3OEvHarBuckLyBZK5zM/ w83wGPv61YXlIqphorcBVZ1Wx4b/maGZrRUu2ENSNm8WWa32IqMHP9DTwB+jG0pL 7s1Jx3+6eW/B1b/rws5m8zlpakEGo3GqV/NexgiQPRxILF6rEqGrKflpK/H0VTxa K0X8TQfuSKgFtZBL2w75Ib2Pnojsl1YDhv8fPnt5nX6MnbGRqkA= =/u0O -----END PGP SIGNATURE----- Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.16.63, created. v3.16.63
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v3.16.63 has been created at 2e3c427a1f7e26dced0061d7795c7fda66b76e66 (tag) tagging e90210bb658d391aeeab597e647e130062b675dd (commit) replaces v3.16.62 tagged by Ben Hutchings on Mon Feb 11 17:54:38 2019 +0000 - Shortlog ------------------------------------------------------------ This is the 3.16.63 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAlxhtt4ACgkQ57/I7JWG EQlKqhAA1T1TSiceytnkT47263lFFu8gF4ULPWcDa1l3Sc2+Tg3Ao9b/9CxbvdHj nomZoYPF8IxMjE8lqFmU0U6HuUKJx9yQHWNVRpoCGV9YpFShZyQsTW+AbZ6yGr2v rFy+BLaCgI7siDygd19ylDCUgv6wnUuJ4o5qcKvfUJpMVm1g057goGmncV4YyvS0 7s79LP7aAtfeEd3SJgunIMxPtlq/a5bzMIxYTwReikyc2PnYv929LGYHkJmc3Emx 8SuA5k44DEMeEn5I10qpE0hb5FLervb/lHERaXNWCe+neeSfuF4xUA/wZKDDFi6x JrVElUp19abN2EdofbOsG8xZoR1XS7bZMYMunPfk4XWixiRNkQTrL+PbzLlJkwpA onbXSyBnDg0tsYw6LajlWdCym+iNN22bsYLKWXtW+cksifyP3IPQ4D0KmuKN6etW jVahiTizcTv+eEADPSczu1VvJNUEusmgXr0OeEjAPUNrcxll7ROVdkONLmTnoMcG /u5BMS5e0T9AXbgdwEQ3PWOJZJQ+QPrUycWrGDAaNksGVWA5ddpNIVx9K1oe7bzd DRZhckvmOWtwwgUVgNJFhBl4nSxskc3qADM7uFuFi1hAN8ea8cgh/hcDQZGZOp3w Se5NfJpC+cnDi4yQ/ckSIvGnnfXIDrKqNBp5ik4gkoqnYtl+Z8M= =QXPA -----END PGP SIGNATURE----- Sven Eckelmann (3): batman-adv: Check total_size when queueing fragments batman-adv: Use only queued fragments when merging batman-adv: Expand merged fragment buffer for full packet ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.0, created. v5.0
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v5.0 has been created at cfb40dbadb669988d32ec0f4f716f541902c7895 (tag) tagging 1c163f4c7b3f621efff9b28a47abb36f7378d783 (commit) replaces v5.0-rc8 tagged by Linus Torvalds on Sun Mar 3 15:21:38 2019 -0800 - Shortlog ------------------------------------------------------------ Linux 5.0 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlx8YYIeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGs5MIAIiVVIH+C0St60vf nzfGpVe+BETe199UveM4Ic2FWMk97ZhSk5Oj6HwYY9vnw4iwoRCZIO5B8Dna4nxY 8XjiwxpJRVLq+7Y1d61O6NHo6UjFHF0GMzyeJeNNUq+mCISxZdLsqzsszt9X09mA GoJjZ0UMw2Tkz/s3Ie4MumKASc+y2CjJc0ZVEZlJsMaqMJLIfUn/CrTzHBivmuqJ sV6ZkP4as6h87bI9mi79p8pzvVooCRJ10cg4A/DHG4t2bEAIlB4t5dfZRFzVMhVo cCPRk9tiA9y4I3zBjcuAZMODcBpfdWoQK8TqYw2cDS3LEDMgnEdIH6snMYHr69z0 kZJjA2A= =Qs0l -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master: batctl: replace multicast_mode with multicast_forceflood command (3ab8f42)
by postmaster＠open-mesh.org 27 Feb '19

27 Feb '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 3ab8f4295876366d66537aab995897af12a81248 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sat Feb 16 03:58:54 2019 +0100 batctl: replace multicast_mode with multicast_forceflood command This patch hides the multicast_mode setting in the UI and adds a new multicast_forceflood command. multicast_forceflood is basically the inverse of the current multicast_mode setting. For the netlink config additions to batman-adv "multicast_mode" was not added. Instead a "multicast_forceflood" attribute was introduced. The multicast_mode batctl command is kept for compatibility for now but should be removed eventually. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3ab8f4295876366d66537aab995897af12a81248 Makefile | 1 + README.rst | 8 +++---- functions.c | 16 +++++++++++++- functions.h | 1 + main.c | 3 +++ main.h | 1 + man/batctl.8 | 8 ++++--- multicast_mode.c => multicast_forceflood.c | 34 +++++++++++++++--------------- multicast_mode.c | 3 +-- sys.c | 30 +++++++++++++++++++++----- 10 files changed, 73 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 55105cc..03dc804 100755 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,log,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) +$(eval $(call add_command,multicast_forceflood,y)) $(eval $(call add_command,multicast_mode,y)) $(eval $(call add_command,nc_nodes,y)) $(eval $(call add_command,neighbors,y)) diff --git a/README.rst b/README.rst index e30b5b9..e20c7c4 100644 --- a/README.rst +++ b/README.rst @@ -468,14 +468,14 @@ Usage:: Note that network coding requires a working promiscuous mode on all interfaces. -batctl multicast_mode -===================== +batctl multicast_forceflood +=========================== -display or modify the multicast mode setting +display or modify the multicast forceflood setting Usage:: - batctl multicast_mode|mm [0|1] + batctl multicast_forceflood|mff [0|1] batctl mcast_flags diff --git a/functions.c b/functions.c index 76deab7..a202969 100644 --- a/functions.c +++ b/functions.c @@ -175,6 +175,16 @@ static bool ether_addr_valid(const uint8_t *addr) return true; } +static void print_inv_bool(char *line) +{ + if (!strncmp("enabled", line, strlen("enabled"))) + printf("disabled\n"); + else if (!strncmp("disabled", line, strlen("disabled"))) + printf("enabled\n"); + else + printf("%s", line); +} + int read_file(const char *dir, const char *fname, int read_opt, float orig_timeout, float watch_interval, size_t header_lines) { @@ -237,7 +247,11 @@ read: continue; if (!(read_opt & USE_BAT_HOSTS)) { - printf("%s", line_ptr); + if (read_opt & INVERSE_BOOL) + print_inv_bool(line_ptr); + else + printf("%s", line_ptr); + continue; } diff --git a/functions.h b/functions.h index e2bbb4e..b3f2159 100644 --- a/functions.h +++ b/functions.h @@ -91,6 +91,7 @@ enum { SKIP_HEADER = 0x100, UNICAST_ONLY = 0x200, MULTICAST_ONLY = 0x400, + INVERSE_BOOL = 0x800, }; #endif diff --git a/main.c b/main.c index 2a28642..199c7a4 100644 --- a/main.c +++ b/main.c @@ -74,6 +74,9 @@ static void print_usage(void) if (cmd->type != type[i]) continue; + if (!cmd->usage) + continue; + if (strcmp(cmd->name, cmd->abbr) == 0) snprintf(buf, sizeof(buf), "%s", cmd->name); else diff --git a/main.h b/main.h index fca2a32..92d0e61 100644 --- a/main.h +++ b/main.h @@ -67,6 +67,7 @@ extern char module_ver_path[]; enum command_flags { COMMAND_FLAG_MESH_IFACE = BIT(0), COMMAND_FLAG_NETLINK = BIT(1), + COMMAND_FLAG_INVERSE = BIT(2), }; enum command_type { diff --git a/man/batctl.8 b/man/batctl.8 index 0fbf1dd..418bd96 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -105,9 +105,11 @@ hop penalty. The penalty is can be 0-255 (255 sets originator message's TQ to ze If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. .br -.IP "\fBmulticast_mode\fP|\fBmm\fP [\fB0\fP|\fB1\fP]" -If no parameter is given the current multicast mode setting is displayed. Otherwise the parameter is used to enable or -disable multicast optimizations (i.e. disabling means always sending own multicast frames via classic flooding). +.IP "\fBmulticast_forceflood\fP|\fBmff\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current multicast forceflood setting is displayed. Otherwise the parameter is used to enable or +disable multicast forceflood. This setting defines whether multicast optimizations should be replaced by simple broadcast-like +flooding of multicast packets. If set to non-zero then all nodes in the mesh are going to use classic flooding for any +multicast packet with no optimizations. .br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log diff --git a/multicast_mode.c b/multicast_forceflood.c similarity index 63% copy from multicast_mode.c copy to multicast_forceflood.c index 836a744..daaa6d0 100644 --- a/multicast_mode.c +++ b/multicast_forceflood.c @@ -30,9 +30,9 @@ #include "netlink.h" #include "sys.h" -static struct simple_boolean_data multicast_mode; +static struct simple_boolean_data multicast_forceflood; -static int print_multicast_mode(struct nl_msg *msg, void *arg) +static int print_multicast_forceflood(struct nl_msg *msg, void *arg) { struct nlattr *attrs[BATADV_ATTR_MAX + 1]; struct nlmsghdr *nlh = nlmsg_hdr(msg); @@ -52,44 +52,44 @@ static int print_multicast_mode(struct nl_msg *msg, void *arg) if (!attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) return NL_OK; - printf("%s\n", !nla_get_u8(attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) ? "enabled" : "disabled"); + printf("%s\n", nla_get_u8(attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) ? "enabled" : "disabled"); *result = 0; return NL_STOP; } -static int get_multicast_mode(struct state *state) +static int get_multicast_forceflood(struct state *state) { return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, - NULL, print_multicast_mode); + NULL, print_multicast_forceflood); } -static int set_attrs_multicast_mode(struct nl_msg *msg, void *arg) +static int set_attrs_multicast_forceflood(struct nl_msg *msg, void *arg) { struct state *state = arg; struct settings_data *settings = state->cmd->arg; struct simple_boolean_data *data = settings->data; - nla_put_u8(msg, BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED, !data->val); + nla_put_u8(msg, BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED, data->val); return 0; } -static int set_multicast_mode(struct state *state) +static int set_multicast_forceflood(struct state *state) { return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, - set_attrs_multicast_mode, NULL); + set_attrs_multicast_forceflood, NULL); } -static struct settings_data batctl_settings_multicast_mode = { +static struct settings_data batctl_settings_multicast_forceflood = { .sysfs_name = "multicast_mode", - .data = &multicast_mode, + .data = &multicast_forceflood, .parse = parse_simple_boolean, - .netlink_get = get_multicast_mode, - .netlink_set = set_multicast_mode, + .netlink_get = get_multicast_forceflood, + .netlink_set = set_multicast_forceflood, }; -COMMAND_NAMED(SUBCOMMAND, multicast_mode, "mm", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_settings_multicast_mode, - "[0|1] \tdisplay or modify multicast_mode setting"); +COMMAND_NAMED(SUBCOMMAND, multicast_forceflood, "mff", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK | COMMAND_FLAG_INVERSE, + &batctl_settings_multicast_forceflood, + "[0|1] \tdisplay or modify multicast_forceflood setting"); diff --git a/multicast_mode.c b/multicast_mode.c index 836a744..fb17586 100644 --- a/multicast_mode.c +++ b/multicast_mode.c @@ -91,5 +91,4 @@ static struct settings_data batctl_settings_multicast_mode = { COMMAND_NAMED(SUBCOMMAND, multicast_mode, "mm", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_settings_multicast_mode, - "[0|1] \tdisplay or modify multicast_mode setting"); + &batctl_settings_multicast_mode, NULL); diff --git a/sys.c b/sys.c index 9a7966f..b0864cd 100644 --- a/sys.c +++ b/sys.c @@ -156,7 +156,8 @@ int sys_simple_print_boolean(struct nl_msg *msg, void *arg, static void settings_usage(struct state *state) { fprintf(stderr, "Usage: batctl [options] %s|%s [parameters] %s\n", - state->cmd->name, state->cmd->abbr, state->cmd->usage); + state->cmd->name, state->cmd->abbr, + state->cmd->usage ? state->cmd->usage : ""); fprintf(stderr, "parameters:\n"); fprintf(stderr, " \t -h print this help\n"); @@ -167,6 +168,7 @@ static int sys_read_setting(struct state *state, const char *path_buff, { struct settings_data *settings = state->cmd->arg; int res = EXIT_FAILURE; + int read_opt = NO_FLAGS; if (settings->netlink_get) { res = settings->netlink_get(state); @@ -176,8 +178,12 @@ static int sys_read_setting(struct state *state, const char *path_buff, return EXIT_SUCCESS; } - if (sysfs_name) - res = read_file(path_buff, sysfs_name, NO_FLAGS, 0, 0, 0); + if (sysfs_name) { + if (state->cmd->flags & COMMAND_FLAG_INVERSE) + read_opt |= INVERSE_BOOL; + + res = read_file(path_buff, sysfs_name, read_opt, 0, 0, 0); + } return res; } @@ -187,6 +193,7 @@ static int sys_write_setting(struct state *state, const char *path_buff, { struct settings_data *settings = state->cmd->arg; int res = EXIT_FAILURE; + char *argv1 = argv[1]; if (settings->netlink_set) { res = settings->netlink_set(state); @@ -196,9 +203,22 @@ static int sys_write_setting(struct state *state, const char *path_buff, return EXIT_SUCCESS; } - if (sysfs_name) + if (sysfs_name) { + if (state->cmd->flags & COMMAND_FLAG_INVERSE) { + if (!strncmp("0", argv[1], strlen("0")) || + !strncmp("disable", argv[1], strlen("disable")) || + !strncmp("disabled", argv[1], strlen("disabled"))) { + argv1 = "enabled"; + } else if (!strncmp("1", argv[1], strlen("1")) || + !strncmp("enable", argv[1], strlen("enable")) || + !strncmp("enabled", argv[1], strlen("enabled"))) { + argv1 = "disabled"; + } + } + res = write_file(path_buff, sysfs_name, - argv[1], argc > 2 ? argv[2] : NULL); + argv1, argc > 2 ? argv[2] : NULL); + } return res; }

1 0

[batctl] master: batctl: Add hop_penalty setting command (cde0af8)
by postmaster＠open-mesh.org 27 Feb '19

27 Feb '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit cde0af82935131f37b308fde47aba06e6d15a5b7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 23 08:41:08 2019 +0100 batctl: Add hop_penalty setting command OpenWrt was switched to use batctl as abstraction of the sysfs and netlink configuration interface. The only additional configuration option to finish this process is hop_penalty. It is required to define the penalty which will be applied to an originator message's tq-field on every hop. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- cde0af82935131f37b308fde47aba06e6d15a5b7 Makefile | 1 + README.rst | 15 ++++++++++++ orig_interval.c => hop_penalty.c | 50 ++++++++++++++++++++-------------------- man/batctl.8 | 4 ++++ 4 files changed, 45 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 4d8b709..55105cc 100755 --- a/Makefile +++ b/Makefile @@ -63,6 +63,7 @@ $(eval $(call add_command,event,y)) $(eval $(call add_command,fragmentation,y)) $(eval $(call add_command,gateways,y)) $(eval $(call add_command,gw_mode,y)) +$(eval $(call add_command,hop_penalty,y)) $(eval $(call add_command,interface,y)) $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,log,y)) diff --git a/README.rst b/README.rst index 4c0f544..e30b5b9 100644 --- a/README.rst +++ b/README.rst @@ -530,6 +530,21 @@ Usage:: batctl aggregation|ag [0|1] +batctl hop_penalty +================== + +display or modify the hop_penalty (0-255) + +Usage:: + + batctl hop_penalty|hp [penalty] + +Example:: + + $ batctl penalty + 30 + + batctl isolation_mark ===================== diff --git a/orig_interval.c b/hop_penalty.c similarity index 62% copy from orig_interval.c copy to hop_penalty.c index d1501af..58067bf 100644 --- a/orig_interval.c +++ b/hop_penalty.c @@ -28,14 +28,14 @@ #include "main.h" #include "sys.h" -static struct orig_interval_data { - uint32_t orig_interval; -} orig_interval; +static struct hop_penalty_data { + uint8_t hop_penalty; +} hop_penalty; -static int parse_orig_interval(struct state *state, int argc, char *argv[]) +static int parse_hop_penalty(struct state *state, int argc, char *argv[]) { struct settings_data *settings = state->cmd->arg; - struct orig_interval_data *data = settings->data; + struct hop_penalty_data *data = settings->data; char *endptr; if (argc != 2) { @@ -43,7 +43,7 @@ static int parse_orig_interval(struct state *state, int argc, char *argv[]) return -EINVAL; } - data->orig_interval = strtoul(argv[1], &endptr, 0); + data->hop_penalty = strtoul(argv[1], &endptr, 0); if (!endptr || *endptr != '\0') { fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); return -EINVAL; @@ -52,7 +52,7 @@ static int parse_orig_interval(struct state *state, int argc, char *argv[]) return 0; } -static int print_orig_interval(struct nl_msg *msg, void *arg) +static int print_hop_penalty(struct nl_msg *msg, void *arg) { struct nlattr *attrs[BATADV_ATTR_MAX + 1]; struct nlmsghdr *nlh = nlmsg_hdr(msg); @@ -69,47 +69,47 @@ static int print_orig_interval(struct nl_msg *msg, void *arg) return NL_OK; } - if (!attrs[BATADV_ATTR_ORIG_INTERVAL]) + if (!attrs[BATADV_ATTR_HOP_PENALTY]) return NL_OK; - printf("%u\n", nla_get_u32(attrs[BATADV_ATTR_ORIG_INTERVAL])); + printf("%u\n", nla_get_u8(attrs[BATADV_ATTR_HOP_PENALTY])); *result = 0; return NL_STOP; } -static int get_orig_interval(struct state *state) +static int get_hop_penalty(struct state *state) { return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, - NULL, print_orig_interval); + NULL, print_hop_penalty); } -static int set_attrs_orig_interval(struct nl_msg *msg, void *arg) +static int set_attrs_hop_penalty(struct nl_msg *msg, void *arg) { struct state *state = arg; struct settings_data *settings = state->cmd->arg; - struct orig_interval_data *data = settings->data; + struct hop_penalty_data *data = settings->data; - nla_put_u32(msg, BATADV_ATTR_ORIG_INTERVAL, data->orig_interval); + nla_put_u8(msg, BATADV_ATTR_HOP_PENALTY, data->hop_penalty); return 0; } -static int set_orig_interval(struct state *state) +static int set_hop_penalty(struct state *state) { return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, - set_attrs_orig_interval, NULL); + set_attrs_hop_penalty, NULL); } -static struct settings_data batctl_settings_orig_interval = { - .sysfs_name = "orig_interval", - .data = &orig_interval, - .parse = parse_orig_interval, - .netlink_get = get_orig_interval, - .netlink_set = set_orig_interval, +static struct settings_data batctl_settings_hop_penalty = { + .sysfs_name = "hop_penalty", + .data = &hop_penalty, + .parse = parse_hop_penalty, + .netlink_get = get_hop_penalty, + .netlink_set = set_hop_penalty, }; -COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND, hop_penalty, "hp", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_settings_orig_interval, - "[interval] \tdisplay or modify orig_interval setting"); + &batctl_settings_hop_penalty, + "[penalty] \tdisplay or modify hop_penalty setting"); diff --git a/man/batctl.8 b/man/batctl.8 index ed8e71f..0fbf1dd 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -97,6 +97,10 @@ when parameter \fB\-t\fP is specified. Parameter \fB\-r\fP will do the same but If no parameter is given the current fragmentation mode setting is displayed. Otherwise the parameter is used to enable or disable fragmentation. .br +.IP "\fBhop_penalty\fP|\fBhp\fP [\fBpenalty\fP]" +If no parameter is given the current hop penalty setting is displayed. Otherwise the parameter is used to set the +hop penalty. The penalty is can be 0-255 (255 sets originator message's TQ to zero when forwarded by this hop). +.br .IP "\fBnetwork_coding\fP|\fBnc\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding.

1 0

[batman-adv] maint's head updated: batman-adv: fix warning in function batadv_v_elp_get_throughput (d09933a2)
by postmaster＠open-mesh.org 27 Feb '19

27 Feb '19

Repository : ssh://git@open-mesh.org/batman-adv Branch 'maint' now includes: 3a7af70a batman-adv: Reduce claim hash refcnt only for removed entry 0c86a051 batman-adv: Reduce tt_local hash refcnt only for removed entry bd6df24d batman-adv: Reduce tt_global hash refcnt only for removed entry d09933a2 batman-adv: fix warning in function batadv_v_elp_get_throughput

1 0

[batman-adv] master: Merge branch 'maint' (6ffe4d5c)
by postmaster＠open-mesh.org 27 Feb '19

27 Feb '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 6ffe4d5cec5103a95ab8dab8137e700b00eb4704 Merge: 816f978a d09933a2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Feb 27 21:39:14 2019 +0100 Merge branch 'maint' >--------------------------------------------------------------- 6ffe4d5cec5103a95ab8dab8137e700b00eb4704 net/batman-adv/bat_v_elp.c | 6 ++++-- net/batman-adv/bridge_loop_avoidance.c | 16 +++++++++++++--- net/batman-adv/translation-table.c | 32 ++++++++++++++++++++++++-------- 3 files changed, 41 insertions(+), 13 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits