[GNUnet-SVN] r26554 - gnunet/src/mesh

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26554 - gnunet/src/mesh

From:	gnunet
Subject:	[GNUnet-SVN] r26554 - gnunet/src/mesh
Date:	Thu, 21 Mar 2013 15:57:09 +0100
Author: wachs
Date: 2013-03-21 15:57:09 +0100 (Thu, 21 Mar 2013)
New Revision: 26554

Modified:
   gnunet/src/mesh/gnunet-service-mesh-new.c
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
fix core api


Modified: gnunet/src/mesh/gnunet-service-mesh-new.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-new.c   2013-03-21 14:55:19 UTC (rev 
26553)
+++ gnunet/src/mesh/gnunet-service-mesh-new.c   2013-03-21 14:57:09 UTC (rev 
26554)
@@ -5070,9 +5070,7 @@
  */
 static int
 handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer,
-                         const struct GNUNET_MessageHeader *message,
-                         const struct GNUNET_ATS_Information *atsi,
-                         unsigned int atsi_count)
+                         const struct GNUNET_MessageHeader *message)
 {
   unsigned int own_pos;
   uint16_t size;
@@ -5256,9 +5254,7 @@
  */
 static int
 handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer,
-                          const struct GNUNET_MessageHeader *message,
-                          const struct GNUNET_ATS_Information *atsi,
-                          unsigned int atsi_count)
+                          const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_ManipulatePath *msg;
   struct GNUNET_PeerIdentity *pi;
@@ -5340,9 +5336,7 @@
  */
 static int
 handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer,
-                         const struct GNUNET_MessageHeader *message,
-                         const struct GNUNET_ATS_Information *atsi,
-                         unsigned int atsi_count)
+                         const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_PathBroken *msg;
   struct MeshTunnel *t;
@@ -5381,9 +5375,7 @@
  */
 static int
 handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer,
-                            const struct GNUNET_MessageHeader *message,
-                            const struct GNUNET_ATS_Information *atsi,
-                            unsigned int atsi_count)
+                            const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_TunnelDestroy *msg;
   struct MeshTunnel *t;
@@ -5452,9 +5444,7 @@
  */
 static int
 handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer,
-                          const struct GNUNET_MessageHeader *message,
-                          const struct GNUNET_ATS_Information *atsi,
-                          unsigned int atsi_count)
+                          const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_Unicast *msg;
   struct GNUNET_PeerIdentity *neighbor;
@@ -5573,9 +5563,7 @@
  */
 static int
 handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer,
-                            const struct GNUNET_MessageHeader *message,
-                            const struct GNUNET_ATS_Information *atsi,
-                            unsigned int atsi_count)
+                            const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_Multicast *msg;
   struct MeshTunnel *t;
@@ -5656,9 +5644,7 @@
  */
 static int
 handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer,
-                          const struct GNUNET_MessageHeader *message,
-                          const struct GNUNET_ATS_Information *atsi,
-                          unsigned int atsi_count)
+                          const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_ToOrigin *msg;
   struct GNUNET_PeerIdentity id;
@@ -5790,9 +5776,7 @@
  */
 static int
 handle_mesh_ack (void *cls, const struct GNUNET_PeerIdentity *peer,
-                 const struct GNUNET_MessageHeader *message,
-                 const struct GNUNET_ATS_Information *atsi,
-                 unsigned int atsi_count)
+                 const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_ACK *msg;
   struct MeshTunnel *t;
@@ -5856,9 +5840,7 @@
  */
 static int
 handle_mesh_poll (void *cls, const struct GNUNET_PeerIdentity *peer,
-                  const struct GNUNET_MessageHeader *message,
-                  const struct GNUNET_ATS_Information *atsi,
-                  unsigned int atsi_count)
+                  const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_Poll *msg;
   struct MeshTunnel *t;
@@ -5911,9 +5893,7 @@
  */
 static int
 handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer,
-                      const struct GNUNET_MessageHeader *message,
-                      const struct GNUNET_ATS_Information *atsi,
-                      unsigned int atsi_count)
+                      const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_PathACK *msg;
   struct GNUNET_PeerIdentity id;
@@ -6014,9 +5994,7 @@
  */
 static int
 handle_mesh_keepalive (void *cls, const struct GNUNET_PeerIdentity *peer,
-                       const struct GNUNET_MessageHeader *message,
-                       const struct GNUNET_ATS_Information *atsi,
-                       unsigned int atsi_count)
+                       const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_TunnelKeepAlive *msg;
   struct MeshTunnel *t;
@@ -7373,7 +7351,7 @@
     copy->ttl = htonl (default_ttl);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "  calling generic handler...\n");
-    handle_mesh_data_unicast (NULL, &my_full_id, &copy->header, NULL, 0);
+    handle_mesh_data_unicast (NULL, &my_full_id, &copy->header);
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "receive done OK\n");
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -7482,7 +7460,8 @@
     copy->sender = my_full_id;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "  calling generic handler...\n");
-    handle_mesh_data_to_orig (NULL, &my_full_id, &copy->header, NULL, 0);
+    handle_mesh_data_to_orig (NULL, &my_full_id, &copy->header);
+
   }
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 
@@ -7573,7 +7552,7 @@
     GNUNET_assert (ntohl (copy->pid) == (t->fwd_pid + 1));
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "  calling generic handler...\n");
-    handle_mesh_data_multicast (client, &my_full_id, &copy->header, NULL, 0);
+    handle_mesh_data_multicast (client, &my_full_id, &copy->header);
   }
 
   GNUNET_SERVER_receive_done (t->owner->handle, GNUNET_OK);
@@ -8036,9 +8015,7 @@
  * @param atsi_count number of records in 'atsi'
  */
 static void
-core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
-              const struct GNUNET_ATS_Information *atsi,
-              unsigned int atsi_count)
+core_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   struct MeshPeerInfo *peer_info;
   struct MeshPeerPath *path;

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-03-21 14:55:19 UTC (rev 
26553)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-03-21 14:57:09 UTC (rev 
26554)
@@ -5074,9 +5074,7 @@
  */
 static int
 handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer,
-                         const struct GNUNET_MessageHeader *message,
-                         const struct GNUNET_ATS_Information *atsi,
-                         unsigned int atsi_count)
+                         const struct GNUNET_MessageHeader *message)
 {
   unsigned int own_pos;
   uint16_t size;
@@ -5260,9 +5258,7 @@
  */
 static int
 handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer,
-                          const struct GNUNET_MessageHeader *message,
-                          const struct GNUNET_ATS_Information *atsi,
-                          unsigned int atsi_count)
+                          const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_ManipulatePath *msg;
   struct GNUNET_PeerIdentity *pi;
@@ -5344,9 +5340,7 @@
  */
 static int
 handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer,
-                         const struct GNUNET_MessageHeader *message,
-                         const struct GNUNET_ATS_Information *atsi,
-                         unsigned int atsi_count)
+                         const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_PathBroken *msg;
   struct MeshTunnel *t;
@@ -5385,9 +5379,7 @@
  */
 static int
 handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer,
-                            const struct GNUNET_MessageHeader *message,
-                            const struct GNUNET_ATS_Information *atsi,
-                            unsigned int atsi_count)
+                            const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_TunnelDestroy *msg;
   struct MeshTunnel *t;
@@ -5456,9 +5448,7 @@
  */
 static int
 handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer,
-                          const struct GNUNET_MessageHeader *message,
-                          const struct GNUNET_ATS_Information *atsi,
-                          unsigned int atsi_count)
+                          const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_Unicast *msg;
   struct GNUNET_PeerIdentity *neighbor;
@@ -5577,9 +5567,7 @@
  */
 static int
 handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer,
-                            const struct GNUNET_MessageHeader *message,
-                            const struct GNUNET_ATS_Information *atsi,
-                            unsigned int atsi_count)
+                            const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_Multicast *msg;
   struct MeshTunnel *t;
@@ -5660,9 +5648,7 @@
  */
 static int
 handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer,
-                          const struct GNUNET_MessageHeader *message,
-                          const struct GNUNET_ATS_Information *atsi,
-                          unsigned int atsi_count)
+                          const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_ToOrigin *msg;
   struct GNUNET_PeerIdentity id;
@@ -5794,9 +5780,7 @@
  */
 static int
 handle_mesh_ack (void *cls, const struct GNUNET_PeerIdentity *peer,
-                 const struct GNUNET_MessageHeader *message,
-                 const struct GNUNET_ATS_Information *atsi,
-                 unsigned int atsi_count)
+                 const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_ACK *msg;
   struct MeshTunnel *t;
@@ -5860,9 +5844,7 @@
  */
 static int
 handle_mesh_poll (void *cls, const struct GNUNET_PeerIdentity *peer,
-                  const struct GNUNET_MessageHeader *message,
-                  const struct GNUNET_ATS_Information *atsi,
-                  unsigned int atsi_count)
+                  const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_Poll *msg;
   struct MeshTunnel *t;
@@ -5915,9 +5897,7 @@
  */
 static int
 handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer,
-                      const struct GNUNET_MessageHeader *message,
-                      const struct GNUNET_ATS_Information *atsi,
-                      unsigned int atsi_count)
+                      const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_PathACK *msg;
   struct GNUNET_PeerIdentity id;
@@ -6017,9 +5997,7 @@
  */
 static int
 handle_mesh_keepalive (void *cls, const struct GNUNET_PeerIdentity *peer,
-                       const struct GNUNET_MessageHeader *message,
-                       const struct GNUNET_ATS_Information *atsi,
-                       unsigned int atsi_count)
+                       const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MESH_TunnelKeepAlive *msg;
   struct MeshTunnel *t;
@@ -7369,7 +7347,7 @@
     copy->ttl = htonl (default_ttl);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "  calling generic handler...\n");
-    handle_mesh_data_unicast (NULL, &my_full_id, &copy->header, NULL, 0);
+    handle_mesh_data_unicast (NULL, &my_full_id, &copy->header);
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "receive done OK\n");
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -7478,7 +7456,7 @@
     copy->sender = my_full_id;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "  calling generic handler...\n");
-    handle_mesh_data_to_orig (NULL, &my_full_id, &copy->header, NULL, 0);
+    handle_mesh_data_to_orig (NULL, &my_full_id, &copy->header);
   }
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 
@@ -7569,7 +7547,7 @@
     GNUNET_assert (ntohl (copy->pid) == (t->fwd_pid + 1));
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "  calling generic handler...\n");
-    handle_mesh_data_multicast (client, &my_full_id, &copy->header, NULL, 0);
+    handle_mesh_data_multicast (client, &my_full_id, &copy->header);
   }
 
   GNUNET_SERVER_receive_done (t->owner->handle, GNUNET_OK);
@@ -8031,9 +8009,7 @@
  * @param atsi_count number of records in 'atsi'
  */
 static void
-core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
-              const struct GNUNET_ATS_Information *atsi,
-              unsigned int atsi_count)
+core_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   struct MeshPeerInfo *peer_info;
   struct MeshPeerPath *path;
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r26554 - gnunet/src/mesh, gnunet <=
Prev by Date: [GNUnet-SVN] r26553 - gnunet/src/consensus
Next by Date: [GNUnet-SVN] r26555 - in gnunet/src: nse testbed topology
Previous by thread: [GNUnet-SVN] r26553 - gnunet/src/consensus
Next by thread: [GNUnet-SVN] r26555 - in gnunet/src: nse testbed topology
Index(es):
- Date
- Thread