[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25827 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r25827 - gnunet/src/transport |
|
Date: |
Fri, 18 Jan 2013 12:16:19 +0100 |
Author: wachs
Date: 2013-01-18 12:16:19 +0100 (Fri, 18 Jan 2013)
New Revision: 25827
Modified:
gnunet/src/transport/test_http_common.c
Log:
change
Modified: gnunet/src/transport/test_http_common.c
===================================================================
--- gnunet/src/transport/test_http_common.c 2013-01-18 11:07:46 UTC (rev
25826)
+++ gnunet/src/transport/test_http_common.c 2013-01-18 11:16:19 UTC (rev
25827)
@@ -113,281 +113,70 @@
}
void
-test_hostname ()
+check_pass (char *src,
+ char * protocol,
+ char * host,
+ int port,
+ char * path)
{
- struct SplittedHTTPAddress * spa;
- spa = http_split_address ("http://test.local";);
+ struct SplittedHTTPAddress * spa;
+ spa = http_split_address (src);
if (NULL == spa)
{
GNUNET_break (0);
}
else
{
- if (GNUNET_OK != check(spa, "http", "test.local",
HTTP_DEFAULT_PORT, ""))
+ if (GNUNET_OK != check(spa, protocol, host, port, path))
{
GNUNET_break (0);
}
clean (spa);
}
+}
- spa = http_split_address ("http://test.local";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "test.local",
HTTP_DEFAULT_PORT, ""))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
+void
+test_hostname ()
+{
+ check_pass("http://test.local";, "http", "test.local", HTTP_DEFAULT_PORT, "");
+ check_pass("http://test.local/";, "http", "test.local", HTTP_DEFAULT_PORT,
"/");
+ check_pass("http://test.local/path";, "http", "test.local",
HTTP_DEFAULT_PORT, "/path");
+ check_pass("http://test.local/path/";, "http", "test.local",
HTTP_DEFAULT_PORT, "/path/");
+ check_pass("http://test.local:81";, "http", "test.local", 81, "");
+ check_pass("http://test.local:81/";, "http", "test.local", 81, "/");
+ check_pass("http://test.local:81/path";, "http", "test.local", 81, "/path");
+ check_pass("http://test.local:81/path/";, "http", "test.local", 81, "/path/");
-
- spa = http_split_address ("http://test.local/";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "test.local",
HTTP_DEFAULT_PORT, "/"))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
-
- spa = http_split_address ("http://test.local/path";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "test.local",
HTTP_DEFAULT_PORT, "/path"))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
-
- spa = http_split_address ("http://test.local/path/";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "test.local",
HTTP_DEFAULT_PORT, "/path/"))
- {
- GNUNET_break (0);
- }
- clean (spa);
-
-
- }
-
- spa = http_split_address ("http://test.local:1000/path/";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "test.local", 1000,
"/path/"))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
}
void
test_ipv4 ()
{
- struct SplittedHTTPAddress * spa;
- spa = http_split_address ("http://127.0.0.1";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "127.0.0.1",
HTTP_DEFAULT_PORT, ""))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
-
- spa = http_split_address ("http://127.0.0.1";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "127.0.0.1",
HTTP_DEFAULT_PORT, ""))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
-
-
- spa = http_split_address ("http://127.0.0.1/";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "127.0.0.1",
HTTP_DEFAULT_PORT, "/"))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
-
- spa = http_split_address ("http://127.0.0.1/path";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "127.0.0.1",
HTTP_DEFAULT_PORT, "/path"))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
-
- spa = http_split_address ("http://127.0.0.1/path/";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "127.0.0.1",
HTTP_DEFAULT_PORT, "/path/"))
- {
- GNUNET_break (0);
- }
- clean (spa);
-
-
- }
-
- spa = http_split_address ("http://127.0.0.1:1000/path/";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "127.0.0.1", 1000,
"/path/"))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
+ check_pass("http://127.0.0.1";, "http", "127.0.0.1", HTTP_DEFAULT_PORT, "");
+ check_pass("http://127.0.0.1/";, "http", "127.0.0.1", HTTP_DEFAULT_PORT, "/");
+ check_pass("http://127.0.0.1/path";, "http", "127.0.0.1", HTTP_DEFAULT_PORT,
"/path");
+ check_pass("http://127.0.0.1/path/";, "http", "127.0.0.1", HTTP_DEFAULT_PORT,
"/path/");
+ check_pass("http://127.0.0.1:81";, "http", "127.0.0.1", 81, "");
+ check_pass("http://127.0.0.1:81/";, "http", "127.0.0.1", 81, "/");
+ check_pass("http://127.0.0.1:81/path";, "http", "127.0.0.1", 81, "/path");
+ check_pass("http://127.0.0.1:81/path/";, "http", "127.0.0.1", 81, "/path/");
}
void
test_ipv6 ()
{
- struct SplittedHTTPAddress * spa;
- spa = http_split_address ("http://[::1]";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "[::1]", HTTP_DEFAULT_PORT,
""))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
+ check_pass("http://[::1]";, "http", "[::1]", HTTP_DEFAULT_PORT, "");
+ check_pass("http://[::1]/";, "http", "[::1]", HTTP_DEFAULT_PORT, "/");
+ check_pass("http://[::1]/path";, "http", "[::1]", HTTP_DEFAULT_PORT, "/path");
+ check_pass("http://[::1]/path/";, "http", "[::1]", HTTP_DEFAULT_PORT,
"/path/");
+ check_pass("http://[::1]:81";, "http", "[::1]", 81, "");
+ check_pass("http://[::1]:81/";, "http", "[::1]", 81, "/");
+ check_pass("http://[::1]:81/path";, "http", "[::1]", 81, "/path");
+ check_pass("http://[::1]:81/path/";, "http", "[::1]", 81, "/path/");
+}
- spa = http_split_address ("http://[::1]";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "[::1]", HTTP_DEFAULT_PORT,
""))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
- spa = http_split_address ("http://[::1]/";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "[::1]", HTTP_DEFAULT_PORT,
"/"))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
-
- spa = http_split_address ("http://[::1]/path";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "[::1]", HTTP_DEFAULT_PORT,
"/path"))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
-
- spa = http_split_address ("http://[::1]/path/";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "[::1]", HTTP_DEFAULT_PORT,
"/path/"))
- {
- GNUNET_break (0);
- }
- clean (spa);
-
-
- }
-
- spa = http_split_address ("http://[::1]:1000/path/";);
- if (NULL == spa)
- {
- GNUNET_break (0);
- }
- else
- {
- if (GNUNET_OK != check(spa, "http", "[::1]", 1000, "/path/"))
- {
- GNUNET_break (0);
- }
- clean (spa);
- }
-}
-
int
main (int argc, char *argv[])
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25827 - gnunet/src/transport,
gnunet <=