udp: update protocol format

Signed-off-by: David Bauer <[email protected]>

openwrt/ffda-oob-state-reporter/files/ffda-oob-state-reporter.init

@@ -10,17 +10,19 @@ start_service() {
 	local port="$(uci -q get ffda-oob-state-reporter.core.port)"
 	local interval="$(uci -q get ffda-oob-state-reporter.core.interval)"
 	local log_level="$(uci -q get ffda-oob-state-reporter.core.log_level)"
+	local reporter_id="$(uci -q get ffda-oob-state-reporter.core.reporter_id)"
 
 	[ -z "$interval" ] && interval=600
 	[ -z "$port" ] && port=1234
 	[ -z "$host" ] && return
 
 	[ -z "$log_level" ] && log_level=3
+	[ -z "$reporter_id" ] && return
 
 	[ "$enabled" -gt 0 ] || return
 
 	procd_open_instance
-	procd_set_param command /sbin/ffda-oob-state-reporter -s -i "$interval" -h "$host" -p "$port" -l "$log_level"
+	procd_set_param command /sbin/ffda-oob-state-reporter -s -i "$interval" -h "$host" -p "$port" -l "$log_level" -r "$reporter_id"
 	procd_set_param respawn 60 5 5
 	procd_close_instance
 }

src/reporter.c

@@ -81,9 +81,10 @@ static void fosr_work(struct uloop_timeout *timeout)
 
 static int fosr_parse_config(struct fosr *fosr, int argc, char *argv[])
 {
+	int reporter_id = 0;
 	int c;
 
-	while ((c = getopt (argc, argv, "h:i:l:p:s")) != -1) {
+	while ((c = getopt (argc, argv, "h:i:l:p:r:s")) != -1) {
 		switch (c){
 			case 'h':
 				fosr->config.host = optarg;
@@ -97,6 +98,9 @@ static int fosr_parse_config(struct fosr *fosr, int argc, char *argv[])
 			case 'p':
 				fosr->config.port = atoi(optarg);
 				break;
+			case 'r':
+				reporter_id = atoi(optarg);
+				break;
 			case 's':
 				fosr_log_set_syslog(1);
 				break;
@@ -127,6 +131,18 @@ static int fosr_parse_config(struct fosr *fosr, int argc, char *argv[])
 		return 1;
 	}
 
+	if (!reporter_id) {
+		MSG(ERROR, "Missing reporter id\n");
+		return 1;
+	}
+
+	if (reporter_id < 0 || reporter_id > 65535) {
+		MSG(ERROR, "Invalid reporter id. Minimum: 0, Maximum: 65535\n");
+		return 1;
+	}
+
+	fosr->config.reporter_id = reporter_id;
+
 	return 0;
 }
 

src/reporter.h

@@ -17,6 +17,8 @@ struct fosr_config {
     const char *host;
     uint16_t port;
     int32_t interval;
+
+    uint16_t reporter_id;
 };
 
 enum fosr_submission_reason {

src/udp.c

@@ -28,8 +28,9 @@ static int fosr_udp_submit_getaddr(int family, const char *host, uint16_t port,
 
 int fosr_udp_submit(struct fosr *fosr, struct fosr_metrics *metrics)
 {
-	uint8_t submission_bufffer[3];
+	uint8_t submission_bufffer[6];
 	struct addrinfo *res = NULL;
+	uint16_t reporter_id;
 	int ret = 0;
 	int fd = -1;
 
@@ -46,9 +47,17 @@ int fosr_udp_submit(struct fosr *fosr, struct fosr_metrics *metrics)
 		goto out_free;
 	}
 
-	submission_bufffer[0] = (uint8_t)metrics->soc;
-	submission_bufffer[1] = metrics->charging ? 0xff : 0x00;
-	submission_bufffer[2] = (uint8_t)metrics->temperature;
+	/* Protocol version */
+	submission_bufffer[0] = 1;
+
+	/* Reporter ID */
+	reporter_id = htons(fosr->config.reporter_id);
+	memcpy(&submission_bufffer[1], &reporter_id, sizeof(fosr->config.reporter_id));
+
+	/* Metrics */
+	submission_bufffer[3] = (uint8_t)metrics->soc;
+	submission_bufffer[4] = metrics->charging ? 0xff : 0x00;
+	submission_bufffer[5] = (uint8_t)metrics->temperature;
 
 	if (sendto(fd, submission_bufffer, sizeof(submission_bufffer), 0, res->ai_addr, res->ai_addrlen) < 0) {
 		/* Don't be spammy, we have retry */