Regression test for isakmpd utility functions, initially just text2sockaddr.

3 files changed, 104 insertions, 2 deletions

diff --git a/sbin/isakmpd/regress/Makefile b/sbin/isakmpd/regress/Makefile
index 23c845ae88d..3fbcce86c82 100644
--- a/sbin/isakmpd/regress/Makefile
+++ b/sbin/isakmpd/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 1999/07/17 21:54:38 niklas Exp $
+#	$OpenBSD: Makefile,v 1.8 2001/07/01 19:25:11 niklas Exp $
 #	$EOM: Makefile,v 1.8 1999/07/17 20:44:13 niklas Exp $
 
 #
@@ -34,6 +34,6 @@
 # This code was written under funding by Ericsson Radio Systems.
 #
 
-SUBDIR=	b2n crypto dh ec2n exchange group hmac prf rsakeygen x509
+SUBDIR=	b2n crypto dh ec2n exchange group hmac prf rsakeygen util x509
 
 .include <bsd.subdir.mk>
diff --git a/sbin/isakmpd/regress/util/Makefile b/sbin/isakmpd/regress/util/Makefile
new file mode 100644
index 00000000000..ff2a19f6243
--- /dev/null
+++ b/sbin/isakmpd/regress/util/Makefile
@@ -0,0 +1,15 @@
+#	$OpenBSD: Makefile,v 1.1 2001/07/01 19:25:11 niklas Exp $
+
+# Test some utility functions
+
+PROG=		utiltest
+SRCS=		log.c sysdep.c util.c utiltest.c
+TOPSRC=		${.CURDIR}/../..
+TOPOBJ!=	cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
+OS!=		awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
+.PATH:		${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
+CFLAGS+=	-I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
+NOMAN=
+DEBUG=		-g
+
+.include <bsd.prog.mk>
diff --git a/sbin/isakmpd/regress/util/utiltest.c b/sbin/isakmpd/regress/util/utiltest.c
new file mode 100644
index 00000000000..facb7e4af46
--- /dev/null
+++ b/sbin/isakmpd/regress/util/utiltest.c
@@ -0,0 +1,87 @@
+/*	$OpenBSD: utiltest.c,v 1.1 2001/07/01 19:25:11 niklas Exp $	*/
+
+/*
+ * Copyright (c) 2001 Niklas Hallqvist.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Ericsson Radio Systems.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <stdio.h>
+
+#include "sysdep.h"
+
+#include "util.h"
+
+int test_1 (char *, char *, int);
+
+int
+main (int argc, char *argv[])
+{
+  test_1 ("10.0.0.1", "10", 0);
+  test_1 ("10.0.0.1", "isakmp", 0);
+  test_1 ("10::1", "10", 0);
+  test_1 ("10::1", "isakmp", 0);
+  test_1 ("10.0x0.1", "10", -1);
+  test_1 ("10.0.0.1", "telnet", -1);
+  test_1 ("10::x:1", "10", -1);
+  test_1 ("10::1", "telnet", -1);
+  return 0;
+}
+
+int test_1 (char *address, char *port, int ok)
+{
+  struct sockaddr *sa;
+  struct sockaddr_in *sai;
+  struct sockaddr_in6 *sai6;
+  int i, rv;
+
+  printf ("test_1 (\"%s\", \"%s\") ", address, port);
+  rv = text2sockaddr (address, port, &sa) == ok;
+  printf (rv ? "OK" : "FAIL");
+  printf ("\n");
+
+#ifdef DEBUG
+  printf ("af %d len %d ", sa->sa_family, sa->sa_len);
+  if (sa->sa_family == AF_INET)
+    {
+      sai = (struct sockaddr_in *)sa;
+      printf ("addr %08x port %d\n", ntohl (sai->sin_addr.s_addr),
+	      ntohs (sai->sin_port));
+    }
+  else
+    {
+      sai6 = (struct sockaddr_in6 *)sa;
+      printf ("addr ");
+      for (i = 0; i < sizeof sai6->sin6_addr; i++)
+	printf ("%02x", sai6->sin6_addr.s6_addr[i]);
+      printf (" port %d\n", ntohs (sai6->sin6_port));
+    }
+  return rv;
+#endif
+}