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

[gnunet]

Author: bartpolot
Date: 2013-11-28 02:45:03 +0100 (Thu, 28 Nov 2013)
New Revision: 30920

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
   gnunet/src/mesh/gnunet-service-mesh_peer.c
Log:
- use new keepalive message type


Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-28 01:28:41 UTC 
(rev 30919)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-28 01:45:03 UTC 
(rev 30920)
@@ -742,7 +742,6 @@
 }
 
 
-
 /**
  * Send keepalive packets for a connection.
  *
@@ -766,6 +765,7 @@
   msg->header.size = htons (size);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE);
   msg->cid = c->id;
+  msg->reserved = htonl (0);
 
   GMC_send_prebuilt_message (&msg->header, c, fwd, NULL, NULL);
 }
@@ -2529,6 +2529,7 @@
     struct GNUNET_MESH_Poll      *pmsg;
     struct GNUNET_MESH_ConnectionDestroy *dmsg;
     struct GNUNET_MESH_ConnectionBroken  *bmsg;
+    struct GNUNET_MESH_ConnectionKeepAlive *kamsg;
     uint32_t ttl;
 
     case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
@@ -2587,6 +2588,7 @@
 
     case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE:
     case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK:
+    case GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE:
       break;
 
     default:

Modified: gnunet/src/mesh/gnunet-service-mesh_peer.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-11-28 01:28:41 UTC (rev 
30919)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-11-28 01:45:03 UTC (rev 
30920)
@@ -808,6 +808,7 @@
   {
     case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
     case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
+    case GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE:
     case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
     case GNUNET_MESSAGE_TYPE_MESH_KX:
     case GNUNET_MESSAGE_TYPE_MESH_ACK: