[GNUnet-SVN] r19794 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-02-13 17:33:24 +0100 (Mon, 13 Feb 2012)
New Revision: 19794

Modified:
   gnunet/src/transport/plugin_transport_http.c
Log:
- fixing coverity errrors


Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2012-02-13 16:21:23 UTC 
(rev 19793)
+++ gnunet/src/transport/plugin_transport_http.c        2012-02-13 16:33:24 UTC 
(rev 19794)
@@ -511,7 +511,11 @@
 
   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)
@@ -543,7 +547,7 @@
   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;
@@ -556,7 +560,7 @@
 #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;