commits

commits@lists.open-mesh.org

1 participants
12421 discussions

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20190328, deleted. v5.0-11593-g438b3d3fae43
by postmaster＠open-mesh.org 07 Apr '19

07 Apr '19

The annotated tag, batadv-net-for-davem-20190328 has been deleted was e5d61e9695ee7facfa5b61b9cb415bc12e244e44 ----------------------------------------------------------------------- tag batadv-net-for-davem-20190328 Here are some batman-adv bugfixes: - Fix refcount underflows in bridge loop avoidance code, by Sven Eckelmann (3 patches) - Fix warning when CFG80211 isn't enabled, by Anders Roxell - Fix genl notification for throughput override, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlyc6H0WHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoQh1D/sHYiFZsMDvwZ6s1ryUSwfj5ThX 3hgYsWzjN6MW2WMFpM/nQ448bLqvXveYOA0R+IpVWB5LOOmRFs7lgjx6J+Vq8SQk dGx+dBrywqTLRzf5al5RPIW2sO4Z6JLXyGU0KioywSd61qj7ii8sRf0fK0tDy/Mr EVvTsjs2nywj43b4dy5szJ1hELW5CEUAtNzGDZA0DogH9clhsTi1yG07eC8UrGpj n0YrbB7SZFFQkNCpbN0DR7qeKwDEPedRQTlDxUtxXCE0acRyHai1qKFoMzEWMJZ0 tLqTMYNHRxCYTv3D8qLQVmq2cO6rCUodfjrMKdyiZs6pM5QR39sBhWfzH1WObo90 gMXM6hAkRGnLgUSh0Wbz1TkRMio8NgPNr9hAdUsuF5yYSni0RxZtGfCeUiby8Znk IGLNHdmITgfFcxHuVtFpBspl3Bdsbnk0+PR4RMkiMtoPhz8RG2oltGpvZ9sG8hJ3 W8ZSI0f2LWueygwKEaiC4Kb7Kz1pgKiB5xPWdBK6+WfujRV+zK3+n+JSygLuJhlf tYpRZk0A2JBHPzDC3B865FFo9089SBBN/WekohsVibnWN7MQnolnGhlFyekjic04 aPMvn+OX7vS9lnSSkBcsen0GFtqZFd7pzt9hWQkyHuJZ8b48KebjuL3Z4w0Uaz6c WqUXAKKs2KPFIKEgFg== =+6Ww -----END PGP SIGNATURE----- 438b3d3fae4346a49fe12fa7cc1dc9327f006a91 batman-adv: Fix genl notification for throughput_override ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20190328, deleted. v5.0-11600-g32e727449c79
by postmaster＠open-mesh.org 07 Apr '19

07 Apr '19

The annotated tag, batadv-next-for-davem-20190328 has been deleted was 1ca53392a2d480d2ee8bee09350558d3531ce7c1 ----------------------------------------------------------------------- tag batadv-next-for-davem-20190328 This feature/cleanup patchset includes the following patches: - Drop license boilerplate (obsoleted by SPDX license IDs), by Sven Eckelmann - Drop documentation for sysfs and debugfs Documentation, by Sven Eckelmann (2 patches) - Mark sysfs as optional and deprecated, by Sven Eckelmann (3 patches) - Update MAINTAINERS Tree, Chat and Bugtracker, by Sven Eckelmann (3 patches) - Rename batadv_dat_send_data, by Sven Eckelmann - update DAT entries with incoming ARP replies, by Linus Luessing - add multicast-to-unicast support for limited destinations, by Linus Luessing -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlyc6uEWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSA9D/sEpVY0qOITIwzbttcyeDU5PPSD OF4dVCf6Za6CqfnPRCdViKAGtC1FOz+X2BXtedrIxgsjSPFoRvRoi1XBdu4Bobv2 /4wx56rz3AeMoBZ1UyziUIS6Qam1x7vVYSRXk+QHqBYVc16YiIePpCqTuryrzuk4 4MMqXz+V0dqm7z7irRDe7W9/CdFRtZEDAS8o6cgw4IlL56Ul3Yz6xP6p3PRA+H6V OWtVwmwcbX2KzZnrWDgql5NBhJ1bOfn2oDp1Y4RpLRmBp0iwg1qZdNZK2+MD2TTw xxuz5lsZFhTBXNqGgeoGk87m2z0wNkvnj9UnkMPl3gb7j+FyyaAgvVY4M2s2qJv/ ++wKDPPun/aGDOuo/rJdBTdlnToH17KS3jsDwhj4TooroI8uCCLWZQaYWkgjcugD ZKsZlIqFrfH3rPAzOBwRZodoYkOPpz/+xHp3p/cg9ANifwqpxqq3PY35BoP4ZXRi xUy79QgNIFxYXwrrqTrt3UrY8AGo1/OOHmA6nFQGZT79S648ZoG5vPDKFKRzTmcj Mj2GXuBzMIkWayHgnH69Kv9vVZc7mZPi7lartsVq/aZtMCh3HbPNfKtNOYsu4QEq 6c2966jvFB+LdTibiJQWbe0s5Z96UaFQUxH5+gGdM5TS5TCIaG3udXoI1ou4YVJI q6eOdAgblbD7oaNY4w== =WB31 -----END PGP SIGNATURE----- 32e727449c792b689c2a06a8b4cc9fef6270c5a7 batman-adv: Add multicast-to-unicast support for multiple targets ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: genetlink: make policy common to family (acfc9a21)
by postmaster＠open-mesh.org 07 Apr '19

07 Apr '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit acfc9a214d01695d1676313ca80cfd2d9309f633 Author: Johannes Berg <johannes.berg(a)intel.com> Date: Sat Mar 30 08:38:15 2019 +0100 batman-adv: genetlink: make policy common to family Since maxattr is common, the policy can't really differ sanely, so make it common as well. The only user that did in fact manage to make a non-common policy is taskstats, which has to be really careful about it (since it's still using a common maxattr!). This is no longer supported, but we can fake it using pre_doit. This reduces the size of e.g. nl80211.o (which has lots of commands): text data bss dec hex filename 398745 14323 2240 415308 6564c net/wireless/nl80211.o (before) 397913 14331 2240 414484 65314 net/wireless/nl80211.o (after) -------------------------------- -832 +8 0 -824 Which is obviously just 8 bytes for each command, and an added 8 bytes for the new policy pointer. I'm not sure why the ops list is counted as .text though. Most of the code transformations were done using the following spatch: @ops@ identifier OPS; expression POLICY; @@ struct genl_ops OPS[] = { ..., { - .policy = POLICY, }, ... }; @@ identifier ops.OPS; expression ops.POLICY; identifier fam; expression M; @@ struct genl_family fam = { .ops = OPS, .maxattr = M, + .policy = POLICY, ... }; This also gets rid of devlink_nl_cmd_region_read_dumpit() accessing the cb->data as ops, which we want to change in a later genl patch. Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> [sven(a)narfation.org: Added compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- acfc9a214d01695d1676313ca80cfd2d9309f633 compat-include/linux/cache.h | 6 +-- compat-include/net/genetlink.h | 88 ++++++++++++++++++++++++++++++++++++++++++ net/batman-adv/netlink.c | 19 +-------- 3 files changed, 90 insertions(+), 23 deletions(-) diff --git a/compat-include/linux/cache.h b/compat-include/linux/cache.h index efe440d1..9ddda312 100644 --- a/compat-include/linux/cache.h +++ b/compat-include/linux/cache.h @@ -13,12 +13,8 @@ #include <linux/version.h> #include_next <linux/cache.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -/* hack for netlink.c which marked the family ops as ro */ -#ifdef __ro_after_init -#undef __ro_after_init -#endif #define __ro_after_init #endif /* < KERNEL_VERSION(4, 6, 0) */ diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index 58fc24d7..7d17a705 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -30,4 +30,92 @@ void batadv_genl_dump_check_consistent(struct netlink_callback *cb, #endif /* < KERNEL_VERSION(4, 15, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + +struct batadv_genl_family { + /* data handled by the actual kernel */ + struct genl_family family; + + /* data which has to be copied to family by + * batadv_genl_register_family + */ + unsigned int hdrsize; + char name[GENL_NAMSIZ]; + unsigned int version; + unsigned int maxattr; + const struct nla_policy *policy; + bool netnsok; + int (*pre_doit)(const struct genl_ops *ops, struct sk_buff *skb, + struct genl_info *info); + void (*post_doit)(const struct genl_ops *ops, struct sk_buff *skb, + struct genl_info *info); + const struct genl_ops *ops; + const struct genl_multicast_group *mcgrps; + unsigned int n_ops; + unsigned int n_mcgrps; + struct module *module; + + /* allocated by batadv_genl_register_family and free'd by + * batadv_genl_unregister_family. Used to modify the usually read-only + * ops + */ + struct genl_ops *copy_ops; +}; + +#define genl_family batadv_genl_family + +static inline int batadv_genl_register_family(struct batadv_genl_family *family) +{ + struct genl_ops *ops; + unsigned int i; + + family->family.hdrsize = family->hdrsize; + strncpy(family->family.name, family->name, sizeof(family->family.name)); + family->family.version = family->version; + family->family.maxattr = family->maxattr; + family->family.netnsok = family->netnsok; + family->family.pre_doit = family->pre_doit; + family->family.post_doit = family->post_doit; + family->family.mcgrps = family->mcgrps; + family->family.n_ops = family->n_ops; + family->family.n_mcgrps = family->n_mcgrps; + family->family.module = family->module; + + ops = kmemdup(family->ops, sizeof(*ops) * family->n_ops, GFP_KERNEL); + if (!ops) + return -ENOMEM; + + for (i = 0; i < family->family.n_ops; i++) + ops[i].policy = family->policy; + + family->family.ops = ops; + family->copy_ops = ops; + + return genl_register_family(&family->family); +} + +#define genl_register_family(family) \ + batadv_genl_register_family((family)) + +static inline void +batadv_genl_unregister_family(struct batadv_genl_family *family) +{ + + genl_unregister_family(&family->family); + kfree(family->copy_ops); +} + +#define genl_unregister_family(family) \ + batadv_genl_unregister_family((family)) + +#define genlmsg_put(_skb, _pid, _seq, _family, _flags, _cmd) \ + genlmsg_put(_skb, _pid, _seq, &(_family)->family, _flags, _cmd) + +#define genlmsg_multicast_netns(_family, _net, _skb, _portid, _group, _flags) \ + genlmsg_multicast_netns(&(_family)->family, _net, _skb, _portid, \ + _group, _flags) + +#endif /* < KERNEL_VERSION(5, 2, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_NET_GENETLINK_H_ */ diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index daf56933..e7907308 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -1344,34 +1344,29 @@ static const struct genl_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_GET_MESH, /* can be retrieved by unprivileged users */ - .policy = batadv_netlink_policy, .doit = batadv_netlink_get_mesh, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_TP_METER, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_tp_meter_start, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_TP_METER_CANCEL, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_tp_meter_cancel, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_GET_ROUTING_ALGOS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_algo_dump, }, { .cmd = BATADV_CMD_GET_HARDIF, /* can be retrieved by unprivileged users */ - .policy = batadv_netlink_policy, .dumpit = batadv_netlink_dump_hardif, .doit = batadv_netlink_get_hardif, .internal_flags = BATADV_FLAG_NEED_MESH | @@ -1380,68 +1375,57 @@ static const struct genl_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_GET_TRANSTABLE_LOCAL, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_tt_local_dump, }, { .cmd = BATADV_CMD_GET_TRANSTABLE_GLOBAL, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_tt_global_dump, }, { .cmd = BATADV_CMD_GET_ORIGINATORS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_orig_dump, }, { .cmd = BATADV_CMD_GET_NEIGHBORS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_hardif_neigh_dump, }, { .cmd = BATADV_CMD_GET_GATEWAYS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_gw_dump, }, { .cmd = BATADV_CMD_GET_BLA_CLAIM, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_bla_claim_dump, }, { .cmd = BATADV_CMD_GET_BLA_BACKBONE, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_bla_backbone_dump, }, { .cmd = BATADV_CMD_GET_DAT_CACHE, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_dat_cache_dump, }, { .cmd = BATADV_CMD_GET_MCAST_FLAGS, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .dumpit = batadv_mcast_flags_dump, }, { .cmd = BATADV_CMD_SET_MESH, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_set_mesh, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_SET_HARDIF, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_set_hardif, .internal_flags = BATADV_FLAG_NEED_MESH | BATADV_FLAG_NEED_HARDIF, @@ -1449,7 +1433,6 @@ static const struct genl_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_GET_VLAN, /* can be retrieved by unprivileged users */ - .policy = batadv_netlink_policy, .doit = batadv_netlink_get_vlan, .internal_flags = BATADV_FLAG_NEED_MESH | BATADV_FLAG_NEED_VLAN, @@ -1457,7 +1440,6 @@ static const struct genl_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_SET_VLAN, .flags = GENL_ADMIN_PERM, - .policy = batadv_netlink_policy, .doit = batadv_netlink_set_vlan, .internal_flags = BATADV_FLAG_NEED_MESH | BATADV_FLAG_NEED_VLAN, @@ -1469,6 +1451,7 @@ struct genl_family batadv_netlink_family __ro_after_init = { .name = BATADV_NL_NAME, .version = 1, .maxattr = BATADV_ATTR_MAX, + .policy = batadv_netlink_policy, .netnsok = true, .pre_doit = batadv_pre_doit, .post_doit = batadv_post_doit,

1 0

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

31 Mar '19

The annotated tag, v5.1-rc3 has been created at e40bc7462f998035ea03e93daab2e5b27ed22149 (tag) tagging 79a3aaa7b82e3106be97842dedfd8429248896e6 (commit) replaces v5.1-rc2 tagged by Linus Torvalds on Sun Mar 31 14:39:35 2019 -0700 - Shortlog ------------------------------------------------------------ Linux 5.1-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlyhM5ceHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG7iEH/RSN8uIxLXrhI9yb cVQq1d/dLS+1vMEbjF35m+jkHOdty7ShLd6Qv5kaeqzIznvzhNaMZwUpoqlCn/Px vXeVH/e5eBBBw7EVCq+FqK22H/TNs10xidBR6bsP/VwrW4Rz3gBt2nsx7Hvpwrxx zCkC6E/qzRv1kkjsF85Zt0lIbFAex7Uk/+ZXK2zXKxk1Dp7Y6h5Aj+jmRByvaUwQ 0Syq1FDexUN3cI+dTmvYE8L/Dblyd2VONxnEXMOP3isk+poAwyVHWtkOzuL+myIz 5OoqSNdu8P02ldm7rEiXrqFNseZJK9sur4OOIg6CMdiXTG1q1QIY5hvUkX/R3tIZ 0E4wxXM= =hkav -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-devel] master: batctl-devel: add switch for setting multicast_fanout (632e987)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 632e98714ef4df9bf7af5393feb1cba13c5ca16b Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 28 21:29:46 2019 +0100 batctl-devel: add switch for setting multicast_fanout Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 632e98714ef4df9bf7af5393feb1cba13c5ca16b batctl-devel/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index c22b1bd..3cd4fd1 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -105,6 +105,7 @@ config-n := \ log \ loglevel \ mcast_flags \ + multicast_fanout \ multicast_mode \ nc_nodes \ neighbors \ @@ -133,6 +134,7 @@ config-settings := \ interface \ isolation_mark \ loglevel \ + multicast_fanout \ multicast_mode \ network_coding \ orig_interval \

1 0

[openwrt-feed-devel] master: batman-adv-devel: Add support for multicast_fanout in batadv proto (96e1b8b)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 96e1b8b2cff6863a73348128bd78c36f0f7a7667 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 28 21:34:25 2019 +0100 batman-adv-devel: Add support for multicast_fanout in batadv proto Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 96e1b8b2cff6863a73348128bd78c36f0f7a7667 batman-adv-devel/files/lib/netifd/proto/batadv.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv.sh b/batman-adv-devel/files/lib/netifd/proto/batadv.sh index eb8153c..a7fe63c 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv.sh @@ -22,6 +22,7 @@ proto_batadv_init_config() { proto_config_add_int 'hop_penalty' proto_config_add_string 'isolation_mark' proto_config_add_string 'log_level' + proto_config_add_int 'multicast_fanout' proto_config_add_boolean 'multicast_mode:bool' proto_config_add_boolean 'network_coding:bool' proto_config_add_int 'orig_interval' @@ -44,6 +45,7 @@ proto_batadv_setup() { local hop_penalty local isolation_mark local log_level + local multicast_fanout local multicast_mode local network_coding local orig_interval @@ -61,6 +63,7 @@ proto_batadv_setup() { json_get_vars hop_penalty json_get_vars isolation_mark json_get_vars log_level + json_get_vars multicast_fanout json_get_vars multicast_mode json_get_vars network_coding json_get_vars orig_interval @@ -100,6 +103,7 @@ proto_batadv_setup() { [ -n "$hop_penalty" ] && batctl -m "$iface" hop_penalty "$hop_penalty" [ -n "$isolation_mark" ] && batctl -m "$iface" isolation_mark "$isolation_mark" + [ -n "$multicast_fanout" ] && batctl -m "$iface" multicast_fanout "$multicast_fanout" [ -n "$multicast_mode" ] && batctl -m "$iface" multicast_mode "$multicast_mode" 2>&- [ -n "$network_coding" ] && batctl -m "$iface" network_coding "$network_coding" 2>&- [ -n "$log_level" ] && batctl -m "$iface" loglevel "$log_level" 2>&-

1 0

[openwrt-feed-devel] master: batman-adv-devel: Make sysfs support optional (b759df5)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit b759df59b3891fa454a1cba9400d7c2a7c32adad Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 28 21:44:27 2019 +0100 batman-adv-devel: Make sysfs support optional The sysfs files will be marked as deprecated in the near future. They are already replaced by the batadv generic netlink family. Add an Kconfig option to disable the sysfs support for users who want to test their tools or want to safe some space. This setting should currently still be enabled by default to keep backward compatible with legacy tools. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b759df59b3891fa454a1cba9400d7c2a7c32adad batman-adv-devel/Config.in | 24 ++++++++++++------------ batman-adv-devel/Makefile | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 7ea862c..79beb3b 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -2,18 +2,6 @@ # Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. # # B.A.T.M.A.N meshing protocol @@ -98,6 +86,18 @@ config BATMAN_ADV_DEVEL_DEBUG buffer. The output is controlled via the batadv netdev specific log_level setting. +config BATMAN_ADV_DEVEL_SYSFS + bool "batman-adv sysfs entries" + depends on PACKAGE_kmod-batman-adv-devel + default y + help + Say Y here if you want to enable batman-adv device configuration and + status interface through sysfs attributes. It is replaced by the + batadv generic netlink family but still used by various userspace + tools and scripts. + + If unsure, say Y. + config BATMAN_ADV_DEVEL_TRACING bool "B.A.T.M.A.N. tracing support" depends on PACKAGE_kmod-batman-adv-devel diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index bede8cc..de3cdb4 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -73,6 +73,7 @@ PKG_EXTRA_KCONFIG:= \ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),y,n) \ CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_DEVEL_NC),y,n) \ CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \ + CONFIG_BATMAN_ADV_SYSFS=$(if $(CONFIG_BATMAN_ADV_DEVEL_SYSFS),y,n) \ CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_DEVEL_TRACING),y,n) \ PKG_EXTRA_CFLAGS:= \

1 0

[alfred] master: alfred: Sync batadv_netlink_policy (1ce394b)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 1ce394b74135c63838d639a4855734cf0b199270 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 28 21:51:59 2019 +0100 alfred: Sync batadv_netlink_policy Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1ce394b74135c63838d639a4855734cf0b199270 batman_adv.h | 7 +++++++ netlink.c | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/batman_adv.h b/batman_adv.h index e53f2b5..67f4636 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -473,6 +473,13 @@ enum batadv_nl_attrs { */ BATADV_ATTR_THROUGHPUT_OVERRIDE, + /** + * @BATADV_ATTR_MULTICAST_FANOUT: defines the maximum number of packet + * copies that may be generated for a multicast-to-unicast conversion. + * Once this limit is exceeded distribution will fall back to broadcast. + */ + BATADV_ATTR_MULTICAST_FANOUT, + /* add attributes above here, update the policy in netlink.c */ /** diff --git a/netlink.c b/netlink.c index eac8245..e8fe55e 100644 --- a/netlink.c +++ b/netlink.c @@ -86,6 +86,27 @@ struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_DAT_CACHE_VID] = { .type = NLA_U16 }, [BATADV_ATTR_MCAST_FLAGS] = { .type = NLA_U32 }, [BATADV_ATTR_MCAST_FLAGS_PRIV] = { .type = NLA_U32 }, + [BATADV_ATTR_VLANID] = { .type = NLA_U16 }, + [BATADV_ATTR_AGGREGATED_OGMS_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_AP_ISOLATION_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_ISOLATION_MARK] = { .type = NLA_U32 }, + [BATADV_ATTR_ISOLATION_MASK] = { .type = NLA_U32 }, + [BATADV_ATTR_BONDING_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_FRAGMENTATION_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_GW_BANDWIDTH_DOWN] = { .type = NLA_U32 }, + [BATADV_ATTR_GW_BANDWIDTH_UP] = { .type = NLA_U32 }, + [BATADV_ATTR_GW_MODE] = { .type = NLA_U8 }, + [BATADV_ATTR_GW_SEL_CLASS] = { .type = NLA_U32 }, + [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, + [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, + [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, + [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, + [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, + [BATADV_ATTR_THROUGHPUT_OVERRIDE] = { .type = NLA_U32 }, }; int missing_mandatory_attrs(struct nlattr *attrs[], const int mandatory[],

1 0

[alfred] master: alfred: Switch packet.h license to MIT (ca62397)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit ca623970258a05d758d68da187f0aaf20f8686ac Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 3 15:52:04 2019 +0100 alfred: Switch packet.h license to MIT The ISC license is considered as not recommended in "Linux kernel licensing rules". It should only be used for existing code or for importing code from a different project with that license. Since we already use this license for the batman-adv related uapi headers, we should also use this for our packet.h. This fixes at the same time the SPDX license identifier which switched incorrectly to GPL-2.0 in commit ea81a05080bd ("alfred: Add SPDX license identifier above copyright header"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ca623970258a05d758d68da187f0aaf20f8686ac packet.h | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/packet.h b/packet.h index 4378694..e2112e4 100644 --- a/packet.h +++ b/packet.h @@ -1,21 +1,27 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: MIT */ /* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * License-Filename: LICENSES/preferred/GPL-2.0 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * License-Filename: LICENSES/preferred/MIT */ #ifndef _ALFRED_PACKET_H

1 0

[alfred] master: alfred: Drop license boilerplate (62a2314)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 62a2314852b83b259cf4fa0017bfeeaad4c6b2d5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 3 15:52:05 2019 +0100 alfred: Drop license boilerplate All files got a SPDX-License-Identifier with commit ea81a05080bd ("alfred: Add SPDX license identifier above copyright header"). All the required information about the license conditions can be found in LICENSES/. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 62a2314852b83b259cf4fa0017bfeeaad4c6b2d5 Makefile | 14 -------------- alfred.h | 14 -------------- batadv_query.c | 14 -------------- batadv_query.h | 14 -------------- batadv_querynl.c | 14 -------------- batadv_querynl.h | 14 -------------- batman_adv.h | 18 ------------------ bitops.h | 18 +----------------- client.c | 14 -------------- debugfs.c | 14 -------------- debugfs.h | 14 -------------- gpsd/Makefile | 14 -------------- gpsd/alfred-gpsd.c | 14 -------------- gpsd/alfred-gpsd.h | 14 -------------- hash.c | 14 -------------- hash.h | 14 -------------- list.h | 14 -------------- main.c | 14 -------------- netlink.c | 14 -------------- netlink.h | 14 -------------- netsock.c | 14 -------------- packet.h | 18 ------------------ recv.c | 14 -------------- send.c | 14 -------------- server.c | 14 -------------- unix_sock.c | 14 -------------- util.c | 14 -------------- vis/Makefile | 14 -------------- vis/vis.c | 14 -------------- vis/vis.h | 14 -------------- 30 files changed, 1 insertion(+), 431 deletions(-) diff --git a/Makefile b/Makefile index 0a54c1b..8840961 100755 --- a/Makefile +++ b/Makefile @@ -4,20 +4,6 @@ # # Copyright (C) 2012-2019 B.A.T.M.A.N. contributors # -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA -# # License-Filename: LICENSES/preferred/GPL-2.0 # alfred build diff --git a/alfred.h b/alfred.h index 22d2897..c7ee518 100644 --- a/alfred.h +++ b/alfred.h @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/batadv_query.c b/batadv_query.c index 7486bf4..fb72e77 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/batadv_query.h b/batadv_query.h index fd7eb2e..7e93791 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -3,20 +3,6 @@ * * Simon Wunderlich, Marek Lindner * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ #ifndef _BATADV_QUERY_H diff --git a/batadv_querynl.c b/batadv_querynl.c index 20ab8b3..d5e9402 100644 --- a/batadv_querynl.c +++ b/batadv_querynl.c @@ -3,20 +3,6 @@ * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/batadv_querynl.h b/batadv_querynl.h index 565c0e1..e2066c2 100644 --- a/batadv_querynl.h +++ b/batadv_querynl.h @@ -3,20 +3,6 @@ * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/batman_adv.h b/batman_adv.h index 305bf31..e53f2b5 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -2,24 +2,6 @@ /* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors: * * Matthias Schiffer - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. */ #ifndef _UAPI_LINUX_BATMAN_ADV_H_ diff --git a/bitops.h b/bitops.h index c4dc5af..ead4a4f 100644 --- a/bitops.h +++ b/bitops.h @@ -4,23 +4,7 @@ * * Copyright (c) 2012-2019, Sven Eckelmann <sven(a)narfation.org> * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. + * License-Filename: LICENSES/preferred/MIT */ #ifndef __LINUX_LIKE_BITOPS_H__ diff --git a/client.c b/client.c index c3bd0cb..85a05ce 100644 --- a/client.c +++ b/client.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/debugfs.c b/debugfs.c index 1cea8ac..5a71d65 100644 --- a/debugfs.c +++ b/debugfs.c @@ -2,20 +2,6 @@ /* Copyright (C) 2009 Clark Williams <williams(a)redhat.com> * Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/debugfs.h b/debugfs.h index 6e49efa..61384f9 100644 --- a/debugfs.h +++ b/debugfs.h @@ -2,20 +2,6 @@ /* Copyright (C) 2009 Clark Williams <williams(a)redhat.com> * Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/gpsd/Makefile b/gpsd/Makefile index 33129c1..81bf254 100755 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -4,20 +4,6 @@ # # Copyright (C) 2013-2019 B.A.T.M.A.N. contributors # -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA -# # License-Filename: LICENSES/preferred/GPL-2.0 # alfred-gpsd build diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 1db9ff9..6e9137c 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -3,20 +3,6 @@ * * Andrew Lunn, Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 70fd2c4..85dcc72 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -3,20 +3,6 @@ * * Andrew Lunn, Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/hash.c b/hash.c index 778a7f4..02ac15e 100644 --- a/hash.c +++ b/hash.c @@ -3,20 +3,6 @@ * * Simon Wunderlich, Marek Lindner * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/hash.h b/hash.h index d3fedb1..f5a8fb5 100644 --- a/hash.h +++ b/hash.h @@ -3,20 +3,6 @@ * * Simon Wunderlich, Marek Lindner * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ #ifndef _BATMAN_HASH_H diff --git a/list.h b/list.h index f6c0cae..0fa634f 100644 --- a/list.h +++ b/list.h @@ -3,20 +3,6 @@ * * Linus Torvalds, ... * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/main.c b/main.c index 6378c49..f633462 100644 --- a/main.c +++ b/main.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/netlink.c b/netlink.c index ffc29f2..eac8245 100644 --- a/netlink.c +++ b/netlink.c @@ -3,20 +3,6 @@ * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/netlink.h b/netlink.h index fcea003..26ad1e8 100644 --- a/netlink.h +++ b/netlink.h @@ -3,20 +3,6 @@ * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/netsock.c b/netsock.c index 927e5cc..fcbc20b 100644 --- a/netsock.c +++ b/netsock.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/packet.h b/packet.h index e2112e4..564afad 100644 --- a/packet.h +++ b/packet.h @@ -3,24 +3,6 @@ * * Simon Wunderlich, Sven Eckelmann * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * * License-Filename: LICENSES/preferred/MIT */ diff --git a/recv.c b/recv.c index a2e0602..e7c2c24 100644 --- a/recv.c +++ b/recv.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/send.c b/send.c index f7f37d8..d4043bc 100644 --- a/send.c +++ b/send.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/server.c b/server.c index 4cbbc7b..18109cc 100644 --- a/server.c +++ b/server.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/unix_sock.c b/unix_sock.c index 25348e8..1d17cee 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/util.c b/util.c index ed7407b..e14350e 100644 --- a/util.c +++ b/util.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/vis/Makefile b/vis/Makefile index 50e6112..53d1f44 100755 --- a/vis/Makefile +++ b/vis/Makefile @@ -4,20 +4,6 @@ # # Copyright (C) 2013-2019 B.A.T.M.A.N. contributors # -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA -# # License-Filename: LICENSES/preferred/GPL-2.0 # batadv-vis build diff --git a/vis/vis.c b/vis/vis.c index 3953475..beaeca1 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */ diff --git a/vis/vis.h b/vis/vis.h index d899f4e..6870dd4 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA - * * License-Filename: LICENSES/preferred/GPL-2.0 */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits