diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-30 00:49:43 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-30 15:51:47 +0300 |
commit | adca074d616ac562095a92e01f2b181e6d3593c8 (patch) | |
tree | f4c11a1c11fcb137cfada7643e6f284465a75c16 /libmailutils/tests/url-parse.c | |
parent | 827cb66a4c639139c3f11c7af26aa5149f25a7e0 (diff) | |
download | mailutils-adca074d616ac562095a92e01f2b181e6d3593c8.tar.gz mailutils-adca074d616ac562095a92e01f2b181e6d3593c8.tar.bz2 |
Implement IPv6 support.
* am/ipv6.m4: New file.
* examples/sa.c: New file.
* include/mailutils/cidr.h: New file.
* include/mailutils/sockaddr.h: New file.
* libmailutils/cidr/Makefile.am: New file.
* libmailutils/cidr/fromsa.c: New file.
* libmailutils/cidr/fromstr.c: New file.
* libmailutils/cidr/match.c: New file.
* libmailutils/cidr/tosa.c: New file.
* libmailutils/cidr/tostr.c: New file.
* libmailutils/sockaddr/Makefile.am: New file.
* libmailutils/sockaddr/copy.c: New file.
* libmailutils/sockaddr/create.c: New file.
* libmailutils/sockaddr/free.c: New file.
* libmailutils/sockaddr/fromnode.c: New file.
* libmailutils/sockaddr/insert.c: New file.
* libmailutils/sockaddr/ipaddr.c: New file.
* libmailutils/sockaddr/str.c: New file.
* libmailutils/sockaddr/unlink.c: New file.
* libmailutils/sockaddr/url.c: New file.
* libmailutils/tests/cidr.c: New file.
* configure.ac: Call MU_ENABLE_IPV6.
Build libmailutils/sockaddr and libmailutils/cidr.
* examples/.gitignore: Add mblconv and sa
* examples/Makefile.am: (noinst_PROGRAMS): Add sa.
* examples/aclck.c: Use new ACL API.
* examples/echosrv.c: Use new mserv API.
* include/mailutils/Makefile.am (pkginclude_HEADERS): Add cidr.h
and sockaddr.h
* include/mailutils/acl.h (mu_acl_append, mu_acl_prepend)
(mu_acl_insert): Change signatures.
* include/mailutils/debug.h (mu_sockaddr_to_str): Remove proto.
* include/mailutils/mailutils.h: Include cidr.h and sockaddr.h
* include/mailutils/server.h (mu_ip_server_create): Change signature.
(mu_ip_server_get_sockaddr): Likewise.
(mu_m_server_set_default_address)
(mu_m_server_get_default_address): Remove.
* include/mailutils/stream.h (mu_tcp_stream_create_from_sa): New proto.
* include/mailutils/types.hin (mu_cidr, mu_sockaddr): New structs.
* include/mailutils/url.h (MU_URL_IPV6): New flag.
(MU_URL_PARSE_DSLASH_OPTIONAL): New parse flag.
* libmailutils/Makefile.am: Descend into cidr and sockaddr. Link in
libcidr and libsockaddr.
* libmailutils/diag/debug.c (mu_debug_log_begin): Flush mu_strerr.
* libmailutils/diag/errors (MU_ERR_NONAME)
(MU_ERR_BADFLAGS,MU_ERR_SOCKTYPE)
(MU_ERR_FAMILY,MU_ERR_SERVICE): New errors.
* libmailutils/server/acl.c: Rewrite API using mu_cidr.
* libmailutils/server/ipsrv.c: Rewrite AI using mu_sockaddr.
* libmailutils/server/msrv.c: Likewise.
* libmailutils/stream/tcp.c: Likewise.
* libmailutils/tests/.gitignore: Add cidr.
* libmailutils/tests/Makefile.am (noinst_PROGRAMS): Add cidr.
* libmailutils/tests/url-parse.c: Support command line options
to tune the parsing.
* libmailutils/tests/url.at: Pass options to url-parse.
* libmailutils/url/create.c (getkn): Return meaningful error code.
(_mu_url_ctx_parse_host): Accept IPv6 addresses. Set the MU_URL_IPV6
flag if one is given.
(_mu_url_ctx_parse): Unless MU_URL_PARSE_DSLASH_OPTIONAL flag is
given, request :// after scheme part.
(mu_url_create): Add MU_URL_PARSE_DSLASH_OPTIONAL flag.
* libmu_cfg/acl.c: Use new ACL API.
* mu/acl.c: Likewise.
* libproto/mailer/smtp.c (smtp_open): Use mu_tcp_stream_create_from_sa
* libproto/pop/mbox.c (pop_open): Likewise.
* mu/imap.c (com_connect): Likewise.
* mu/pop.c (com_connect): Likewise.
* testsuite/smtpsend.c (main): Likewise.
Diffstat (limited to 'libmailutils/tests/url-parse.c')
-rw-r--r-- | libmailutils/tests/url-parse.c | 49 |
1 files changed, 45 insertions, 4 deletions
diff --git a/libmailutils/tests/url-parse.c b/libmailutils/tests/url-parse.c index 86c917315..48dd40f84 100644 --- a/libmailutils/tests/url-parse.c +++ b/libmailutils/tests/url-parse.c @@ -25,6 +25,7 @@ #include <mailutils/errno.h> #include <mailutils/url.h> #include <mailutils/secret.h> +#include <mailutils/kwd.h> #define CAT2(a,b) a ## b @@ -73,12 +74,52 @@ print_query (mu_url_t url) printf ("query[%lu] <%s>\n", (unsigned long) i, qargv[i]); } +struct mu_kwd parse_kwtab[] = { + { "hexcode", MU_URL_PARSE_HEXCODE }, + { "hidepass", MU_URL_PARSE_HIDEPASS }, + { "portsrv", MU_URL_PARSE_PORTSRV }, + { "portwc", MU_URL_PARSE_PORTWC }, + { "pipe", MU_URL_PARSE_PIPE }, + { "slash", MU_URL_PARSE_SLASH }, + { "dslash_optional", MU_URL_PARSE_DSLASH_OPTIONAL }, + { "default", MU_URL_PARSE_DEFAULT }, + { "all", MU_URL_PARSE_ALL }, + { NULL } +}; + + int -main () +main (int argc, char **argv) { char str[1024]; unsigned port = 0; - mu_url_t u = NULL; + mu_url_t u = NULL, uhint = NULL; + int i; + int parse_flags = 0; + int rc; + + mu_set_program_name (argv[0]); + for (i = 1; i < argc; i++) + { + int flag; + + if (strncmp (argv[i], "hint=", 5) == 0) + { + rc = mu_url_create (&uhint, argv[i] + 5); + if (rc) + { + mu_error ("cannot create hints: %s", mu_strerror (rc)); + exit (1); + } + } + else if (mu_kwd_xlat_name_ci (parse_kwtab, argv[i], &flag) == 0) + parse_flags |= flag; + else + { + mu_error ("%s: unknown flag %s", argv[0], argv[i]); + exit (1); + } + } while (fgets (str, sizeof (str), stdin) != NULL) { @@ -89,9 +130,9 @@ main () str[strlen (str) - 1] = '\0'; /* chop newline */ if (strspn (str, " \t") == strlen (str)) continue; /* skip empty lines */ - if ((rc = mu_url_create (&u, str)) != 0) + if ((rc = mu_url_create_hint (&u, str, parse_flags, uhint)) != 0) { - fprintf (stderr, "mu_url_create %s ERROR: [%d] %s", + fprintf (stderr, "mu_url_create %s ERROR: [%d] %s\n", str, rc, mu_strerror (rc)); exit (1); } |