[GNUnet-SVN] r28129 - gnunet/src/include

[gnunet]

Author: grothoff
Date: 2013-07-17 23:46:36 +0200 (Wed, 17 Jul 2013)
New Revision: 28129

Modified:
   gnunet/src/include/gnunet_identity_service.h
   gnunet/src/include/gnunet_protocols.h
Log:
-removing obsolte stream message types

Modified: gnunet/src/include/gnunet_identity_service.h
===================================================================
--- gnunet/src/include/gnunet_identity_service.h        2013-07-17 20:26:51 UTC 
(rev 28128)
+++ gnunet/src/include/gnunet_identity_service.h        2013-07-17 21:46:36 UTC 
(rev 28129)
@@ -192,15 +192,15 @@
  *
  * @param id identity service to use
  * @param identifier desired identifier
- * @param cb function to call with the result (will only be called once)
- * @param cb_cls closure for cb
+ * @param cont function to call with the result (will only be called once)
+ * @param cont_cls closure for cont
  * @return handle to abort the operation
  */
 struct GNUNET_IDENTITY_Operation *
 GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id,
                        const char *identifier,
-                       GNUNET_IDENTITY_Callback cb,
-                       void *cb_cls);
+                       GNUNET_IDENTITY_Continuation cont,
+                       void *cont_cls);
 
 
 /** 

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2013-07-17 20:26:51 UTC (rev 
28128)
+++ gnunet/src/include/gnunet_protocols.h       2013-07-17 21:46:36 UTC (rev 
28129)
@@ -520,14 +520,14 @@
 #define GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP 139
 
 /**
- * P2P request for content (one FS to another via a stream).
+ * P2P request for content (one FS to another via a mesh).
  */
-#define GNUNET_MESSAGE_TYPE_FS_STREAM_QUERY 140
+#define GNUNET_MESSAGE_TYPE_FS_MESH_QUERY 140
 
 /**
- * P2P answer for content (one FS to another via a stream).
+ * P2P answer for content (one FS to another via a mesh).
  */
-#define GNUNET_MESSAGE_TYPE_FS_STREAM_REPLY 141
+#define GNUNET_MESSAGE_TYPE_FS_MESH_REPLY 141
 
 
 
/*******************************************************************************
@@ -1261,67 +1261,8 @@
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_TRAFFIC_METRIC 385
 
-/*******************************************************************************
- * STREAM messages types
- 
******************************************************************************/
 
-/**
- * Message containing data exchanged between stream end-points over mesh.
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_DATA 400
 
-/**
- * ACK message
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_ACK 401
-
-/**
- * Handshake hello message
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_HELLO 402
-
-/**
- * Handshake hello acknowledgement message
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_HELLO_ACK 403
-
-/**
- * Reset message
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_RESET 404
-
-/**
- * Transmit close message (data transmission no longer possible after this
- * message) 
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE 405
-
-/**
- * Transmit close acknowledgement message
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE_ACK 406
-
-/**
- * Receive close message (data is no loger read by the receiver after this
- * message) 
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE 407
-
-/**
- * Receive close acknowledgement message
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE_ACK 408
-
-/**
- * Stream close message (data is no longer sent or read after this message)
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_CLOSE 409
-
-/**
- * Close acknowledgement message
- */
-#define GNUNET_MESSAGE_TYPE_STREAM_CLOSE_ACK 410
-
 
/*******************************************************************************
  * FS-PUBLISH-HELPER IPC Messages
  
******************************************************************************/