remove 'nac' option from VPN, always return IP immediately, always build mesh tunnel asynchronously afterwards

4 files changed, 26 insertions, 186 deletions

diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 030816797..2b5b41e14 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -204,23 +204,12 @@ struct TunnelState
   struct TunnelMessageQueueEntry *tmq_tail;  
 
   /**
-   * Client that needs to be notified about the tunnel being
-   * up as soon as a peer is connected; NULL for none.
-   */
-  struct GNUNET_SERVER_Client *client;
-
-  /**
    * Destination entry that has a pointer to this tunnel state;
    * NULL if this tunnel state is in the tunnel map.
    */
   struct DestinationEntry *destination_container;
 
   /**
-   * ID of the client request that caused us to setup this entry.
-   */ 
-  uint64_t request_id;
-
-  /**
    * Destination to which this tunnel leads.  Note that
    * this struct is NOT in the destination_map (but a
    * local copy) and that the 'heap_node' should always
@@ -636,40 +625,6 @@ tunnel_peer_disconnect_handler (void *cls,
 
 
 /**
- * Method called whenever a peer has connected to the tunnel.  Notifies
- * the waiting client that the tunnel is now up.
- *
- * FIXME merge with tunnel_create
- * 
- * @param cls closure
- * @param peer peer identity the tunnel was created to, NULL on timeout
- * @param atsi performance data for the connection
- */
-void
-tunnel_peer_connect_handler (void *cls,
-                             const struct GNUNET_PeerIdentity *peer,
-                             const struct
-                             GNUNET_ATS_Information * atsi)
-{
-  struct TunnelState *ts = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer %s connected to tunnel.\n",
-              GNUNET_i2s (peer));
-  GNUNET_STATISTICS_update (stats,
-                            gettext_noop ("# peers connected to mesh tunnels"),
-                            1, GNUNET_NO);
-  if (NULL == ts->client)
-    return; /* nothing to do */
-  send_client_reply (ts->client,
-                     ts->request_id,
-                     ts->af,
-                     &ts->destination_ip);
-  ts->client = NULL;
-}
-
-
-/**
  * Send a message from the message queue via mesh.
  *
  * @param cls the `struct TunnelState` with the message queue
@@ -796,14 +751,12 @@ handle_regex_result (void *cls,
  * Initialize the given destination entry's mesh tunnel.
  *
  * @param de destination entry for which we need to setup a tunnel
- * @param client client to notify on successful tunnel setup, or NULL for none
  * @param client_af address family of the address returned to the client
  * @param request_id request ID to send in client notification (unused if client is NULL)
  * @return tunnel state of the tunnel that was created
  */
 static struct TunnelState *
 create_tunnel_to_destination (struct DestinationEntry *de,
-                              struct GNUNET_SERVER_Client *client,
                               int client_af,
                               uint64_t request_id)
 {
@@ -815,11 +768,6 @@ create_tunnel_to_destination (struct DestinationEntry *de,
   GNUNET_assert (NULL == de->ts);
   ts = GNUNET_new (struct TunnelState);
   ts->af = client_af;
-  if (NULL != client)
-  {
-    ts->request_id = request_id;
-    ts->client = client;
-  }
   ts->destination = *de;
   ts->destination.heap_node = NULL; /* copy is NOT in destination heap */
   de->ts = ts;
@@ -1093,7 +1041,7 @@ route_packet (struct DestinationEntry *destination,
        available) or create a fresh one */
     is_new = GNUNET_YES;
     if (NULL == destination->ts)
-      ts = create_tunnel_to_destination (destination, NULL, af, 0);
+      ts = create_tunnel_to_destination (destination, af, 0);
     else
       ts = destination->ts;
     if (NULL == ts)
@@ -2579,16 +2527,17 @@ allocate_response_ip (int *result_af,
 
 
 /**
- * A client asks us to setup a redirection via some exit
- * node to a particular IP.  Setup the redirection and
- * give the client the allocated IP.
+ * A client asks us to setup a redirection via some exit node to a
+ * particular IP.  Setup the redirection and give the client the
+ * allocated IP.
  *
  * @param cls unused
  * @param client requesting client
  * @param message redirection request (a `struct RedirectToIpRequestMessage`)
  */
 static void
-service_redirect_to_ip (void *cls GNUNET_UNUSED, struct GNUNET_SERVER_Client *client,
+service_redirect_to_ip (void *cls,
+                        struct GNUNET_SERVER_Client *client,
                         const struct GNUNET_MessageHeader *message)
 {
   size_t mlen;
@@ -2647,15 +2596,11 @@ service_redirect_to_ip (void *cls GNUNET_UNUSED, struct GNUNET_SERVER_Client *cl
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;      
   }
-  if ( (result_af == AF_UNSPEC) ||
-       (GNUNET_NO == ntohl (msg->nac)) )
-  {
-    /* send reply "instantly" */
-    send_client_reply (client,
-                       msg->request_id,
-                       result_af,
-                       addr);
-  }
+  /* send reply with our IP address */
+  send_client_reply (client,
+                     msg->request_id,
+                     result_af,
+                     addr);  
   if (result_af == AF_UNSPEC)
   {
     /* failure, we're done */
@@ -2701,7 +2646,6 @@ service_redirect_to_ip (void *cls GNUNET_UNUSED, struct GNUNET_SERVER_Client *cl
   
   /* setup tunnel to destination */
   ts = create_tunnel_to_destination (de, 
-                                     (GNUNET_NO == ntohl (msg->nac)) ? NULL : client,
                                      result_af,
                                      msg->request_id);
   switch (result_af)
@@ -2754,15 +2698,10 @@ service_redirect_to_service (void *cls GNUNET_UNUSED, struct GNUNET_SERVER_Clien
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;      
   }
-  if ( (result_af == AF_UNSPEC) ||
-       (GNUNET_NO == ntohl (msg->nac)) )
-  {
-    /* send reply "instantly" */
-    send_client_reply (client,
-                       msg->request_id,
-                       result_af,
-                       addr);
-  }
+  send_client_reply (client,
+                     msg->request_id,
+                     result_af,
+                     addr);  
   if (result_af == AF_UNSPEC)
   {
     /* failure, we're done */
@@ -2802,7 +2741,6 @@ service_redirect_to_service (void *cls GNUNET_UNUSED, struct GNUNET_SERVER_Clien
   while (GNUNET_CONTAINER_multihashmap_size (destination_map) > max_destination_mappings)
     expire_destination (de);
   ts = create_tunnel_to_destination (de,
-                                     (GNUNET_NO == ntohl (msg->nac)) ? NULL : client,
                                      result_af,
                                      msg->request_id);
   switch (result_af)
@@ -2948,75 +2886,6 @@ cleanup (void *cls,
 
 
 /**
- * A client disconnected, clean up all references to it.
- *
- * @param cls the client that disconnected
- * @param key unused
- * @param value a `struct TunnelState *`
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-cleanup_tunnel_client (void *cls,
-                       const struct GNUNET_HashCode *key,
-                       void *value)
-{
-  struct GNUNET_SERVER_Client *client = cls;
-  struct TunnelState *ts = value;
-
-  if (client == ts->client)
-    ts->client = NULL;
-  return GNUNET_OK;
-}
-
-
-/**
- * A client disconnected, clean up all references to it.
- *
- * @param cls the client that disconnected
- * @param key unused
- * @param value a `struct DestinationEntry *`
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-cleanup_destination_client (void *cls,
-                            const struct GNUNET_HashCode *key,
-                            void *value)
-{
-  struct GNUNET_SERVER_Client *client = cls;
-  struct DestinationEntry *de = value;
-  struct TunnelState *ts;
-
-  if (NULL == (ts = de->ts))
-    return GNUNET_OK;
-  if (client == ts->client)
-    ts->client = NULL;
-  return GNUNET_OK;
-}
-
-  
-/**
- * A client has disconnected from us.  If we are currently building
- * a tunnel for it, cancel the operation.
- *
- * @param cls unused
- * @param client handle to the client that disconnected
- */
-static void
-client_disconnect (void *cls, 
-                   struct GNUNET_SERVER_Client *client)
-{
-  if (NULL != tunnel_map)
-    GNUNET_CONTAINER_multihashmap_iterate (tunnel_map,
-                                           &cleanup_tunnel_client,
-                                           client);
-  if (NULL != destination_map)
-    GNUNET_CONTAINER_multihashmap_iterate (destination_map,
-                                           &cleanup_destination_client,
-                                           client);
-}
-
-
-/**
  * Main function that will be run by the scheduler.
  *
  * @param cls closure
@@ -3176,7 +3045,6 @@ run (void *cls,
                                        &message_token, NULL, NULL);
   nc = GNUNET_SERVER_notification_context_create (server, 1);
   GNUNET_SERVER_add_handlers (server, service_handlers);
-  GNUNET_SERVER_disconnect_notify (server, &client_disconnect, NULL);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
 }
 
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index 6402e1063..4c8dc43c0 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -80,11 +80,6 @@ static int udp;
 static int verbosity;
 
 /**
- * Option '-a':  Notify only once the tunnel is connected?
- */
-static int nac;
-
-/**
  * Global return value.
  */
 static int ret;
@@ -246,7 +241,6 @@ run (void *cls, char *const *args, const char *cfgfile,
                                            protocol,
                                            &peer,
                                            &sd,
-                                           nac,
                                            etime,
                                            &allocation_cb, NULL);
   }
@@ -275,7 +269,6 @@ run (void *cls, char *const *args, const char *cfgfile,
                                          req_af,
                                          dst_af,
                                          addr,
-                                         nac,
                                          etime,
                                          &allocation_cb, NULL);
   }
@@ -297,9 +290,6 @@ main (int argc, char *const *argv)
     {'6', "ipv6", NULL,
      gettext_noop ("request that result should be an IPv6 address"),
      0, &GNUNET_GETOPT_set_one, &ipv6},
-    {'a', "after-connect", NULL,
-     gettext_noop ("print IP address only after mesh tunnel has been created"),
-     0, &GNUNET_GETOPT_set_one, &ipv6},
     {'d', "duration", "TIME",
      gettext_noop ("how long should the mapping be valid for new tunnels?"),
      1, &GNUNET_GETOPT_set_relative_time, &duration},
diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h
index e1ae130e7..b74b5b766 100644
--- a/src/vpn/vpn.h
+++ b/src/vpn/vpn.h
@@ -38,15 +38,14 @@ GNUNET_NETWORK_STRUCT_BEGIN
 struct RedirectToIpRequestMessage
 {
   /**
-   * Type is  GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP
+   * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * GNUNET_YES to notify only after completion of the mesh-level connection,
-   * GNUNET_NO to notify as soon as an address was allocated (in nbo).
+   * Always zero.
    */
-  int32_t nac GNUNET_PACKED;
+  uint32_t reserved GNUNET_PACKED;
   
   /**
    * How long should the redirection be maintained at most?
@@ -82,15 +81,14 @@ struct RedirectToIpRequestMessage
 struct RedirectToServiceRequestMessage
 {
   /**
-   * Type is  GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE
+   * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * GNUNET_YES to notify only after completion of the mesh-level connection,
-   * GNUNET_NO to notify as soon as an address was allocated (in nbo).
+   * Always zero.
    */
-  int32_t nac GNUNET_PACKED;
+  uint32_t reserved GNUNET_PACKED;
   
   /**
    * How long should the redirection be maintained at most?
@@ -134,7 +132,7 @@ struct RedirectToIpResponseMessage
 {
   
   /**
-   * Type is  GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP
+   * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP
    */
   struct GNUNET_MessageHeader header;
 
diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index e4da5fae0..8539a6a37 100644
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -143,12 +143,6 @@ struct GNUNET_VPN_RedirectionRequest
   int addr_af;
   
   /**
-   * GNUNET_YES if we are to call the callback only after successful
-   * mesh tunnel creation.
-   */
-  int nac;
-  
-  /**
    * For service redirection, IPPROT_UDP or IPPROTO_TCP.
    */
   uint8_t protocol;
@@ -285,7 +279,7 @@ transmit_request (void *cls,
     GNUNET_assert (ret <= size);
     rs.header.size = htons ((uint16_t) ret);
     rs.header.type = htons (GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE);
-    rs.nac = htonl (rr->nac);
+    rs.reserved = htonl (0);
     rs.expiration_time = GNUNET_TIME_absolute_hton (rr->expiration_time);
     rs.protocol = htonl (rr->protocol);
     rs.result_af = htonl (rr->result_af);
@@ -312,7 +306,7 @@ transmit_request (void *cls,
     GNUNET_assert (ret <= size);
     rip.header.size = htons ((uint16_t) ret);
     rip.header.type = htons (GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP);
-    rip.nac = htonl (rr->nac);
+    rip.reserved = htonl (0);
     rip.expiration_time = GNUNET_TIME_absolute_hton (rr->expiration_time);
     rip.result_af = htonl (rr->result_af);
     rip.addr_af = htonl (rr->addr_af);
@@ -448,9 +442,6 @@ GNUNET_VPN_cancel_request (struct GNUNET_VPN_RedirectionRequest *rr)
  * @param protocol protocol, IPPROTO_UDP or IPPROTO_TCP
  * @param peer target peer for the redirection
  * @param serv service descriptor to give to the peer
- * @param nac GNUNET_YES to notify via callback only after completion of
- *            the MESH-level connection,
- *            GNUNET_NO to notify as soon as the IP has been reserved
  * @param expiration_time at what time should the redirection expire?
  *        (this should not impact connections that are active at that time)
  * @param cb function to call with the IP
@@ -465,14 +456,13 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh,
                              uint8_t protocol,
                              const struct GNUNET_PeerIdentity *peer,
                              const struct GNUNET_HashCode *serv,
-                             int nac,
                              struct GNUNET_TIME_Absolute expiration_time,
                              GNUNET_VPN_AllocationCallback cb,
                              void *cb_cls)
 {
   struct GNUNET_VPN_RedirectionRequest *rr;
 
-  rr = GNUNET_malloc (sizeof (struct GNUNET_VPN_RedirectionRequest));
+  rr = GNUNET_new (struct GNUNET_VPN_RedirectionRequest);
   rr->vh = vh;
   rr->cb = cb;
   rr->cb_cls = cb_cls;
@@ -480,7 +470,6 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh,
   rr->serv = *serv;
   rr->expiration_time = expiration_time;
   rr->result_af = result_af;
-  rr->nac = nac;
   rr->protocol = protocol;
   queue_request (rr);
   return rr;
@@ -501,9 +490,6 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh,
  * @param addr_af address family for 'addr', AF_INET or AF_INET6
  * @param addr destination IP address on the Internet; destination
  *             port is to be taken from the VPN packet itself
- * @param nac GNUNET_YES to notify via callback only after completion of
- *            the MESH-level connection,
- *            GNUNET_NO to notify as soon as the IP has been reserved
  * @param expiration_time at what time should the redirection expire?
  *        (this should not impact connections that are active at that time)
  * @param cb function to call with the IP
@@ -517,7 +503,6 @@ GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh,
                            int result_af,
                            int addr_af,
                            const void *addr,
-                           int nac,
                            struct GNUNET_TIME_Absolute expiration_time,
                            GNUNET_VPN_AllocationCallback cb,
                            void *cb_cls)
@@ -545,7 +530,6 @@ GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh,
   rr->expiration_time = expiration_time;
   rr->result_af = result_af;
   rr->addr_af = addr_af;
-  rr->nac = nac;
   memcpy (&rr[1], addr, alen);
   queue_request (rr);
   return rr;
@@ -563,7 +547,7 @@ GNUNET_VPN_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_VPN_Handle *vh;
 
-  vh = GNUNET_malloc (sizeof (struct GNUNET_VPN_Handle));
+  vh = GNUNET_new (struct GNUNET_VPN_Handle);
   vh->cfg = cfg;
   vh->client = GNUNET_CLIENT_connect ("vpn", cfg);
   if (NULL == vh->client)