Author: grothoff
Date: 2008-02-23 22:22:43 -0700 (Sat, 23 Feb 2008)
New Revision: 6425
Modified:
GNUnet/src/applications/session/http-peer.conf
GNUnet/src/transports/http.c
GNUnet/todo
Log:
cleaner
Modified: GNUnet/src/applications/session/http-peer.conf
===================================================================
--- GNUnet/src/applications/session/http-peer.conf 2008-02-24 04:52:19 UTC
(rev 6424)
+++ GNUnet/src/applications/session/http-peer.conf 2008-02-24 05:22:43 UTC
(rev 6425)
@@ -25,6 +25,7 @@
HELLOEXCHANGE = YES
TRUSTED = 127.0.0.0/8;
IP = 127.0.0.1
+IP6 = ::1
[LOAD]
BASICLIMITING = YES
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2008-02-24 04:52:19 UTC (rev 6424)
+++ GNUnet/src/transports/http.c 2008-02-24 05:22:43 UTC (rev 6425)
@@ -1148,7 +1148,9 @@
url = GNUNET_malloc (64 + sizeof (GNUNET_EncName) + strlen (buf));
GNUNET_snprintf (url,
64 + sizeof (GNUNET_EncName),
- "http://%s%s%s/%s";, obr, buf, cbr, &enc);
+ "http://%s%s%s:%u/%s";, obr, buf, cbr,
+ ntohs(haddr->port),
+ &enc);
httpSession->cs.client.url = url;
}
EXIT ();
@@ -1168,7 +1170,6 @@
CURLcode ret;
CURLMcode mret;
GNUNET_CronTime now;
- const HostAddress *haddr;
ENTER ();
if (httpSession->cs.client.url == NULL)
@@ -1192,11 +1193,8 @@
if (curl_get == NULL)
return GNUNET_SYSERR;
/* create GET */
- haddr =
- (const HostAddress *) &httpSession->cs.client.address;
CURL_EASY_SETOPT (curl_get, CURLOPT_FAILONERROR, 1);
CURL_EASY_SETOPT (curl_get, CURLOPT_URL, httpSession->cs.client.url);
- CURL_EASY_SETOPT (curl_get, CURLOPT_PORT, (long) ntohs (haddr->port));
if (strlen (proxy) > 0)
CURL_EASY_SETOPT (curl_get, CURLOPT_PROXY, proxy);
CURL_EASY_SETOPT (curl_get, CURLOPT_BUFFERSIZE, 32 * 1024);
@@ -1359,7 +1357,6 @@
CURLcode ret;
CURLMcode mret;
long size;
- const HostAddress *haddr;
ENTER ();
/* we should have initiated a GET earlier,
@@ -1371,11 +1368,8 @@
STEP ();
if (curl_put == NULL)
return GNUNET_SYSERR;
- haddr =
- (const HostAddress *) &httpSession->cs.client.address;
CURL_EASY_SETOPT (curl_put, CURLOPT_FAILONERROR, 1);
CURL_EASY_SETOPT (curl_put, CURLOPT_URL, httpSession->cs.client.url);
- CURL_EASY_SETOPT (curl_put, CURLOPT_PORT, (long) ntohs (haddr->port));
if (strlen (proxy) > 0)
CURL_EASY_SETOPT (curl_put, CURLOPT_PROXY, proxy);
CURL_EASY_SETOPT (curl_put, CURLOPT_BUFFERSIZE, put->size);
Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2008-02-24 04:52:19 UTC (rev 6424)
+++ GNUnet/todo 2008-02-24 05:22:43 UTC (rev 6425)
@@ -5,13 +5,13 @@
PRE == to be done before a pre-release
0.8.0 [6'08] (aka "advanced features"):
-- full support for FSUI pause/resume of search
-- HTTP transport uses FAR too much CPU (80-90%!?) => possibly fixed!
+- full support for FSUI pause/resume of search [DONE, could use more testing]
- clean up VPN code
- tune GAP query planning code [RC]
- gnunet-chat (CS-only)
TESTING:
+- test RPC code (write a small demo)
- test GAP code in general (still have one unexplained crazy crash!)
Program terminated with signal 11, Segmentation fault.
#0 0xb4e8e73a in GNUNET_FS_SHARED_test_valid_new_response (rl=0x8060,
@@ -36,10 +36,6 @@
crash.
-
-
-- test RPC code (write a small demo)
-
Hostlist for network testing:
* http://vserver1236.vserver-on.de/hostlist-074
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
