Use existing temporary variable conn.

[radsecproxy.git] / radsecproxy.c

diff --git a/radsecproxy.c b/radsecproxy.c
index 1b3408b..2276d40 100644 (file)
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -62,6 +62,7 @@
 #include <regex.h>
 #include <libgen.h>
 #include <pthread.h>
+#include <errno.h>
 #include <openssl/ssl.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
@@ -370,24 +371,24 @@ int addserver(struct clsrvconf *conf) {
            goto errexit;
        }
        if (pthread_mutex_init(conf->servers->requests[i].lock, NULL)) {
-           debug(DBG_ERR, "mutex init failed");
+           debugerrno(errno, DBG_ERR, "mutex init failed");
            free(conf->servers->requests[i].lock);
            conf->servers->requests[i].lock = NULL;
            goto errexit;
        }
     }
     if (pthread_mutex_init(&conf->servers->lock, NULL)) {
-       debug(DBG_ERR, "mutex init failed");
+       debugerrno(errno, DBG_ERR, "mutex init failed");
        goto errexit;
     }
     conf->servers->newrq = 0;
     if (pthread_mutex_init(&conf->servers->newrq_mutex, NULL)) {
-       debug(DBG_ERR, "mutex init failed");
+       debugerrno(errno, DBG_ERR, "mutex init failed");
        pthread_mutex_destroy(&conf->servers->lock);
        goto errexit;
     }
     if (pthread_cond_init(&conf->servers->newrq_cond, NULL)) {
-       debug(DBG_ERR, "mutex init failed");
+       debugerrno(errno, DBG_ERR, "mutex init failed");
        pthread_mutex_destroy(&conf->servers->newrq_mutex);
        pthread_mutex_destroy(&conf->servers->lock);
        goto errexit;
@@ -1633,21 +1634,31 @@ void replyh(struct server *server, unsigned char *buf) {
            replymsg = radattr2ascii(radmsg_gettype(msg, RAD_Attr_Reply_Message));
            if (stationid) {
                if (replymsg) {
-                   debug(DBG_WARN, "%s for user %s stationid %s from %s (%s) to %s (%s)",
-                         radmsgtype2string(msg->code), username, stationid, server->conf->name, replymsg, from->conf->name, addr2string(from->addr));
+                   debug(DBG_NOTICE,
+                         "%s for user %s stationid %s from %s (%s) to %s (%s)",
+                         radmsgtype2string(msg->code), username, stationid,
+                         server->conf->name, replymsg, from->conf->name,
+                         addr2string(from->addr));
                    free(replymsg);
                } else
-                   debug(DBG_WARN, "%s for user %s stationid %s from %s to %s (%s)",
-                         radmsgtype2string(msg->code), username, stationid, server->conf->name, from->conf->name, addr2string(from->addr));
+                   debug(DBG_NOTICE,
+                         "%s for user %s stationid %s from %s to %s (%s)",
+                         radmsgtype2string(msg->code), username, stationid,
+                         server->conf->name, from->conf->name,
+                         addr2string(from->addr));
                free(stationid);
            } else {
                if (replymsg) {
-                   debug(DBG_WARN, "%s for user %s from %s (%s) to %s (%s)",
-                         radmsgtype2string(msg->code), username, server->conf->name, replymsg, from->conf->name, addr2string(from->addr));
+                   debug(DBG_NOTICE, "%s for user %s from %s (%s) to %s (%s)",
+                         radmsgtype2string(msg->code), username,
+                         server->conf->name, replymsg, from->conf->name,
+                         addr2string(from->addr));
                    free(replymsg);
                } else
-                   debug(DBG_WARN, "%s for user %s from %s to %s (%s)",
-                         radmsgtype2string(msg->code), username, server->conf->name, from->conf->name, addr2string(from->addr));
+                   debug(DBG_NOTICE, "%s for user %s from %s to %s (%s)",
+                         radmsgtype2string(msg->code), username,
+                         server->conf->name, from->conf->name,
+                         addr2string(from->addr));
            }
            free(username);
        }
@@ -1762,7 +1773,7 @@ void *clientwr(void *arg) {
        }
        server->connectionok = 1;
        if (pthread_create(&clientrdth, NULL, conf->pdef->clientconnreader, (void *)server)) {
-           debug(DBG_ERR, "clientwr: pthread_create failed");
+           debugerrno(errno, DBG_ERR, "clientwr: pthread_create failed");
            goto errexit;
        }
     } else
@@ -1895,7 +1906,7 @@ void createlistener(uint8_t type, char *arg) {
     for (res = hp->addrinfo; res; res = res->ai_next) {
         s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
         if (s < 0) {
-            debug(DBG_WARN, "createlistener: socket failed");
+            debugerrno(errno, DBG_WARN, "createlistener: socket failed");
             continue;
         }
        setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
@@ -1907,7 +1918,7 @@ void createlistener(uint8_t type, char *arg) {
            setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
 #endif
        if (bind(s, res->ai_addr, res->ai_addrlen)) {
-           debug(DBG_WARN, "createlistener: bind failed");
+           debugerrno(errno, DBG_WARN, "createlistener: bind failed");
            close(s);
            s = -1;
            continue;
@@ -1918,7 +1929,7 @@ void createlistener(uint8_t type, char *arg) {
             debugx(1, DBG_ERR, "malloc failed");
        *sp = s;
        if (pthread_create(&th, NULL, protodefs[type]->listener, (void *)sp))
-            debugx(1, DBG_ERR, "pthread_create failed");
+            debugerrnox(errno, DBG_ERR, "pthread_create failed");
        pthread_detach(th);
     }
     if (!sp)
@@ -2067,7 +2078,7 @@ struct realm *addrealm(struct list *realmlist, char *value, char **servers, char
     memset(realm, 0, sizeof(struct realm));
 
     if (pthread_mutex_init(&realm->mutex, NULL)) {
-       debug(DBG_ERR, "mutex init failed");
+       debugerrno(errno, DBG_ERR, "mutex init failed");
        free(realm);
        realm = NULL;
        goto exit;
@@ -2158,7 +2169,7 @@ struct list *createsubrealmservers(struct realm *realm, struct list *srvconfs) {
                srvconf->servers->dynamiclookuparg = stringcopy(realm->name, 0);
                srvconf->servers->dynstartup = 1;
                if (pthread_create(&clientth, NULL, clientwr, (void *)(srvconf->servers))) {
-                   debug(DBG_ERR, "pthread_create failed");
+                   debugerrno(errno, DBG_ERR, "pthread_create failed");
                    freeserver(srvconf->servers, 1);
                    srvconf->servers = NULL;
                } else
@@ -2220,12 +2231,12 @@ int dynamicconfig(struct server *server) {
     debug(DBG_DBG, "dynamicconfig: need dynamic server config for %s", server->dynamiclookuparg);
 
     if (pipe(fd) > 0) {
-       debug(DBG_ERR, "dynamicconfig: pipe error");
+       debugerrno(errno, DBG_ERR, "dynamicconfig: pipe error");
        goto errexit;
     }
     pid = fork();
     if (pid < 0) {
-       debug(DBG_ERR, "dynamicconfig: fork error");
+       debugerrno(errno, DBG_ERR, "dynamicconfig: fork error");
        close(fd[0]);
        close(fd[1]);
        goto errexit;
@@ -2250,7 +2261,7 @@ int dynamicconfig(struct server *server) {
     freegconf(&cf);
 
     if (waitpid(pid, &status, 0) < 0) {
-       debug(DBG_ERR, "dynamicconfig: wait error");
+       debugerrno(errno, DBG_ERR, "dynamicconfig: wait error");
        goto errexit;
     }
 
@@ -2294,8 +2305,14 @@ int vattrname2val(char *attrname, uint32_t *vendor, uint32_t *type) {
     return *type < 256;
 }
 
-/* should accept both names and numeric values, only numeric right now */
-struct tlv *extractattr(char *nameval) {
+/** Extract attributes from string NAMEVAL, create a struct tlv and
+ * return the tlv.  If VENDOR_FLAG, NAMEVAL is on the form
+ * "<vendor>:<name>:<val>" and otherwise it's "<name>:<val>".  Return
+ * NULL if fields are missing or if conversion fails.
+ *
+ * FIXME: Should accept both names and numeric values, only numeric
+ * right now */
+struct tlv *extractattr(char *nameval, char vendor_flag) {
     int len, name = 0;
     int vendor = 0;        /* Vendor 0 is reserved, see RFC 1700.  */
     char *s, *s2;
@@ -2306,9 +2323,10 @@ struct tlv *extractattr(char *nameval) {
        return NULL;
     name = atoi(nameval);
 
-    /* Two ':' means that we have vendor:name:val.  */
-    s2 = strchr(s + 1, ':');
-    if (s2) {
+    if (vendor_flag) {
+       s2 = strchr(s + 1, ':');
+       if (!s2)
+           return NULL;
        vendor = name;
        name = atoi(s + 1);
        s = s2;
@@ -2331,7 +2349,7 @@ struct tlv *extractattr(char *nameval) {
     a->t = name;
     a->l = len;
 
-    if (vendor)
+    if (vendor_flag)
        a = makevendortlv(vendor, a);
 
     return a;
@@ -2447,7 +2465,7 @@ void addrewrite(char *value, char **rmattrs, char **rmvattrs, char **addattrs, c
        if (!adda)
            debugx(1, DBG_ERR, "malloc failed");
        for (i = 0; addattrs[i]; i++) {
-           a = extractattr(addattrs[i]);
+           a = extractattr(addattrs[i], 0);
            if (!a)
                debugx(1, DBG_ERR, "addrewrite: adding invalid attribute %s", addattrs[i]);
            if (!list_push(adda, a))
@@ -2462,7 +2480,7 @@ void addrewrite(char *value, char **rmattrs, char **rmvattrs, char **addattrs, c
        if (!adda)
            debugx(1, DBG_ERR, "malloc failed");
        for (i = 0; addvattrs[i]; i++) {
-           a = extractattr(addvattrs[i]);
+           a = extractattr(addvattrs[i], 1);
            if (!a)
                debugx(1, DBG_ERR, "addrewrite: adding invalid vendor attribute %s", addvattrs[i]);
            if (!list_push(adda, a))
@@ -3043,8 +3061,8 @@ void getmainconfig(const char *configfile) {
        debugx(1, DBG_ERR, "configuration error");
 
     if (loglevel != LONG_MIN) {
-       if (loglevel < 1 || loglevel > 4)
-           debugx(1, DBG_ERR, "error in %s, value of option LogLevel is %d, must be 1, 2, 3 or 4", configfile, loglevel);
+       if (loglevel < 1 || loglevel > 5)
+           debugx(1, DBG_ERR, "error in %s, value of option LogLevel is %d, must be 1, 2, 3, 4 or 5", configfile, loglevel);
        options.loglevel = (uint8_t)loglevel;
     }
     if (addttl != LONG_MIN) {
@@ -3069,8 +3087,8 @@ void getargs(int argc, char **argv, uint8_t *foreground, uint8_t *pretend, uint8
            *configfile = optarg;
            break;
        case 'd':
-           if (strlen(optarg) != 1 || *optarg < '1' || *optarg > '4')
-               debugx(1, DBG_ERR, "Debug level must be 1, 2, 3 or 4, not %s", optarg);
+           if (strlen(optarg) != 1 || *optarg < '1' || *optarg > '5')
+               debugx(1, DBG_ERR, "Debug level must be 1, 2, 3, 4 or 5, not %s", optarg);
            *loglevel = *optarg - '0';
            break;
        case 'f':
@@ -3083,7 +3101,7 @@ void getargs(int argc, char **argv, uint8_t *foreground, uint8_t *pretend, uint8
            *pretend = 1;
            break;
        case 'v':
-           debug(DBG_ERR, "radsecproxy revision $Rev$");
+           debug(DBG_ERR, "radsecproxy revision %s", PACKAGE_VERSION);
            debug(DBG_ERR, "This binary was built with support for the following transports:");
 #ifdef RADPROT_UDP
            debug(DBG_ERR, "  UDP");
@@ -3153,10 +3171,10 @@ void *sighandler(void *arg) {
 }
 
 int createpidfile(const char *pidfile) {
-    int r;
+    int r = 0;
     FILE *f = fopen(pidfile, "w");
     if (f)
-       r = fprintf(f, "%d\n", getpid());
+       r = fprintf(f, "%ld\n", (long) getpid());
     return f && !fclose(f) && r >= 0;
 }
 
@@ -3202,7 +3220,7 @@ int main(int argc, char **argv) {
        debugx(1, DBG_ERR, "daemon() failed: %s", strerror(errno));
 
     debug_timestamp_on();
-    debug(DBG_INFO, "radsecproxy revision $Rev$ starting");
+    debug(DBG_INFO, "radsecproxy revision %s starting", PACKAGE_VERSION);
     if (pidfile && !createpidfile(pidfile))
        debugx(1, DBG_ERR, "failed to create pidfile %s: %s", pidfile, strerror(errno));