removing legacy send functions from plugins and renaming new send function

1 files changed, 1 insertions, 334 deletions

diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 2ce3cc8c7..4157024c9 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -863,337 +863,6 @@ disconnect_session (struct Session *session)
 
 
 /**
- * Given two otherwise equivalent sessions, pick the better one.
- *
- * @param s1 one session (also default)
- * @param s2 other session
- * @return "better" session (more active)
- */
-static struct Session *
-select_better_session (struct Session *s1, struct Session *s2)
-{
-  if (s1 == NULL)
-    return s2;
-  if (s2 == NULL)
-    return s1;
-  if ((s1->expecting_welcome == GNUNET_NO) &&
-      (s2->expecting_welcome == GNUNET_YES))
-    return s1;
-  if ((s1->expecting_welcome == GNUNET_YES) &&
-      (s2->expecting_welcome == GNUNET_NO))
-    return s2;
-  if (s1->last_activity.abs_value < s2->last_activity.abs_value)
-    return s2;
-  if (s1->last_activity.abs_value > s2->last_activity.abs_value)
-    return s1;
-  if ((GNUNET_YES == s1->inbound) && (GNUNET_NO == s2->inbound))
-    return s1;
-  if ((GNUNET_NO == s1->inbound) && (GNUNET_YES == s2->inbound))
-    return s2;
-  return s1;
-}
-
-
-
-/**
- * Function that can be used by the transport service to transmit
- * a message using the plugin.   Note that in the case of a
- * peer disconnecting, the continuation MUST be called
- * prior to the disconnect notification itself.  This function
- * will be called with this peer's HELLO message to initiate
- * a fresh connection to another peer.
- *
- * @param cls closure
- * @param target who should receive this message
- * @param msg the message to transmit
- * @param msgbuf_size number of bytes in 'msg'
- * @param priority how important is the message (most plugins will
- *                 ignore message priority and just FIFO)
- * @param timeout how long to wait at most for the transmission (does not
- *                require plugins to discard the message after the timeout,
- *                just advisory for the desired delay; most plugins will ignore
- *                this as well)
- * @param session which session must be used (or NULL for "any")
- * @param addr the address to use (can be NULL if the plugin
- *                is "on its own" (i.e. re-use existing TCP connection))
- * @param addrlen length of the address in bytes
- * @param force_address GNUNET_YES if the plugin MUST use the given address,
- *                GNUNET_NO means the plugin may use any other address and
- *                GNUNET_SYSERR means that only reliable existing
- *                bi-directional connections should be used (regardless
- *                of address)
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...); can be NULL
- * @param cont_cls closure for cont
- * @return number of bytes used (on the physical network, with overheads);
- *         -1 on hard errors (i.e. address invalid); 0 is a legal value
- *         and does NOT mean that the message was not transmitted (DV and NAT)
- */
-static ssize_t
-tcp_plugin_send_old (void *cls, const struct GNUNET_PeerIdentity *target,
-                 const char *msg, size_t msgbuf_size, uint32_t priority,
-                 struct GNUNET_TIME_Relative timeout, struct Session *session,
-                 const void *addr, size_t addrlen, int force_address,
-                 GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  struct Session *cand_session;
-  struct Session *next;
-  struct PendingMessage *pm;
-  struct GNUNET_CONNECTION_Handle *sa;
-  int af;
-  const void *sb;
-  size_t sbs;
-  struct sockaddr_in a4;
-  struct sockaddr_in6 a6;
-  const struct IPv4TcpAddress *t4;
-  const struct IPv6TcpAddress *t6;
-  unsigned int is_natd;
-
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# bytes TCP was asked to transmit"),
-                            msgbuf_size, GNUNET_NO);
-  /* FIXME: we could do this cheaper with a hash table
-   * where we could restrict the iteration to entries that match
-   * the target peer... */
-  is_natd = GNUNET_NO;
-  if (session == NULL)
-  {
-    cand_session = NULL;
-    next = plugin->sessions;
-    while (NULL != (session = next))
-    {
-      next = session->next;
-      GNUNET_assert (session->client != NULL);
-      if (0 !=
-          memcmp (target, &session->target,
-                  sizeof (struct GNUNET_PeerIdentity)))
-        continue;
-      if (((GNUNET_SYSERR == force_address) &&
-           (session->expecting_welcome == GNUNET_NO)) ||
-          (GNUNET_NO == force_address))
-      {
-        cand_session = select_better_session (cand_session, session);
-        continue;
-      }
-      if (GNUNET_SYSERR == force_address)
-        continue;
-      GNUNET_break (GNUNET_YES == force_address);
-      if (addr == NULL)
-      {
-        GNUNET_break (0);
-        break;
-      }
-      if ((addrlen != session->connect_alen) && (session->is_nat == GNUNET_NO))
-        continue;
-      if ((0 != memcmp (session->connect_addr, addr, addrlen)) &&
-          (session->is_nat == GNUNET_NO))
-        continue;
-      cand_session = select_better_session (cand_session, session);
-    }
-    session = cand_session;
-  }
-  if ((session == NULL) && (addrlen == 0))
-  {
-#if DEBUG_TCP
-    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
-                     "Asked to transmit to `%4s' without address and I have no existing connection (failing).\n",
-                     GNUNET_i2s (target));
-#endif
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              gettext_noop
-                              ("# bytes discarded by TCP (no address and no connection)"),
-                              msgbuf_size, GNUNET_NO);
-    return -1;
-  }
-  if (session == NULL)
-  {
-    if (addrlen == sizeof (struct IPv6TcpAddress))
-    {
-      GNUNET_assert (NULL != addr);     /* make static analysis happy */
-      t6 = addr;
-      af = AF_INET6;
-      memset (&a6, 0, sizeof (a6));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      a6.sin6_len = sizeof (a6);
-#endif
-      a6.sin6_family = AF_INET6;
-      a6.sin6_port = t6->t6_port;
-      if (t6->t6_port == 0)
-        is_natd = GNUNET_YES;
-      memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof (struct in6_addr));
-      sb = &a6;
-      sbs = sizeof (a6);
-    }
-    else if (addrlen == sizeof (struct IPv4TcpAddress))
-    {
-      GNUNET_assert (NULL != addr);     /* make static analysis happy */
-      t4 = addr;
-      af = AF_INET;
-      memset (&a4, 0, sizeof (a4));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      a4.sin_len = sizeof (a4);
-#endif
-      a4.sin_family = AF_INET;
-      a4.sin_port = t4->t4_port;
-      if (t4->t4_port == 0)
-        is_natd = GNUNET_YES;
-      a4.sin_addr.s_addr = t4->ipv4_addr;
-      sb = &a4;
-      sbs = sizeof (a4);
-    }
-    else
-    {
-      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp",
-                       _("Address of unexpected length: %u\n"), addrlen);
-      GNUNET_break (0);
-      return -1;
-    }
-
-    if ((is_natd == GNUNET_YES) && (addrlen == sizeof (struct IPv6TcpAddress)))
-      return -1;                /* NAT client only works with IPv4 addresses */
-    if (0 == plugin->max_connections)
-      return -1;                /* saturated */
-
-    if ((is_natd == GNUNET_YES) && (NULL != plugin->nat) &&
-        (GNUNET_NO ==
-         GNUNET_CONTAINER_multihashmap_contains (plugin->nat_wait_conns,
-                                                 &target->hashPubKey)))
-    {
-#if DEBUG_TCP_NAT
-      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
-                       _("Found valid IPv4 NAT address (creating session)!\n"));
-#endif
-      session = create_session (plugin, target, NULL, GNUNET_YES);
-      GNUNET_assert (session != NULL);
-
-      /* create new message entry */
-      pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size);
-      /* FIXME: the memset of this malloc can be up to 2% of our total runtime */
-      pm->msg = (const char *) &pm[1];
-      memcpy (&pm[1], msg, msgbuf_size);
-      /* FIXME: this memcpy can be up to 7% of our total run-time
-       * (for transport service) */
-      pm->message_size = msgbuf_size;
-      pm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
-      pm->transmit_cont = cont;
-      pm->transmit_cont_cls = cont_cls;
-
-      /* append pm to pending_messages list */
-      GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head,
-                                        session->pending_messages_tail, pm);
-
-      GNUNET_assert (GNUNET_CONTAINER_multihashmap_put
-                     (plugin->nat_wait_conns, &target->hashPubKey, session,
-                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY) ==
-                     GNUNET_OK);
-#if DEBUG_TCP_NAT
-      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
-                       "Created NAT WAIT connection to `%4s' at `%s'\n",
-                       GNUNET_i2s (target), GNUNET_a2s (sb, sbs));
-#endif
-      GNUNET_NAT_run_client (plugin->nat, &a4);
-      return 0;
-    }
-    if ((is_natd == GNUNET_YES) &&
-        (GNUNET_YES ==
-         GNUNET_CONTAINER_multihashmap_contains (plugin->nat_wait_conns,
-                                                 &target->hashPubKey)))
-    {
-      /* Only do one NAT punch attempt per peer identity */
-      return -1;
-    }
-    sa = GNUNET_CONNECTION_create_from_sockaddr (af, sb, sbs);
-    if (sa == NULL)
-    {
-#if DEBUG_TCP
-      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
-                       "Failed to create connection to `%4s' at `%s'\n",
-                       GNUNET_i2s (target), GNUNET_a2s (sb, sbs));
-#endif
-      GNUNET_STATISTICS_update (plugin->env->stats,
-                                gettext_noop
-                                ("# bytes discarded by TCP (failed to connect)"),
-                                msgbuf_size, GNUNET_NO);
-      return -1;
-    }
-    GNUNET_assert (0 != plugin->max_connections);
-    plugin->max_connections--;
-#if DEBUG_TCP_NAT
-    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
-                     "Asked to transmit to `%4s', creating fresh session using address `%s'.\n",
-                     GNUNET_i2s (target), GNUNET_a2s (sb, sbs));
-#endif
-    session =
-        create_session (plugin, target,
-                        GNUNET_SERVER_connect_socket (plugin->server, sa),
-                        GNUNET_NO);
-    session->connect_addr = GNUNET_malloc (addrlen);
-    memcpy (session->connect_addr, addr, addrlen);
-    session->connect_alen = addrlen;
-    if (addrlen != 0)
-    {
-      struct GNUNET_ATS_Information ats;
-      ats = plugin->env->get_address_type (plugin->env->cls, sb ,sbs);
-      session->ats_address_network_type = ats.value;
-    }
-    else
-      GNUNET_break (0);
-  }
-  else                          /* session != NULL */
-  {
-    /* check if session is valid */
-    struct Session *ses = plugin->sessions;
-
-    if (0 !=
-        memcmp (target, &session->target, sizeof (struct GNUNET_PeerIdentity)))
-    {
-      GNUNET_break (0);
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Got session %p for `%s', but should be for peer `%s'!\n",
-                  session, GNUNET_i2s (&session->target),
-                  GNUNET_h2s (&target->hashPubKey));
-      return -1;
-    }
-
-    while ((ses != NULL) && (ses != session))
-      ses = ses->next;
-    if (ses == NULL)
-    {
-      return -1;
-    }
-  }
-  GNUNET_assert (session != NULL);
-  GNUNET_assert (session->client != NULL);
-  GNUNET_SERVER_client_set_timeout (session->client,
-                                    GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# bytes currently in TCP buffers"),
-                            msgbuf_size, GNUNET_NO);
-  /* create new message entry */
-  pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size);
-  pm->msg = (const char *) &pm[1];
-  memcpy (&pm[1], msg, msgbuf_size);
-  pm->message_size = msgbuf_size;
-  pm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
-  pm->transmit_cont = cont;
-  pm->transmit_cont_cls = cont_cls;
-
-  /* append pm to pending_messages list */
-  GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head,
-                                    session->pending_messages_tail, pm);
-#if DEBUG_TCP
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
-                   "Asked to transmit %u bytes to `%s', added message to list.\n",
-                   msgbuf_size, GNUNET_i2s (target));
-#endif
-  process_pending_messages (session);
-  return msgbuf_size;
-}
-
-/**
  * Function that can be used by the transport service to transmit
  * a message using the plugin.   Note that in the case of a
  * peer disconnecting, the continuation MUST be called
@@ -2285,9 +1954,7 @@ libgnunet_plugin_transport_tcp_init (void *cls)
   }
   api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
   api->cls = plugin;
-  api->send = &tcp_plugin_send_old;
-
-  api->send_with_session = &tcp_plugin_send;
+  api->send = &tcp_plugin_send;
   api->get_session = &tcp_plugin_get_session;
 
   api->disconnect = &tcp_plugin_disconnect;