Update cca mode and options output

Earlier cca_modes and cca_opts were printed separately but these two patches now prints them together so cca_opts are only printed when the specified mode
is (3).

Output for "current" mode (only one line is printed for each wpan):
cca_mode: 1, energy above threshold.
cca_mode: 2, carrier sense only.
cca_mode: 3, carrier sense with energy above threshold (logical operator is 'and').
cca_mode: 3, carrier sense with energy above threshold (logical operator is 'or').
cca_mode: 3, carrier sense with energy above threshold (logical operator is unknown).
cca_mode: 4, ALOHA.
cca_mode: 5, UWB preamble sense based on the SHR of a frame.
cca_mode: 6, UWB preamble sense based on the packet with the multiplexed preamble.

capabilities:
...
cca_modes:
(1) energy above threshold
(2) carrier sense only
(3, cca_opt: 0) carrier sense with energy above threshold (logical operator is 'and') (3, cca_opt: 1) carrier sense with energy above threshold (logical operator is 'or')

Quoted 14 lines · Christoffer Holmstedt

Earlier cca_modes and cca_opts were printed separately but these two patches now prints them together so cca_opts are only printed when the specified mode
is (3).

Output for "current" mode (only one line is printed for each wpan):
cca_mode: 1, energy above threshold.
cca_mode: 2, carrier sense only.
cca_mode: 3, carrier sense with energy above threshold (logical operator is 'and').
cca_mode: 3, carrier sense with energy above threshold (logical operator is 'or').
cca_mode: 3, carrier sense with energy above threshold (logical operator is unknown).
cca_mode: 4, ALOHA.
cca_mode: 5, UWB preamble sense based on the SHR of a frame.
cca_mode: 6, UWB preamble sense based on the packet with the multiplexed preamble.

Quoted 9 lines

capabilities:
...
cca_modes:
(1) energy above threshold
(2) carrier sense only
(3, cca_opt: 0) carrier sense with energy above threshold (logical operator is 'and') (3, cca_opt: 1) carrier sense with energy above threshold (logical operator is 'or')

Please check your mail settings, can you try to make some "In-reply-to" behaviour when you send more than one patch?

- Alex

Earlier cca_modes and cca_opts were printed separately but these two patches now prints them together so cca_opts are only printed when the specified mode
is (3).

Output for "current" mode (only one line is printed for each wpan):
cca_mode: 1, energy above threshold.
cca_mode: 2, carrier sense only.
cca_mode: 3, carrier sense with energy above threshold (logical operator is 'and').
cca_mode: 3, carrier sense with energy above threshold (logical operator is 'or').
cca_mode: 3, carrier sense with energy above threshold (logical operator is unknown).
cca_mode: 4, ALOHA.
cca_mode: 5, UWB preamble sense based on the SHR of a frame.
cca_mode: 6, UWB preamble sense based on the packet with the multiplexed preamble.

capabilities:
...
cca_modes:
(1) energy above threshold
(2) carrier sense only
(3, cca_opt: 0) carrier sense with energy above threshold (logical operator is 'and') (3, cca_opt: 1) carrier sense with energy above threshold (logical operator is 'or')

Christoffer Holmstedt (2):
info: add cca mode descriptive text to output
info: remove old cca options capabilities output

  src/info.c | 99 +++++++++++++++++++++++++++++++++++++-------------------------
  1 file changed, 60 insertions(+), 39 deletions(-)

Hi Christoffer Holmstedt,

Quoted 4 lines · Christoffer Holmstedt

Earlier cca_modes and cca_opts were printed separately but these two patches now prints them together so cca_opts are only printed when the specified mode
is (3).

Quoted 9 lines

Output for "current" mode (only one line is printed for each wpan):
cca_mode: 1, energy above threshold.
cca_mode: 2, carrier sense only.
cca_mode: 3, carrier sense with energy above threshold (logical operator is 'and').
cca_mode: 3, carrier sense with energy above threshold (logical operator is 'or').
cca_mode: 3, carrier sense with energy above threshold (logical operator is unknown).
cca_mode: 4, ALOHA.
cca_mode: 5, UWB preamble sense based on the SHR of a frame.
cca_mode: 6, UWB preamble sense based on the packet with the multiplexed preamble.

Do you think that cca_mode number is required overhear..?

What i mean is that:
The cca mode number 1 indicates that its *energy above threshold*,
So what i feel is that printing the number is required.

May be Alex has to tell its preferred or not. I think we can remove the number.

Signature · 1 line

Varka Bhadram

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

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

src/info.c +35 -0

index 2434bef6a87f..364c02f718aa 100644
@@ -146,6 +146,41 @@ static void print_freq_handler(int channel_page, int channel)
 	}
 }
 
+static char cca_mode_buf[100];
+
+const char *print_cca_mode_handler(enum nl802154_cca_modes cca_mode,
+				   enum nl802154_cca_opts cca_opt)
+{
+	switch (cca_mode) {
+	case NL802154_CCA_ENERGY:
+		return "Energy above threshold";
+	case NL802154_CCA_CARRIER:
+		return "Carrier sense only";
+	case NL802154_CCA_ENERGY_CARRIER:
+		switch (cca_opt) {
+		case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
+			return "Carrier sense with energy above threshold (logical operator is 'and')";
+		case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
+			return "Carrier sense with energy above threshold (logical operator is 'or')";
+		default:
+			sprintf(cca_mode_buf,
+				"Unknown CCA option (%d) for CCA mode (%d)",
+				cca_opt,
+				cca_mode);
+			return cca_mode_buf;
+		}
+	case NL802154_CCA_ALOHA:
+		return "ALOHA";
+	case NL802154_CCA_UWB_SHR:
+		return "UWB preamble sense based on the SHR of a frame";
+	case NL802154_CCA_UWB_MULTIPEXED:
+		return "UWB preamble sense based on the packet with the multiplexed preamble";
+	default:
+		sprintf(cca_mode_buf, "Unknown CCA mode (%d)", cca_mode);
+		return cca_mode_buf;
+	}
+}
+
 static const char *commands[NL802154_CMD_MAX + 1] = {
 	[NL802154_CMD_UNSPEC] = "unspec",
 	[NL802154_CMD_GET_WPAN_PHY] = "get_wpan_phy",

Quoted 54 lines · Christoffer Holmstedt

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

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

src/info.c +35 -0

index 2434bef6a87f..364c02f718aa 100644
@@ -146,6 +146,41 @@ static void print_freq_handler(int channel_page, int channel)
 	}
 }
 
+static char cca_mode_buf[100];
+
+const char *print_cca_mode_handler(enum nl802154_cca_modes cca_mode,
+				   enum nl802154_cca_opts cca_opt)
+{
+	switch (cca_mode) {
+	case NL802154_CCA_ENERGY:
+		return "Energy above threshold";
+	case NL802154_CCA_CARRIER:
+		return "Carrier sense only";
+	case NL802154_CCA_ENERGY_CARRIER:
+		switch (cca_opt) {
+		case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
+			return "Carrier sense with energy above threshold (logical operator is 'and')";
+		case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
+			return "Carrier sense with energy above threshold (logical operator is 'or')";
+		default:
+			sprintf(cca_mode_buf,
+				"Unknown CCA option (%d) for CCA mode (%d)",
+				cca_opt,
+				cca_mode);
+			return cca_mode_buf;
+		}
+	case NL802154_CCA_ALOHA:
+		return "ALOHA";
+	case NL802154_CCA_UWB_SHR:
+		return "UWB preamble sense based on the SHR of a frame";
+	case NL802154_CCA_UWB_MULTIPEXED:
+		return "UWB preamble sense based on the packet with the multiplexed preamble";
+	default:
+		sprintf(cca_mode_buf, "Unknown CCA mode (%d)", cca_mode);
+		return cca_mode_buf;
+	}
+}
+
 static const char *commands[NL802154_CMD_MAX + 1] = {
 	[NL802154_CMD_UNSPEC] = "unspec",
 	[NL802154_CMD_GET_WPAN_PHY] = "get_wpan_phy",

@@ -235,23 +270,13 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
 	}
 

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 = 99;

use:

NL802154_CCA_OPT_ATTR_MAX

should always be invalid. Maybe there exists a better way to evaluate the tb_msg[NL802154_ATTR_CCA_MODE] first when somewhere is a cca_mode which have some option (like cca_mode == 3). I don't know how to do it _exactly_ better now. I am fine with your current solution.

Can you try to add first a patch which updates the nl802154.h from the kernel "just for syncing" and then replace the cca_mode printout. And please fixup patch 2 with 1.

Then you have:

1. patch which sync the nl802154 header with the kernel
2. patch which replace the cca modes printout with your implementation.

Current behaviour would have some state in wpan-tools which we havn't any cca output, this is the case when I apply patch 1 only in your series.

- Alex

This patch updates nl802154 enum to match the one in bluetooth-next tree from commit d446278c408b ("nl802154: fix misspelled enum").

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

Instead of printing out CCA mode and CCA options in integers descriptive text is now printed to the user when "iwpan list" is run.

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

---
I think I got all the changes right now as requested.

Changes v3 -> v4:
* Sent "nl802154: fix misspelled enum" patch separately (already merged).
* Did a "fixup" of remaining two patches so it is only one now.
* Changed "random" value of 99 to NL802154_CCA_OPT_ATTR_MAX.

Changes v2 -> v3:
* Fixed misspelled enum in nl802154

Changes v1 -> v2:
* cca_mode number is removed from "current cca_mode", only text is printed as an example:

cca_mode: Energy above threshold
was
cca_mode: 1, Energy above threshold

* Changed "enum" to string mapping in print_cca_mode_handler. Instead of printing out the strings in the function I return a tempbuf that is formatted by the caller.

* Added default value to cca_opt when printing current cca_mode and cca_opt. It is set to the "random" value of 99 as the enum only has 2 values, is this a proper solution? (or should we use limits.h with MAX_INT perhaps?)

 src/info.c | 100 +++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 39 deletions(-)

src/info.c +25 -0

index 2434bef6a87f..9b0780df0262 100644
@@ -146,6 +146,41 @@ static void print_freq_handler(int channel_page, int channel)
 	}
 }
 
+static char cca_mode_buf[100];
+
+const char *print_cca_mode_handler(enum nl802154_cca_modes cca_mode,
+				   enum nl802154_cca_opts cca_opt)
+{
+	switch (cca_mode) {
+	case NL802154_CCA_ENERGY:
+		return "Energy above threshold";
+	case NL802154_CCA_CARRIER:
+		return "Carrier sense only";
+	case NL802154_CCA_ENERGY_CARRIER:
+		switch (cca_opt) {
+		case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
+			return "Carrier sense with energy above threshold (logical operator is 'and')";
+		case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
+			return "Carrier sense with energy above threshold (logical operator is 'or')";
+		default:
+			sprintf(cca_mode_buf,
+				"Unknown CCA option (%d) for CCA mode (%d)",
+				cca_opt,
+				cca_mode);
+			return cca_mode_buf;
+		}
+	case NL802154_CCA_ALOHA:
+		return "ALOHA";

Quoted 11 lines · Christoffer Holmstedt

Instead of printing out CCA mode and CCA options in integers descriptive text is now printed to the user when "iwpan list" is run.

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

---
I think I got all the changes right now as requested.

Changes v3 -> v4:
* Sent "nl802154: fix misspelled enum" patch separately (already merged).
* Did a "fixup" of remaining two patches so it is only one now.
* Changed "random" value of 99 to NL802154_CCA_OPT_ATTR_MAX.

Quoted 5 lines

src/info.c +5 -0

+	case NL802154_CCA_UWB_SHR:
+		return "UWB preamble sense based on the SHR of a frame";
+	case NL802154_CCA_UWB_MULTIPLEXED:
+		return "UWB preamble sense based on the packet with the multiplexed preamble";
+	default:

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

Quoted 5 lines

src/info.c +5 -0

+		sprintf(cca_mode_buf, "Unknown CCA mode (%d)", cca_mode);
+		return cca_mode_buf;
+	}
+}
+

sorry, I see this now. Why not simple making this return values void of this function and doing instead of:

return "Carrier sense with energy above threshold (logical operator is 'or')";

a:

sprintf(cca_mode_buf, "%s", "Carrier sense with energy above threshold (logical operator is 'or')");
and always use the cca_mode_buf afterwards for printing.
Is this possible?

Then you can directly use the parameters for baking the cca_mode string, like:
sprintf(cca_mode, "mode %d, %s", cca_mode, "cca mode description");

After calling that function you can call:
printf("additional stuff %s\n", cca_mode_buf);

The function print_cca_mode_handler should be a helper function only to place the cca description inside the cca_mode_buf and it can be used until the next call of print_cca_mode_handler by printf or something else.

- Alex

Quoted 12 lines · Alexander Aring

Quoted 11 lines · Christoffer Holmstedt

Instead of printing out CCA mode and CCA options in integers descriptive text is now printed to the user when "iwpan list" is run.

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

---
I think I got all the changes right now as requested.

Changes v3 -> v4:
* Sent "nl802154: fix misspelled enum" patch separately (already merged).
* Did a "fixup" of remaining two patches so it is only one now.
* Changed "random" value of 99 to NL802154_CCA_OPT_ATTR_MAX.

...cut...

Quoted 5 lines

Quoted 5 lines

src/info.c +5 -0

+	case NL802154_CCA_UWB_SHR:
+		return "UWB preamble sense based on the SHR of a frame";
+	case NL802154_CCA_UWB_MULTIPLEXED:
+		return "UWB preamble sense based on the packet with the multiplexed preamble";
+	default:

Quoted 9 lines

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

Quoted 5 lines

src/info.c +5 -0

+		sprintf(cca_mode_buf, "Unknown CCA mode (%d)", cca_mode);
+		return cca_mode_buf;
+	}
+}
+

sorry, I see this now. Why not simple making this return values void of this function and doing instead of:

No need to say sorry, I appreciate all the feedback I can get. I hope I can return the favor in the future when I know the code base a little bit more.

Quoted 10 lines

return "Carrier sense with energy above threshold (logical operator is 'or')";

a:

sprintf(cca_mode_buf, "%s", "Carrier sense with energy above threshold (logical operator is 'or')");
and always use the cca_mode_buf afterwards for printing.
Is this possible?

Yes it is possible, I just prepared a patch for the change (haven't sent it to the list yet), will send it later today. One question first, should the declaration of the "cca_mode_buf" (file scope) be put at the top of the file or just above the helper function using it?

Quoted 14 lines

Then you can directly use the parameters for baking the cca_mode string, like:
sprintf(cca_mode, "mode %d, %s", cca_mode, "cca mode description");

After calling that function you can call:
printf("additional stuff %s\n", cca_mode_buf);

The function print_cca_mode_handler should be a helper function only to place the cca description inside the cca_mode_buf and it can be used until the next call of print_cca_mode_handler by printf or something else.

Quoted 1 line

- Alex

This new solution makes much more sense to me. The first implementation was inspired by *iftype_name() from interface.c, perhaps that should be refactored as well.

Quoted 1 line · Christoffer Holmstedt

On Wed, Jun 10, 2015 at 03:45:31PM +0200, Alexander Aring wrote:

Quoted 6 lines

Quoted 6 lines

The function print_cca_mode_handler should be a helper function only to place the cca description inside the cca_mode_buf and it can be used until the next call of print_cca_mode_handler by printf or something else.

Quoted 6 lines

Quoted 1 line

- Alex

This new solution makes much more sense to me. The first implementation was inspired by *iftype_name() from interface.c, perhaps that should be refactored as well.

then better maybe would be to leave the return value as "const char *" there and returning the buffer. Just if you need to "bake" some string with an format string, then use the temp buffer and build your string and return the buffer.

If it's just a "const char *" then just 'return "foobar";' but this isn't your case here because you want to put some numbers in there, for cca handling.

It's just:
The return of the temporary buffer allows us to use the helper printout functionality also from another c-file when the buffer is declared as static buffer.

- Alex

Instead of printing out CCA mode and CCA options in integers descriptive text is now printed to the user when "iwpan list" is run.

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

---
I think I got all the changes right now as requested.

Changes v3 -> v4:
* Sent "nl802154: fix misspelled enum" patch separately (already merged).
* Did a "fixup" of remaining two patches so it is only one now.
* Changed "random" value of 99 to NL802154_CCA_OPT_ATTR_MAX.

Changes v2 -> v3:
* Fixed misspelled enum in nl802154

Changes v1 -> v2:
* cca_mode number is removed from "current cca_mode", only text is printed as an example:

cca_mode: Energy above threshold
was
cca_mode: 1, Energy above threshold

* Changed "enum" to string mapping in print_cca_mode_handler. Instead of printing out the strings in the function I return a tempbuf that is formatted by the caller.

* Added default value to cca_opt when printing current cca_mode and cca_opt. It is set to the "random" value of 99 as the enum only has 2 values, is this a proper solution? (or should we use limits.h with MAX_INT perhaps?)

 src/info.c | 100 +++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 39 deletions(-)

src/info.c +0 -0

index 2434bef6a87f..9b0780df0262 100644
@@ -146,6 +146,41 @@ static void print_freq_handler(int channel_page, int channel)
 	}

src/info.c +40 -38

+	case NL802154_CCA_CARRIER:
+		return "Carrier sense only";
+	case NL802154_CCA_ENERGY_CARRIER:
+		switch (cca_opt) {
+		case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
+			return "Carrier sense with energy above threshold (logical operator is 'and')";
+		case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
+			return "Carrier sense with energy above threshold (logical operator is 'or')";
+		default:
+			sprintf(cca_mode_buf,
+				"Unknown CCA option (%d) for CCA mode (%d)",
+				cca_opt,
+				cca_mode);
+			return cca_mode_buf;
+		}
+	case NL802154_CCA_ALOHA:
+		return "ALOHA";
+	case NL802154_CCA_UWB_SHR:
+		return "UWB preamble sense based on the SHR of a frame";
+	case NL802154_CCA_UWB_MULTIPLEXED:
+		return "UWB preamble sense based on the packet with the multiplexed preamble";
+	default:
+		sprintf(cca_mode_buf, "Unknown CCA mode (%d)", cca_mode);
+		return cca_mode_buf;
+	}
+}
+
 static const char *commands[NL802154_CMD_MAX + 1] = {
 	[NL802154_CMD_UNSPEC] = "unspec",
 	[NL802154_CMD_GET_WPAN_PHY] = "get_wpan_phy",

@@ -235,23 +270,13 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
 	}
 
 	if (tb_msg[NL802154_ATTR_CCA_MODE]) {
+		enum nl802154_cca_opts cca_opt = NL802154_CCA_OPT_ATTR_MAX;
+		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: %s", print_cca_mode_handler(cca_mode, cca_opt));
 		printf("\n");
 	}
 

@@ -361,33 +386,30 @@ 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));
-			/* TODO */
-			printf("\b \n");
-		}
-
-		if (tb_caps[NL802154_CAP_ATTR_CCA_OPTS]) {
-			struct nlattr *nl_cca_opts;
-			int rem_cca_opts;
-
-			printf("\tcca_opts: ");
-			nla_for_each_nested(nl_cca_opts,
-					    tb_caps[NL802154_CAP_ATTR_CCA_OPTS],
-					    rem_cca_opts) {
-				printf("%d", nla_type(nl_cca_opts));
-				switch (nla_type(nl_cca_opts)) {
-				case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
-				case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
-					printf("(cca_mode: 3),");
-					break;
-				default:
-					printf("unkown\n");
-					break;
+					    rem_cca_modes) {
+				if (nla_type(nl_cca_modes) != NL802154_CCA_ENERGY_CARRIER) {
+					printf("\n\t\t(%d) %s",
+						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;

Quoted 4 lines · Christoffer Holmstedt

Instead of printing out CCA mode and CCA options in integers descriptive text is now printed to the user when "iwpan list" is run.

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

I would apply this patch now. This is the nearest solution which I would ack. Reason see below. Tell me if you are fine with that.

Quoted 16 lines

---
I think I got all the changes right now as requested.

Changes v3 -> v4:
* Sent "nl802154: fix misspelled enum" patch separately (already merged).
* Did a "fixup" of remaining two patches so it is only one now.
* Changed "random" value of 99 to NL802154_CCA_OPT_ATTR_MAX.

Changes v2 -> v3:
* Fixed misspelled enum in nl802154

Changes v1 -> v2:
* cca_mode number is removed from "current cca_mode", only text is printed as an example:

Quoted 4 lines

cca_mode: Energy above threshold
was
cca_mode: 1, Energy above threshold

The reason why we have the helper function is too have the look and feel everywhere the same for the one enum definition.

Quoted 18 lines

* Changed "enum" to string mapping in print_cca_mode_handler. Instead of printing out the strings in the function I return a tempbuf that is formatted by the caller.

* Added default value to cca_opt when printing current cca_mode and cca_opt. It is set to the "random" value of 99 as the enum only has 2 values, is this a proper solution? (or should we use limits.h with MAX_INT perhaps?)

 src/info.c | 100 +++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 39 deletions(-)

src/info.c +0 -0

index 2434bef6a87f..9b0780df0262 100644
@@ -146,6 +146,41 @@ static void print_freq_handler(int channel_page, int channel)
 	}

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

Quoted 10 lines

src/info.c +8 -0

 }
 
+static char cca_mode_buf[100];
+
+const char *print_cca_mode_handler(enum nl802154_cca_modes cca_mode,
+				   enum nl802154_cca_opts cca_opt)
+{
+	switch (cca_mode) {
+	case NL802154_CCA_ENERGY:
+		return "Energy above threshold";

Don't add the enum numbers afterwards, do that here with sprintf and return the cca_mode_buf. Like you did that for the default case of cca_opt.

Example:

You do afterwards:
printf("\n\t\t(%d) %s"....);

then simple do a:

sprintf(cca_mode_buf, "(%d) %s", cca_mode, "Energy above threshold"); return cca_mode_buf;

If you _really_ like to remove the cca_mode _number_ (in case of current cca), then make some bool argument with_numbers and change the format string here.

Quoted 94 lines

src/info.c +40 -38

+	case NL802154_CCA_CARRIER:
+		return "Carrier sense only";
+	case NL802154_CCA_ENERGY_CARRIER:
+		switch (cca_opt) {
+		case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
+			return "Carrier sense with energy above threshold (logical operator is 'and')";
+		case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
+			return "Carrier sense with energy above threshold (logical operator is 'or')";
+		default:
+			sprintf(cca_mode_buf,
+				"Unknown CCA option (%d) for CCA mode (%d)",
+				cca_opt,
+				cca_mode);
+			return cca_mode_buf;
+		}
+	case NL802154_CCA_ALOHA:
+		return "ALOHA";
+	case NL802154_CCA_UWB_SHR:
+		return "UWB preamble sense based on the SHR of a frame";
+	case NL802154_CCA_UWB_MULTIPLEXED:
+		return "UWB preamble sense based on the packet with the multiplexed preamble";
+	default:
+		sprintf(cca_mode_buf, "Unknown CCA mode (%d)", cca_mode);
+		return cca_mode_buf;
+	}
+}
+
 static const char *commands[NL802154_CMD_MAX + 1] = {
 	[NL802154_CMD_UNSPEC] = "unspec",
 	[NL802154_CMD_GET_WPAN_PHY] = "get_wpan_phy",

@@ -235,23 +270,13 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
 	}
 
 	if (tb_msg[NL802154_ATTR_CCA_MODE]) {
+		enum nl802154_cca_opts cca_opt = NL802154_CCA_OPT_ATTR_MAX;
+		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: %s", print_cca_mode_handler(cca_mode, cca_opt));
 		printf("\n");
 	}
 

@@ -361,33 +386,30 @@ 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));
-			/* TODO */
-			printf("\b \n");
-		}
-
-		if (tb_caps[NL802154_CAP_ATTR_CCA_OPTS]) {
-			struct nlattr *nl_cca_opts;
-			int rem_cca_opts;
-
-			printf("\tcca_opts: ");
-			nla_for_each_nested(nl_cca_opts,
-					    tb_caps[NL802154_CAP_ATTR_CCA_OPTS],
-					    rem_cca_opts) {
-				printf("%d", nla_type(nl_cca_opts));
-				switch (nla_type(nl_cca_opts)) {
-				case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
-				case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
-					printf("(cca_mode: 3),");
-					break;
-				default:
-					printf("unkown\n");
-					break;
+					    rem_cca_modes) {
+				if (nla_type(nl_cca_modes) != NL802154_CCA_ENERGY_CARRIER) {
+					printf("\n\t\t(%d) %s",
+						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;

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

Quoted 10 lines

src/info.c +10 -0

+						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, cca_opt: %d) %s",
+								nla_type(nl_cca_modes),
+								nla_type(nl_cca_opts),
+								print_cca_mode_handler(nla_type(nl_cca_modes), nla_type(nl_cca_opts)));

Replace this one then with:

printf("\n\t\t%s", print_cca_mode_handler(nla_type(nl_cca_modes), nla_type(nl_cca_opts)));

no special handling is needed here anymore for NL802154_CCA_ENERGY_CARRIER.

- Alex

Instead of printing out CCA mode and CCA options in integers descriptive text is now printed to the user when "iwpan list" is run.

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