[PATCH wpan-tools 1/2] nl802154: update nl802154.h

[PATCH wpan-tools 1/2] nl802154: update nl802154.h

[Alexander Aring]

Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
 src/nl802154.h | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)

diff --git a/src/nl802154.h b/src/nl802154.h
index cf2713d..ddcee12 100644
--- a/src/nl802154.h
+++ b/src/nl802154.h
@@ -54,8 +54,26 @@ enum nl802154_commands {
 
 	NL802154_CMD_SET_ACKREQ_DEFAULT,
 
+	NL802154_CMD_SET_WPAN_PHY_NETNS,
+
 	/* add new commands above here */
 
+#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
+	NL802154_CMD_SET_SEC_PARAMS,
+	NL802154_CMD_GET_SEC_KEY,		/* can dump */
+	NL802154_CMD_NEW_SEC_KEY,
+	NL802154_CMD_DEL_SEC_KEY,
+	NL802154_CMD_GET_SEC_DEV,		/* can dump */
+	NL802154_CMD_NEW_SEC_DEV,
+	NL802154_CMD_DEL_SEC_DEV,
+	NL802154_CMD_GET_SEC_DEVKEY,		/* can dump */
+	NL802154_CMD_NEW_SEC_DEVKEY,
+	NL802154_CMD_DEL_SEC_DEVKEY,
+	NL802154_CMD_GET_SEC_LEVEL,		/* can dump */
+	NL802154_CMD_NEW_SEC_LEVEL,
+	NL802154_CMD_DEL_SEC_LEVEL,
+#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
+
 	/* used to define NL802154_CMD_MAX below */
 	__NL802154_CMD_AFTER_LAST,
 	NL802154_CMD_MAX = __NL802154_CMD_AFTER_LAST - 1
@@ -108,8 +126,25 @@ enum nl802154_attrs {
 
 	NL802154_ATTR_ACKREQ_DEFAULT,
 
+	NL802154_ATTR_PAD,
+
+	NL802154_ATTR_PID,
+	NL802154_ATTR_NETNS_FD,
+
 	/* add attributes here, update the policy in nl802154.c */
 
+#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
+	NL802154_ATTR_SEC_ENABLED,
+	NL802154_ATTR_SEC_OUT_LEVEL,
+	NL802154_ATTR_SEC_OUT_KEY_ID,
+	NL802154_ATTR_SEC_FRAME_COUNTER,
+
+	NL802154_ATTR_SEC_LEVEL,
+	NL802154_ATTR_SEC_DEVICE,
+	NL802154_ATTR_SEC_DEVKEY,
+	NL802154_ATTR_SEC_KEY,
+#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
+
 	__NL802154_ATTR_AFTER_LAST,
 	NL802154_ATTR_MAX = __NL802154_ATTR_AFTER_LAST - 1
 };
@@ -247,4 +282,171 @@ enum nl802154_supported_bool_states {
 	NL802154_SUPPORTED_BOOL_MAX = __NL802154_SUPPORTED_BOOL_AFTER_LAST - 1
 };
 
+#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
+
+enum nl802154_dev_addr_modes {
+	NL802154_DEV_ADDR_NONE,
+	__NL802154_DEV_ADDR_INVALID,
+	NL802154_DEV_ADDR_SHORT,
+	NL802154_DEV_ADDR_EXTENDED,
+
+	/* keep last */
+	__NL802154_DEV_ADDR_AFTER_LAST,
+	NL802154_DEV_ADDR_MAX = __NL802154_DEV_ADDR_AFTER_LAST - 1
+};
+
+enum nl802154_dev_addr_attrs {
+	NL802154_DEV_ADDR_ATTR_UNSPEC,
+
+	NL802154_DEV_ADDR_ATTR_PAN_ID,
+	NL802154_DEV_ADDR_ATTR_MODE,
+	NL802154_DEV_ADDR_ATTR_SHORT,
+	NL802154_DEV_ADDR_ATTR_EXTENDED,
+	NL802154_DEV_ADDR_ATTR_PAD,
+
+	/* keep last */
+	__NL802154_DEV_ADDR_ATTR_AFTER_LAST,
+	NL802154_DEV_ADDR_ATTR_MAX = __NL802154_DEV_ADDR_ATTR_AFTER_LAST - 1
+};
+
+enum nl802154_key_id_modes {
+	NL802154_KEY_ID_MODE_IMPLICIT,
+	NL802154_KEY_ID_MODE_INDEX,
+	NL802154_KEY_ID_MODE_INDEX_SHORT,
+	NL802154_KEY_ID_MODE_INDEX_EXTENDED,
+
+	/* keep last */
+	__NL802154_KEY_ID_MODE_AFTER_LAST,
+	NL802154_KEY_ID_MODE_MAX = __NL802154_KEY_ID_MODE_AFTER_LAST - 1
+};
+
+enum nl802154_key_id_attrs {
+	NL802154_KEY_ID_ATTR_UNSPEC,
+
+	NL802154_KEY_ID_ATTR_MODE,
+	NL802154_KEY_ID_ATTR_INDEX,
+	NL802154_KEY_ID_ATTR_IMPLICIT,
+	NL802154_KEY_ID_ATTR_SOURCE_SHORT,
+	NL802154_KEY_ID_ATTR_SOURCE_EXTENDED,
+	NL802154_KEY_ID_ATTR_PAD,
+
+	/* keep last */
+	__NL802154_KEY_ID_ATTR_AFTER_LAST,
+	NL802154_KEY_ID_ATTR_MAX = __NL802154_KEY_ID_ATTR_AFTER_LAST - 1
+};
+
+enum nl802154_seclevels {
+	NL802154_SECLEVEL_NONE,
+	NL802154_SECLEVEL_MIC32,
+	NL802154_SECLEVEL_MIC64,
+	NL802154_SECLEVEL_MIC128,
+	NL802154_SECLEVEL_ENC,
+	NL802154_SECLEVEL_ENC_MIC32,
+	NL802154_SECLEVEL_ENC_MIC64,
+	NL802154_SECLEVEL_ENC_MIC128,
+
+	/* keep last */
+	__NL802154_SECLEVEL_AFTER_LAST,
+	NL802154_SECLEVEL_MAX = __NL802154_SECLEVEL_AFTER_LAST - 1
+};
+
+enum nl802154_frames {
+	NL802154_FRAME_BEACON,
+	NL802154_FRAME_DATA,
+	NL802154_FRAME_ACK,
+	NL802154_FRAME_CMD,
+
+	/* keep last */
+	__NL802154_FRAME_AFTER_LAST,
+	NL802154_FRAME_MAX = __NL802154_FRAME_AFTER_LAST - 1
+};
+
+enum nl802154_cmd_frames {
+	__NL802154_CMD_FRAME_INVALID,
+	NL802154_CMD_FRAME_ASSOC_REQUEST,
+	NL802154_CMD_FRAME_ASSOC_RESPONSE,
+	NL802154_CMD_FRAME_DISASSOC_NOTIFY,
+	NL802154_CMD_FRAME_DATA_REQUEST,
+	NL802154_CMD_FRAME_PAN_ID_CONFLICT_NOTIFY,
+	NL802154_CMD_FRAME_ORPHAN_NOTIFY,
+	NL802154_CMD_FRAME_BEACON_REQUEST,
+	NL802154_CMD_FRAME_COORD_REALIGNMENT,
+	NL802154_CMD_FRAME_GTS_REQUEST,
+
+	/* keep last */
+	__NL802154_CMD_FRAME_AFTER_LAST,
+	NL802154_CMD_FRAME_MAX = __NL802154_CMD_FRAME_AFTER_LAST - 1
+};
+
+enum nl802154_seclevel_attrs {
+	NL802154_SECLEVEL_ATTR_UNSPEC,
+
+	NL802154_SECLEVEL_ATTR_LEVELS,
+	NL802154_SECLEVEL_ATTR_FRAME,
+	NL802154_SECLEVEL_ATTR_CMD_FRAME,
+	NL802154_SECLEVEL_ATTR_DEV_OVERRIDE,
+
+	/* keep last */
+	__NL802154_SECLEVEL_ATTR_AFTER_LAST,
+	NL802154_SECLEVEL_ATTR_MAX = __NL802154_SECLEVEL_ATTR_AFTER_LAST - 1
+};
+
+/* TODO what is this? couldn't find in mib */
+enum {
+	NL802154_DEVKEY_IGNORE,
+	NL802154_DEVKEY_RESTRICT,
+	NL802154_DEVKEY_RECORD,
+
+	/* keep last */
+	__NL802154_DEVKEY_AFTER_LAST,
+	NL802154_DEVKEY_MAX = __NL802154_DEVKEY_AFTER_LAST - 1
+};
+
+enum nl802154_dev {
+	NL802154_DEV_ATTR_UNSPEC,
+
+	NL802154_DEV_ATTR_FRAME_COUNTER,
+	NL802154_DEV_ATTR_PAN_ID,
+	NL802154_DEV_ATTR_SHORT_ADDR,
+	NL802154_DEV_ATTR_EXTENDED_ADDR,
+	NL802154_DEV_ATTR_SECLEVEL_EXEMPT,
+	NL802154_DEV_ATTR_KEY_MODE,
+	NL802154_DEV_ATTR_PAD,
+
+	/* keep last */
+	__NL802154_DEV_ATTR_AFTER_LAST,
+	NL802154_DEV_ATTR_MAX = __NL802154_DEV_ATTR_AFTER_LAST - 1
+};
+
+enum nl802154_devkey {
+	NL802154_DEVKEY_ATTR_UNSPEC,
+
+	NL802154_DEVKEY_ATTR_FRAME_COUNTER,
+	NL802154_DEVKEY_ATTR_EXTENDED_ADDR,
+	NL802154_DEVKEY_ATTR_ID,
+	NL802154_DEVKEY_ATTR_PAD,
+
+	/* keep last */
+	__NL802154_DEVKEY_ATTR_AFTER_LAST,
+	NL802154_DEVKEY_ATTR_MAX = __NL802154_DEVKEY_ATTR_AFTER_LAST - 1
+};
+
+enum nl802154_key {
+	NL802154_KEY_ATTR_UNSPEC,
+
+	NL802154_KEY_ATTR_ID,
+	NL802154_KEY_ATTR_USAGE_FRAMES,
+	NL802154_KEY_ATTR_USAGE_CMDS,
+	NL802154_KEY_ATTR_BYTES,
+
+	/* keep last */
+	__NL802154_KEY_ATTR_AFTER_LAST,
+	NL802154_KEY_ATTR_MAX = __NL802154_KEY_ATTR_AFTER_LAST - 1
+};
+
+#define NL802154_KEY_SIZE		16
+#define NL802154_CMD_FRAME_NR_IDS	256
+
+#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
+
 #endif /* __NL802154_H */
-- 
2.8.2

[PATCH wpan-tools 2/2] phy: add netns support

[Alexander Aring]

This patch adds netns support, basically most parts are copy&pasted from
iw tool, same handling just wpan instead wireless.

Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
 src/phy.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/src/phy.c b/src/phy.c
index 816bdd8..887b610 100644
--- a/src/phy.c
+++ b/src/phy.c
@@ -2,6 +2,10 @@
 #include <errno.h>
 #include <string.h>
 #include <stdbool.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
@@ -144,3 +148,65 @@ nla_put_failure:
 }
 COMMAND(set, cca_ed_level, "<level>",
 	NL802154_CMD_SET_CCA_ED_LEVEL, 0, CIB_PHY, handle_cca_ed_level, NULL);
+
+#ifndef NETNS_RUN_DIR
+#define NETNS_RUN_DIR "/var/run/netns"
+#endif
+int netns_get_fd(const char *name)
+{
+	char pathbuf[MAXPATHLEN];
+	const char *path, *ptr;
+
+	path = name;
+	ptr = strchr(name, '/');
+	if (!ptr) {
+		snprintf(pathbuf, sizeof(pathbuf), "%s/%s",
+			NETNS_RUN_DIR, name );
+		path = pathbuf;
+	}
+	return open(path, O_RDONLY);
+}
+
+static int handle_netns(struct nl802154_state *state,
+			struct nl_cb *cb,
+			struct nl_msg *msg,
+			int argc, char **argv,
+			enum id_input id)
+{
+	char *end;
+	int fd;
+
+	if (argc < 1 || !*argv[0])
+		return 1;
+
+	if (argc == 1) {
+		NLA_PUT_U32(msg, NL802154_ATTR_PID,
+			    strtoul(argv[0], &end, 10));
+		if (*end != '\0') {
+			printf("Invalid parameter: pid(%s)\n", argv[0]);
+			return 1;
+		}
+		return 0;
+	}
+
+	if (argc != 2 || strcmp(argv[0], "name"))
+		return 1;
+
+	if ((fd = netns_get_fd(argv[1])) >= 0) {
+		NLA_PUT_U32(msg, NL802154_ATTR_NETNS_FD, fd);
+		return 0;
+	} else {
+		printf("Invalid parameter: nsname(%s)\n", argv[0]);
+	}
+
+	return 1;
+
+ nla_put_failure:
+	return -ENOBUFS;
+}
+COMMAND(set, netns, "{ <pid> | name <nsname> }",
+	NL802154_CMD_SET_WPAN_PHY_NETNS, 0, CIB_PHY, handle_netns,
+	"Put this wpan device into a different network namespace:\n"
+	"    <pid>    - change network namespace by process id\n"
+	"    <nsname> - change network namespace by name from "NETNS_RUN_DIR"\n"
+	"               or by absolute path (man ip-netns)\n");
-- 
2.8.2

Re: [PATCH wpan-tools 1/2] nl802154: update nl802154.h

[Stefan Schmidt]

Hello.

On 11/05/16 11:46, Alexander Aring wrote:
> Signed-off-by: Alexander Aring <aar@pengutronix.de>

You could have explained here that this update brings the defines needed 
for netns and later on llsec support.
But after all its only a sync of the header file from kernel to 
userspace utility.

> ---
>   src/nl802154.h | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 202 insertions(+)
>
> diff --git a/src/nl802154.h b/src/nl802154.h
> index cf2713d..ddcee12 100644
> --- a/src/nl802154.h
> +++ b/src/nl802154.h
> @@ -54,8 +54,26 @@ enum nl802154_commands {
>   
>   	NL802154_CMD_SET_ACKREQ_DEFAULT,
>   
> +	NL802154_CMD_SET_WPAN_PHY_NETNS,
> +
>   	/* add new commands above here */
>   
> +#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
> +	NL802154_CMD_SET_SEC_PARAMS,
> +	NL802154_CMD_GET_SEC_KEY,		/* can dump */
> +	NL802154_CMD_NEW_SEC_KEY,
> +	NL802154_CMD_DEL_SEC_KEY,
> +	NL802154_CMD_GET_SEC_DEV,		/* can dump */
> +	NL802154_CMD_NEW_SEC_DEV,
> +	NL802154_CMD_DEL_SEC_DEV,
> +	NL802154_CMD_GET_SEC_DEVKEY,		/* can dump */
> +	NL802154_CMD_NEW_SEC_DEVKEY,
> +	NL802154_CMD_DEL_SEC_DEVKEY,
> +	NL802154_CMD_GET_SEC_LEVEL,		/* can dump */
> +	NL802154_CMD_NEW_SEC_LEVEL,
> +	NL802154_CMD_DEL_SEC_LEVEL,
> +#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
> +
>   	/* used to define NL802154_CMD_MAX below */
>   	__NL802154_CMD_AFTER_LAST,
>   	NL802154_CMD_MAX = __NL802154_CMD_AFTER_LAST - 1
> @@ -108,8 +126,25 @@ enum nl802154_attrs {
>   
>   	NL802154_ATTR_ACKREQ_DEFAULT,
>   
> +	NL802154_ATTR_PAD,
> +
> +	NL802154_ATTR_PID,
> +	NL802154_ATTR_NETNS_FD,
> +
>   	/* add attributes here, update the policy in nl802154.c */
>   
> +#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
> +	NL802154_ATTR_SEC_ENABLED,
> +	NL802154_ATTR_SEC_OUT_LEVEL,
> +	NL802154_ATTR_SEC_OUT_KEY_ID,
> +	NL802154_ATTR_SEC_FRAME_COUNTER,
> +
> +	NL802154_ATTR_SEC_LEVEL,
> +	NL802154_ATTR_SEC_DEVICE,
> +	NL802154_ATTR_SEC_DEVKEY,
> +	NL802154_ATTR_SEC_KEY,
> +#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
> +
>   	__NL802154_ATTR_AFTER_LAST,
>   	NL802154_ATTR_MAX = __NL802154_ATTR_AFTER_LAST - 1
>   };
> @@ -247,4 +282,171 @@ enum nl802154_supported_bool_states {
>   	NL802154_SUPPORTED_BOOL_MAX = __NL802154_SUPPORTED_BOOL_AFTER_LAST - 1
>   };
>   
> +#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
> +
> +enum nl802154_dev_addr_modes {
> +	NL802154_DEV_ADDR_NONE,
> +	__NL802154_DEV_ADDR_INVALID,
> +	NL802154_DEV_ADDR_SHORT,
> +	NL802154_DEV_ADDR_EXTENDED,
> +
> +	/* keep last */
> +	__NL802154_DEV_ADDR_AFTER_LAST,
> +	NL802154_DEV_ADDR_MAX = __NL802154_DEV_ADDR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_dev_addr_attrs {
> +	NL802154_DEV_ADDR_ATTR_UNSPEC,
> +
> +	NL802154_DEV_ADDR_ATTR_PAN_ID,
> +	NL802154_DEV_ADDR_ATTR_MODE,
> +	NL802154_DEV_ADDR_ATTR_SHORT,
> +	NL802154_DEV_ADDR_ATTR_EXTENDED,
> +	NL802154_DEV_ADDR_ATTR_PAD,
> +
> +	/* keep last */
> +	__NL802154_DEV_ADDR_ATTR_AFTER_LAST,
> +	NL802154_DEV_ADDR_ATTR_MAX = __NL802154_DEV_ADDR_ATTR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_key_id_modes {
> +	NL802154_KEY_ID_MODE_IMPLICIT,
> +	NL802154_KEY_ID_MODE_INDEX,
> +	NL802154_KEY_ID_MODE_INDEX_SHORT,
> +	NL802154_KEY_ID_MODE_INDEX_EXTENDED,
> +
> +	/* keep last */
> +	__NL802154_KEY_ID_MODE_AFTER_LAST,
> +	NL802154_KEY_ID_MODE_MAX = __NL802154_KEY_ID_MODE_AFTER_LAST - 1
> +};
> +
> +enum nl802154_key_id_attrs {
> +	NL802154_KEY_ID_ATTR_UNSPEC,
> +
> +	NL802154_KEY_ID_ATTR_MODE,
> +	NL802154_KEY_ID_ATTR_INDEX,
> +	NL802154_KEY_ID_ATTR_IMPLICIT,
> +	NL802154_KEY_ID_ATTR_SOURCE_SHORT,
> +	NL802154_KEY_ID_ATTR_SOURCE_EXTENDED,
> +	NL802154_KEY_ID_ATTR_PAD,
> +
> +	/* keep last */
> +	__NL802154_KEY_ID_ATTR_AFTER_LAST,
> +	NL802154_KEY_ID_ATTR_MAX = __NL802154_KEY_ID_ATTR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_seclevels {
> +	NL802154_SECLEVEL_NONE,
> +	NL802154_SECLEVEL_MIC32,
> +	NL802154_SECLEVEL_MIC64,
> +	NL802154_SECLEVEL_MIC128,
> +	NL802154_SECLEVEL_ENC,
> +	NL802154_SECLEVEL_ENC_MIC32,
> +	NL802154_SECLEVEL_ENC_MIC64,
> +	NL802154_SECLEVEL_ENC_MIC128,
> +
> +	/* keep last */
> +	__NL802154_SECLEVEL_AFTER_LAST,
> +	NL802154_SECLEVEL_MAX = __NL802154_SECLEVEL_AFTER_LAST - 1
> +};
> +
> +enum nl802154_frames {
> +	NL802154_FRAME_BEACON,
> +	NL802154_FRAME_DATA,
> +	NL802154_FRAME_ACK,
> +	NL802154_FRAME_CMD,
> +
> +	/* keep last */
> +	__NL802154_FRAME_AFTER_LAST,
> +	NL802154_FRAME_MAX = __NL802154_FRAME_AFTER_LAST - 1
> +};
> +
> +enum nl802154_cmd_frames {
> +	__NL802154_CMD_FRAME_INVALID,
> +	NL802154_CMD_FRAME_ASSOC_REQUEST,
> +	NL802154_CMD_FRAME_ASSOC_RESPONSE,
> +	NL802154_CMD_FRAME_DISASSOC_NOTIFY,
> +	NL802154_CMD_FRAME_DATA_REQUEST,
> +	NL802154_CMD_FRAME_PAN_ID_CONFLICT_NOTIFY,
> +	NL802154_CMD_FRAME_ORPHAN_NOTIFY,
> +	NL802154_CMD_FRAME_BEACON_REQUEST,
> +	NL802154_CMD_FRAME_COORD_REALIGNMENT,
> +	NL802154_CMD_FRAME_GTS_REQUEST,
> +
> +	/* keep last */
> +	__NL802154_CMD_FRAME_AFTER_LAST,
> +	NL802154_CMD_FRAME_MAX = __NL802154_CMD_FRAME_AFTER_LAST - 1
> +};
> +
> +enum nl802154_seclevel_attrs {
> +	NL802154_SECLEVEL_ATTR_UNSPEC,
> +
> +	NL802154_SECLEVEL_ATTR_LEVELS,
> +	NL802154_SECLEVEL_ATTR_FRAME,
> +	NL802154_SECLEVEL_ATTR_CMD_FRAME,
> +	NL802154_SECLEVEL_ATTR_DEV_OVERRIDE,
> +
> +	/* keep last */
> +	__NL802154_SECLEVEL_ATTR_AFTER_LAST,
> +	NL802154_SECLEVEL_ATTR_MAX = __NL802154_SECLEVEL_ATTR_AFTER_LAST - 1
> +};
> +
> +/* TODO what is this? couldn't find in mib */
> +enum {
> +	NL802154_DEVKEY_IGNORE,
> +	NL802154_DEVKEY_RESTRICT,
> +	NL802154_DEVKEY_RECORD,
> +
> +	/* keep last */
> +	__NL802154_DEVKEY_AFTER_LAST,
> +	NL802154_DEVKEY_MAX = __NL802154_DEVKEY_AFTER_LAST - 1
> +};
> +
> +enum nl802154_dev {
> +	NL802154_DEV_ATTR_UNSPEC,
> +
> +	NL802154_DEV_ATTR_FRAME_COUNTER,
> +	NL802154_DEV_ATTR_PAN_ID,
> +	NL802154_DEV_ATTR_SHORT_ADDR,
> +	NL802154_DEV_ATTR_EXTENDED_ADDR,
> +	NL802154_DEV_ATTR_SECLEVEL_EXEMPT,
> +	NL802154_DEV_ATTR_KEY_MODE,
> +	NL802154_DEV_ATTR_PAD,
> +
> +	/* keep last */
> +	__NL802154_DEV_ATTR_AFTER_LAST,
> +	NL802154_DEV_ATTR_MAX = __NL802154_DEV_ATTR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_devkey {
> +	NL802154_DEVKEY_ATTR_UNSPEC,
> +
> +	NL802154_DEVKEY_ATTR_FRAME_COUNTER,
> +	NL802154_DEVKEY_ATTR_EXTENDED_ADDR,
> +	NL802154_DEVKEY_ATTR_ID,
> +	NL802154_DEVKEY_ATTR_PAD,
> +
> +	/* keep last */
> +	__NL802154_DEVKEY_ATTR_AFTER_LAST,
> +	NL802154_DEVKEY_ATTR_MAX = __NL802154_DEVKEY_ATTR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_key {
> +	NL802154_KEY_ATTR_UNSPEC,
> +
> +	NL802154_KEY_ATTR_ID,
> +	NL802154_KEY_ATTR_USAGE_FRAMES,
> +	NL802154_KEY_ATTR_USAGE_CMDS,
> +	NL802154_KEY_ATTR_BYTES,
> +
> +	/* keep last */
> +	__NL802154_KEY_ATTR_AFTER_LAST,
> +	NL802154_KEY_ATTR_MAX = __NL802154_KEY_ATTR_AFTER_LAST - 1
> +};
> +
> +#define NL802154_KEY_SIZE		16
> +#define NL802154_CMD_FRAME_NR_IDS	256
> +
> +#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
> +
>   #endif /* __NL802154_H */

Reviewed-by: Stefan Schmidt<stefan@osg.samsung.com>

regards
Stefan Schmidt

Re: [PATCH wpan-tools 2/2] phy: add netns support

[Stefan Schmidt]

Hello.

Quick tip. If you want to check your code with coverity before putting 
it into master you can push it to the branch coverty_scan on github and 
travis will build and submit it to coverity. I find this handy when 
doing new code to check it before putting it into master. Nothing wrong 
with this code just a tip. :)

On 11/05/16 11:46, Alexander Aring wrote:
> This patch adds netns support, basically most parts are copy&pasted from
> iw tool, same handling just wpan instead wireless.
>
> Signed-off-by: Alexander Aring <aar@pengutronix.de>
> ---
>   src/phy.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 66 insertions(+)
>
> diff --git a/src/phy.c b/src/phy.c
> index 816bdd8..887b610 100644
> --- a/src/phy.c
> +++ b/src/phy.c
> @@ -2,6 +2,10 @@
>   #include <errno.h>
>   #include <string.h>
>   #include <stdbool.h>
> +#include <sys/param.h>
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <fcntl.h>
>   
>   #include <netlink/genl/genl.h>
>   #include <netlink/genl/family.h>
> @@ -144,3 +148,65 @@ nla_put_failure:
>   }
>   COMMAND(set, cca_ed_level, "<level>",
>   	NL802154_CMD_SET_CCA_ED_LEVEL, 0, CIB_PHY, handle_cca_ed_level, NULL);
> +
> +#ifndef NETNS_RUN_DIR
> +#define NETNS_RUN_DIR "/var/run/netns"
> +#endif
> +int netns_get_fd(const char *name)
Make this function static?

> +{
> +	char pathbuf[MAXPATHLEN];
> +	const char *path, *ptr;
> +
> +	path = name;
> +	ptr = strchr(name, '/');
> +	if (!ptr) {
> +		snprintf(pathbuf, sizeof(pathbuf), "%s/%s",
> +			NETNS_RUN_DIR, name );
> +		path = pathbuf;
> +	}
> +	return open(path, O_RDONLY);
> +}
> +
> +static int handle_netns(struct nl802154_state *state,
> +			struct nl_cb *cb,
> +			struct nl_msg *msg,
> +			int argc, char **argv,
> +			enum id_input id)
> +{
> +	char *end;
> +	int fd;
> +
> +	if (argc < 1 || !*argv[0])
> +		return 1;
> +
> +	if (argc == 1) {
> +		NLA_PUT_U32(msg, NL802154_ATTR_PID,
> +			    strtoul(argv[0], &end, 10));
> +		if (*end != '\0') {
> +			printf("Invalid parameter: pid(%s)\n", argv[0]);
> +			return 1;
> +		}
> +		return 0;
> +	}
> +
> +	if (argc != 2 || strcmp(argv[0], "name"))
> +		return 1;
> +
> +	if ((fd = netns_get_fd(argv[1])) >= 0) {
> +		NLA_PUT_U32(msg, NL802154_ATTR_NETNS_FD, fd);
> +		return 0;
> +	} else {
> +		printf("Invalid parameter: nsname(%s)\n", argv[0]);
> +	}
> +
> +	return 1;
> +
> + nla_put_failure:
> +	return -ENOBUFS;
> +}
> +COMMAND(set, netns, "{ <pid> | name <nsname> }",
> +	NL802154_CMD_SET_WPAN_PHY_NETNS, 0, CIB_PHY, handle_netns,
> +	"Put this wpan device into a different network namespace:\n"
> +	"    <pid>    - change network namespace by process id\n"
> +	"    <nsname> - change network namespace by name from "NETNS_RUN_DIR"\n"
> +	"               or by absolute path (man ip-netns)\n");

Reviewed-by: Stefan Schmidt<stefan@osg.samsung.com>

regards
Stefan Schmidt

Re: [PATCH wpan-tools 1/2] nl802154: update nl802154.h

[Alexander Aring]

Hi,

On 05/11/2016 05:07 PM, Stefan Schmidt wrote:
> Hello.
> 
> On 11/05/16 11:46, Alexander Aring wrote:
>> Signed-off-by: Alexander Aring <aar@pengutronix.de>
> 
> You could have explained here that this update brings the defines needed for netns and later on llsec support.
> But after all its only a sync of the header file from kernel to userspace utility.
> 

Yea, it's just a update and nobody should touch the nl802154 header by
any editor here, it's just a copy from kernel.

Maybe I should use the commit msg like [0].

- Alex

[0] http://git.kernel.org/cgit/linux/kernel/git/jberg/iw.git/commit/?id=f45d4583f14acf115aa248af0caee80a3dfa98d3

Re: [PATCH wpan-tools 2/2] phy: add netns support

[Alexander Aring]

Hi,

On 05/11/2016 05:13 PM, Stefan Schmidt wrote:
> Hello.
> 
> Quick tip. If you want to check your code with coverity before putting it into master you can push it to the branch coverty_scan on github and travis will build and submit it to coverity. I find this handy when doing new code to check it before putting it into master. Nothing wrong with this code just a tip. :)
> 

ok, I will try it put don't be angry if everything is broken afterwards.
:-)

> On 11/05/16 11:46, Alexander Aring wrote:
>> This patch adds netns support, basically most parts are copy&pasted from
>> iw tool, same handling just wpan instead wireless.
>>
>> Signed-off-by: Alexander Aring <aar@pengutronix.de>
>> ---
>>   src/phy.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>   1 file changed, 66 insertions(+)
>>
>> diff --git a/src/phy.c b/src/phy.c
>> index 816bdd8..887b610 100644
>> --- a/src/phy.c
>> +++ b/src/phy.c
>> @@ -2,6 +2,10 @@
>>   #include <errno.h>
>>   #include <string.h>
>>   #include <stdbool.h>
>> +#include <sys/param.h>
>> +#include <sys/types.h>
>> +#include <sys/stat.h>
>> +#include <fcntl.h>
>>     #include <netlink/genl/genl.h>
>>   #include <netlink/genl/family.h>
>> @@ -144,3 +148,65 @@ nla_put_failure:
>>   }
>>   COMMAND(set, cca_ed_level, "<level>",
>>       NL802154_CMD_SET_CCA_ED_LEVEL, 0, CIB_PHY, handle_cca_ed_level, NULL);
>> +
>> +#ifndef NETNS_RUN_DIR
>> +#define NETNS_RUN_DIR "/var/run/netns"
>> +#endif
>> +int netns_get_fd(const char *name)
> Make this function static?
> 

ok.

- Alex