rename script_data to node_info

It's a more descriptive name, and we will have host_info later as well

Signed-off-by: Felix Fietkau <nbd@nbd.name>

local_node.c

@@ -62,7 +62,7 @@ usteer_free_node(struct ubus_context *ctx, struct usteer_local_node *ln)
 	uloop_timeout_cancel(&ln->update);
 	avl_delete(&local_nodes, &ln->node.avl);
 	ubus_unregister_subscriber(ctx, &ln->ev);
-	kvlist_free(&ln->script_data);
+	kvlist_free(&ln->node_info);
 	free(ln);
 }
 
@@ -375,7 +375,7 @@ usteer_get_node(struct ubus_context *ctx, const char *name)
 	ln->req_timer.cb = usteer_local_node_state_next;
 	ubus_register_subscriber(ctx, &ln->ev);
 	avl_insert(&local_nodes, &node->avl);
-	kvlist_init(&ln->script_data, kvlist_blob_len);
+	kvlist_init(&ln->node_info, kvlist_blob_len);
 	INIT_LIST_HEAD(&node->sta_info);
 
 	return ln;
@@ -506,13 +506,13 @@ node_list_cb(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv)
 	usteer_register_node(ctx, obj->path, obj->id);
 }
 
-void usteer_local_node_update_script_data(struct usteer_local_node *ln)
+void usteer_local_node_update_node_info(struct usteer_local_node *ln)
 {
 	struct blob_attr *val;
 	const char *name;
 
 	blob_buf_init(&b, 0);
-	kvlist_for_each(&ln->script_data, name, val)
+	kvlist_for_each(&ln->node_info, name, val)
 		blobmsg_add_field(&b, blobmsg_type(val), name,
 				  blobmsg_data(val), blobmsg_len(val));
 
@@ -520,7 +520,7 @@ void usteer_local_node_update_script_data(struct usteer_local_node *ln)
 	if (!blobmsg_len(val))
 		val = NULL;
 
-	usteer_node_set_blob(&ln->node.script_data, val);
+	usteer_node_set_blob(&ln->node.node_info, val);
 }
 
 void config_set_node_up_script(struct blob_attr *data)

monitor.c

@@ -94,9 +94,9 @@ decode_node(struct blob_attr *data)
 		fprintf(stderr, "\n");
 	}
 
-	if (msg.script_data) {
-		char *data = blobmsg_format_json(msg.script_data, true);
-		fprintf(stderr, "\t\tScript data: %s\n", data);
+	if (msg.node_info) {
+		char *data = blobmsg_format_json(msg.node_info, true);
+		fprintf(stderr, "\t\tNode info: %s\n", data);
 		free(data);
 	}
 

node.h

@@ -51,7 +51,7 @@ struct usteer_local_node {
 
 	uint64_t time, time_busy;
 
-	struct kvlist script_data;
+	struct kvlist node_info;
 
 	struct {
 		bool present;

parse.c

@@ -60,7 +60,7 @@ bool parse_apmsg_node(struct apmsg_node *msg, struct blob_attr *data)
 		[APMSG_NODE_NOISE] = { .type = BLOB_ATTR_INT32 },
 		[APMSG_NODE_LOAD] = { .type = BLOB_ATTR_INT32 },
 		[APMSG_NODE_RRM_NR] = { .type = BLOB_ATTR_NESTED },
-		[APMSG_NODE_SCRIPT_DATA] = { .type = BLOB_ATTR_NESTED },
+		[APMSG_NODE_NODE_INFO] = { .type = BLOB_ATTR_NESTED },
 	};
 	struct blob_attr *tb[__APMSG_NODE_MAX];
 	struct blob_attr *cur;
@@ -105,7 +105,7 @@ bool parse_apmsg_node(struct apmsg_node *msg, struct blob_attr *data)
 			msg->rrm_nr = NULL;
 	}
 
-	msg->script_data = tb[APMSG_NODE_SCRIPT_DATA];
+	msg->node_info = tb[APMSG_NODE_NODE_INFO];
 
 	return true;
 }

remote.c

@@ -240,7 +240,7 @@ interface_add_node(struct interface *iface, const char *addr, unsigned long id,
 	node->iface = iface;
 	snprintf(node->node.ssid, sizeof(node->node.ssid), "%s", msg.ssid);
 	usteer_node_set_blob(&node->node.rrm_nr, msg.rrm_nr);
-	usteer_node_set_blob(&node->node.script_data, msg.script_data);
+	usteer_node_set_blob(&node->node.node_info, msg.node_info);
 
 	blob_for_each_attr(cur, msg.stations, rem)
 		interface_add_station(node, cur);
@@ -422,10 +422,10 @@ static void usteer_send_node(struct usteer_node *node, struct sta_info *sta)
 		blob_nest_end(&buf, r);
 	}
 
-	if (node->script_data)
-		blob_put(&buf, APMSG_NODE_SCRIPT_DATA,
-			 blob_data(node->script_data),
-			 blob_len(node->script_data));
+	if (node->node_info)
+		blob_put(&buf, APMSG_NODE_NODE_INFO,
+			 blob_data(node->node_info),
+			 blob_len(node->node_info));
 
 	s = blob_nest_start(&buf, APMSG_NODE_STATIONS);
 

remote.h

@@ -45,7 +45,7 @@ enum {
 	APMSG_NODE_SSID,
 	APMSG_NODE_MAX_ASSOC,
 	APMSG_NODE_RRM_NR,
-	APMSG_NODE_SCRIPT_DATA,
+	APMSG_NODE_NODE_INFO,
 	__APMSG_NODE_MAX
 };
 
@@ -59,7 +59,7 @@ struct apmsg_node {
 	int load;
 	struct blob_attr *stations;
 	struct blob_attr *rrm_nr;
-	struct blob_attr *script_data;
+	struct blob_attr *node_info;
 };
 
 enum {

ubus.c

@@ -281,10 +281,10 @@ usteer_dump_node(struct usteer_node *node)
 		blobmsg_add_field(&b, BLOBMSG_TYPE_ARRAY, "rrm_nr",
 				  blobmsg_data(node->rrm_nr),
 				  blobmsg_data_len(node->rrm_nr));
-	if (node->script_data)
-		blobmsg_add_field(&b, BLOBMSG_TYPE_TABLE, "script_data",
-				  blob_data(node->script_data),
-				  blob_len(node->script_data));
+	if (node->node_info)
+		blobmsg_add_field(&b, BLOBMSG_TYPE_TABLE, "node_info",
+				  blob_data(node->node_info),
+				  blob_len(node->node_info));
 
 	blobmsg_close_table(&b, c);
 }
@@ -348,12 +348,12 @@ __usteer_ubus_update_node_data(struct usteer_local_node *ln, struct blob_attr *d
 
 	blobmsg_for_each_attr(cur, data, rem) {
 		if (delete)
-			kvlist_delete(&ln->script_data, blobmsg_get_string(cur));
+			kvlist_delete(&ln->node_info, blobmsg_get_string(cur));
 		else
-			kvlist_set(&ln->script_data, blobmsg_name(cur), cur);
+			kvlist_set(&ln->node_info, blobmsg_name(cur), cur);
 	}
 
-	usteer_local_node_update_script_data(ln);
+	usteer_local_node_update_node_info(ln);
 }
 
 static int

usteer.h

@@ -61,7 +61,7 @@ struct usteer_node {
 	enum usteer_node_type type;
 
 	struct blob_attr *rrm_nr;
-	struct blob_attr *script_data;
+	struct blob_attr *node_info;
 	char ssid[33];
 
 	bool disabled;
@@ -230,7 +230,7 @@ bool usteer_handle_sta_event(struct usteer_node *node, const uint8_t *addr,
 
 void usteer_local_nodes_init(struct ubus_context *ctx);
 void usteer_local_node_kick(struct usteer_local_node *ln);
-void usteer_local_node_update_script_data(struct usteer_local_node *ln);
+void usteer_local_node_update_node_info(struct usteer_local_node *ln);
 
 void usteer_ubus_init(struct ubus_context *ctx);
 void usteer_ubus_kick_client(struct sta_info *si);