info: add cca mode descriptive text to output

PATCH Superseded Christoffer Holmstedt 2 participants 3 messages Jun 4, 2015 IEEE 802.15.4

lore

Share & tools

lore

Christoffer Holmstedt

author

2015-06-04 09:20 UTC #0 lore raw

PATCH 1/2 info: add cca mode descriptive text to output

Signed-off-by Christoffer Holmstedt <[email protected]>

---
 src/info.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 18 deletions(-)

src/info.c +62 ~~-18~~

index 2434bef6a87f..d2e88febd20c 100644
@@ -146,6 +146,41 @@ static void print_freq_handler(int channel_page, int channel)
 	}
 }
 
+static void print_cca_mode_handler(enum nl802154_cca_modes cca_mode,
+				   enum nl802154_cca_opts cca_opt)
+{
+	switch (cca_mode) {
+	case NL802154_CCA_ENERGY:
+		printf("energy above threshold");
+		break;
+	case NL802154_CCA_CARRIER:
+		printf("carrier sense only");
+		break;
+	case NL802154_CCA_ENERGY_CARRIER:
+		printf("carrier sense with energy above threshold");
+		switch (cca_opt) {
+		case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
+			printf(" (logical operator is 'and')");
+			break;
+		case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
+			printf(" (logical operator is 'or')");
+			break;
+		default:
+			printf(" (logical operator is unknown)");
+		}
+		break;
+	case NL802154_CCA_ALOHA:
+		printf("ALOHA");
+		break;
+	case NL802154_CCA_UWB_SHR:
+		printf("UWB preamble sense based on the SHR of a frame");
+		break;
+	case NL802154_CCA_UWB_MULTIPEXED:
+		printf("UWB preamble sense based on the packet with the multiplexed preamble");
+		break;
+	}
+}
+
 static const char *commands[NL802154_CMD_MAX + 1] = {
 	[NL802154_CMD_UNSPEC] = "unspec",
 	[NL802154_CMD_GET_WPAN_PHY] = "get_wpan_phy",

@@ -235,23 +270,14 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
 	}
 
 	if (tb_msg[NL802154_ATTR_CCA_MODE]) {
+		enum nl802154_cca_opts cca_opt;
+		if (tb_msg[NL802154_ATTR_CCA_OPT])
+			cca_opt = nla_get_u32(tb_msg[NL802154_ATTR_CCA_OPT]);
+
 		cca_mode = nla_get_u32(tb_msg[NL802154_ATTR_CCA_MODE]);
-		printf("cca_mode: %d", cca_mode);
-		if (cca_mode == NL802154_CCA_ENERGY_CARRIER) {
-			enum nl802154_cca_opts cca_opt;
 
-			cca_opt = nla_get_u32(tb_msg[NL802154_ATTR_CCA_OPT]);
-			switch (cca_opt) {
-			case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
-				printf(" logical and ");
-				break;
-			case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
-				printf(" logical or ");
-				break;
-			default:
-				printf(" logical op mode unkown ");
-			}
-		}
+		printf("cca_mode: %d, ", cca_mode);
+		print_cca_mode_handler(cca_mode, cca_opt);
 		printf("\n");
 	}

@@ -361,10 +387,28 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
 			printf("\tcca_modes: ");
 			nla_for_each_nested(nl_cca_modes,
 					    tb_caps[NL802154_CAP_ATTR_CCA_MODES],
-					    rem_cca_modes)
-				printf("%d,", nla_type(nl_cca_modes));
+					    rem_cca_modes) {
+				if (nla_type(nl_cca_modes) != NL802154_CCA_ENERGY_CARRIER) {
+					printf("\n\t\t(%d) ", nla_type(nl_cca_modes));
+					print_cca_mode_handler(nla_type(nl_cca_modes), 0);
+				} else {
+					if (tb_caps[NL802154_CAP_ATTR_CCA_OPTS]) {
+						struct nlattr *nl_cca_opts;
+						int rem_cca_opts;
+
+						nla_for_each_nested(nl_cca_opts,
+								    tb_caps[NL802154_CAP_ATTR_CCA_OPTS],
+								    rem_cca_opts) {
+							printf("\n\t\t(%d, ", nla_type(nl_cca_modes));
+							printf("cca_opt: %d) ", nla_type(nl_cca_opts));
+							print_cca_mode_handler(nla_type(nl_cca_modes),
+										nla_type(nl_cca_opts));
+						}
+					}
+				}
+			}
 			/* TODO */
-			printf("\b \n");
+			printf("\n");
 		}
 
 		if (tb_caps[NL802154_CAP_ATTR_CCA_OPTS]) {

Signature · 5 lines

1.9.1


-- 
Christoffer Holmstedt

Alexander Aring

maintainer

2015-06-04 11:01 UTC #1 lore raw

Quoted 38 lines · Christoffer Holmstedt

Signed-off-by Christoffer Holmstedt <[email protected]>

---
 src/info.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 18 deletions(-)

src/info.c +25 -0

index 2434bef6a87f..d2e88febd20c 100644
@@ -146,6 +146,41 @@ static void print_freq_handler(int channel_page, int channel)
 	}
 }
 
+static void print_cca_mode_handler(enum nl802154_cca_modes cca_mode,
+				   enum nl802154_cca_opts cca_opt)
+{
+	switch (cca_mode) {
+	case NL802154_CCA_ENERGY:
+		printf("energy above threshold");
+		break;
+	case NL802154_CCA_CARRIER:
+		printf("carrier sense only");
+		break;
+	case NL802154_CCA_ENERGY_CARRIER:
+		printf("carrier sense with energy above threshold");
+		switch (cca_opt) {
+		case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
+			printf(" (logical operator is 'and')");
+			break;
+		case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
+			printf(" (logical operator is 'or')");
+			break;
+		default:
+			printf(" (logical operator is unknown)");
+		}
+		break;
+	case NL802154_CCA_ALOHA:
+		printf("ALOHA");

src/info.c static void print_freq_handler(int channel_page, int channel) · line 183

Quoted 10 lines

src/info.c +10 -0

+		break;
+	case NL802154_CCA_UWB_SHR:
+		printf("UWB preamble sense based on the SHR of a frame");
+		break;
+	case NL802154_CCA_UWB_MULTIPEXED:
+		printf("UWB preamble sense based on the packet with the multiplexed preamble");
+		break;
+	}
+}
+

mhhh, there exists now two different styles to making some "enum" -> string mapping. The first one was (and this is the original way which was grabbed from wireless) to have some temp buffer and use sprintf to put the string in there.

This is a more generic way. After calling the function we should use printf to printout the string with some format string. You know what I mean? We should change this.

So what I mean is here use in this function sprintf and put the mapping string into a local buffer, not directly printf. You can do that after calling this function.

src/info.c static int print_phy_handler(struct nl_msg *msg, void *arg) · line 273

Quoted 8 lines

src/info.c +1 -0

 static const char *commands[NL802154_CMD_MAX + 1] = {
 	[NL802154_CMD_UNSPEC] = "unspec",
 	[NL802154_CMD_GET_WPAN_PHY] = "get_wpan_phy",

@@ -235,23 +270,14 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
 	}
 
 	if (tb_msg[NL802154_ATTR_CCA_MODE]) {
+		enum nl802154_cca_opts cca_opt;

init this with a invalid value, so default case will occur if not NL802154_ATTR_CCA_OPT is there.

Quoted 13 lines

src/info.c +3 -8

+		if (tb_msg[NL802154_ATTR_CCA_OPT])
+			cca_opt = nla_get_u32(tb_msg[NL802154_ATTR_CCA_OPT]);
+
 		cca_mode = nla_get_u32(tb_msg[NL802154_ATTR_CCA_MODE]);
-		printf("cca_mode: %d", cca_mode);
-		if (cca_mode == NL802154_CCA_ENERGY_CARRIER) {
-			enum nl802154_cca_opts cca_opt;
 
-			cca_opt = nla_get_u32(tb_msg[NL802154_ATTR_CCA_OPT]);
-			switch (cca_opt) {
-			case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
-				printf(" logical and ");
-				break;

src/info.c static int print_phy_handler(struct nl_msg *msg, void *arg) · line 281

Quoted 10 lines

src/info.c +2 -7

-			case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
-				printf(" logical or ");
-				break;
-			default:
-				printf(" logical op mode unkown ");
-			}
-		}
+		printf("cca_mode: %d, ", cca_mode);
+		print_cca_mode_handler(cca_mode, cca_opt);
 		printf("\n");

- Alex

Christoffer Holmstedt

author

2015-06-04 11:55 UTC #2 lore raw

Quoted 55 lines · Alexander Aring

Quoted 38 lines · Christoffer Holmstedt

Signed-off-by Christoffer Holmstedt <[email protected]>

---
 src/info.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 18 deletions(-)

src/info.c +25 -0

index 2434bef6a87f..d2e88febd20c 100644
@@ -146,6 +146,41 @@ static void print_freq_handler(int channel_page, int channel)
 	}
 }
 
+static void print_cca_mode_handler(enum nl802154_cca_modes cca_mode,
+				   enum nl802154_cca_opts cca_opt)
+{
+	switch (cca_mode) {
+	case NL802154_CCA_ENERGY:
+		printf("energy above threshold");
+		break;
+	case NL802154_CCA_CARRIER:
+		printf("carrier sense only");
+		break;
+	case NL802154_CCA_ENERGY_CARRIER:
+		printf("carrier sense with energy above threshold");
+		switch (cca_opt) {
+		case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
+			printf(" (logical operator is 'and')");
+			break;
+		case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
+			printf(" (logical operator is 'or')");
+			break;
+		default:
+			printf(" (logical operator is unknown)");
+		}
+		break;
+	case NL802154_CCA_ALOHA:
+		printf("ALOHA");

src/info.c static void print_freq_handler(int channel_page, int channel) · line 183

Quoted 10 lines

src/info.c +10 -0

+		break;
+	case NL802154_CCA_UWB_SHR:
+		printf("UWB preamble sense based on the SHR of a frame");
+		break;
+	case NL802154_CCA_UWB_MULTIPEXED:
+		printf("UWB preamble sense based on the packet with the multiplexed preamble");
+		break;
+	}
+}
+

Quoted 3 lines

This is a more generic way. After calling the function we should use printf to printout the string with some format string. You know what I mean? We should change this.

I think I do, just like the default case in iftype_name() function in interface.c and is later on printed out with printf in print_iface_handler() in interface.c

I will fix that.

Quoted 11 lines

So what I mean is here use in this function sprintf and put the mapping string into a local buffer, not directly printf. You can do that after calling this function.
Quoted 6 lines
src/info.c +0 -0
 static const char *commands[NL802154_CMD_MAX + 1] = {
 	[NL802154_CMD_UNSPEC] = "unspec",
 	[NL802154_CMD_GET_WPAN_PHY] = "get_wpan_phy",
@@ -235,23 +270,14 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
 	}
 

Quoted 6 lines

src/info.c static int print_phy_handler(struct nl_msg *msg, void *arg) · line 273
Quoted 2 lines
src/info.c +1 -0
 	if (tb_msg[NL802154_ATTR_CCA_MODE]) {
+		enum nl802154_cca_opts cca_opt;
init this with a invalid value, so default case will occur if not NL802154_ATTR_CCA_OPT is there.

Right. I will fix that.

Concerning setting invalid values, for cca_modes we have an enum value for invalid but for cca_opts we don't. Should I include limits.h and set MAX_INT or just set a high random int value like 9999?

Quoted 25 lines

Quoted 13 lines

src/info.c +3 -8

+		if (tb_msg[NL802154_ATTR_CCA_OPT])
+			cca_opt = nla_get_u32(tb_msg[NL802154_ATTR_CCA_OPT]);
+
 		cca_mode = nla_get_u32(tb_msg[NL802154_ATTR_CCA_MODE]);
-		printf("cca_mode: %d", cca_mode);
-		if (cca_mode == NL802154_CCA_ENERGY_CARRIER) {
-			enum nl802154_cca_opts cca_opt;
 
-			cca_opt = nla_get_u32(tb_msg[NL802154_ATTR_CCA_OPT]);
-			switch (cca_opt) {
-			case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
-				printf(" logical and ");
-				break;

src/info.c static int print_phy_handler(struct nl_msg *msg, void *arg) · line 281

Quoted 10 lines

src/info.c +2 -7

-			case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
-				printf(" logical or ");
-				break;
-			default:
-				printf(" logical op mode unkown ");
-			}
-		}
+		printf("cca_mode: %d, ", cca_mode);
+		print_cca_mode_handler(cca_mode, cca_opt);
 		printf("\n");

- Alex

Signature · 1 line

Christoffer Holmstedt