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/cidr/fromstr.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/cidr/fromstr.c')
-rw-r--r-- | libmailutils/cidr/fromstr.c | 128 |
1 files changed, 128 insertions, 0 deletions
diff --git a/libmailutils/cidr/fromstr.c b/libmailutils/cidr/fromstr.c new file mode 100644 index 000000000..4e7a56f80 --- /dev/null +++ b/libmailutils/cidr/fromstr.c @@ -0,0 +1,128 @@ +/* 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 + <http://www.gnu.org/licenses/>. */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif +#include <string.h> +#include <stdlib.h> +#include <arpa/inet.h> +#include <mailutils/cidr.h> +#include <mailutils/errno.h> +#include <mailutils/sockaddr.h> + +static void +masklen_to_netmask (unsigned char *buf, size_t len, size_t masklen) +{ + int i, cnt; + + cnt = masklen / 8; + for (i = 0; i < cnt; i++) + buf[i] = 0xff; + if (i == MU_INADDR_BYTES) + return; + cnt = 8 - masklen % 8; + buf[i++] = (0xff >> cnt) << cnt; + for (; i < MU_INADDR_BYTES; i++) + buf[i] = 0; +} + +int +mu_cidr_from_string (struct mu_cidr *pcidr, const char *str) +{ + int rc; + char ipbuf[41]; + struct mu_cidr cidr; + char *p; + size_t len; + union + { + struct in_addr in; +#ifdef MAILUTILS_IPV6 + struct in6_addr in6; +#endif + } inaddr; + + p = strchr (str, '/'); + if (p) + len = p - str; + else + len = strlen (str); + + if (len > sizeof (ipbuf)) + return MU_ERR_BUFSPACE; + + memcpy (ipbuf, str, len); + ipbuf[len] = 0; + + if (mu_str_is_ipv4 (ipbuf)) + cidr.family = AF_INET; +#ifdef MAILUTILS_IPV6 + else if (mu_str_is_ipv6 (ipbuf)) + cidr.family = AF_INET6; +#endif + else + return MU_ERR_FAMILY; + + rc = inet_pton (cidr.family, ipbuf, &inaddr); + if (rc == -1) + return MU_ERR_FAMILY; + else if (rc == 0) + return MU_ERR_NONAME; + else if (rc != 1) + return MU_ERR_FAILURE; + + cidr.len = _mu_inaddr_to_bytes (cidr.family, &inaddr, cidr.address); + if (cidr.len == 0) + return MU_ERR_FAMILY; + + if (p) + { + char *end; + unsigned long masklen; + + p++; + + masklen = strtoul (p, &end, 10); + if (*end == 0) + masklen_to_netmask (cidr.netmask, cidr.len, masklen); + else if ((cidr.family == AF_INET && mu_str_is_ipv4 (p)) +#ifdef MAILUTILS_IPV6 + || (cidr.family == AF_INET6 && mu_str_is_ipv6 (ipbuf)) +#endif + ) + { + rc = inet_pton (cidr.family, p, &inaddr); + if (rc == -1) + return MU_ERR_FAMILY; + else if (rc == 0) + return MU_ERR_NONAME; + else if (rc != 1) + return MU_ERR_FAILURE; + + _mu_inaddr_to_bytes (cidr.family, &inaddr, cidr.netmask); + } + else + return MU_ERR_FAMILY; + } + else + masklen_to_netmask (cidr.netmask, cidr.len, cidr.len * 8); + + memcpy (pcidr, &cidr, sizeof (*pcidr)); + return 0; +} + |