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

[gnunet]

Author: wachs
Date: 2010-06-14 11:31:57 +0200 (Mon, 14 Jun 2010)
New Revision: 11737

Modified:
   gnunet/src/transport/plugin_transport_http.c
   gnunet/src/transport/test_plugin_transport_http.c
Log:


Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-06-14 08:29:59 UTC 
(rev 11736)
+++ gnunet/src/transport/plugin_transport_http.c        2010-06-14 09:31:57 UTC 
(rev 11737)
@@ -395,14 +395,12 @@
     {
       ses->ip = GNUNET_malloc (INET_ADDRSTRLEN);
       addrin = addr_in;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Port %u \n", addrin->sin_port);
       
inet_ntop(addrin->sin_family,&(addrin->sin_addr),ses->ip,INET_ADDRSTRLEN);
     }
     if ( AF_INET6 == addr_in->sin_family)
     {
       ses->ip = GNUNET_malloc (INET6_ADDRSTRLEN);
       addrin6 = (struct sockaddr_in6 *) addr_in;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Port %u \n", addrin6->sin6_port);
       inet_ntop(addrin6->sin6_family, &(addrin6->sin6_addr) 
,ses->ip,INET6_ADDRSTRLEN);
     }
   }
@@ -1194,13 +1192,12 @@
   unsigned int port;
   if (addrlen == (sizeof (struct IPv4HttpAddress)))
     {
-      inet_ntop(AF_INET, (struct in_addr *) addr,address,INET_ADDRSTRLEN);
-      port = ((struct IPv4HttpAddress *) addr)->u_port;
-      //port = ntohs(((struct in_addr *) addr)->);
+      inet_ntop(AF_INET,&((struct IPv4HttpAddress *) 
addr)->ipv4_addr,address,INET_ADDRSTRLEN);
+      port = ntohs(((struct IPv4HttpAddress *) addr)->u_port);
     }
   else if (addrlen == (sizeof (struct IPv6HttpAddress)))
     {
-      inet_ntop(AF_INET6, (struct in6_addr *) addr,address,INET6_ADDRSTRLEN);
+      inet_ntop(AF_INET6, &((struct IPv6HttpAddress *) 
addr)->ipv6_addr,address,INET6_ADDRSTRLEN);
       port = ntohs(((struct IPv6HttpAddress *) addr)->u6_port);
     }
   else
@@ -1208,7 +1205,6 @@
       GNUNET_break (0);
       return -1;
     }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"ADDR `%s':%u \n",address,port);
 
   ses->transmit_cont = cont;
   ses->transmit_cont_cls = cont_cls;
@@ -1346,6 +1342,7 @@
 {
   struct IPv4HttpAddress *v4;
   struct IPv6HttpAddress *v6;
+  unsigned int port;
 
   if ((addrlen != sizeof (struct IPv4HttpAddress)) &&
       (addrlen != sizeof (struct IPv6HttpAddress)))
@@ -1357,8 +1354,8 @@
     {
       v4 = (struct IPv4HttpAddress *) addr;
 
-      v4->u_port = ntohs (v4->u_port);
-      if (v4->u_port != plugin->port_inbound)
+      port = ntohs (v4->u_port);
+      if (port != plugin->port_inbound)
       {
         GNUNET_break_op (0);
         return GNUNET_SYSERR;
@@ -1372,8 +1369,8 @@
           GNUNET_break_op (0);
           return GNUNET_SYSERR;
         }
-      v6->u6_port = ntohs (v6->u6_port);
-      if (v6->u6_port != plugin->port_inbound)
+      port = ntohs (v6->u6_port);
+      if (port != plugin->port_inbound)
       {
         GNUNET_break_op (0);
         return GNUNET_SYSERR;

Modified: gnunet/src/transport/test_plugin_transport_http.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_http.c   2010-06-14 08:29:59 UTC 
(rev 11736)
+++ gnunet/src/transport/test_plugin_transport_http.c   2010-06-14 09:31:57 UTC 
(rev 11737)
@@ -902,6 +902,9 @@
   struct Plugin_Address * tmp_addr;
   struct GNUNET_MessageHeader msg;
   char * tmp = GNUNET_malloc(sizeof(struct GNUNET_MessageHeader));
+  char address[INET6_ADDRSTRLEN];
+  unsigned int port;
+
   msg.size=htons(sizeof(struct GNUNET_MessageHeader));
   msg.type=htons(13);
   memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
@@ -912,7 +915,25 @@
 
   while (tmp_addr != NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Sending message to addres no. %u\n", 
count);
+
+
+    if (tmp_addr->addrlen == (sizeof (struct IPv4HttpAddress)))
+      {
+        inet_ntop(AF_INET, (struct in_addr *) 
tmp_addr->addr,address,INET_ADDRSTRLEN);
+        port = ntohs(((struct IPv4HttpAddress *) tmp_addr->addr)->u_port);
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Sending message to addres no. %u: 
`%s':%u\n", count,address, port);
+      }
+    else if (tmp_addr->addrlen == (sizeof (struct IPv6HttpAddress)))
+      {
+        inet_ntop(AF_INET6, (struct in6_addr *) 
tmp_addr->addr,address,INET6_ADDRSTRLEN);
+        port = ntohs(((struct IPv6HttpAddress *) tmp_addr->addr)->u6_port);
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Sending message to addres no. %u: 
`%s':%u\n", count,address,port);
+      }
+    else
+      {
+        GNUNET_break (0);
+        return;
+      }
     api->send(api->cls, &my_identity, tmp, sizeof(struct 
GNUNET_MessageHeader), 0, TIMEOUT, NULL,tmp_addr->addr, tmp_addr->addrlen, 
GNUNET_YES, &task_send_cont, NULL);
     tmp_addr = tmp_addr->next;
     count ++;