[GNUnet-SVN] r24157 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-10-01 17:04:19 +0200 (Mon, 01 Oct 2012)
New Revision: 24157

Modified:
   gnunet/src/testbed/testbed_api.c
   gnunet/src/testbed/testbed_api.h
   gnunet/src/testbed/testbed_api_services.c
Log:
rename to extract_config_()

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2012-10-01 14:59:31 UTC (rev 24156)
+++ gnunet/src/testbed/testbed_api.c    2012-10-01 15:04:19 UTC (rev 24157)
@@ -607,7 +607,7 @@
     break;
   case GNUNET_TESTBED_PIT_CONFIGURATION:
     pinfo->result.cfg =        /* Freed in oprelease_peer_getinfo */
-       GNUNET_TESTBED_get_config_from_peerinfo_msg_ (&msg->header);    
+       GNUNET_TESTBED_extract_config_ (&msg->header);
     break;
   case GNUNET_TESTBED_PIT_GENERIC:
     GNUNET_assert (0);          /* never reach here */
@@ -765,8 +765,7 @@
   if ((0 != (GNUNET_TESTBED_ET_OPERATION_FINISHED & c->event_mask)) &&
       (NULL != c->cc))
   {
-    opc->data = 
-       GNUNET_TESTBED_get_config_from_peerinfo_msg_ (&msg->header);
+    opc->data = GNUNET_TESTBED_extract_config_ (&msg->header);
     event.type = GNUNET_TESTBED_ET_OPERATION_FINISHED;   
     event.details.operation_finished.generic = opc->data;
     event.details.operation_finished.operation = opc->op;
@@ -1940,15 +1939,16 @@
 
 
 /**
- * Generates configuration by parsing Peer configuration information reply 
message
+ * Generates configuration by uncompressing configuration in given message. The
+ * given message should be of the following types:
+ * GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG,
+ * GNUNET_MESSAGE_TYPE_TESTBED_SLAVECONFIG
  *
- * @param msg the message containing compressed configuration. This message
- *          should be of the following types: 
GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG,
- *          GNUNET_MESSAGE_TYPE_TESTBED_SLAVECONFIG
+ * @param msg the message containing compressed configuration
  * @return handle to the parsed configuration
  */
 struct GNUNET_CONFIGURATION_Handle *
-GNUNET_TESTBED_get_config_from_peerinfo_msg_ (const struct 
GNUNET_MessageHeader *msg)
+GNUNET_TESTBED_extract_config_ (const struct GNUNET_MessageHeader *msg)
 {  
   struct GNUNET_CONFIGURATION_Handle *cfg;
   Bytef *data;

Modified: gnunet/src/testbed/testbed_api.h
===================================================================
--- gnunet/src/testbed/testbed_api.h    2012-10-01 14:59:31 UTC (rev 24156)
+++ gnunet/src/testbed/testbed_api.h    2012-10-01 15:04:19 UTC (rev 24157)
@@ -398,14 +398,16 @@
 
 
 /**
- * Generates configuration by parsing Peer configuration information reply 
message
+ * Generates configuration by uncompressing configuration in given message. The
+ * given message should be of the following types:
+ * GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG,
+ * GNUNET_MESSAGE_TYPE_TESTBED_SLAVECONFIG
  *
- * @param msg the peer configuration information message
+ * @param msg the message containing compressed configuration
  * @return handle to the parsed configuration
  */
 struct GNUNET_CONFIGURATION_Handle *
-GNUNET_TESTBED_get_config_from_peerinfo_msg_ (const struct 
-                                             GNUNET_MessageHeader *msg);
+GNUNET_TESTBED_extract_config_ (const struct GNUNET_MessageHeader *msg);
 
 
 /**

Modified: gnunet/src/testbed/testbed_api_services.c
===================================================================
--- gnunet/src/testbed/testbed_api_services.c   2012-10-01 14:59:31 UTC (rev 
24156)
+++ gnunet/src/testbed/testbed_api_services.c   2012-10-01 15:04:19 UTC (rev 
24157)
@@ -158,7 +158,7 @@
     info.details.operation_finished.generic = NULL;
     goto call_cb;
   }  
-  data->cfg = GNUNET_TESTBED_get_config_from_peerinfo_msg_ (msg);
+  data->cfg = GNUNET_TESTBED_extract_config_ (msg);
   GNUNET_assert (NULL == data->op_result);
   data->op_result = data->ca (data->cada_cls, data->cfg);  
   info.details.operation_finished.emsg = NULL;