[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33153 - in gnunet/src: peerstore sensor
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33153 - in gnunet/src: peerstore sensor |
Date: |
Fri, 2 May 2014 16:42:03 +0200 |
Author: otarabai
Date: 2014-05-02 16:42:03 +0200 (Fri, 02 May 2014)
New Revision: 33153
Modified:
gnunet/src/peerstore/gnunet-service-peerstore.c
gnunet/src/sensor/gnunet-service-sensor.c
gnunet/src/sensor/sensor_api.c
Log:
bug fix
Modified: gnunet/src/peerstore/gnunet-service-peerstore.c
===================================================================
--- gnunet/src/peerstore/gnunet-service-peerstore.c 2014-04-30 16:49:38 UTC
(rev 33152)
+++ gnunet/src/peerstore/gnunet-service-peerstore.c 2014-05-02 14:42:03 UTC
(rev 33153)
@@ -75,7 +75,7 @@
}
/**
- * Process statistics requests.
+ * Peerstore service runner.
*
* @param cls closure
* @param server the initialized server
Modified: gnunet/src/sensor/gnunet-service-sensor.c
===================================================================
--- gnunet/src/sensor/gnunet-service-sensor.c 2014-04-30 16:49:38 UTC (rev
33152)
+++ gnunet/src/sensor/gnunet-service-sensor.c 2014-05-02 14:42:03 UTC (rev
33153)
@@ -365,9 +365,9 @@
return GNUNET_OK;
}
if(GNUNET_YES == add_sensor_to_hashmap(sensor, sensors))
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Sensor `%s' added to global
hashmap\n"), sensor->name);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, _("Sensor `%s' added to global
hashmap\n"), sensor->name);
else
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, ("Could not add sensor `%s' to global
hashmap\n"), sensor->name);
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, ("Could not add sensor `%s' to
global hashmap\n"), sensor->name);
return GNUNET_OK;
}
@@ -413,7 +413,7 @@
/**
* Creates a structure with basic sensor info to be sent to a client
*
- * @parm sensor sensor information
+ * @param sensor sensor information
* @return message ready to be sent to client
*/
static struct SensorInfoMessage *
@@ -423,6 +423,7 @@
uint16_t len;
size_t name_len;
size_t desc_len;
+ char *str_ptr;
name_len = strlen(sensor->name);
if(NULL == sensor->description)
@@ -440,8 +441,14 @@
msg->description_len = htons(desc_len);
msg->version_major = htons(sensor->version_major);
msg->version_minor = htons(sensor->version_minor);
- memcpy(&msg[1], sensor->name, name_len);
- memcpy((&msg[1]) + name_len, sensor->description, desc_len);
+ str_ptr = (char*) &msg[1];
+ memcpy(str_ptr, sensor->name, name_len);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending sensor name (%d): %.*s\n",
+ name_len, name_len, str_ptr);
+ str_ptr += name_len;
+ memcpy(str_ptr, sensor->description, desc_len);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending sensor description (%d):
%.*s\n",
+ desc_len, desc_len, str_ptr);
return msg;
}
Modified: gnunet/src/sensor/sensor_api.c
===================================================================
--- gnunet/src/sensor/sensor_api.c 2014-04-30 16:49:38 UTC (rev 33152)
+++ gnunet/src/sensor/sensor_api.c 2014-05-02 14:42:03 UTC (rev 33153)
@@ -366,8 +366,8 @@
struct SensorInfoShort *sensor;
size_t name_len;
size_t desc_len;
+ char *str_ptr;
-
h->in_receive = GNUNET_NO;
if (NULL == msg)
{
@@ -400,7 +400,7 @@
if (GNUNET_MESSAGE_TYPE_SENSOR_END == ntohs (msg->type))
{
/* normal end of list of sensors, signal end, process next pending request
*/
- LOG (GNUNET_ERROR_TYPE_INFO,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received end of list of sensors from `%s' service\n", "SENSOR");
GNUNET_SENSOR_iterate_sensor_cancel(ic);
trigger_transmit (h);
@@ -432,9 +432,17 @@
return;
}
sensor = GNUNET_new(struct SensorInfoShort);
- sensor->name = GNUNET_strndup((char *)&im[1], name_len);
+ str_ptr = (char *)&im[1];
+ sensor->name = GNUNET_strndup(str_ptr, name_len);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received sensor name (%d): %.*s\n",
+ name_len, name_len, str_ptr);
+ str_ptr += name_len;
if(desc_len > 0)
- sensor->description = GNUNET_strndup((char *)((&im[1]) + name_len),
desc_len);
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received sensor description (%d): %.*s\n",
+ desc_len, desc_len, str_ptr);
+ sensor->description = GNUNET_strndup(str_ptr, desc_len);
+ }
sensor->version_major = ntohs(im->version_major);
sensor->version_minor = ntohs(im->version_minor);
h->in_receive = GNUNET_YES;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33153 - in gnunet/src: peerstore sensor,
gnunet <=