build: Move stuff to be shared to lib/ (nvt_log, socket)

lib/Makefile.am

@@ -0,0 +1,6 @@
+noinst_LTLIBRARIES = libnvt.la
+
+libnvt_la_CFLAGS = $(CFLAGS_WARN)
+
+libnvt_la_SOURCES  = nvt_log.c nvt_log.h
+libnvt_la_SOURCES += nvt_socket.c nvt_socket.h

lib/nvt_log.c

@@ -0,0 +1,114 @@
+/*
+ * Logging functions
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <syslog.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include "nvt_log.h"
+
+#include <sys/syscall.h>
+#define gettid() (pid_t)syscall(__NR_gettid)
+
+char            log_level = 0;
+
+static char     log_threshold = LOG_DEBUG;
+
+static FILE    *log_dest = NULL;
+
+void nvt_log_dest(int dest)
+{
+    switch (dest)
+    {
+    default:
+    case NVT_LOG_SYSLOG:
+        log_dest = NULL;
+        break;
+    case NVT_LOG_STDOUT:
+        log_dest = stdout;
+        break;
+    case NVT_LOG_STDERR:
+        log_dest = stderr;
+        break;
+    }
+}
+
+void nvt_log_level(int quiet, int level)
+{
+    if (quiet)
+        log_threshold = LOG_NOTICE;
+    log_level = level;
+}
+
+static const char *_hms_txt(char *buf, unsigned int len)
+{
+    struct timeval  tv;
+    unsigned int    sod, hh, mm, ss;
+
+    gettimeofday(&tv, NULL);
+
+    sod = tv.tv_sec % (24 * 3600);
+    hh = sod / 3600;
+    mm = (sod - hh * 3600) / 60;
+    ss = sod - hh * 3600 - mm * 60;
+    snprintf(buf, len, "%02d:%02d:%02d.%06d",
+             hh, mm, ss, (unsigned int)tv.tv_usec);
+
+    return buf;
+}
+
+void nvt_log(int prio, const char *fmt, ...)
+{
+    va_list         arg;
+    char            buf[256], buft[64];
+    const char     *eol;
+    int             len;
+
+    if (prio > log_threshold)
+        return;
+
+    va_start(arg, fmt);
+    len = vsnprintf(buf, sizeof(buf), fmt, arg);
+
+    if (log_dest)
+    {
+        eol = (len > 0 && buf[len - 1] != '\n') ? "\n" : "";
+        fprintf(log_dest, "%s: [%d] %d: %s%s",
+                _hms_txt(buft, sizeof(buft)), gettid(), prio, buf, eol);
+    }
+    else
+    {
+        syslog(prio, "[%d] %s", gettid(), buf);
+    }
+
+    va_end(arg);
+}
+
+#define BPL 16                  /* Bytes per line */
+
+void nvt_log_buf(int prio, const char *txt, const void *ptr_, unsigned int len)
+{
+    unsigned int    ix, i, imax;
+    int             l, n;
+    char            buf[128];
+    const unsigned char *ptr = ptr_;
+
+    for (ix = 0; ix < len || (len == 0 && ix == 0); ix += BPL)
+    {
+        n = snprintf(buf, sizeof(buf), "%s: %04x:", txt, ix);
+        if (n <= 0)
+            return;             /* Just playing it safe */
+        imax = (len - ix < BPL) ? len - ix : BPL;
+        for (i = 0; i < imax; i++)
+        {
+            l = snprintf(buf + n, sizeof(buf) - n, " %02x", *ptr++);
+            if (l <= 0)
+                return;         /* Just playing it safe */
+            n += l;
+        }
+        nvt_log(prio, "%s\n", buf);
+    }
+}

lib/nvt_log.h

@@ -0,0 +1,31 @@
+/*
+ * Logging functions
+ */
+#ifndef NVT_LOG_H
+#define NVT_LOG_H
+
+#include <syslog.h>
+
+#define _PRF_N_(no) __attribute__((__format__(__printf__, (no), (no) + 1)))
+#define _PRF2_ _PRF_N_(2)
+
+void            nvt_log_dest(int dest);
+void            nvt_log_level(int quiet, int level);
+_PRF2_ void     nvt_log(int prio, const char *fmt, ...);
+void            nvt_log_buf(int prio, const char *txt,
+                            const void *ptr, unsigned int len);
+
+#define NVT_LOG_SYSLOG  0
+#define NVT_LOG_STDOUT  1
+#define NVT_LOG_STDERR  2
+
+extern char     log_level;
+
+#define DBG(...) \
+    if (log_level > 0) nvt_log(LOG_DEBUG, __VA_ARGS__)
+#define DBG2(...) \
+    if (log_level > 1) nvt_log(LOG_DEBUG, __VA_ARGS__)
+#define DBG2_BUF(txt, ptr, len) \
+    if (log_level > 1) nvt_log_buf(LOG_DEBUG, txt, ptr, len)
+
+#endif /* NVT_LOG_H */

lib/nvt_socket.c

@@ -0,0 +1,49 @@
+/*
+ * Socket interface API
+ */
+#include <netdb.h>              /* getaddrinfo() */
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
+
+#include "nvt_log.h"
+#include "nvt_socket.h"
+
+
+int socket_create_client(const char *host, unsigned int port)
+{
+    struct sockaddr_in serveraddr;
+    struct hostent *server;
+    int             sockfd, err;
+
+    sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    if (sockfd < 0)
+    {
+        nvt_log(LOG_ERR, "Socket open failed: %m\n");
+        return sockfd;
+    }
+
+    server = gethostbyname(host);
+    if (server == NULL)
+    {
+        nvt_log(LOG_ERR, "Cannot resolve host name: %m\n");
+        close(sockfd);
+        return -1;
+    }
+
+    bzero((char *)&serveraddr, sizeof(serveraddr));
+    serveraddr.sin_family = AF_INET;
+    bcopy((char *)server->h_addr, (char *)&serveraddr.sin_addr.s_addr,
+          server->h_length);
+    serveraddr.sin_port = htons(port);
+
+    err = connect(sockfd, (struct sockaddr *)&serveraddr, sizeof(serveraddr));
+    if (err < 0)
+    {
+        nvt_log(LOG_ERR, "Failed to connect to: %s:%u: %m\n", host, port);
+        close(sockfd);
+        return -1;
+    }
+
+    return sockfd;
+}

lib/nvt_socket.h

@@ -0,0 +1,9 @@
+/*
+ * Socket functions
+ */
+#ifndef NVT_SOCKET_H
+#define NVT_SOCKET_H
+
+int             socket_create_client(const char *host, unsigned int port);
+
+#endif /* NVT_SOCKET_H */