[GNUnet-SVN] r17299 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2011-10-10 10:02:30 +0200 (Mon, 10 Oct 2011)
New Revision: 17299

Modified:
   gnunet/src/core/Makefile.am
   gnunet/src/core/gnunet-service-core_kx.c
   gnunet/src/core/gnunet-service-core_sessions.c
Log:
core-new now compiles

Modified: gnunet/src/core/Makefile.am
===================================================================
--- gnunet/src/core/Makefile.am 2011-10-09 09:53:07 UTC (rev 17298)
+++ gnunet/src/core/Makefile.am 2011-10-10 08:02:30 UTC (rev 17299)
@@ -26,6 +26,7 @@
 
 bin_PROGRAMS = \
  gnunet-service-core \
+ gnunet-service-core-new \
  gnunet-core-list-connections
 
 gnunet_service_core_SOURCES = \

Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c    2011-10-09 09:53:07 UTC (rev 
17298)
+++ gnunet/src/core/gnunet-service-core_kx.c    2011-10-10 08:02:30 UTC (rev 
17299)
@@ -737,7 +737,7 @@
   if (kx->public_key == NULL)
   {
     GNUNET_free_non_null (kx->skm_received);
-    kx->skm_received = GNUNET_copy_message (msg);
+    kx->skm_received = (struct SetKeyMessage*) GNUNET_copy_message (msg);
     return;
   }
   if (0 !=
@@ -866,7 +866,7 @@
     {
       /* defer */
       GNUNET_free_non_null (kx->ping_received);
-      kx->ping_received = GNUNET_copy_message (msg);
+      kx->ping_received = (struct PingMessage*) GNUNET_copy_message (msg);
       return;
     }
   m = (const struct PingMessage*) msg;
@@ -1065,7 +1065,7 @@
     if (kx->status == KX_STATE_KEY_SENT)
     {
       GNUNET_free_non_null (kx->pong_received);
-      kx->pong_received = GNUNET_copy_message (msg);
+      kx->pong_received = (struct PongMessage*) GNUNET_copy_message (msg);
     }
     return;
   }

Modified: gnunet/src/core/gnunet-service-core_sessions.c
===================================================================
--- gnunet/src/core/gnunet-service-core_sessions.c      2011-10-09 09:53:07 UTC 
(rev 17298)
+++ gnunet/src/core/gnunet-service-core_sessions.c      2011-10-10 08:02:30 UTC 
(rev 17299)
@@ -122,6 +122,41 @@
   GNUNET_SCHEDULER_TaskIdentifier cork_task;
 
   /**
+   * Tracking bandwidth for sending to this peer.
+   * // FIXME: unused! should it be used?
+   */
+  struct GNUNET_BANDWIDTH_Tracker available_send_window;
+
+  /**
+   * Tracking bandwidth for receiving from this peer.
+   * // FIXME: need to set it!
+   */
+  struct GNUNET_BANDWIDTH_Tracker available_recv_window;
+
+  /**
+   * Available bandwidth out for this peer (current target).
+   * // FIXME: check usage!
+   */
+  struct GNUNET_BANDWIDTH_Value32NBO bw_out;
+
+  /**
+   * Internal bandwidth limit set for this peer (initially typically
+   * set to "-1").  Actual "bw_out" is MIN of
+   * "bpm_out_internal_limit" and "bw_out_external_limit".
+   * // FIXME: check usage
+   */
+  struct GNUNET_BANDWIDTH_Value32NBO bw_out_internal_limit;
+
+  /**
+   * External bandwidth limit set for this peer by the
+   * peer that we are communicating with.  "bw_out" is MIN of
+   * "bw_out_internal_limit" and "bw_out_external_limit".
+   * // FIXME: check usage
+   */
+  struct GNUNET_BANDWIDTH_Value32NBO bw_out_external_limit;
+
+
+  /**
    * Is the neighbour queue empty and thus ready for us
    * to transmit an encrypted message?  
    */