REST/NAMESTORE: rework API

[oweals/gnunet.git] / src / transport / transport_api2_communication.c

diff --git a/src/transport/transport_api2_communication.c b/src/transport/transport_api2_communication.c
index 1a176e68fae95df59612a735aed7f06eed996b29..6d497c9676e618502d9ab0168a4f4d63aac49fb7 100644 (file)
--- a/src/transport/transport_api2_communication.c
+++ b/src/transport/transport_api2_communication.c
@@ -273,11 +273,6 @@ struct GNUNET_TRANSPORT_QueueHandle
    */
   enum GNUNET_TRANSPORT_ConnectionStatus cs;
 
-  /**
-   * How many hops is the target away (DV-only)
-   */
-  uint32_t distance;
-
   /**
    * ID for this queue when talking to the transport service.
    */
@@ -418,7 +413,6 @@ send_add_queue (struct GNUNET_TRANSPORT_QueueHandle *qh)
   aqm->nt = htonl ((uint32_t) qh->nt);
   aqm->mtu = htonl (qh->mtu);
   aqm->cs = htonl ((uint32_t) qh->cs);
-  aqm->distance = htonl (qh->distance);
   memcpy (&aqm[1],
          qh->address,
          strlen (qh->address) + 1);
@@ -624,15 +618,8 @@ static int
 check_send_msg (void *cls,
                const struct GNUNET_TRANSPORT_SendMessageTo *smt)
 {
-  uint16_t len = ntohs (smt->header.size) - sizeof (*smt);
-  const struct GNUNET_MessageHeader *mh = (const struct GNUNET_MessageHeader *) &smt[1];
-
   (void) cls;
-  if (ntohs (mh->size) != len)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
+  GNUNET_MQ_check_boxed_message (smt);
   return GNUNET_OK;
 }
 
@@ -738,6 +725,46 @@ handle_send_msg (void *cls,
 }
 
 
+/**
+ * Transport service gives us backchannel message. Check if @a bi
+ * is well-formed.
+ *
+ * @param cls our `struct GNUNET_TRANSPORT_CommunicatorHandle *`
+ * @param bi the backchannel message
+ * @return #GNUNET_OK if @a smt is well-formed
+ */
+static int
+check_backchannel_incoming (void *cls,
+                           const struct GNUNET_TRANSPORT_CommunicatorBackchannelIncoming *bi)
+{
+  (void) cls;
+  GNUNET_MQ_check_boxed_message (bi);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Transport service gives us backchannel message. Handle it.
+ *
+ * @param cls our `struct GNUNET_TRANSPORT_CommunicatorHandle *`
+ * @param bi the backchannel message
+ */
+static void
+handle_backchannel_incoming (void *cls,
+                            const struct GNUNET_TRANSPORT_CommunicatorBackchannelIncoming *bi)
+{
+  struct GNUNET_TRANSPORT_CommunicatorHandle *ch = cls;
+
+  if (NULL != ch->notify_cb)
+    ch->notify_cb (ch->notify_cb_cls,
+                  &bi->pid,
+                  (const struct GNUNET_MessageHeader *) &bi[1]);
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+               _("Dropped backchanel message: handler not provided by communicator\n"));
+}
+
+
 /**
  * (re)connect our communicator to the transport service
  *
@@ -759,7 +786,10 @@ reconnect (struct GNUNET_TRANSPORT_CommunicatorHandle *ch)
                           GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG,
                           struct GNUNET_TRANSPORT_SendMessageTo,
                           ch),
-    // FIXME: handle backchannel notifications!
+    GNUNET_MQ_hd_var_size (backchannel_incoming,
+                          GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL_INCOMING,
+                          struct GNUNET_TRANSPORT_CommunicatorBackchannelIncoming,
+                          ch),
     GNUNET_MQ_handler_end()
   };
   struct GNUNET_TRANSPORT_CommunicatorAvailableMessage *cam;
@@ -876,6 +906,9 @@ GNUNET_TRANSPORT_communicator_disconnect (struct GNUNET_TRANSPORT_CommunicatorHa
  * @param sender presumed sender of the message (details to be checked
  *        by higher layers)
  * @param msg the message
+ * @param expected_addr_validity how long does the communicator believe it
+ *        will continue to be able to receive messages from the same address
+ *        on which it received this message?
  * @param cb function to call once handling the message is done, NULL if
  *         flow control is not supported by this communicator
  * @param cb_cls closure for @a cb
@@ -889,6 +922,7 @@ int
 GNUNET_TRANSPORT_communicator_receive (struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
                                        const struct GNUNET_PeerIdentity *sender,
                                        const struct GNUNET_MessageHeader *msg,
+                                       struct GNUNET_TIME_Relative expected_addr_validity,
                                        GNUNET_TRANSPORT_MessageCompletedCallback cb,
                                        void *cb_cls)
 {
@@ -902,24 +936,25 @@ GNUNET_TRANSPORT_communicator_receive (struct GNUNET_TRANSPORT_CommunicatorHandl
        (GNUNET_MQ_get_length (ch->mq) >= ch->max_queue_length) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-               "Dropping message: transprot is too slow, queue length %llu exceeded\n",
-               ch->max_queue_length);
+                "Dropping message: transprot is too slow, queue length %llu exceeded\n",
+                ch->max_queue_length);
     return GNUNET_NO;
   }
 
   msize = ntohs (msg->size);
   env = GNUNET_MQ_msg_extra (im,
-                            msize,
-                            GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG);
+                             msize,
+                             GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG);
   if (NULL == env)
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
+  im->expected_address_validity = GNUNET_TIME_relative_hton (expected_addr_validity);
   im->sender = *sender;
   memcpy (&im[1],
-         msg,
-         msize);
+          msg,
+          msize);
   if (NULL != cb)
   {
     struct FlowControl *fc;
@@ -932,11 +967,11 @@ GNUNET_TRANSPORT_communicator_receive (struct GNUNET_TRANSPORT_CommunicatorHandl
     fc->cb = cb;
     fc->cb_cls = cb_cls;
     GNUNET_CONTAINER_DLL_insert (ch->fc_head,
-                                ch->fc_tail,
-                                fc);
+                                 ch->fc_tail,
+                                 fc);
   }
   GNUNET_MQ_send (ch->mq,
-                 env);
+                  env);
   return GNUNET_OK;
 }
 
@@ -956,7 +991,6 @@ GNUNET_TRANSPORT_communicator_receive (struct GNUNET_TRANSPORT_CommunicatorHandl
  *            sending is not supported, SIZE_MAX for no MTU
  * @param nt which network type does the @a address belong to?
  * @param cc what characteristics does the communicator have?
- * @param distance how many hops does this queue use (DV-only)?
  * @param cs what is the connection status of the queue?
  * @param mq message queue of the @a peer
  * @return API handle identifying the new MQ
@@ -967,7 +1001,6 @@ GNUNET_TRANSPORT_communicator_mq_add (struct GNUNET_TRANSPORT_CommunicatorHandle
                                       const char *address,
                                      uint32_t mtu,
                                       enum GNUNET_NetworkType nt,
-                                      uint32_t distance,
                                      enum GNUNET_TRANSPORT_ConnectionStatus cs,
                                       struct GNUNET_MQ_Handle *mq)
 {
@@ -979,7 +1012,6 @@ GNUNET_TRANSPORT_communicator_mq_add (struct GNUNET_TRANSPORT_CommunicatorHandle
   qh->address = GNUNET_strdup (address);
   qh->nt = nt;
   qh->mtu = mtu;
-  qh->distance = distance;
   qh->cs = cs;
   qh->mq = mq;
   qh->queue_id = ch->queue_gen++;