From f874eb3423cde2257d57c0f5d651297b303b3cff Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 23 Jun 2014 19:24:14 +0000 Subject: -minor code cleanup, indentation, doxygen --- src/transport/test_http_common.c | 250 +++++++++++++++++++-------------------- 1 file changed, 121 insertions(+), 129 deletions(-) (limited to 'src/transport/test_http_common.c') diff --git a/src/transport/test_http_common.c b/src/transport/test_http_common.c index c97ae1745..9c619ea60 100644 --- a/src/transport/test_http_common.c +++ b/src/transport/test_http_common.c @@ -26,135 +26,125 @@ #include "transport-testing.h" #include "plugin_transport_http_common.h" -struct SplittedHTTPAddress -{ - char *protocol; - char *host; - char *path; - int port; -}; -void +static void clean (struct SplittedHTTPAddress *addr) { - if (NULL != addr) - { - GNUNET_free_non_null (addr->host); - GNUNET_free_non_null (addr->path); - GNUNET_free_non_null (addr->protocol); - GNUNET_free_non_null (addr); - } + if (NULL == addr) + return; + GNUNET_free_non_null (addr->host); + GNUNET_free_non_null (addr->path); + GNUNET_free_non_null (addr->protocol); + GNUNET_free (addr); } -int +static int check (struct SplittedHTTPAddress *addr, - char * protocol, - char * host, - int port, - char * path) + char * protocol, + char * host, + int port, + char * path) { + if (NULL == addr) + return GNUNET_NO; + if (((NULL == addr->protocol) && (NULL != protocol)) || + ((NULL != addr->protocol) && (NULL == protocol))) + { + GNUNET_break (0); + return GNUNET_NO; + } + else if ((NULL != addr->protocol) && (NULL != protocol)) + { + if (0 != strcmp(addr->protocol, protocol)) + { + GNUNET_break (0); + return GNUNET_NO; + } + } + + if (((NULL == addr->host) && (NULL != host)) || + ((NULL != addr->host) && (NULL == host))) + { + GNUNET_break (0); + return GNUNET_NO; + } + else if ((NULL != addr->host) && (NULL != host)) + { + if (0 != strcmp(addr->host, host)) + { + GNUNET_break (0); + return GNUNET_NO; + } + } + + if (((NULL == addr->path) && (NULL != path)) || + ((NULL != addr->path) && (NULL == path))) + { + GNUNET_break (0); + return GNUNET_NO; + } + else if ((NULL != addr->path) && (NULL != path)) + { + if (0 != strcmp(addr->path, path)) + { + GNUNET_break (0); + return GNUNET_NO; + } + } - if (NULL == addr) - return GNUNET_NO; - if (((NULL == addr->protocol) && (NULL != protocol)) || - ((NULL != addr->protocol) && (NULL == protocol))) - { - GNUNET_break (0); - return GNUNET_NO; - } - else if ((NULL != addr->protocol) && (NULL != protocol)) - { - if (0 != strcmp(addr->protocol, protocol)) - { - GNUNET_break (0); - return GNUNET_NO; - } - } - - if (((NULL == addr->host) && (NULL != host)) || - ((NULL != addr->host) && (NULL == host))) - { - GNUNET_break (0); - return GNUNET_NO; - } - else if ((NULL != addr->host) && (NULL != host)) - { - if (0 != strcmp(addr->host, host)) - { - GNUNET_break (0); - return GNUNET_NO; - } - } - - - if (((NULL == addr->path) && (NULL != path)) || - ((NULL != addr->path) && (NULL == path))) - { - GNUNET_break (0); - return GNUNET_NO; - } - else if ((NULL != addr->path) && (NULL != path)) - { - if (0 != strcmp(addr->path, path)) - { - GNUNET_break (0); - return GNUNET_NO; - } - } - - if ((addr->port != port)) - { - GNUNET_break (0); - return GNUNET_NO; - } - - return GNUNET_OK; + if ((addr->port != port)) + { + GNUNET_break (0); + return GNUNET_NO; + } + return GNUNET_OK; } -int -check_pass (char *src, - char * protocol, - char * host, - int port, - char * path) + +static int +check_pass (const char *src, + const char *protocol, + const char *host, + int port, + const char *path) { - struct SplittedHTTPAddress * spa; + struct SplittedHTTPAddress *spa; + spa = http_split_address (src); if (NULL == spa) { - GNUNET_break (0); - return GNUNET_SYSERR; + GNUNET_break (0); + return GNUNET_SYSERR; } - else + if (GNUNET_OK != check(spa, protocol, host, port, path)) { - if (GNUNET_OK != check(spa, protocol, host, port, path)) - { - clean (spa); - GNUNET_break (0); - return GNUNET_SYSERR; - } - clean (spa); + clean (spa); + GNUNET_break (0); + return GNUNET_SYSERR; } + clean (spa); return GNUNET_OK; } -int -check_fail (char *src) + +static int +check_fail (const char *src) { - struct SplittedHTTPAddress * spa; + struct SplittedHTTPAddress * spa; + spa = http_split_address (src); if (NULL != spa) { - GNUNET_break (0); - clean (spa); - return GNUNET_SYSERR; + GNUNET_break (0); + clean (spa); + return GNUNET_SYSERR; } return GNUNET_OK; } -void +static void test_pass_hostname () { check_pass("http://test.local", "http", "test.local", HTTP_DEFAULT_PORT, ""); @@ -171,7 +161,7 @@ test_pass_hostname () } -void +static void test_pass_ipv4 () { check_pass("http://127.0.0.1", "http", "127.0.0.1", HTTP_DEFAULT_PORT, ""); @@ -185,7 +175,8 @@ test_pass_ipv4 () check_pass("http://127.0.0.1:81/path/more", "http", "127.0.0.1", 81, "/path/more"); } -void + +static void test_fail_ipv6 () { check_pass("http://[::1]", "http", "[::1]", HTTP_DEFAULT_PORT, ""); @@ -200,57 +191,58 @@ test_fail_ipv6 () } -void +static void test_fail () { - if (GNUNET_SYSERR == check_fail ("")) - GNUNET_break (0); - if (GNUNET_SYSERR == check_fail ("http")) - GNUNET_break (0); - if (GNUNET_SYSERR == check_fail ("://")) - GNUNET_break (0); - if (GNUNET_SYSERR == check_fail ("http://")) - GNUNET_break (0); - if (GNUNET_SYSERR == check_fail ("//localhost")) - GNUNET_break (0); - if (GNUNET_SYSERR == check_fail ("//:80")) - GNUNET_break (0); - if (GNUNET_SYSERR == check_fail ("//:80/")) - GNUNET_break (0); - if (GNUNET_SYSERR == check_fail ("//:80:")) - GNUNET_break (0); - if (GNUNET_SYSERR == check_fail ("http://localhost:a/")) - GNUNET_break (0); - if (GNUNET_SYSERR == check_fail ("http://127.0.0.1:a/")) - GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("")) + GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("http")) + GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("://")) + GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("http://")) + GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("//localhost")) + GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("//:80")) + GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("//:80/")) + GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("//:80:")) + GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("http://localhost:a/")) + GNUNET_break (0); + if (GNUNET_SYSERR == check_fail ("http://127.0.0.1:a/")) + GNUNET_break (0); } + int main (int argc, char *argv[]) { int ret = 0; struct SplittedHTTPAddress * spa; - GNUNET_log_setup ("test", "DEBUG", NULL); + GNUNET_log_setup ("test", "DEBUG", NULL); spa = http_split_address (""); if (NULL != spa) { - clean (spa); - GNUNET_break (0); + clean (spa); + GNUNET_break (0); } http_split_address ("http://"); if (NULL != spa) { - clean (spa); - GNUNET_break (0); + clean (spa); + GNUNET_break (0); } http_split_address ("://"); if (NULL != spa) { - clean (spa); - GNUNET_break (0); + clean (spa); + GNUNET_break (0); } test_pass_hostname (); -- cgit v1.2.3