From 8d53ff54e562ddb2ed8397781dd78edc76f6ff38 Mon Sep 17 00:00:00 2001
From: "aiyion.prime" <git@aiyionpri.me>
Date: Sun, 18 Apr 2021 11:50:36 +0200
Subject: [PATCH] respondd-module-airtime: add idx

implements freifunk-gluon/gluon#2204
---
 net/respondd-module-airtime/README.md      | 10 ++++++++--
 net/respondd-module-airtime/src/respondd.c | 12 +++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/net/respondd-module-airtime/README.md b/net/respondd-module-airtime/README.md
index eb82b0c..eb22845 100644
--- a/net/respondd-module-airtime/README.md
+++ b/net/respondd-module-airtime/README.md
@@ -11,7 +11,8 @@ The format is the following:
         "busy": 46496566,
         "rx": 808415,
         "tx": 41711344,
-        "noise": 162
+        "noise": 162,
+        "phy": 1
       },
       {
         "frequency": 2437,
@@ -19,7 +20,8 @@ The format is the following:
         "busy": 205221222,
         "rx": 108121446,
         "tx": 85453679,
-        "noise": 161
+        "noise": 161,
+        "phy": 0
       }
     ]
   }
@@ -29,8 +31,12 @@ The format is the following:
 The numbers `active`, `busy`, `rx` and `tx` are times in milliseconds, where
 `busy`, `rx` and `tx` have to be interpreted by taking the quotient with
 `active`.
+`phy` is the index of the radio in the mac80211 subsystem.
 
 The motivation for having a list with the frequency as a value in the objects
 instead of having an object with the frequency as keys is that multiple wifi
 devices might be present, in which case the same frequency can appear multiple
 times (because the statistics are reported once for every phy).
+
+The field `phy` is added to distinguish multiple radios in the same band.
+It is not the key of mapped data due to backwards compatibility.
diff --git a/net/respondd-module-airtime/src/respondd.c b/net/respondd-module-airtime/src/respondd.c
index 4648bd4..4423b10 100644
--- a/net/respondd-module-airtime/src/respondd.c
+++ b/net/respondd-module-airtime/src/respondd.c
@@ -7,7 +7,9 @@
 #include "ifaces.h"
 
 static struct json_object *respondd_provider_statistics(void) {
-	struct json_object *result, *wireless;
+	bool ok;
+	int newest_element_index;
+	struct json_object *last, *result, *wireless;
 	struct iface_list *ifaces;
 
 	result = json_object_new_object();
@@ -22,8 +24,12 @@ static struct json_object *respondd_provider_statistics(void) {
 
 	ifaces = get_ifaces();
 	while (ifaces != NULL) {
-		get_airtime(wireless, ifaces->ifx);
-
+		ok = get_airtime(wireless, ifaces->ifx);
+		if (ok) {
+			newest_element_index = json_object_array_length(wireless)-1;
+			last = json_object_array_get_idx(wireless, newest_element_index);
+			json_object_object_add(last, "phy", json_object_new_int(ifaces->wiphy));
+		}
 		void *freeptr = ifaces;
 		ifaces = ifaces->next;
 		free(freeptr);