summaryrefslogtreecommitdiff
path: root/libmailutils/cidr/tostr.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2011-03-30 00:49:43 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2011-03-30 15:51:47 +0300
commitadca074d616ac562095a92e01f2b181e6d3593c8 (patch)
treef4c11a1c11fcb137cfada7643e6f284465a75c16 /libmailutils/cidr/tostr.c
parent827cb66a4c639139c3f11c7af26aa5149f25a7e0 (diff)
downloadmailutils-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/tostr.c')
-rw-r--r--libmailutils/cidr/tostr.c159
1 files changed, 159 insertions, 0 deletions
diff --git a/libmailutils/cidr/tostr.c b/libmailutils/cidr/tostr.c
new file mode 100644
index 000000000..3d1ee5f49
--- /dev/null
+++ b/libmailutils/cidr/tostr.c
@@ -0,0 +1,159 @@
+/* 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 <mailutils/cidr.h>
+#include <mailutils/errno.h>
+
+static int
+to_xdig (unsigned char b)
+{
+ if (b >= 0xa)
+ return 'A' + b - 0xa;
+ else
+ return '0' + b;
+}
+
+static size_t
+format_ipv6_bytes (const unsigned char *bytes, int len,
+ char *buf, size_t size)
+{
+ size_t total = 0;
+ int i;
+
+ for (i = 0; i < len; i += 2)
+ {
+ if (i)
+ {
+ if (total++ < size)
+ *buf++ = ':';
+ }
+ if (total++ < size)
+ *buf++ = to_xdig (*bytes >> 4);
+ if (total++ < size)
+ *buf++ = to_xdig (*bytes & 0xf);
+ bytes++;
+ if (total++ < size)
+ *buf++ = to_xdig (*bytes >> 4);
+ if (total++ < size)
+ *buf++ = to_xdig (*bytes & 0xf);
+ bytes++;
+ }
+ return total;
+}
+
+static size_t
+format_ipv4_bytes (const unsigned char *bytes, int len,
+ char *buf, size_t size)
+{
+ int i;
+ size_t total = 0;
+
+ for (i = 0; i < len; i++)
+ {
+ unsigned char b = *bytes++;
+ char nbuf[3];
+ int j;
+
+ if (i)
+ {
+ if (total++ < size)
+ *buf++ = '.';
+ }
+
+ j = 0;
+ do
+ {
+ nbuf[j++] = b % 10 + '0';
+ b /= 10;
+ }
+ while (b);
+
+ for (; j; j--)
+ {
+ if (total++ < size)
+ *buf++ = nbuf[j - 1];
+ }
+ }
+ return total;
+}
+
+int
+mu_cidr_to_string (struct mu_cidr *cidr, int flags,
+ char *buf, size_t size, size_t *pret)
+{
+ size_t (*fmt) (const unsigned char *bytes, int len, char *buf, size_t size);
+ size_t n, total = 0;
+
+ if (size == 0)
+ return MU_ERR_BUFSPACE;
+ size--;
+ switch (cidr->family)
+ {
+ case AF_INET:
+ fmt = format_ipv4_bytes;
+ break;
+
+#ifdef MAILUTILS_IPV6
+ case AF_INET6:
+ fmt = format_ipv6_bytes;
+ break;
+#endif
+
+ default:
+ return MU_ERR_FAMILY;
+ }
+
+ n = fmt (cidr->address, cidr->len, buf, size);
+ if (buf)
+ buf += n;
+ total += n;
+
+ if (!(flags & MU_CIDR_FMT_ADDRONLY))
+ {
+ if (total++ < size)
+ *buf++ = '/';
+ n = fmt (cidr->netmask, cidr->len, buf, size - total);
+ if (buf)
+ buf += n;
+ total += n;
+ }
+
+ if (buf)
+ *buf++ = 0;
+ if (pret)
+ *pret = total;
+ return 0;
+}
+
+int
+mu_cidr_format (struct mu_cidr *cidr, int flags, char **pbuf)
+{
+ char buf[MU_CIDR_MAXBUFSIZE];
+ int rc = mu_cidr_to_string (cidr, flags, buf, sizeof (buf), NULL);
+ if (rc)
+ return rc;
+ *pbuf = strdup (buf);
+ if (!*buf)
+ return ENOMEM;
+ return 0;
+}
+

Return to:

Send suggestions and report system problems to the System administrator.