X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fplugin_transport_http_common.c;h=eb8320c8e698212ac731100be3bae264b067eb77;hb=5126e9d42b24a0a6cf26de79b65bcd23790dee9b;hp=a420b8cdc5a73a20852546b027b95341f4af58c2;hpb=93e4fd134940b5f029cd293a580ab012a71012f3;p=oweals%2Fgnunet.git diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c index a420b8cdc..eb8320c8e 100644 --- a/src/transport/plugin_transport_http_common.c +++ b/src/transport/plugin_transport_http_common.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - (C) 2002-2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2002-2013 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -41,6 +41,7 @@ http_clean_splitted (struct SplittedHTTPAddress *spa) } } + struct SplittedHTTPAddress * http_split_address (const char * addr) { @@ -204,7 +205,7 @@ struct PrettyPrinterContext /** * Timeout task */ - GNUNET_SCHEDULER_TaskIdentifier timeout_task; + struct GNUNET_SCHEDULER_Task * timeout_task; /** * Splitted Address @@ -244,13 +245,15 @@ static struct PrettyPrinterContext *dll_ppc_tail; * to override the address again. * * @param plugin the name of the plugin - * @param addr binary address - * @param addrlen length of the address - * @return string representing the same address + * @param saddr the splitted http address + * @param options address options + * @param dnsresult dns name to include in address + * @return string representing the same address or NULL on error */ static const char * http_common_plugin_dnsresult_to_address (const char *plugin, - const struct SplittedHTTPAddress *saddr, uint32_t options, + const struct SplittedHTTPAddress *saddr, + uint32_t options, const char *dnsresult) { static char rbuf[1024]; @@ -260,7 +263,7 @@ http_common_plugin_dnsresult_to_address (const char *plugin, dnsresult, saddr->port, saddr->path); if (strlen (res) + 1 < 500) { - memcpy (rbuf, res, strlen (res) + 1); + GNUNET_memcpy (rbuf, res, strlen (res) + 1); GNUNET_free(res); return rbuf; } @@ -269,6 +272,7 @@ http_common_plugin_dnsresult_to_address (const char *plugin, return NULL ; } + static void http_common_dns_reverse_lookup_cb (void *cls, const char *hostname) { @@ -294,39 +298,48 @@ http_common_dns_reverse_lookup_cb (void *cls, const char *hostname) } } + static int http_common_dns_reverse_lookup (const struct sockaddr *sockaddr, - socklen_t sockaddr_len, const char *type, struct SplittedHTTPAddress *saddr, - uint32_t options, - struct GNUNET_TIME_Relative timeout, - GNUNET_TRANSPORT_AddressStringCallback asc, void *asc_cls) + socklen_t sockaddr_len, + const char *type, + struct SplittedHTTPAddress *saddr, + uint32_t options, + struct GNUNET_TIME_Relative timeout, + GNUNET_TRANSPORT_AddressStringCallback asc, + void *asc_cls) { struct PrettyPrinterContext *ppc; - ppc = GNUNET_new (struct PrettyPrinterContext); - ppc->sucess = GNUNET_NO; + ppc = GNUNET_new (struct PrettyPrinterContext); ppc->saddr = saddr; ppc->asc = asc; ppc->asc_cls = asc_cls; ppc->plugin = GNUNET_strdup (type); ppc->options = options; - - ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sockaddr, sockaddr_len, - GNUNET_YES, timeout, &http_common_dns_reverse_lookup_cb, ppc); + ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sockaddr, + sockaddr_len, + GNUNET_YES, + timeout, + &http_common_dns_reverse_lookup_cb, + ppc); if (NULL == ppc->resolver_handle) { GNUNET_free(ppc->plugin); GNUNET_free(ppc); return GNUNET_SYSERR; } - - GNUNET_CONTAINER_DLL_insert(dll_ppc_head, dll_ppc_tail, ppc); + GNUNET_CONTAINER_DLL_insert (dll_ppc_head, + dll_ppc_tail, + ppc); return GNUNET_OK; } + static void -http_common_dns_ip_lookup_cb (void *cls, const struct sockaddr *addr, - socklen_t addrlen) +http_common_dns_ip_lookup_cb (void *cls, + const struct sockaddr *addr, + socklen_t addrlen) { struct PrettyPrinterContext *ppc = cls; @@ -350,36 +363,42 @@ http_common_dns_ip_lookup_cb (void *cls, const struct sockaddr *addr, } } + static int -http_common_dns_ip_lookup (const char *name, const char *type, - struct SplittedHTTPAddress *saddr, - uint32_t options, - struct GNUNET_TIME_Relative timeout, - GNUNET_TRANSPORT_AddressStringCallback asc, void *asc_cls) +http_common_dns_ip_lookup (const char *name, + const char *type, + struct SplittedHTTPAddress *saddr, + uint32_t options, + struct GNUNET_TIME_Relative timeout, + GNUNET_TRANSPORT_AddressStringCallback asc, void *asc_cls) { struct PrettyPrinterContext *ppc; - ppc = GNUNET_new (struct PrettyPrinterContext); + ppc = GNUNET_new (struct PrettyPrinterContext); ppc->sucess = GNUNET_NO; ppc->saddr = saddr; ppc->asc = asc; ppc->asc_cls = asc_cls; ppc->plugin = GNUNET_strdup (type); ppc->options = options; - - ppc->resolver_handle = GNUNET_RESOLVER_ip_get (name, AF_UNSPEC, timeout, - &http_common_dns_ip_lookup_cb, ppc); + ppc->resolver_handle = GNUNET_RESOLVER_ip_get (name, + AF_UNSPEC, + timeout, + &http_common_dns_ip_lookup_cb, + ppc); if (NULL == ppc->resolver_handle) { GNUNET_free(ppc->plugin); GNUNET_free(ppc); return GNUNET_SYSERR; } - - GNUNET_CONTAINER_DLL_insert(dll_ppc_head, dll_ppc_tail, ppc); + GNUNET_CONTAINER_DLL_insert (dll_ppc_head, + dll_ppc_tail, + ppc); return GNUNET_OK; } + /** * Convert the transports address to a nice, human-readable * format. @@ -396,9 +415,12 @@ http_common_dns_ip_lookup (const char *name, const char *type, */ void http_common_plugin_address_pretty_printer (void *cls, const char *type, - const void *addr, size_t addrlen, int numeric, - struct GNUNET_TIME_Relative timeout, - GNUNET_TRANSPORT_AddressStringCallback asc, void *asc_cls) + const void *addr, + size_t addrlen, + int numeric, + struct GNUNET_TIME_Relative timeout, + GNUNET_TRANSPORT_AddressStringCallback asc, + void *asc_cls) { const struct HttpAddress *address = addr; struct SplittedHTTPAddress *saddr; @@ -410,8 +432,8 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type, saddr = NULL; sock_addr = NULL; - if ((addrlen < sizeof(struct HttpAddress)) - || (addrlen != http_common_address_get_size (address))) + if ( (addrlen < sizeof(struct HttpAddress)) || + (addrlen != http_common_address_get_size (address)) ) { GNUNET_break(0); goto handle_error; @@ -435,7 +457,7 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type, if (GNUNET_SYSERR == res) { /* Malformed address */ - GNUNET_break(0); + GNUNET_break (0); goto handle_error; } else if (GNUNET_NO == res) @@ -451,81 +473,90 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type, else { /* Must not happen */ - GNUNET_break(0); + GNUNET_break (0); goto handle_error; } - if ((GNUNET_YES == numeric) && (GNUNET_YES == have_ip)) + if ( (GNUNET_YES == numeric) && + (GNUNET_YES == have_ip) ) { /* No lookup required */ ret = http_common_plugin_address_to_string (type, address, addrlen); asc (asc_cls, ret, (NULL == ret) ? GNUNET_SYSERR : GNUNET_OK); asc (asc_cls, NULL, GNUNET_OK); http_clean_splitted (saddr); - GNUNET_free_non_null(sock_addr); + GNUNET_free_non_null (sock_addr); return; } - else if ((GNUNET_YES == numeric) && (GNUNET_NO == have_ip)) + if ( (GNUNET_YES == numeric) && + (GNUNET_NO == have_ip) ) { /* Forward lookup */ - if (GNUNET_SYSERR - == http_common_dns_ip_lookup (saddr->host, type, saddr, address->options, timeout, asc, - asc_cls)) + if (GNUNET_SYSERR == + http_common_dns_ip_lookup (saddr->host, type, saddr, + address->options, timeout, + asc, asc_cls)) { GNUNET_break(0); goto handle_error; } /* Wait for resolver callback */ + GNUNET_free_non_null (sock_addr); return; } - else if ((GNUNET_NO == numeric) && (GNUNET_YES == have_ip)) + if ( (GNUNET_NO == numeric) && + (GNUNET_YES == have_ip) ) { /* Reverse lookup */ - if (GNUNET_SYSERR - == http_common_dns_reverse_lookup (sock_addr, - (AF_INET == sock_addr->sa_family) ? - sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), type, - saddr, address->options, timeout, asc, asc_cls)) + if (GNUNET_SYSERR == + http_common_dns_reverse_lookup (sock_addr, + (AF_INET == sock_addr->sa_family) + ? sizeof(struct sockaddr_in) + : sizeof(struct sockaddr_in6), + type, + saddr, + address->options, timeout, + asc, asc_cls)) { GNUNET_break(0); goto handle_error; } /* Wait for resolver callback */ + GNUNET_free_non_null (sock_addr); return; } - else if ((GNUNET_NO == numeric) && (GNUNET_NO == have_ip)) + if ( (GNUNET_NO == numeric) && + (GNUNET_NO == have_ip) ) { /* No lookup required */ ret = http_common_plugin_address_to_string (type, address, addrlen); asc (asc_cls, ret, (NULL == ret) ? GNUNET_SYSERR : GNUNET_OK); asc (asc_cls, NULL, GNUNET_OK); - GNUNET_free_non_null(sock_addr); + GNUNET_free_non_null (sock_addr); http_clean_splitted (saddr); return; } - else - { - /* Error */ - goto handle_error; - } - return; + /* Error (argument supplied not GNUNET_YES or GNUNET_NO) */ + GNUNET_break (0); + goto handle_error; - handle_error: - /* Error */ + handle_error: + /* Report error */ asc (asc_cls, NULL, GNUNET_SYSERR); asc (asc_cls, NULL, GNUNET_OK); - GNUNET_free_non_null(sock_addr); + GNUNET_free_non_null (sock_addr); if (NULL != saddr) http_clean_splitted (saddr); - return; - } + /** * FIXME. */ const char * -http_common_plugin_address_to_url (void *cls, const void *addr, size_t addrlen) +http_common_plugin_address_to_url (void *cls, + const void *addr, + size_t addrlen) { static char rbuf[1024]; const struct HttpAddress *address = addr; @@ -534,27 +565,29 @@ http_common_plugin_address_to_url (void *cls, const void *addr, size_t addrlen) if (NULL == addr) { GNUNET_break(0); - return NULL ; + return NULL; } - if (0 >= addrlen) + if (0 == addrlen) { GNUNET_break(0); - return NULL ; + return NULL; } if (addrlen != http_common_address_get_size (address)) { GNUNET_break(0); - return NULL ; + return NULL; } addr_str = (char *) &address[1]; - if (addr_str[ntohl (address->urlen) - 1] != '\0') - return NULL ; + return NULL; - memcpy (rbuf, &address[1], ntohl (address->urlen)); + GNUNET_memcpy (rbuf, + &address[1], + ntohl (address->urlen)); return rbuf; } + /** * Function called for a quick conversion of the binary address to * a numeric address. Note that the caller must not free the @@ -567,8 +600,9 @@ http_common_plugin_address_to_url (void *cls, const void *addr, size_t addrlen) * @return string representing the same address */ const char * -http_common_plugin_address_to_string (const char *plugin, const void *addr, - size_t addrlen) +http_common_plugin_address_to_string (const char *plugin, + const void *addr, + size_t addrlen) { static char rbuf[1024]; const struct HttpAddress *address = addr; @@ -577,25 +611,25 @@ http_common_plugin_address_to_string (const char *plugin, const void *addr, GNUNET_assert(NULL != plugin); if (NULL == addr) - return NULL ; + return NULL; if (0 == addrlen) - return NULL ; + return NULL; if (addrlen != http_common_address_get_size (address)) - return NULL ; + return NULL; addr_str = (char *) &address[1]; if (addr_str[ntohl (address->urlen) - 1] != '\0') - return NULL ; + return NULL; GNUNET_asprintf (&res, "%s.%u.%s", plugin, ntohl (address->options), &address[1]); if (strlen (res) + 1 < 500) { - memcpy (rbuf, res, strlen (res) + 1); + GNUNET_memcpy (rbuf, res, strlen (res) + 1); GNUNET_free(res); return rbuf; } GNUNET_break(0); GNUNET_free(res); - return NULL ; + return NULL; } /** @@ -611,8 +645,11 @@ http_common_plugin_address_to_string (const char *plugin, const void *addr, * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure */ int -http_common_plugin_string_to_address (void *cls, const char *addr, - uint16_t addrlen, void **buf, size_t *added) +http_common_plugin_string_to_address (void *cls, + const char *addr, + uint16_t addrlen, + void **buf, + size_t *added) { struct HttpAddress *a; char *address; @@ -665,7 +702,7 @@ http_common_plugin_string_to_address (void *cls, const char *addr, a = GNUNET_malloc (sizeof (struct HttpAddress) + urlen); a->options = htonl (options); a->urlen = htonl (urlen); - memcpy (&a[1], address, urlen); + GNUNET_memcpy (&a[1], address, urlen); (*buf) = a; (*added) = sizeof(struct HttpAddress) + urlen; @@ -673,6 +710,7 @@ http_common_plugin_string_to_address (void *cls, const char *addr, return GNUNET_OK; } + /** * Create a HTTP address from a socketaddr * @@ -683,22 +721,28 @@ http_common_plugin_string_to_address (void *cls, const char *addr, */ struct HttpAddress * http_common_address_from_socket (const char *protocol, - const struct sockaddr *addr, socklen_t addrlen) + const struct sockaddr *addr, + socklen_t addrlen) { struct HttpAddress *address = NULL; char *res; size_t len; - GNUNET_asprintf (&res, "%s://%s", protocol, GNUNET_a2s (addr, addrlen)); + GNUNET_asprintf (&res, + "%s://%s", + protocol, + GNUNET_a2s (addr, + addrlen)); len = strlen (res) + 1; address = GNUNET_malloc (sizeof (struct HttpAddress) + len); address->options = htonl (HTTP_OPTIONS_NONE); address->urlen = htonl (len); - memcpy (&address[1], res, len); + GNUNET_memcpy (&address[1], res, len); GNUNET_free(res); return address; } + /** * Create a socketaddr from a HTTP address * @@ -711,7 +755,9 @@ http_common_address_from_socket (const char *protocol, * @return the string */ struct sockaddr * -http_common_socket_from_address (const void *addr, size_t addrlen, int *res) +http_common_socket_from_address (const void *addr, + size_t addrlen, + int *res) { const struct HttpAddress *ha; struct SplittedHTTPAddress * spa; @@ -723,40 +769,40 @@ http_common_socket_from_address (const void *addr, size_t addrlen, int *res) ha = (const struct HttpAddress *) addr; if (NULL == addr) { - GNUNET_break(0); - return NULL ; + GNUNET_break (0); + return NULL; } - if (0 >= addrlen) + if (0 == addrlen) { - GNUNET_break(0); - return NULL ; + GNUNET_break (0); + return NULL; } if (addrlen < sizeof(struct HttpAddress)) { - GNUNET_break(0); - return NULL ; + GNUNET_break (0); + return NULL; } urlen = ntohl (ha->urlen); if (sizeof(struct HttpAddress) + urlen != addrlen) { /* This is a legacy addresses */ - return NULL ; + return NULL; } if (addrlen < sizeof(struct HttpAddress) + urlen) { /* This is a legacy addresses */ - return NULL ; + return NULL; } if (((char *) addr)[addrlen - 1] != '\0') { - GNUNET_break(0); - return NULL ; + GNUNET_break (0); + return NULL; } spa = http_split_address ((const char *) &ha[1]); if (NULL == spa) { (*res) = GNUNET_SYSERR; - return NULL ; + return NULL; } s = GNUNET_new (struct sockaddr_storage); @@ -771,8 +817,7 @@ http_common_socket_from_address (const void *addr, size_t addrlen, int *res) } else if ((AF_INET != s->ss_family) && (AF_INET6 != s->ss_family)) { - - GNUNET_free(s); + GNUNET_free (s); (*res) = GNUNET_SYSERR; s = NULL; } @@ -781,10 +826,11 @@ http_common_socket_from_address (const void *addr, size_t addrlen, int *res) (*res) = GNUNET_YES; } http_clean_splitted (spa); - GNUNET_free(to_conv); + GNUNET_free (to_conv); return (struct sockaddr *) s; } + /** * Get the length of an address * @@ -797,6 +843,7 @@ http_common_address_get_size (const struct HttpAddress * addr) return sizeof(struct HttpAddress) + ntohl (addr->urlen); } + /** * Compare addr1 to addr2 * @@ -807,8 +854,10 @@ http_common_address_get_size (const struct HttpAddress * addr) * @return #GNUNET_YES if equal, #GNUNET_NO if not, #GNUNET_SYSERR on error */ size_t -http_common_cmp_addresses (const void *addr1, size_t addrlen1, - const void *addr2, size_t addrlen2) +http_common_cmp_addresses (const void *addr1, + size_t addrlen1, + const void *addr2, + size_t addrlen2) { const char *a1 = addr1; const char *a2 = addr2; @@ -819,14 +868,14 @@ http_common_cmp_addresses (const void *addr1, size_t addrlen1, if (NULL == a1) return GNUNET_SYSERR; - if (0 >= addrlen1) + if (0 == addrlen1) return GNUNET_SYSERR; if (a1[addrlen1 - 1] != '\0') return GNUNET_SYSERR; if (NULL == a2) return GNUNET_SYSERR; - if (0 >= addrlen2) + if (0 == addrlen2) return GNUNET_SYSERR; if (a2[addrlen2 - 1] != '\0') return GNUNET_SYSERR; @@ -841,4 +890,49 @@ http_common_cmp_addresses (const void *addr1, size_t addrlen1, return GNUNET_NO; } + +/** + * Function obtain the network type for an address. + * + * @param env the environment + * @param address the address + * @return the network type + */ +enum GNUNET_ATS_Network_Type +http_common_get_network_for_address (struct GNUNET_TRANSPORT_PluginEnvironment *env, + const struct GNUNET_HELLO_Address *address) +{ + + struct sockaddr *sa; + enum GNUNET_ATS_Network_Type net_type; + size_t salen = 0; + int res; + + net_type = GNUNET_ATS_NET_UNSPECIFIED; + sa = http_common_socket_from_address (address->address, + address->address_length, + &res); + if (GNUNET_SYSERR == res) + return net_type; + if (GNUNET_YES == res) + { + GNUNET_assert (NULL != sa); + if (AF_INET == sa->sa_family) + { + salen = sizeof (struct sockaddr_in); + } + else if (AF_INET6 == sa->sa_family) + { + salen = sizeof (struct sockaddr_in6); + } + net_type = env->get_address_type (env->cls, + sa, + salen); + GNUNET_free (sa); + } + return net_type; +} + + + /* end of plugin_transport_http_common.c */