* Port to add after the IP address.
*/
uint16_t port;
+
+ uint32_t addrlen;
+
+ int numeric;
};
append_port (void *cls, const char *hostname)
{
struct PrettyPrinterContext *ppc = cls;
- char *ret;
+ static char rbuf[INET6_ADDRSTRLEN + 13];
if (hostname == NULL)
{
GNUNET_free (ppc);
return;
}
- GNUNET_asprintf (&ret, "%s://%s:%d", ppc->plugin->protocol, hostname,
- ppc->plugin->port);
- ppc->asc (ppc->asc_cls, ret);
- GNUNET_free (ret);
+
+#if !BUILD_HTTPS
+ const char *protocol = "http";
+#else
+ const char *protocol = "https";
+#endif
+ GNUNET_assert ((strlen (hostname) + 7) < (INET6_ADDRSTRLEN + 13));
+ if (ppc->addrlen == sizeof (struct IPv6HttpAddress))
+ {
+ if (ppc->numeric == GNUNET_YES)
+ GNUNET_snprintf (rbuf, sizeof (rbuf), "%s://[%s]:%u/", protocol, hostname, ppc->port);
+ else
+ {
+ if (strchr(hostname, ':') != NULL)
+ GNUNET_snprintf (rbuf, sizeof (rbuf), "%s://[%s]:%u/", protocol, hostname, ppc->port);
+ else
+ GNUNET_snprintf (rbuf, sizeof (rbuf), "%s://%s:%u/", protocol, hostname, ppc->port);
+ }
+ }
+ else if (ppc->addrlen == sizeof (struct IPv4HttpAddress))
+ GNUNET_snprintf (rbuf, sizeof (rbuf), "%s://%s:%u/", protocol, hostname, ppc->port);
+ ppc->asc (ppc->asc_cls, rbuf);
}
GNUNET_assert (cls != NULL);
struct PrettyPrinterContext *ppc;
const void *sb;
+ struct sockaddr_in s4;
+ struct sockaddr_in6 s6;
size_t sbs;
uint16_t port = 0;
- if (addrlen == sizeof (struct IPv6HttpAddress))
+ if ((addrlen == sizeof (struct IPv6HttpAddress)) && (addr != NULL))
{
struct IPv6HttpAddress *a6 = (struct IPv6HttpAddress *) addr;
-
- sb = &a6->ipv6_addr;
- sbs = sizeof (struct in6_addr);
+ 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
+ sb = &s6;
+ sbs = sizeof (struct sockaddr_in6);
port = ntohs (a6->u6_port);
+
}
- else if (addrlen == sizeof (struct IPv4HttpAddress))
+ else if ((addrlen == sizeof (struct IPv4HttpAddress)) && (addr != NULL))
{
struct IPv4HttpAddress *a4 = (struct IPv4HttpAddress *) addr;
- sb = &a4->ipv4_addr;
- sbs = sizeof (struct in_addr);
+ 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
+ sb = &s4;
+ sbs = sizeof (struct sockaddr_in);
port = ntohs (a4->u4_port);
}
else
ppc->asc_cls = asc_cls;
ppc->port = port;
ppc->plugin = cls;
+ ppc->addrlen = addrlen;
+ ppc->numeric = numeric;
GNUNET_RESOLVER_hostname_get (sb, sbs, !numeric, timeout, &append_port, ppc);
}
{
struct Session *s = cls;
struct Plugin *plugin = s->plugin;
- struct GNUNET_ATS_Information distance;
struct GNUNET_TIME_Relative delay;
+ struct GNUNET_ATS_Information atsi[2];
- distance.type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
- distance.value = htonl (1);
+ atsi[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+ atsi[0].value = htonl (1);
+ atsi[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ atsi[1].value = session->ats_address_network_type;
+ GNUNET_break (session->ats_address_network_type != ntohl (GNUNET_ATS_NET_UNSPECIFIED));
delay =
plugin->env->receive (plugin->env->cls, &s->target, message,
- (const struct GNUNET_ATS_Information *) &distance,
- 1, s, s->addr, s->addrlen);
+ (const struct GNUNET_ATS_Information *) &atsi,
+ 2, s, s->addr, s->addrlen);
return delay;
}
}
struct Session *
-lookup_session (struct Plugin *plugin, const struct GNUNET_PeerIdentity *target,
+lookup_session_old (struct Plugin *plugin, const struct GNUNET_PeerIdentity *target,
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 NULL;
+}
+struct Session *
+lookup_session (struct Plugin *plugin,
+ const struct GNUNET_HELLO_Address *address)
+{
+ struct Session *pos;
- return s;
+ 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;
}
+
void
delete_session (struct Session *s)
{
s->addrlen = addrlen;
s->next = NULL;
s->next_receive = GNUNET_TIME_absolute_get_zero ();
+ s->ats_address_network_type = htonl (GNUNET_ATS_NET_UNSPECIFIED);
return s;
}
{
struct Plugin *plugin = cls;
- plugin->env->session_end (NULL, peer, s);
+ plugin->env->session_end (plugin->env->cls, peer, s);
GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
delete_session (s);
}
+/**
+ * Creates a new outbound session the transport service will use to send data to the
+ * peer
+ *
+ * @param cls the plugin
+ * @param address the address
+ * @return the session or NULL of max connections exceeded
+ */
+
+static struct Session *
+http_get_session (void *cls,
+ const struct GNUNET_HELLO_Address *address)
+{
+ struct Plugin *plugin = cls;
+ struct Session * s = NULL;
+ struct GNUNET_ATS_Information ats;
+ size_t addrlen;
+
+ 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);
+ if (s != NULL)
+ return s;
+
+ 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 (&address->peer));
+ return NULL;
+ }
+
+ /* create new session */
+ addrlen = address->address_length;
+
+ GNUNET_assert ((addrlen == sizeof (struct IPv6HttpAddress)) ||
+ (addrlen == sizeof (struct IPv4HttpAddress)));
+
+ s = GNUNET_malloc (sizeof (struct Session));
+ memcpy (&s->target, &address->peer, sizeof (struct GNUNET_PeerIdentity));
+ s->plugin = plugin;
+ s->addr = GNUNET_malloc (address->address_length);
+ memcpy (s->addr, address->address, address->address_length);
+ 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))
+ {
+ struct IPv4HttpAddress *a4 = (struct IPv4HttpAddress *) address->address;
+ 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 (addrlen == sizeof (struct IPv6HttpAddress))
+ {
+ struct IPv6HttpAddress *a6 = (struct IPv6HttpAddress *) address->address;
+ 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));
+ }
+ s->ats_address_network_type = ats.value;
+
+ /* add new session */
+ GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
+ /* initiate new connection */
+ if (GNUNET_SYSERR == client_connect (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;
+ }
+
+ return s;
+}
/**
* Function that can be used by the transport service to transmit
* a fresh connection to another peer.
*
* @param cls closure
- * @param target who should receive this message
+ * @param session which session must be used
* @param msgbuf the message to transmit
* @param msgbuf_size number of bytes in 'msgbuf'
* @param priority how important is the message (most plugins will
* 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
* and does NOT mean that the message was not transmitted (DV)
*/
static ssize_t
-http_plugin_send (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,
+http_plugin_send (void *cls,
+ struct Session *session,
+ const char *msgbuf, size_t msgbuf_size,
+ unsigned int priority,
+ struct GNUNET_TIME_Relative to,
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
-
-
+ struct Session *tmp;
+ size_t res = -1;
- if (addrlen != 0)
- GNUNET_assert ((addrlen == sizeof (struct IPv4HttpAddress)) ||
- (addrlen == sizeof (struct IPv6HttpAddress)));
-
- /* look for existing connection */
- s = lookup_session (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
+ GNUNET_assert (plugin != NULL);
+ GNUNET_assert (session != NULL);
- /* create new outbound connection */
- if (s == NULL)
+ /* lookup if session is really existing */
+ tmp = plugin->head;
+ while (tmp != 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
- s = create_session (plugin, target, addr, addrlen, cont, cont_cls);
- GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
- // initiate new connection
- if (GNUNET_SYSERR == (res = client_connect (s)))
- {
- GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
- delete_session (s);
- return GNUNET_SYSERR;
- }
+ 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)))
+ break;
+ tmp = tmp->next;
+ }
+ if (tmp == NULL)
+ {
+ GNUNET_break_op (0);
+ return res;
}
+ /* create new message and schedule */
+
msg = GNUNET_malloc (sizeof (struct HTTP_Message) + msgbuf_size);
msg->next = NULL;
msg->size = msgbuf_size;
msg->transmit_cont_cls = cont_cls;
memcpy (msg->buf, msgbuf, msgbuf_size);
- if (s->inbound == GNUNET_NO)
+ if (session->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));
+ "Using outbound client session %p to send to `%session'\n", session,
+ GNUNET_i2s (&session->target));
#endif
- client_send (s, msg);
+ client_send (session, msg);
res = msgbuf_size;
}
- if (s->inbound == GNUNET_YES)
+ if (session->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));
+ "Using inbound server %p session to send to `%session'\n", session,
+ GNUNET_i2s (&session->target));
#endif
- server_send (s, msg);
+ server_send (session, msg);
res = msgbuf_size;
}
return res;
+
}
GNUNET_assert (GNUNET_OK == server_disconnect (s));
GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
- struct HTTP_Message * msg = s->msg_head;
- struct HTTP_Message * tmp = s->msg_head;
+ struct HTTP_Message *msg = s->msg_head;
+ struct HTTP_Message *tmp = NULL;
+
while (msg != NULL)
{
tmp = msg->next;
- GNUNET_CONTAINER_DLL_remove(s->msg_head,s->msg_tail, msg);
+ GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
if (msg->transmit_cont != NULL)
{
- msg->transmit_cont(msg->transmit_cont_cls, target, GNUNET_SYSERR);
+ msg->transmit_cont (msg->transmit_cont_cls, target, GNUNET_SYSERR);
}
GNUNET_free (msg);
msg = tmp;
plugin->env = env;
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = plugin;
- api->send = &http_plugin_send;
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 = &http_plugin_send;
#if BUILD_HTTPS
plugin->name = "transport-https";
while (s != NULL)
{
struct Session *t = s->next;
+
GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
- struct HTTP_Message * msg = s->msg_head;
- struct HTTP_Message * tmp = s->msg_head;
+ struct HTTP_Message *msg = s->msg_head;
+ struct HTTP_Message *tmp = NULL;
+
while (msg != NULL)
{
tmp = msg->next;
- GNUNET_CONTAINER_DLL_remove(s->msg_head,s->msg_tail, msg);
+ GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
if (msg->transmit_cont != NULL)
{
- msg->transmit_cont(msg->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+ msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR);
}
GNUNET_free (msg);
msg = tmp;
projects / oweals / gnunet.git / blobdiff