removed some harmless compiler warnings

[radsecproxy.git] / util.c

diff --git a/util.c b/util.c
index ae733eb..d551cf0 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Stig Venaas <venaas@uninett.no>
+ * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -13,9 +13,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
 #include <stdarg.h>
+#include "debug.h"
 
+#if 0
+#include <errno.h>
 void errx(char *format, ...) {
     extern int errno;
 
@@ -46,19 +48,30 @@ void err(char *format, ...) {
     } else
         fprintf(stderr, "\n");
 }
+#endif
 
-char *stringcopy(char *s, int len) {
+char *stringcopy(const char *s, int len) {
     char *r;
     if (!len)
        len = strlen(s);
     r = malloc(len + 1);
     if (!r)
-       errx("stringcopy: malloc failed");
+       debug(DBG_ERR, "stringcopy: malloc failed");
     memcpy(r, s, len);
     r[len] = '\0';
     return r;
 }
-               
+
+void printfchars(char *prefixfmt, char *prefix, char *charfmt, char *chars, int len) {
+    int i;
+    unsigned char *s = (unsigned char *)chars;
+    if (prefix)
+       printf(prefixfmt ? prefixfmt : "%s: ", prefix);
+    for (i = 0; i < len; i++)
+       printf(charfmt ? charfmt : "%c", s[i]);
+    printf("\n");
+}
+
 char *addr2string(struct sockaddr *addr, socklen_t len) {
     struct sockaddr_in6 *sa6;
     struct sockaddr_in sa4;
@@ -75,36 +88,38 @@ char *addr2string(struct sockaddr *addr, socklen_t len) {
            addr = (struct sockaddr *)&sa4;
        }
     }
+    len = addr->sa_family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
+    
     if (getnameinfo(addr, len, addr_buf[i], sizeof(addr_buf[i]),
                     NULL, 0, NI_NUMERICHOST)) {
-        err("getnameinfo");
-        return NULL;
+        debug(DBG_WARN, "getnameinfo failed");
+        return "getnameinfo_failed";
     }
     return addr_buf[i];
 }
 
 int connectport(int type, char *host, char *port) {
     struct addrinfo hints, *res0, *res;
-    int s;
+    int s = -1;
     
     memset(&hints, 0, sizeof(hints));
     hints.ai_socktype = type;
     hints.ai_family = AF_UNSPEC;
 
     if (getaddrinfo(host, port, &hints, &res0) != 0) {
-        err("connectport: can't resolve host %s port %s", host, port);
+       debug(DBG_ERR, "connectport: can't resolve host %s port %s", host, port);
        return -1;
     }
 
     for (res = res0; res; res = res->ai_next) {
        s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
        if (s < 0) {
-           err("connectport: socket failed");
+           debug(DBG_WARN, "connectport: socket failed");
            continue;
        }
        if (connect(s, res->ai_addr, res->ai_addrlen) == 0)
            break;
-       err("connectport: connect failed");
+       debug(DBG_WARN, "connectport: connect failed");
        close(s);
        s = -1;
     }