fix compiler issues

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index f75b2fdb0b4b98ffb8a63367d7d6330e6d790909..edf54f03aec13c25c99c2ae9fa241646b52ff23e 100644 (file)
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -598,8 +598,6 @@ GCC_handle_encrypted (struct CadetConnection *cc,
 int
 set_monotime_sig (struct GNUNET_CADET_ConnectionCreateMessage * msg) 
 {
-  struct GNUNET_CRYPTO_EddsaPrivateKey *key;
-  
   struct CadetConnectionCreatePS cp = { .purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CADET_CONNECTION_INITIATOR),
                            .purpose.size = htonl (sizeof(cp)),
                            .monotonic_time = msg->monotime};

diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c
index 6c97986e78065233567a04386da32db842c19bcd..45b86a67b807f28a68adb3da6faec7ee2350e393 100644 (file)
--- a/src/cadet/gnunet-service-cadet_core.c
+++ b/src/cadet/gnunet-service-cadet_core.c
@@ -827,7 +827,7 @@ handle_connection_create (
     // Check for CADET state in case the other side has lost the tunnel (xrs,t3ss)
     if ((GNUNET_YES == msg->has_monotime) &&
         (GNUNET_YES == GCP_check_monotime(origin, msg->monotime)) &&
-        ( GNUNET_OK == GCP_check_monotime_sig(&origin, &msg)) &&
+        ( GNUNET_OK == GCP_check_monotime_sig(origin, msg)) &&
          (CADET_TUNNEL_KEY_OK == GCT_get_estate(t)))
     {
       GCT_change_estate (t, CADET_TUNNEL_KEY_UNINITIALIZED);

diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index b7a89dfe9f9de1ddffd668139dfc924096f4a8bc..475e60ddb8fc2401f127635debfa369c9e2e081b 100644 (file)
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -1577,7 +1577,7 @@ GCP_check_monotime (struct CadetPeer *peer, struct GNUNET_TIME_AbsoluteNBO monot
  * FIXME: documentation here
  */
 int
-GCP_check_monotime_sig (struct CadetPeer *peer, struct GNUNET_CADET_ConnectionCreateMessage *msg)
+GCP_check_monotime_sig (struct CadetPeer *peer, const struct GNUNET_CADET_ConnectionCreateMessage *msg)
 {
   //struct CadetPeer *peer;
   //const struct GNUNET_CADET_ConnectionCreateMessage *msg;

diff --git a/src/cadet/gnunet-service-cadet_peer.h b/src/cadet/gnunet-service-cadet_peer.h
index 9336092fb3bde6346bd8218f1d8560c78cde9d39..6afec627447d407c0dc75df6789cb18db9271fb6 100644 (file)
--- a/src/cadet/gnunet-service-cadet_peer.h
+++ b/src/cadet/gnunet-service-cadet_peer.h
@@ -403,7 +403,7 @@ GCP_set_mq (struct CadetPeer *cp,
             struct GNUNET_MQ_Handle *mq);
 
 int
-GCP_check_monotime_sig (struct CadetPeer *peer, struct GNUNET_CADET_ConnectionCreateMessage *msg);
+GCP_check_monotime_sig (struct CadetPeer *peer, const struct GNUNET_CADET_ConnectionCreateMessage *msg);
 
 void 
 GCP_update_monotime (struct CadetPeer *cp);

diff --git a/src/cadet/gnunet-service-cadet_tunnels.h b/src/cadet/gnunet-service-cadet_tunnels.h
index 20cdabc80ef3073979d026d6a22659993df17c85..147f2e56f13eab232f35e6a6960e566b3f825757 100644 (file)
--- a/src/cadet/gnunet-service-cadet_tunnels.h
+++ b/src/cadet/gnunet-service-cadet_tunnels.h
@@ -329,6 +329,16 @@ GCT_iterate_channels (struct CadetTunnel *t,
 enum CadetTunnelEState
 GCT_get_estate (struct CadetTunnel *t);
 
+/**
+ * Change the tunnel encryption state.
+ * If the encryption state changes to OK, stop the rekey task.
+ *
+ * @param t Tunnel whose encryption state to change, or NULL.
+ * @param state New encryption state.
+ */
+void
+GCT_change_estate (struct CadetTunnel *t,
+                   enum CadetTunnelEState state);
 
 /**
  * Handle KX message.