Mercurial > bms / file diff

--- a/bmsd/mysql.c	Sat Jun 13 13:50:57 2020 +0200
+++ b/bmsd/mysql.c	Mon Jun 15 20:26:46 2020 +0200
@@ -118,6 +118,7 @@
 		node->net_ifname    = xstrcpy(row[19]);
 		node->net_rssi      = atoi(row[20]);
 		node->interval      = atoi(row[21]);
+		node->net_ssid	    = xstrcpy(row[22]);
 
 		if (nodes == NULL) {
 		    nodes = node;
@@ -454,6 +455,8 @@
 	    free(tmpn->net_address);
 	if (tmpn->net_ifname)
 	    free(tmpn->net_ifname);
+	if (tmpn->net_ssid)
+	    free(tmpn->net_ssid);
 	free(tmpn);
     }
 }
@@ -516,11 +519,11 @@
 	"INSERT INTO  mon_nodes SET uuid='%s', node='%s', online='%d', group_id='%s', " \
         "hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', firstseen='%s', lastseen='%s', " \
 	"temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \
-	"net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d'",
+	"net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d', net_ssid='%s'",
 	node->uuid, node->node, node->online ?1:0, node->group_id, 
 	node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, first, last,
 	node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude,
-	node->net_address, node->net_ifname, node->net_rssi, node->interval);
+	node->net_address, node->net_ifname, node->net_rssi, node->interval, node->net_ssid);
 
     if (bms_mysql_query(query) == 0) {
 	syslog(LOG_NOTICE,  "MySQL: insert new node %s", node->node);
@@ -543,10 +546,10 @@
     snprintf(query, 1023,
 	"UPDATE mon_nodes SET online='%d', hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', lastseen='%s', " \
 	"temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \
-	"net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d' WHERE uuid='%s'",
+	"net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d', net_ssid='%s' WHERE uuid='%s'",
 	node->online ? 1:0, node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, last,
 	node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude, 
-	node->net_address, node->net_ifname, node->net_rssi, node->interval, node->uuid);
+	node->net_address, node->net_ifname, node->net_rssi, node->interval, node->net_ssid, node->uuid);
 
     bms_mysql_query(query);
     free(query);