comparison: bmsd/nodes.c
bmsd/nodes.c
- changeset 703
- faeede125639
- parent 695
- cfe232710027
- child 792
- 36d51473aa81
equal
deleted
inserted
replaced
| 702:f0896a6f9b64 | 703:faeede125639 |
|---|---|
| 80 node->online = true; | 80 node->online = true; |
| 81 node->hardwaremake = node->hardwaremodel = node->os = node->os_version = node->firmware = NULL; | 81 node->hardwaremake = node->hardwaremodel = node->os = node->os_version = node->firmware = NULL; |
| 82 node->firstseen = node->lastseen = time(NULL); | 82 node->firstseen = node->lastseen = time(NULL); |
| 83 node->temperature = node->humidity = node->barometer = 0.0; | 83 node->temperature = node->humidity = node->barometer = 0.0; |
| 84 node->gps_latitude = node->gps_longitude = node->gps_altitude = 0.0; | 84 node->gps_latitude = node->gps_longitude = node->gps_altitude = 0.0; |
| 85 node->net_address = node->net_ifname = NULL; | 85 node->net_address = node->net_ifname = node->net_ssid = NULL; |
| 86 node->net_rssi = 0; | 86 node->net_rssi = 0; |
| 87 node->interval = 300; | 87 node->interval = 300; |
| 88 } | 88 } |
| 89 | 89 |
| 90 /* | 90 /* |
| 169 if (json_object_object_get_ex(metric2, "ifname", &val)) { | 169 if (json_object_object_get_ex(metric2, "ifname", &val)) { |
| 170 if (node->net_ifname) | 170 if (node->net_ifname) |
| 171 free(node->net_ifname); | 171 free(node->net_ifname); |
| 172 node->net_ifname = xstrcpy((char *)json_object_get_string(val)); | 172 node->net_ifname = xstrcpy((char *)json_object_get_string(val)); |
| 173 } | 173 } |
| 174 if (json_object_object_get_ex(metric2, "ssid", &val)) { | |
| 175 if (node->net_ssid) | |
| 176 free(node->net_ssid); | |
| 177 node->net_ssid = xstrcpy((char *)json_object_get_string(val)); | |
| 178 } | |
| 174 if (json_object_object_get_ex(metric2, "rssi", &val)) { | 179 if (json_object_object_get_ex(metric2, "rssi", &val)) { |
| 175 node->net_rssi = json_object_get_int(val); | 180 node->net_rssi = json_object_get_int(val); |
| 176 } | 181 } |
| 177 } | 182 } |
| 178 } | 183 } |
| 231 msg = xstrcat(msg, (char *)",\"net_ifname\":\""); | 236 msg = xstrcat(msg, (char *)",\"net_ifname\":\""); |
| 232 msg = xstrcat(msg, node->net_ifname); | 237 msg = xstrcat(msg, node->net_ifname); |
| 233 msg = xstrcat(msg, (char *)"\",\"net_address\":\""); | 238 msg = xstrcat(msg, (char *)"\",\"net_address\":\""); |
| 234 msg = xstrcat(msg, node->net_address); | 239 msg = xstrcat(msg, node->net_address); |
| 235 msg = xstrcat(msg, (char *)"\""); | 240 msg = xstrcat(msg, (char *)"\""); |
| 241 if (node->net_ssid) { | |
| 242 msg = xstrcat(msg, (char *)",\"net_ssid\":\""); | |
| 243 msg = xstrcat(msg, node->net_ssid); | |
| 244 msg = xstrcat(msg, (char *)"\""); | |
| 245 } | |
| 236 if (node->net_rssi != 0) { | 246 if (node->net_rssi != 0) { |
| 237 msg = xstrcat(msg, (char *)",\"net_rssi\":"); | 247 msg = xstrcat(msg, (char *)",\"net_rssi\":"); |
| 238 snprintf(buf, 64, "%d", node->net_rssi); | 248 snprintf(buf, 64, "%d", node->net_rssi); |
| 239 msg = xstrcat(msg, buf); | 249 msg = xstrcat(msg, buf); |
| 240 } | 250 } |
| 276 printf("firmware %s\n", node->firmware); | 286 printf("firmware %s\n", node->firmware); |
| 277 printf("first %ld last %ld\n", node->firstseen, node->lastseen); | 287 printf("first %ld last %ld\n", node->firstseen, node->lastseen); |
| 278 printf("THB %.2f %.2f %.2f\n", node->temperature, node->humidity, node->barometer); | 288 printf("THB %.2f %.2f %.2f\n", node->temperature, node->humidity, node->barometer); |
| 279 printf("GPS %.5f %.5f %.5f\n", node->gps_latitude, node->gps_longitude, node->gps_altitude); | 289 printf("GPS %.5f %.5f %.5f\n", node->gps_latitude, node->gps_longitude, node->gps_altitude); |
| 280 printf("net %s:%s\n", node->net_ifname, node->net_address); | 290 printf("net %s:%s\n", node->net_ifname, node->net_address); |
| 281 printf("rssi %d\n", node->net_rssi); | 291 printf("ssid rssi %s %d\n", node->net_ssid, node->net_rssi); |
| 282 printf("interval %d\n", node->interval); | 292 printf("interval %d\n", node->interval); |
| 283 } | 293 } |
| 284 } | 294 } |
| 285 | 295 |
| 286 | 296 |
