comparison: bmsd/mysql.c
bmsd/mysql.c
- changeset 703
- faeede125639
- parent 684
- ccb9f24d0fe9
- child 705
- d77b723f7b35
equal
deleted
inserted
replaced
| 702:f0896a6f9b64 | 703:faeede125639 |
|---|---|
| 116 node->gps_altitude = atof(row[17]); | 116 node->gps_altitude = atof(row[17]); |
| 117 node->net_address = xstrcpy(row[18]); | 117 node->net_address = xstrcpy(row[18]); |
| 118 node->net_ifname = xstrcpy(row[19]); | 118 node->net_ifname = xstrcpy(row[19]); |
| 119 node->net_rssi = atoi(row[20]); | 119 node->net_rssi = atoi(row[20]); |
| 120 node->interval = atoi(row[21]); | 120 node->interval = atoi(row[21]); |
| 121 node->net_ssid = xstrcpy(row[22]); | |
| 121 | 122 |
| 122 if (nodes == NULL) { | 123 if (nodes == NULL) { |
| 123 nodes = node; | 124 nodes = node; |
| 124 } else { | 125 } else { |
| 125 for (tmpp = nodes; tmpp; tmpp = tmpp->next) { | 126 for (tmpp = nodes; tmpp; tmpp = tmpp->next) { |
| 452 free(tmpn->firmware); | 453 free(tmpn->firmware); |
| 453 if (tmpn->net_address) | 454 if (tmpn->net_address) |
| 454 free(tmpn->net_address); | 455 free(tmpn->net_address); |
| 455 if (tmpn->net_ifname) | 456 if (tmpn->net_ifname) |
| 456 free(tmpn->net_ifname); | 457 free(tmpn->net_ifname); |
| 458 if (tmpn->net_ssid) | |
| 459 free(tmpn->net_ssid); | |
| 457 free(tmpn); | 460 free(tmpn); |
| 458 } | 461 } |
| 459 } | 462 } |
| 460 | 463 |
| 461 | 464 |
| 514 | 517 |
| 515 snprintf(query, 1023, | 518 snprintf(query, 1023, |
| 516 "INSERT INTO mon_nodes SET uuid='%s', node='%s', online='%d', group_id='%s', " \ | 519 "INSERT INTO mon_nodes SET uuid='%s', node='%s', online='%d', group_id='%s', " \ |
| 517 "hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', firstseen='%s', lastseen='%s', " \ | 520 "hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', firstseen='%s', lastseen='%s', " \ |
| 518 "temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \ | 521 "temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \ |
| 519 "net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d'", | 522 "net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d', net_ssid='%s'", |
| 520 node->uuid, node->node, node->online ?1:0, node->group_id, | 523 node->uuid, node->node, node->online ?1:0, node->group_id, |
| 521 node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, first, last, | 524 node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, first, last, |
| 522 node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude, | 525 node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude, |
| 523 node->net_address, node->net_ifname, node->net_rssi, node->interval); | 526 node->net_address, node->net_ifname, node->net_rssi, node->interval, node->net_ssid); |
| 524 | 527 |
| 525 if (bms_mysql_query(query) == 0) { | 528 if (bms_mysql_query(query) == 0) { |
| 526 syslog(LOG_NOTICE, "MySQL: insert new node %s", node->node); | 529 syslog(LOG_NOTICE, "MySQL: insert new node %s", node->node); |
| 527 } | 530 } |
| 528 | 531 |
| 541 mytime->tm_year + 1900, mytime->tm_mon + 1, mytime->tm_mday, mytime->tm_hour, mytime->tm_min, mytime->tm_sec); | 544 mytime->tm_year + 1900, mytime->tm_mon + 1, mytime->tm_mday, mytime->tm_hour, mytime->tm_min, mytime->tm_sec); |
| 542 | 545 |
| 543 snprintf(query, 1023, | 546 snprintf(query, 1023, |
| 544 "UPDATE mon_nodes SET online='%d', hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', lastseen='%s', " \ | 547 "UPDATE mon_nodes SET online='%d', hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', lastseen='%s', " \ |
| 545 "temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \ | 548 "temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \ |
| 546 "net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d' WHERE uuid='%s'", | 549 "net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d', net_ssid='%s' WHERE uuid='%s'", |
| 547 node->online ? 1:0, node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, last, | 550 node->online ? 1:0, node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, last, |
| 548 node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude, | 551 node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude, |
| 549 node->net_address, node->net_ifname, node->net_rssi, node->interval, node->uuid); | 552 node->net_address, node->net_ifname, node->net_rssi, node->interval, node->net_ssid, node->uuid); |
| 550 | 553 |
| 551 bms_mysql_query(query); | 554 bms_mysql_query(query); |
| 552 free(query); | 555 free(query); |
| 553 } | 556 } |
| 554 | 557 |
