From adca074d616ac562095a92e01f2b181e6d3593c8 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Wed, 30 Mar 2011 00:49:43 +0300 Subject: 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. --- libmailutils/tests/.gitignore | 1 + libmailutils/tests/Makefile.am | 1 + libmailutils/tests/cidr.c | 77 ++++++++++++++++++++++++++++++++++++++++++ libmailutils/tests/url-parse.c | 49 ++++++++++++++++++++++++--- libmailutils/tests/url.at | 14 ++++++-- 5 files changed, 136 insertions(+), 6 deletions(-) create mode 100644 libmailutils/tests/cidr.c (limited to 'libmailutils/tests') diff --git a/libmailutils/tests/.gitignore b/libmailutils/tests/.gitignore index d205efe63..d01d4ad93 100644 --- a/libmailutils/tests/.gitignore +++ b/libmailutils/tests/.gitignore @@ -1,5 +1,6 @@ atconfig atlocal +cidr package.m4 testsuite testsuite.dir diff --git a/libmailutils/tests/Makefile.am b/libmailutils/tests/Makefile.am index 68618a1df..5c0087398 100644 --- a/libmailutils/tests/Makefile.am +++ b/libmailutils/tests/Makefile.am @@ -41,6 +41,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac INCLUDES = @MU_LIB_COMMON_INCLUDES@ noinst_PROGRAMS = \ addr\ + cidr\ debugspec\ decode2047\ encode2047\ diff --git a/libmailutils/tests/cidr.c b/libmailutils/tests/cidr.c new file mode 100644 index 000000000..797fb248e --- /dev/null +++ b/libmailutils/tests/cidr.c @@ -0,0 +1,77 @@ +/* GNU Mailutils -- a suite of utilities for electronic mail + Copyright (C) 2011 Free Software Foundation, Inc. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General + Public License along with this library. If not, see + . */ + +#ifdef HAVE_CONFIG_H +# include +#endif +#include +#include +#include + +static void +print_bytes (unsigned char *b, size_t l) +{ + for (; l; l--, b++) + printf (" %02x", *b); + printf ("\n"); +} + +int +main (int argc, char **argv) +{ + mu_set_program_name (argv[0]); + if (argc < 2) + { + mu_error ("usage: %s CIDR [CIDR...]", argv[0]); + return 1; + } + + while (--argc) + { + char *arg = *++argv; + struct mu_cidr cidr; + int rc; + char *str; + + rc = mu_cidr_from_string (&cidr, arg); + if (rc) + { + mu_error ("%s: %s", arg, mu_strerror (rc)); + continue; + } + + printf ("%s:\n", arg); + printf ("family = %d\n", cidr.family); + printf ("len = %d\n", cidr.len); + printf ("address ="); + print_bytes (cidr.address, cidr.len); + printf ("netmask ="); + print_bytes (cidr.netmask, cidr.len); + rc = mu_cidr_format (&cidr, 0, &str); + if (rc) + { + mu_error ("cannot covert to string: %s", mu_strerror (rc)); + return 2; + } + + printf ("string = %s\n", str); + free (str); + } + return 0; +} + + 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 #include #include +#include #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); } diff --git a/libmailutils/tests/url.at b/libmailutils/tests/url.at index 8c392ea0e..c0669e2aa 100644 --- a/libmailutils/tests/url.at +++ b/libmailutils/tests/url.at @@ -20,10 +20,11 @@ dnl TESTURL([NAME], [KW = `'], [INPUT], [STDOUT = `'], dnl [STDERR = `'], [RUN-IF-FAIL], [RUN-IF-PASS]) dnl +m4_pushdef([URL_PARSE_OPTIONS]) m4_pushdef([TESTURL],[ m4_pushdef([MU_TEST_GROUP],[Url]) m4_pushdef([MU_TEST_KEYWORDS],[url]) -m4_pushdef([MU_TEST_COMMAND],[url-parse]) +m4_pushdef([MU_TEST_COMMAND],[url-parse URL_PARSE_OPTIONS]) MU_GENERIC_TEST([$1],[$2 url-m4_translit($3,[ ],[_])],[$3],[],[$4],[$5]) m4_popdef([MU_TEST_COMMAND]) m4_popdef([MU_TEST_KEYWORDS]) @@ -32,6 +33,8 @@ m4_popdef([MU_TEST_GROUP]) dnl ------------------------------------------------------------ +m4_define([URL_PARSE_OPTIONS],[default dslash_optional]) + TESTURL([],[], [scheme:], [scheme @@ -76,6 +79,10 @@ port 0 path ]) +dnl ------------------------------------------------------------ + +m4_define([URL_PARSE_OPTIONS],[default]) + TESTURL([],[], [scheme://%75%73%65%72:%70%61%73%73@%68%6f%73%74], [scheme @@ -198,7 +205,7 @@ path ]) TESTURL([],[], -[ftp:/a/path], +[ftp:///a/path], [scheme user <> passwd <> @@ -716,6 +723,7 @@ path param[0] ]]) +m4_pushdef([URL_PARSE_OPTIONS],[default dslash_optional]) TESTURL([],[], [mbox:/var/spool/mail;type=index;param=2;user=gray], [[scheme @@ -729,6 +737,7 @@ param[0] param[1] param[2] ]]) +m4_popdef([URL_PARSE_OPTIONS]) TESTURL([],[], [mbox:///var/spool/mail;type=index;param=2;user=gray], @@ -823,3 +832,4 @@ query[1] ]]) m4_popdef([TESTURL]) +m4_popdef([URL_PARSE_OPTIONS]) -- cgit v1.2.1