more work on tng

6 files changed, 62 insertions, 21 deletions

diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h
index 4395b878b..cb30b73e1 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -236,10 +236,10 @@ GNUNET_BANDWIDTH_tracker_init (struct GNUNET_BANDWIDTH_Tracker *av,
 /**
  * Initialize bandwidth tracker.  Note that in addition to the
  * 'max_carry_s' limit, we also always allow at least
- * GNUNET_MAX_MESSAGE_SIZE to accumulate.  So if the
+ * #GNUNET_MAX_MESSAGE_SIZE to accumulate.  So if the
  * bytes-per-second limit is so small that within 'max_carry_s' not
- * even GNUNET_MAX_MESSAGE_SIZE is allowed to accumulate, it is
- * ignored and replaced by GNUNET_MAX_MESSAGE_SIZE (which is in
+ * even #GNUNET_MAX_MESSAGE_SIZE is allowed to accumulate, it is
+ * ignored and replaced by #GNUNET_MAX_MESSAGE_SIZE (which is in
  * bytes).
  *
  * @param av tracker to initialize
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index a06d697f7..1fb460ece 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -11,7 +11,7 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index c82b11762..fd5adeef2 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -3076,6 +3076,20 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR 1211
 
+/**
+ * Tell transport that it should assist with exchanging a
+ * message between communicators.  Usually used when
+ * communciators are uni-directional and need an alternative
+ * back-channel.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL 1212
+
+/**
+ * Message type used between transport services when they
+ * internally forward communicator backchannel messages.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_BACKCHANNEL_ENCAPSULATION 1213
+
 
 /**
  * Message sent to indicate to the transport that a monitor
@@ -3094,6 +3108,18 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_END 1252
 
+/**
+ * Message exchanged between communicators to confirm
+ * successful KX (and address validation).
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_KX_CONFIRMATION 1275
+
+/**
+ * Message exchanged between communicators to exchange
+ * flow control (FC) limits and acknowledgemets.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_FC_LIMITS 1276
+
 
 /* ************** NEW (NG) ATS Messages ************* */
 
diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h
index 03c97f199..109fe7045 100644
--- a/src/include/gnunet_signatures.h
+++ b/src/include/gnunet_signatures.h
@@ -11,7 +11,7 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -194,6 +194,12 @@ extern "C"
  */
 #define GNUNET_SIGNATURE_PURPOSE_TRANSPORT_ADDRESS 29
 
+/**
+ * Signature by a peer affirming that the given ephemeral
+ * key is currently in use by that peer's transport service.
+ */
+#define GNUNET_SIGNATURE_PURPOSE_TRANSPORT_EPHEMERAL 30
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h
index 2ba1f831a..a5547778e 100644
--- a/src/include/gnunet_transport_communication_service.h
+++ b/src/include/gnunet_transport_communication_service.h
@@ -105,15 +105,23 @@ enum GNUNET_TRANSPORT_CommunicatorCharacteristics {
 /**
  * Function called when the transport service has received an
  * acknowledgement for this communicator (!) via a different return
- * path. 
+ * path.
+ *
+ * Typically used to receive messages of type
+ * #GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_FC_LIMITS or
+ * #GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_KX_CONFIRMATION
+ * as well as communicator-specific messages to assist with
+ * NAT traversal.
+ *
+ * @param cls closure
+ * @param sender which peer sent the notification
+ * @param msg payload
  */
 typedef void
 (*GNUNET_TRANSPORT_CommunicatorNotify) (void *cls,
                                         const struct GNUNET_PeerIdentity *sender,
-                                        struct GNUNET_TIME_Absolute monotonic_time,
-                                        struct GNUNET_TIME_Relative validity,
-                                        const struct GNUNET_HashCode *token                     
-                                        );
+                                        const struct GNUNET_MessageHeader *msg);
+
 
 /**
  * Connect to the transport service.
@@ -127,6 +135,8 @@ typedef void
  *                the address of another peer, can be NULL if the
  *                communicator only supports receiving messages
  * @param mq_init_cls closure for @a mq_init
+ * @param notify_cb function to pass backchannel messages to communicator
+ * @param notify_cb_cls closure for @a notify_cb
  * @return NULL on error
  */
 struct GNUNET_TRANSPORT_CommunicatorHandle *
@@ -135,9 +145,9 @@ GNUNET_TRANSPORT_communicator_connect (const struct GNUNET_CONFIGURATION_Handle
                                        const char *addr_prefix,
                                        enum GNUNET_TRANSPORT_CommunicatorCharacteristics cc,
                                        GNUNET_TRANSPORT_CommunicatorMqInit mq_init,
-                                       void *mq_init_cls);
-//                                     GNUNET_TRANSPORT_CommunicatorNotify notify_cb,
-//                                     void *notify_cb_cls);
+                                       void *mq_init_cls,
+                                       GNUNET_TRANSPORT_CommunicatorNotify notify_cb,
+                                       void *notify_cb_cls);
 
 
 /**
@@ -221,7 +231,7 @@ enum GNUNET_TRANSPORT_ConnectionStatus {
 
 
 /**
- * Notify transport service that an MQ became available due to an
+ * Notify transport service that a MQ became available due to an
  * "inbound" connection or because the communicator discovered the
  * presence of another peer.
  *
@@ -299,17 +309,16 @@ GNUNET_TRANSPORT_communicator_address_remove (struct GNUNET_TRANSPORT_AddressIde
  * send the message back itself).
  *
  * @param ch handle of this communicator
- * @param target_pid peer to send the message to
- * @param target_comm name of the communicator to send the message to
+ * @param pid peer to send the message to
+ * @param comm name of the communicator to send the message to
+ * @param header header of the message to transmit and pass via the
+ *        notify-API to @a pid's communicator @a comm
  */
 void
 GNUNET_TRANSPORT_communicator_notify (struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
                                       const struct GNUNET_PeerIdentity *pid,
                                       const char *comm,
-                                      struct GNUNET_TIME_Absolute monotonic_time,
-                                      struct GNUNET_TIME_Relative validity,
-                                      const struct GNUNET_HashCode *token
-                                      );
+                                      const struct GNUNET_MessageHeader *header);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_transport_monitor_service.h b/src/include/gnunet_transport_monitor_service.h
index ef599f902..8357b101f 100644
--- a/src/include/gnunet_transport_monitor_service.h
+++ b/src/include/gnunet_transport_monitor_service.h
@@ -41,7 +41,7 @@ extern "C"
 #endif
 
 #include "gnunet_util_lib.h"
-#include "gnunet_ats_service.h"
+#include "gnunet_ats_transport_service.h"
 #include "gnunet_transport_communication_service.h"