move netutils in libvty/ since vty is the only user

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index ca60326eebfe70c5280a44c1c6fa4ed99055783e..b47bdd160f2ded7e973907cac5330ecd77e703fe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,6 @@ dist_doc_DATA         = \
 
 noinst_HEADERS         = \
                          cfg.h \
-                         netutils.h \
                          utils.h
 
 sbin_PROGRAMS          = kronosnetd
@@ -36,7 +35,6 @@ sbin_PROGRAMS         = kronosnetd
 kronosnetd_SOURCES     = \
                          cfg.c \
                          main.c \
-                         netutils.c \
                          utils.c
 
 kronosnetd_LDADD       = \

diff --git a/libvty/Makefile.am b/libvty/Makefile.am
index 2d6c5a75dbd9bee58e2fb67e9f7cf02cb44df338..f9f4625a9f3f446d482bc68c35ba81806f10d38a 100644 (file)
--- a/libvty/Makefile.am
+++ b/libvty/Makefile.am
@@ -9,7 +9,8 @@ noinst_HEADERS          = \
                          vty_auth.h \
                          vty_cli.h \
                          vty_cli_cmds.h \
-                         vty_utils.h
+                         vty_utils.h \
+                         netutils.h
 
 noinst_LIBRARIES       = libvty.a
 
@@ -18,4 +19,5 @@ libvty_a_SOURCES      = \
                          vty_auth.c \
                          vty_cli.c \
                          vty_cli_cmds.c \
-                         vty_utils.c
+                         vty_utils.c \
+                         netutils.c

diff --git a/libvty/netutils.c b/libvty/netutils.c
new file mode 100644 (file)
index 0000000..736793d
--- /dev/null
+++ b/libvty/netutils.c
@@ -0,0 +1,112 @@
+#include "config.h"
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+#include "netutils.h"
+#include "utils.h"
+
+#define ADDRTOSTR_HOST_LEN 256
+#define ADDRTOSTR_PORT_LEN 24
+
+static int is_v4_mapped(struct sockaddr_storage *ss, socklen_t salen)
+{
+       char map[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
+       struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) ss;
+       return memcmp(&addr6->sin6_addr, map, 12);
+}
+
+int cmpaddr(struct sockaddr_storage *ss1, socklen_t sslen1,
+           struct sockaddr_storage *ss2, socklen_t sslen2)
+{
+       int ss1_offset = 0, ss2_offset = 0;
+       struct sockaddr_in6 *ss1_addr6 = (struct sockaddr_in6 *)ss1;
+       struct sockaddr_in6 *ss2_addr6 = (struct sockaddr_in6 *)ss2;
+       struct sockaddr_in *ss1_addr = (struct sockaddr_in *)ss1;
+       struct sockaddr_in *ss2_addr = (struct sockaddr_in *)ss2;
+       char *addr1, *addr2;
+
+       if (ss1->ss_family == ss2->ss_family)
+               return memcmp(ss1, ss2, sslen1);
+
+       if (ss1->ss_family == AF_INET6) {
+               if (is_v4_mapped(ss1, sslen1))
+                       return 1;
+
+               addr1 = (char *)&ss1_addr6->sin6_addr;
+               ss1_offset = 12;
+       } else
+               addr1 = (char *)&ss1_addr->sin_addr;
+
+       if (ss2->ss_family == AF_INET6) {
+               if (is_v4_mapped(ss2, sslen2))
+                       return 1;
+
+               addr2 = (char *)&ss2_addr6->sin6_addr;  
+               ss2_offset = 12;
+       } else
+               addr2 = (char *)&ss2_addr->sin_addr; 
+
+       return memcmp(addr1+ss1_offset, addr2+ss2_offset, 4);
+}
+
+int strtoaddr(const char *host, const char *port, struct sockaddr *sa, socklen_t salen)
+{
+       int ret;
+       struct addrinfo hints;
+       struct addrinfo *result = NULL;
+
+       memset(&hints, 0, sizeof(struct addrinfo));
+
+       hints.ai_family = AF_UNSPEC;
+       hints.ai_socktype = SOCK_DGRAM;
+       hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
+
+       ret = getaddrinfo(host, port, &hints, &result);
+
+       if (ret != 0) {
+               errno = EINVAL;
+               return -1;
+       }
+
+       memmove(sa, result->ai_addr,
+               (salen < result->ai_addrlen) ? salen : result->ai_addrlen);
+
+       freeaddrinfo(result);
+
+       return ret;
+}
+
+int addrtostr(const struct sockaddr *sa, socklen_t salen, char *buf[2])
+{
+       int ret;
+
+       buf[0] = malloc(ADDRTOSTR_HOST_LEN + ADDRTOSTR_PORT_LEN);
+
+       if (buf[0] == NULL)
+               return -1;
+
+       buf[1] = buf[0] + ADDRTOSTR_HOST_LEN;
+
+       ret = getnameinfo(sa, salen, buf[0], ADDRTOSTR_HOST_LEN,
+                               buf[1], ADDRTOSTR_PORT_LEN,
+                               NI_NUMERICHOST | NI_NUMERICSERV);
+
+       if (ret != 0) {
+               buf[0] = '\0';
+               buf[1] = '\0';
+       } else {
+               buf[0][ADDRTOSTR_HOST_LEN - 1] = '\0';
+               buf[1][ADDRTOSTR_PORT_LEN - 1] = '\0';
+       }
+
+       return ret;
+}
+
+void addrtostr_free(char *str[2])
+{
+       if (str[0] != NULL)
+               free(str[0]);
+}

diff --git a/libvty/netutils.h b/libvty/netutils.h
new file mode 100644 (file)
index 0000000..8c0030e
--- /dev/null
+++ b/libvty/netutils.h
@@ -0,0 +1,11 @@
+#ifndef __NETUTILS_H__
+#define __NETUTILS_H__
+
+#include <sys/socket.h>
+
+int cmpaddr(struct sockaddr_storage *ss1, socklen_t sslen1, struct sockaddr_storage *ss2, socklen_t sslen2);
+int strtoaddr(const char *host, const char *port, struct sockaddr *sa, socklen_t salen);
+int addrtostr(const struct sockaddr *sa, socklen_t salen, char *str[2]);
+void addrtostr_free(char *str[2]);
+
+#endif

diff --git a/netutils.c b/netutils.c
deleted file mode 100644 (file)
index 736793d..0000000
--- a/netutils.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "config.h"
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-#include "netutils.h"
-#include "utils.h"
-
-#define ADDRTOSTR_HOST_LEN 256
-#define ADDRTOSTR_PORT_LEN 24
-
-static int is_v4_mapped(struct sockaddr_storage *ss, socklen_t salen)
-{
-       char map[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
-       struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) ss;
-       return memcmp(&addr6->sin6_addr, map, 12);
-}
-
-int cmpaddr(struct sockaddr_storage *ss1, socklen_t sslen1,
-           struct sockaddr_storage *ss2, socklen_t sslen2)
-{
-       int ss1_offset = 0, ss2_offset = 0;
-       struct sockaddr_in6 *ss1_addr6 = (struct sockaddr_in6 *)ss1;
-       struct sockaddr_in6 *ss2_addr6 = (struct sockaddr_in6 *)ss2;
-       struct sockaddr_in *ss1_addr = (struct sockaddr_in *)ss1;
-       struct sockaddr_in *ss2_addr = (struct sockaddr_in *)ss2;
-       char *addr1, *addr2;
-
-       if (ss1->ss_family == ss2->ss_family)
-               return memcmp(ss1, ss2, sslen1);
-
-       if (ss1->ss_family == AF_INET6) {
-               if (is_v4_mapped(ss1, sslen1))
-                       return 1;
-
-               addr1 = (char *)&ss1_addr6->sin6_addr;
-               ss1_offset = 12;
-       } else
-               addr1 = (char *)&ss1_addr->sin_addr;
-
-       if (ss2->ss_family == AF_INET6) {
-               if (is_v4_mapped(ss2, sslen2))
-                       return 1;
-
-               addr2 = (char *)&ss2_addr6->sin6_addr;  
-               ss2_offset = 12;
-       } else
-               addr2 = (char *)&ss2_addr->sin_addr; 
-
-       return memcmp(addr1+ss1_offset, addr2+ss2_offset, 4);
-}
-
-int strtoaddr(const char *host, const char *port, struct sockaddr *sa, socklen_t salen)
-{
-       int ret;
-       struct addrinfo hints;
-       struct addrinfo *result = NULL;
-
-       memset(&hints, 0, sizeof(struct addrinfo));
-
-       hints.ai_family = AF_UNSPEC;
-       hints.ai_socktype = SOCK_DGRAM;
-       hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
-
-       ret = getaddrinfo(host, port, &hints, &result);
-
-       if (ret != 0) {
-               errno = EINVAL;
-               return -1;
-       }
-
-       memmove(sa, result->ai_addr,
-               (salen < result->ai_addrlen) ? salen : result->ai_addrlen);
-
-       freeaddrinfo(result);
-
-       return ret;
-}
-
-int addrtostr(const struct sockaddr *sa, socklen_t salen, char *buf[2])
-{
-       int ret;
-
-       buf[0] = malloc(ADDRTOSTR_HOST_LEN + ADDRTOSTR_PORT_LEN);
-
-       if (buf[0] == NULL)
-               return -1;
-
-       buf[1] = buf[0] + ADDRTOSTR_HOST_LEN;
-
-       ret = getnameinfo(sa, salen, buf[0], ADDRTOSTR_HOST_LEN,
-                               buf[1], ADDRTOSTR_PORT_LEN,
-                               NI_NUMERICHOST | NI_NUMERICSERV);
-
-       if (ret != 0) {
-               buf[0] = '\0';
-               buf[1] = '\0';
-       } else {
-               buf[0][ADDRTOSTR_HOST_LEN - 1] = '\0';
-               buf[1][ADDRTOSTR_PORT_LEN - 1] = '\0';
-       }
-
-       return ret;
-}
-
-void addrtostr_free(char *str[2])
-{
-       if (str[0] != NULL)
-               free(str[0]);
-}

diff --git a/netutils.h b/netutils.h
deleted file mode 100644 (file)
index 8c0030e..0000000
--- a/netutils.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __NETUTILS_H__
-#define __NETUTILS_H__
-
-#include <sys/socket.h>
-
-int cmpaddr(struct sockaddr_storage *ss1, socklen_t sslen1, struct sockaddr_storage *ss2, socklen_t sslen2);
-int strtoaddr(const char *host, const char *port, struct sockaddr *sa, socklen_t salen);
-int addrtostr(const struct sockaddr *sa, socklen_t salen, char *str[2]);
-void addrtostr_free(char *str[2]);
-
-#endif

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 367213e780c78b57b0dbf13ee352b0f55c6114c0..4151546fa6260d759133d11e1e0f80207a042cb6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,35 +25,32 @@ TESTS = $(check_PROGRAMS)
 AM_CPPFLAGS            = -DTEST \
                          -I$(srcdir)/../ \
                          -I$(srcdir)/../libtap/ \
-                         -I$(srcdir)/../libknet/
+                         -I$(srcdir)/../libknet/ \
+                         -I$(srcdir)/../libvty/
 
 AM_LDFLAGS             = \
                          $(top_builddir)/libtap/libtap.la \
-                         $(top_builddir)/libknet/libknet.a
+                         $(top_builddir)/libknet/libknet.a \
+                         $(top_builddir)/libvty/libvty.a
 
 ping_test_SOURCES      = \
                          ping_test.c \
-                         ../netutils.c \
                          ../utils.c
 
 khandle_test_SOURCES   = \
                          khandle_test.c \
-                         ../netutils.c \
                          ../utils.c
 
 lookup_bench_SOURCES   = \
                          lookup_bench.c \
-                         ../netutils.c \
                          ../utils.c
 
 listener_test_SOURCES  = \
                          listener_test.c \
-                         ../netutils.c \
                          ../utils.c
 
 netutils_test_SOURCES  = \
                          netutils_test.c \
-                         ../netutils.c \
                          ../utils.c
 
 utils_test_SOURCES     = \