aboutsummaryrefslogtreecommitdiff
path: root/src/sensor/gnunet-service-sensor.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sensor/gnunet-service-sensor.c')
-rw-r--r--src/sensor/gnunet-service-sensor.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/sensor/gnunet-service-sensor.c b/src/sensor/gnunet-service-sensor.c
index 2f7ffaa0a..5a574f77d 100644
--- a/src/sensor/gnunet-service-sensor.c
+++ b/src/sensor/gnunet-service-sensor.c
@@ -365,9 +365,9 @@ reload_sensors_dir_cb(void *cls, const char *filename)
365 return GNUNET_OK; 365 return GNUNET_OK;
366 } 366 }
367 if(GNUNET_YES == add_sensor_to_hashmap(sensor, sensors)) 367 if(GNUNET_YES == add_sensor_to_hashmap(sensor, sensors))
368 GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Sensor `%s' added to global hashmap\n"), sensor->name); 368 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, _("Sensor `%s' added to global hashmap\n"), sensor->name);
369 else 369 else
370 GNUNET_log(GNUNET_ERROR_TYPE_INFO, ("Could not add sensor `%s' to global hashmap\n"), sensor->name); 370 GNUNET_log(GNUNET_ERROR_TYPE_WARNING, ("Could not add sensor `%s' to global hashmap\n"), sensor->name);
371 371
372 return GNUNET_OK; 372 return GNUNET_OK;
373} 373}
@@ -413,7 +413,7 @@ reload_sensors()
413/** 413/**
414 * Creates a structure with basic sensor info to be sent to a client 414 * Creates a structure with basic sensor info to be sent to a client
415 * 415 *
416 * @parm sensor sensor information 416 * @param sensor sensor information
417 * @return message ready to be sent to client 417 * @return message ready to be sent to client
418 */ 418 */
419static struct SensorInfoMessage * 419static struct SensorInfoMessage *
@@ -423,6 +423,7 @@ create_sensor_info_msg(struct SensorInfo *sensor)
423 uint16_t len; 423 uint16_t len;
424 size_t name_len; 424 size_t name_len;
425 size_t desc_len; 425 size_t desc_len;
426 char *str_ptr;
426 427
427 name_len = strlen(sensor->name); 428 name_len = strlen(sensor->name);
428 if(NULL == sensor->description) 429 if(NULL == sensor->description)
@@ -440,8 +441,14 @@ create_sensor_info_msg(struct SensorInfo *sensor)
440 msg->description_len = htons(desc_len); 441 msg->description_len = htons(desc_len);
441 msg->version_major = htons(sensor->version_major); 442 msg->version_major = htons(sensor->version_major);
442 msg->version_minor = htons(sensor->version_minor); 443 msg->version_minor = htons(sensor->version_minor);
443 memcpy(&msg[1], sensor->name, name_len); 444 str_ptr = (char*) &msg[1];
444 memcpy((&msg[1]) + name_len, sensor->description, desc_len); 445 memcpy(str_ptr, sensor->name, name_len);
446 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending sensor name (%d): %.*s\n",
447 name_len, name_len, str_ptr);
448 str_ptr += name_len;
449 memcpy(str_ptr, sensor->description, desc_len);
450 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending sensor description (%d): %.*s\n",
451 desc_len, desc_len, str_ptr);
445 452
446 return msg; 453 return msg;
447} 454}