commits November 2020

commits@lists.open-mesh.org

1 participants
37 discussions

[linux-merge]linux integration; annotated tag, v5.10-rc5, created. v5.10-rc5

by postmaster＠open-mesh.org

The annotated tag, v5.10-rc5 has been created at af69a948d2ce48f8bfe9935958d12f86fb50326b (tag) tagging 418baf2c28f3473039f2f7377760bd8f6897ae18 (commit) replaces v5.10-rc4 tagged by Linus Torvalds on Sun Nov 22 15:36:08 2020 -0800 - Shortlog ------------------------------------------------------------ Linux 5.10-rc5 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl+69egeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGTSYH/ifRBlaxy5UiHFc0 2zdR7pkjWrYfDTTT3sazIAhdlzzcfnkUqgFxOP45F4ZIqeTzunH3sUY+5UlT9IX7 liUgnLxQ/1R9Gx8kPGQfu+tLCey78xVFydGsqJoW9sPRw2R+apMdGGa/lOrk+OXz DXIN+dDnGFqwCCNJpK+rxQQhFf++IPpSI8z6Y23moOFhsDZrEziHuVFy2FGyRM6z prZ/us/tcobE8ptCk1RmOxLoJ1DR6UxpA2vLimTE+JD8siOsSWPbjE0KudnWCnd5 BLqIjrsPJbSxyuzzK3v9dnO5wMv7tMDuMIuYM/MQTXDttNwtsqt/aP6gdnUCym7N 5eHEj5g= =MuO1 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

2 years, 4 months

[linux-merge]linux integration; annotated tag, v5.10-rc4, created. v5.10-rc4

by postmaster＠open-mesh.org

The annotated tag, v5.10-rc4 has been created at a93711503472d4c89977ce2c80dcd4b75e36cc45 (tag) tagging 09162bc32c880a791c6c0668ce0745cf7958f576 (commit) replaces v5.10-rc3 tagged by Linus Torvalds on Sun Nov 15 16:44:31 2020 -0800 - Shortlog ------------------------------------------------------------ Linux 5.10-rc4 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl+xy28eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGAl4H+weJtTIK59po2iVj j8OIoVm2lNwJxd2iCrj/jibpo6NPaATNwKloML3F3tQL5rmn7TknFVDzZJAvIo9+ d+WNBcdFbgkGAPhTXNXpnt7Ah4YlhrBFi/qu0q8t96mxg+gPo+Zi5tIAcOw1FtFO rfuhNgoQG/X6UHI+xW2EMDTzJY/94iF+2uEp6HUDoiJJwq9DAnUm172tPrQdrHPL D9zEHY9v7SrIacOeV0TApVaMnj9XaudY71xwgmvp7f6dypDD+TGnrr3qj6FKgRsR aL4f+JfYbUjnk4yWHpzPljkDe7SrPkKLZeon26M+mfClBgkiG/ktQFNH7r7PCFrv eqC8RUE= =PYO+ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

2 years, 4 months

[batman-adv] maint's head updated: batman-adv: set .owner to THIS_MODULE (6e293753)

by postmaster＠open-mesh.org

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: 6e293753 batman-adv: set .owner to THIS_MODULE

2 years, 4 months

[batman-adv] master: batman-adv: set .owner to THIS_MODULE (6e293753)

by postmaster＠open-mesh.org

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 6e2937539a2c9f8a8536515258bc1f08bed19a06 Author: Taehee Yoo <ap420073(a)gmail.com> Date: Sun Nov 15 10:30:04 2020 +0000 batman-adv: set .owner to THIS_MODULE If THIS_MODULE is not set, the module would be removed while debugfs is being used. It eventually makes kernel panic. Fixes: 24571be14371 ("batman-adv: add routing debug log accessible via debugfs") Signed-off-by: Taehee Yoo <ap420073(a)gmail.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6e2937539a2c9f8a8536515258bc1f08bed19a06 net/batman-adv/log.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c index a67b2b09..c0ca5fbe 100644 --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@ -180,6 +180,7 @@ static const struct file_operations batadv_log_fops = { .read = batadv_log_read, .poll = batadv_log_poll, .llseek = no_llseek, + .owner = THIS_MODULE, }; /**

2 years, 4 months

[batman-adv] master: Merge branch 'maint' (b7f96ca3)

by postmaster＠open-mesh.org

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit b7f96ca3798bf2019fd4916e14efedc58441a829 Merge: 20489310 6e293753 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Nov 15 11:50:47 2020 +0100 Merge branch 'maint' >--------------------------------------------------------------- b7f96ca3798bf2019fd4916e14efedc58441a829

2 years, 4 months

[alfred] master: alfred: Sync batman-adv netlink uapi header (bdd9fc8)

by postmaster＠open-mesh.org

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit bdd9fc82ccf0401cbbdfc793f8ca9b386053f145 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Nov 10 08:22:35 2020 +0100 alfred: Sync batman-adv netlink uapi header Sync headers after following batman-adv changes: * batman-adv: Prepare infrastructure for newlink settings * batman-adv: Allow selection of routing algorithm over rtnetlink Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- bdd9fc82ccf0401cbbdfc793f8ca9b386053f145 batman_adv.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/batman_adv.h b/batman_adv.h index bb0ae94..bdb317f 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -675,4 +675,30 @@ enum batadv_tp_meter_reason { BATADV_TP_REASON_TOO_MANY = 133, }; +/** + * enum batadv_ifla_attrs - batman-adv ifla nested attributes + */ +enum batadv_ifla_attrs { + /** + * @IFLA_BATADV_UNSPEC: unspecified attribute which is not parsed by + * rtnetlink + */ + IFLA_BATADV_UNSPEC, + + /** + * @IFLA_BATADV_ALGO_NAME: routing algorithm (name) which should be + * used by the newly registered batadv net_device. + */ + IFLA_BATADV_ALGO_NAME, + + /* add attributes above here, update the policy in soft-interface.c */ + + /** + * @__IFLA_BATADV_MAX: internal use + */ + __IFLA_BATADV_MAX, +}; + +#define IFLA_BATADV_MAX (__IFLA_BATADV_MAX - 1) + #endif /* _UAPI_LINUX_BATMAN_ADV_H_ */

2 years, 4 months

[linux-merge]linux integration; annotated tag, v5.10-rc3, created. v5.10-rc3

by postmaster＠open-mesh.org

The annotated tag, v5.10-rc3 has been created at 4d3d761b5b27bb33a731e8df51b7fb6a6c565804 (tag) tagging f8394f232b1eab649ce2df5c5f15b0e528c92091 (commit) replaces v5.10-rc2 tagged by Linus Torvalds on Sun Nov 8 16:10:16 2020 -0800 - Shortlog ------------------------------------------------------------ Linux 5.10-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl+oiOgeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGKBQIAJw6oad/FA7j9OO2 dMoaXb8UaBehGWgW2rdfWrFPV5v0DBnp/GkdRpLoZIjV3W4mBfnog7bIa4Eswlxo Y8sZxo5/3JlgJQUkHvzR1TYk5z61lHkUw9Kj/cCyx6YdbjSl19AfFsnhQVVMuyp9 TXL2c7hxkHlw8eBGrymVu0Ip7Zq0x8O2g+8nQpmRcvaR6SBuSHdikDF/iWCtU1YW wpk5eWEVaAO67keZOz6b+aCFHqjFX+1dUBBuPnslucYLR73Qi16hfaU9pebe97Gb lX/MJ1bR9BeRp314cF0PYbm4WhKjRLudHOFJH8x3dj/BiYNrFK3SJGLiiTwsrAZ8 kytU0Xs= =Ke/D -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

2 years, 4 months

[batctl] maint's head updated: batctl: Fix retrieval of meshif ap_isolation (107cee5)

by postmaster＠open-mesh.org

Repository : ssh://git@diktynna/batctl Branch 'maint' now includes: 107cee5 batctl: Fix retrieval of meshif ap_isolation

2 years, 4 months

[alfred] master: alfred: Drop deprecated sysfs support (8f1949c)

by postmaster＠open-mesh.org

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit 8f1949c28a4c5c46d697ac521b0ea160cf625392 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Oct 31 18:39:12 2020 +0100 alfred: Drop deprecated sysfs support The sysfs support is disabled by default in batman-adv since a while and will be removed in 2021. The generic netlink interface should be used instead. The alfred support for it should be removed with the same release as the removal in batman-adv. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8f1949c28a4c5c46d697ac521b0ea160cf625392 vis/vis.c | 50 ++++---------------------------------------------- vis/vis.h | 3 --- 2 files changed, 4 insertions(+), 49 deletions(-) diff --git a/vis/vis.c b/vis/vis.c index b62359c..1bb82ab 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -36,39 +36,6 @@ struct vis_netlink_opts { struct nlquery_opts query_opts; }; -static char *read_file(char *fname) -{ - FILE *fp; - char *buf = NULL, *buf_tmp; - size_t size, ret; - - fp = fopen(fname, "r"); - - if (!fp) - return NULL; - - size = 0; - while (!feof(fp)) { - - buf_tmp = realloc(buf, size + 4097); - if (!buf_tmp) { - free(buf); - fclose(fp); - return NULL; - } - - buf = buf_tmp; - ret = fread(buf + size, 1, 4096, fp); - size += ret; - } - fclose(fp); - - if (buf) - buf[size] = 0; - - return buf; -} - static char *mac_to_str(uint8_t *mac) { static char macstr[20]; @@ -443,26 +410,17 @@ err_free_sock: return ret_status; } -static bool interface_active(unsigned int meshif, unsigned int hardif, - const char *ifname) +static bool interface_active(unsigned int meshif, unsigned int hardif) { char iface_status[IFACE_STATUS_LEN]; - char path_buff[PATH_BUFF_LEN]; char *file_content = NULL; char *content_newline; bool active = false; char *status; status = get_iface_status_netlink(meshif, hardif, iface_status); - if (!status) { - snprintf(path_buff, sizeof(path_buff), SYS_IFACE_STATUS_FMT, - ifname); - file_content = read_file(path_buff); - if (!file_content) - return false; - - status = file_content; - } + if (!status) + return false; content_newline = strstr(status, "\n"); if (content_newline) @@ -518,7 +476,7 @@ static int register_interfaces_rtnl_parse(struct nl_msg *msg, void *arg) if (master != register_arg->ifindex) goto err; - if (!interface_active(master, ifm->ifi_index, ifname)) + if (!interface_active(master, ifm->ifi_index)) goto err; get_if_index_byname(register_arg->globals, ifname); diff --git a/vis/vis.h b/vis/vis.h index bed6615..6f5b839 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -23,9 +23,6 @@ #define VIS_PACKETVERSION 1 #define UPDATE_INTERVAL 10 -#define SYS_IFACE_PATH "/sys/class/net" -#define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" - enum opmode { OPMODE_SERVER,

2 years, 4 months

[batctl] master: batctl: Allow to configure routing_algo during interface creation (07bacdf)

by postmaster＠open-mesh.org

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 07bacdf37dc6d703346886a0b0955c4874dfd0bc Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 11 13:09:50 2020 +0200 batctl: Allow to configure routing_algo during interface creation A batadv net_device is associated to a B.A.T.M.A.N. routing algorithm. This algorithm has to be selected before the interface is initialized and cannot be changed after that. The only way to select this algorithm was a module parameter which specifies the default algorithm used during the creation of the net_device. This module parameter is writeable over /sys/module/batman_adv/parameters/routing_algo and thus allows switching of the routing algorithm: 1. change routing_algo parameter 2. create new batadv net_device But this is not race free because another process can be scheduled between 1 + 2 and in that time frame change the routing_algo parameter again. It is much cleaner to directly provide this information inside the rtnetlink's RTM_NEWLINK message. The two processes would be (in regards of the creation parameter of their batadv interfaces) be isolated. This can now be done (with a compatible kernel module) using the routing_algo parameter of interface create: $ batctl meshif bat0 interface create routing_algo BATMAN_IV or $ batctl meshif bat0 interface create routing_algo BATMAN_V Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 07bacdf37dc6d703346886a0b0955c4874dfd0bc batman_adv.h | 26 +++++++++++++++++++++++ interface.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----- man/batctl.8 | 8 ++++--- 3 files changed, 95 insertions(+), 8 deletions(-) diff --git a/batman_adv.h b/batman_adv.h index bb0ae94..bdb317f 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -675,4 +675,30 @@ enum batadv_tp_meter_reason { BATADV_TP_REASON_TOO_MANY = 133, }; +/** + * enum batadv_ifla_attrs - batman-adv ifla nested attributes + */ +enum batadv_ifla_attrs { + /** + * @IFLA_BATADV_UNSPEC: unspecified attribute which is not parsed by + * rtnetlink + */ + IFLA_BATADV_UNSPEC, + + /** + * @IFLA_BATADV_ALGO_NAME: routing algorithm (name) which should be + * used by the newly registered batadv net_device. + */ + IFLA_BATADV_ALGO_NAME, + + /* add attributes above here, update the policy in soft-interface.c */ + + /** + * @__IFLA_BATADV_MAX: internal use + */ + __IFLA_BATADV_MAX, +}; + +#define IFLA_BATADV_MAX (__IFLA_BATADV_MAX - 1) + #endif /* _UAPI_LINUX_BATMAN_ADV_H_ */ diff --git a/interface.c b/interface.c index d0d9435..73720e3 100644 --- a/interface.c +++ b/interface.c @@ -29,7 +29,8 @@ static void interface_usage(void) { fprintf(stderr, "Usage: batctl [options] interface [parameters] [add|del iface(s)]\n"); - fprintf(stderr, " batctl [options] interface [parameters] [create|destroy]\n"); + fprintf(stderr, " batctl [options] interface [parameters] create [routing_algo|ra RA_NAME]\n"); + fprintf(stderr, " batctl [options] interface [parameters] destroy\n"); fprintf(stderr, "parameters:\n"); fprintf(stderr, " \t -M disable automatic creation of batman-adv interface\n"); fprintf(stderr, " \t -h print this help\n"); @@ -256,12 +257,47 @@ static unsigned int count_interfaces(char *mesh_iface) return count_arg.count; } -static int create_interface(const char *mesh_iface) +struct interface_create_params { + const char *routing_algo; +}; + +static int +interface_parse_create_params(int argc, char **argv, + struct interface_create_params *create_params) +{ + int pos = 1; + + while (pos < argc) { + if (strcmp(argv[pos], "routing_algo") == 0 || + strcmp(argv[pos], "ra") == 0) { + pos++; + if (pos >= argc) { + fprintf(stderr, + "Error - missing parameter for 'routing_algo'\n"); + return -EINVAL; + } + + create_params->routing_algo = argv[pos]; + pos++; + } else { + fprintf(stderr, + "Error - unknown parameter '%s'\n", + argv[pos]); + return -EINVAL; + } + } + + return 0; +} + +static int create_interface(const char *mesh_iface, + const struct interface_create_params *create_param) { struct ifinfomsg rt_hdr = { .ifi_family = IFLA_UNSPEC, }; struct nlattr *linkinfo; + struct nlattr *linkdata; struct nl_msg *msg; int err = 0; int ret; @@ -296,6 +332,22 @@ static int create_interface(const char *mesh_iface) goto err_free_msg; } + linkdata = nla_nest_start(msg, IFLA_INFO_DATA); + if (!linkdata) { + err = -ENOMEM; + goto err_free_msg; + } + + if (create_param->routing_algo) { + ret = nla_put_string(msg, IFLA_BATADV_ALGO_NAME, + create_param->routing_algo); + if (ret < 0) { + err = -ENOMEM; + goto err_free_msg; + } + } + + nla_nest_end(msg, linkdata); nla_nest_end(msg, linkinfo); err = netlink_simple_request(msg); @@ -382,6 +434,7 @@ err_free_msg: static int interface(struct state *state, int argc, char **argv) { + struct interface_create_params create_params = {}; int i, optchar; int ret; unsigned int ifindex; @@ -438,7 +491,6 @@ static int interface(struct state *state, int argc, char **argv) goto err; } break; - case 'c': case 'D': if (rest_argc != 1) { fprintf(stderr, @@ -448,13 +500,20 @@ static int interface(struct state *state, int argc, char **argv) goto err; } break; + case 'c': + ret = interface_parse_create_params(rest_argc, rest_argv, + &create_params); + if (ret) { + interface_usage(); + goto err; + } default: break; } switch (rest_argv[0][0]) { case 'c': - ret = create_interface(state->mesh_iface); + ret = create_interface(state->mesh_iface, &create_params); if (ret < 0) { fprintf(stderr, "Error - failed to add create batman-adv interface: %s\n", @@ -478,7 +537,7 @@ static int interface(struct state *state, int argc, char **argv) /* get index of batman-adv interface - or try to create it */ ifmaster = if_nametoindex(state->mesh_iface); if (!manual_mode && !ifmaster && rest_argv[0][0] == 'a') { - ret = create_interface(state->mesh_iface); + ret = create_interface(state->mesh_iface, &create_params); if (ret < 0) { fprintf(stderr, "Error - failed to create batman-adv interface: %s\n", diff --git a/man/batctl.8 b/man/batctl.8 index 1737e17..de84ffc 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -60,9 +60,11 @@ In order to add or delete interfaces specify "add" or "del" as first argument an add or delete. Multiple interfaces can be specified. The "\-M" option tells batctl to not automatically create the batman-adv interface on "add". It can also be used to suppress the warning about the manual destruction when "del" removed all interfaces which belonged to it. -.IP "[\fBmeshif <netdev>\fP] \fBinterface\fP|\fBif\fP [\fBcreate\fP|\fBdestroy\fP]" -A batman-adv interface without attached interfaces can be created using "create". The parameter "destroy" can be used to -free all attached interfaces and remove batman-adv interface. +.IP "[\fBmeshif <netdev>\fP] \fBinterface\fP|\fBif\fP \fBcreate\fP [\fBrouting_algo|ra RA_NAME\fP]" +A batman-adv interface without attached interfaces can be created using "create". The parameter routing_algo +can be used to overwrite the (default) routing algorithm. +.IP "[\fBmeshif <netdev>\fP] \fBinterface\fP|\fBif\fP \fBdestroy\fP" +Remove all attached interfaces and destroy the batman-adv interface. .br .IP "[\fBmeshif <netdev>\fP] \fBorig_interval\fP|\fBit\fP [\fBinterval\fP]" If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the

2 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2020