removing legacy send functions from plugins and renaming new send function

1 files changed, 1 insertions, 185 deletions

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index e40d2c8f8..b6e862aa3 100644
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -685,189 +685,6 @@ http_plugin_send (void *cls,
 
 }
 
-/**
- * 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 msgbuf the message to transmit
- * @param msgbuf_size number of bytes in 'msgbuf'
- * @param priority how important is the message (most plugins will
- *                 ignore message priority and just FIFO)
- * @param to 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)
- */
-static ssize_t
-http_plugin_send_old (void *cls, const struct GNUNET_PeerIdentity *target,
-                  const char *msgbuf, size_t msgbuf_size, unsigned int priority,
-                  struct GNUNET_TIME_Relative to, struct Session *session,
-                  const void *addr, size_t addrlen, int force_address,
-                  GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  struct HTTP_Message *msg;
-  struct Session *s;
-
-  GNUNET_assert (plugin != NULL);
-
-  int res = GNUNET_SYSERR;
-
-#if DEBUG_HTTP
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                   "Sending %u bytes to peer `%s' on address `%s' %X %i\n",
-                   msgbuf_size, GNUNET_i2s (target), ((addr != NULL) &&
-                                                      (addrlen !=
-                                                       0)) ?
-                   http_plugin_address_to_string (plugin, addr,
-                                                  addrlen) : "<inbound>",
-                   session, force_address);
-#endif
-
-
-
-  if (addrlen != 0)
-    GNUNET_assert ((addrlen == sizeof (struct IPv4HttpAddress)) ||
-                   (addrlen == sizeof (struct IPv6HttpAddress)));
-  /* look for existing connection */
-  s = lookup_session_old (plugin, target, session, addr, addrlen, 1);
-#if DEBUG_HTTP
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                   "%s existing session: %s\n",
-                   (s != NULL) ? "Found" : "NOT Found", ((s != NULL) &&
-                                                         (s->inbound ==
-                                                          GNUNET_YES)) ?
-                   "inbound" : "outbound");
-#endif
-  /* create new outbound connection */
-  if (s == NULL)
-  {
-    if (plugin->max_connections <= plugin->cur_connections)
-    {
-      GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name,
-                       "Maximum number of connections reached, "
-                       "cannot connect to peer `%s'\n", GNUNET_i2s (target));
-      return res;
-    }
-
-#if DEBUG_HTTP
-    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                     "Initiiating new connection to peer `%s'\n",
-                     GNUNET_i2s (target));
-#endif
-/* AAAAAAAAAAAAAAAAAAA */
-    int res = GNUNET_OK;
-    struct GNUNET_ATS_Information ats;
-    if ((addrlen == sizeof (struct IPv4HttpAddress)) && (addr != NULL))
-    {
-      struct IPv4HttpAddress *a4 = (struct IPv4HttpAddress *) addr;
-      struct sockaddr_in s4;
-
-      s4.sin_family = AF_INET;
-      s4.sin_addr.s_addr = a4->ipv4_addr;
-      s4.sin_port = a4->u4_port;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      s4.sin_len = sizeof (struct sockaddr_in);
-#endif
-      ats = plugin->env->get_address_type (plugin->env->cls, (const struct sockaddr *) &s4, sizeof (struct sockaddr_in));
-
-      if ((ntohs (a4->u4_port) == 0) || (plugin->ipv4 == GNUNET_NO))
-        res = GNUNET_SYSERR;
-    }
-    if ((addrlen == sizeof (struct IPv6HttpAddress)) && (addr != NULL))
-    {
-      struct IPv6HttpAddress *a6 = (struct IPv6HttpAddress *) addr;
-      struct sockaddr_in6 s6;
-
-      s6.sin6_family = AF_INET6;
-      s6.sin6_addr = a6->ipv6_addr;
-      s6.sin6_port = a6->u6_port;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      s6.sin6_len = sizeof (struct sockaddr_in6);
-#endif
-      ats = plugin->env->get_address_type (plugin->env->cls, (const struct sockaddr *) &s6, sizeof (struct sockaddr_in6));
-
-      if ((ntohs (a6->u6_port) == 0) || (plugin->ipv6 == GNUNET_NO))
-        res = GNUNET_SYSERR;
-    }
-    if (res == GNUNET_OK)
-    {
-      s = create_session (plugin, target, addr, addrlen, cont, cont_cls);
-      s->ats_address_network_type = ats.value;
-      GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
-      // initiate new connection
-      res = client_connect (s);
-    }
-    if (res == GNUNET_SYSERR)
-    {
-      if (s != NULL)
-      {
-        GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
-        delete_session (s);
-      }
-      return GNUNET_SYSERR;
-    }
-  }
-
-  /* real sending */
-
-  msg = GNUNET_malloc (sizeof (struct HTTP_Message) + msgbuf_size);
-  msg->next = NULL;
-  msg->size = msgbuf_size;
-  msg->pos = 0;
-  msg->buf = (char *) &msg[1];
-  msg->transmit_cont = cont;
-  msg->transmit_cont_cls = cont_cls;
-  memcpy (msg->buf, msgbuf, msgbuf_size);
-
-  if (s->inbound == GNUNET_NO)
-  {
-#if DEBUG_HTTP
-    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                     "Using outbound client session %p to send to `%s'\n", s,
-                     GNUNET_i2s (target));
-#endif
-
-    client_send (s, msg);
-    res = msgbuf_size;
-  }
-  if (s->inbound == GNUNET_YES)
-  {
-#if DEBUG_HTTP
-    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                     "Using inbound server %p session to send to `%s'\n", s,
-                     GNUNET_i2s (target));
-#endif
-
-    server_send (s, msg);
-    res = msgbuf_size;
-  }
-  return res;
-}
-
 
 /**
  * Function that can be used to force the plugin to disconnect
@@ -1556,13 +1373,12 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
   plugin->env = env;
   api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
   api->cls = plugin;
-  api->send = &http_plugin_send_old;
   api->disconnect = &http_plugin_disconnect;
   api->address_pretty_printer = &http_plugin_address_pretty_printer;
   api->check_address = &http_plugin_address_suggested;
   api->address_to_string = &http_plugin_address_to_string;
   api->get_session = &http_get_session;
-  api->send_with_session =   &http_plugin_send;
+  api->send = &http_plugin_send;
 
 #if BUILD_HTTPS
   plugin->name = "transport-https";