-more logging, avoid duplicate re-scheduling

[oweals/gnunet.git] / src / transport / plugin_transport_http_common.c

diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c
index 1df9835aced0be5f9b236316b26ebedee6cf11df..13f01f7131b6bc5a97f9cae4ba95a13e1075def5 100644 (file)
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -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.
  */
 
 /**
@@ -854,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;
@@ -888,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 */