struct Session *session, const void *addr, size_t addrlen,
int force_address)
{
- struct Session *s = NULL;
- struct Session *t = NULL;
+ struct Session *t;
int e_peer;
int e_addr;
- t = plugin->head;
- if (t == NULL)
- return NULL;
- while (t != NULL)
+ for (t = plugin->head; NULL != t; t = t->next)
{
#if 0
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
#endif
e_peer = GNUNET_NO;
e_addr = GNUNET_NO;
-
if (0 == memcmp (target, &t->target, sizeof (struct GNUNET_PeerIdentity)))
{
e_peer = GNUNET_YES;
- if (addrlen == t->addrlen)
- {
- if (0 == memcmp (addr, t->addr, addrlen))
- {
- e_addr = GNUNET_YES;
- }
- }
- if ((t == session))
- {
- if (t->addrlen == session->addrlen)
- {
- if (0 == memcmp (session->addr, t->addr, t->addrlen))
- {
- e_addr = GNUNET_YES;
- }
- }
- }
+ if ( (addrlen == t->addrlen) &&
+ (0 == memcmp (addr, t->addr, addrlen)) )
+ e_addr = GNUNET_YES;
+ if ( (t == session) &&
+ (t->addrlen == session->addrlen) &&
+ (0 == memcmp (session->addr, t->addr, t->addrlen)) )
+ e_addr = GNUNET_YES;
}
- if ((e_peer == GNUNET_YES) && (force_address == GNUNET_NO))
- {
- s = t;
- break;
- }
- if ((e_peer == GNUNET_YES) && (force_address == GNUNET_YES) &&
- (e_addr == GNUNET_YES))
- {
- s = t;
- break;
- }
- if ((e_peer == GNUNET_YES) && (force_address == GNUNET_SYSERR))
- {
- s = t;
- break;
- }
- if (s != NULL)
- break;
- t = t->next;
+ if ( ((e_peer == GNUNET_YES) && (force_address == GNUNET_NO)) ||
+ ((e_peer == GNUNET_YES) && (force_address == GNUNET_YES) && (e_addr == GNUNET_YES)) ||
+ ((e_peer == GNUNET_YES) && (force_address == GNUNET_SYSERR)) )
+ return t;
}
-
-
- return s;
+ return NULL;
}
struct Session *
lookup_session (struct Plugin *plugin,
const struct GNUNET_HELLO_Address *address)
{
- struct Session *tmp = NULL;
-
- tmp = plugin->head;
- if (tmp == NULL)
- return NULL;
- while (tmp != NULL)
- {
- if (0 != memcmp (&address->peer, &tmp->target, sizeof (struct GNUNET_PeerIdentity)))
- continue;
- if ((address->address_length != tmp->addrlen) &&
- (0 != memcmp (address->address, tmp->addr, tmp->addrlen)))
- continue;
+ struct Session *pos;
- return tmp;
- }
+ for (pos = plugin->head; NULL != pos; pos = pos->next)
+ if ( (0 == memcmp (&address->peer, &pos->target, sizeof (struct GNUNET_PeerIdentity))) &&
+ (address->address_length == pos->addrlen) &&
+ (0 == memcmp (address->address, pos->addr, pos->addrlen)) )
+ return pos;
return NULL;
}
}
/**
- * Creates a new session the transport service will use to send data to the
+ * Creates a new outbound session the transport service will use to send data to the
* peer
*
* @param cls the plugin
* @return the session or NULL of max connections exceeded
*/
-static const struct Session *
+static struct Session *
http_get_session (void *cls,
const struct GNUNET_HELLO_Address *address)
{
GNUNET_assert (plugin != NULL);
GNUNET_assert (address != NULL);
+ GNUNET_assert (address->address != NULL);
+
+ ats.type = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
+ ats.value = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
/* find existing session */
s = lookup_session (plugin, address);
s->addrlen = addrlen;
s->next = NULL;
s->next_receive = GNUNET_TIME_absolute_get_zero ();
-
+ s->inbound = GNUNET_NO;
s->ats_address_network_type = htonl (GNUNET_ATS_NET_UNSPECIFIED);
/* Get ATS type */
- if ((addrlen == sizeof (struct IPv4HttpAddress)) && (address->address != NULL))
+ if (addrlen == sizeof (struct IPv4HttpAddress))
{
struct IPv4HttpAddress *a4 = (struct IPv4HttpAddress *) address->address;
struct sockaddr_in s4;
#endif
ats = plugin->env->get_address_type (plugin->env->cls, (const struct sockaddr *) &s4, sizeof (struct sockaddr_in));
}
- if ((addrlen == sizeof (struct IPv6HttpAddress)) && (address->address != NULL))
+ if (addrlen == sizeof (struct IPv6HttpAddress))
{
struct IPv6HttpAddress *a6 = (struct IPv6HttpAddress *) address->address;
struct sockaddr_in6 s6;
/* initiate new connection */
if (GNUNET_SYSERR == client_connect (s))
{
- if (s != NULL)
- {
- GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
- delete_session (s);
- }
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ "Cannot connect to peer `%s' address `%s''\n",
+ http_plugin_address_to_string(NULL, s->addr, s->addrlen),
+ GNUNET_i2s (&s->target));
+ GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
+ delete_session (s);
return NULL;
}
{
if ((tmp == session) &&
(0 == memcmp (&session->target, &tmp->target, sizeof (struct GNUNET_PeerIdentity))) &&
- (session->addrlen != tmp->addrlen) &&
- (0 != memcmp (session->addr, tmp->addr, tmp->addrlen)))
+ (session->addrlen == tmp->addrlen) &&
+ (0 == memcmp (session->addr, tmp->addr, tmp->addrlen)))
break;
tmp = tmp->next;
}
}
-/**
- * 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
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";
projects / oweals / gnunet.git / blobdiff