cleaning up code

[radsecproxy.git] / dtls.c

diff --git a/dtls.c b/dtls.c
index ed5e44e..6ada359 100644 (file)
--- a/dtls.c
+++ b/dtls.c
@@ -31,10 +31,57 @@
 #include "hash.h"
 #include "util.h"
 #include "radsecproxy.h"
-#include "dtls.h"
+
+static void setprotoopts(struct commonprotoopts *opts);
+static char **getlistenerargs();
+void *udpdtlsserverrd(void *arg);
+int dtlsconnect(struct server *server, struct timeval *when, int timeout, char *text);
+void *dtlsclientrd(void *arg);
+int clientradputdtls(struct server *server, unsigned char *rad);
+void addserverextradtls(struct clsrvconf *conf);
+void dtlssetsrcres();
+void initextradtls();
+
+static const struct protodefs protodefs = {
+    "dtls",
+    "mysecret", /* secretdefault */
+    SOCK_DGRAM, /* socktype */
+    "2083", /* portdefault */
+    REQUEST_RETRY_COUNT, /* retrycountdefault */
+    10, /* retrycountmax */
+    REQUEST_RETRY_INTERVAL, /* retryintervaldefault */
+    60, /* retryintervalmax */
+    DUPLICATE_INTERVAL, /* duplicateintervaldefault */
+    setprotoopts, /* setprotoopts */
+    getlistenerargs, /* getlistenerargs */
+    udpdtlsserverrd, /* listener */
+    dtlsconnect, /* connecter */
+    dtlsclientrd, /* clientconnreader */
+    clientradputdtls, /* clientradput */
+    NULL, /* addclient */
+    addserverextradtls, /* addserverextra */
+    dtlssetsrcres, /* setsrcres */
+    initextradtls /* initextra */
+};
 
 static int client4_sock = -1;
 static int client6_sock = -1;
+static struct addrinfo *srcres = NULL;
+static uint8_t handle;
+static struct commonprotoopts *protoopts = NULL;
+
+const struct protodefs *dtlsinit(uint8_t h) {
+    handle = h;
+    return &protodefs;
+}
+
+static void setprotoopts(struct commonprotoopts *opts) {
+    protoopts = opts;
+}
+
+static char **getlistenerargs() {
+    return protoopts ? protoopts->listenargs : NULL;
+}
 
 struct sessioncacheentry {
     pthread_mutex_t mutex;
@@ -48,6 +95,12 @@ struct dtlsservernewparams {
     struct sockaddr_storage addr;    
 };
 
+void dtlssetsrcres() {
+    if (!srcres)
+       srcres = resolve_hostport_addrinfo(handle, protoopts ? protoopts->sourcearg : NULL);
+    
+}
+
 int udp2bio(int s, struct queue *q, int cnt) {
     unsigned char *buf;
     BIO *rbio;
@@ -286,7 +339,6 @@ void dtlsserverrd(struct client *client) {
     pthread_mutex_unlock(&client->replyq->mutex);
     debug(DBG_DBG, "dtlsserverrd: waiting for writer to end");
     pthread_join(dtlsserverwrth, NULL);
-    removeclientrqs(client);
     debug(DBG_DBG, "dtlsserverrd: reader for %s exiting", addr2string(client->addr));
 }
 
@@ -301,9 +353,9 @@ void *dtlsservernew(void *arg) {
     uint8_t delay = 60;
 
     debug(DBG_DBG, "dtlsservernew: starting");
-    conf = find_clconf(RAD_DTLS, (struct sockaddr *)&params->addr, NULL);
+    conf = find_clconf(handle, (struct sockaddr *)&params->addr, NULL);
     if (conf) {
-       ctx = tlsgetctx(RAD_DTLS, conf->tlsconf);
+       ctx = tlsgetctx(handle, conf->tlsconf);
        if (!ctx)
            goto exit;
        ssl = dtlsacccon(1, ctx, params->sock, (struct sockaddr *)&params->addr, params->sesscache->rbios);
@@ -331,7 +383,7 @@ void *dtlsservernew(void *arg) {
            }
            goto exit;
        }
-       conf = find_clconf(RAD_DTLS, (struct sockaddr *)&params->addr, &cur);
+       conf = find_clconf(handle, (struct sockaddr *)&params->addr, &cur);
     }
     debug(DBG_WARN, "dtlsservernew: ignoring request, no matching TLS client");
 
@@ -516,7 +568,7 @@ int dtlsconnect(struct server *server, struct timeval *when, int timeout, char *
 
        SSL_free(server->ssl);
        server->ssl = NULL;
-       ctx = tlsgetctx(RAD_DTLS, server->conf->tlsconf);
+       ctx = tlsgetctx(handle, server->conf->tlsconf);
        if (!ctx)
            continue;
        server->ssl = dtlsacccon(0, ctx, server->sock, server->conf->addrinfo->ai_addr, server->rbios);
@@ -578,7 +630,7 @@ void *udpdtlsclientrd(void *arg) {
            continue;
        }
        
-       conf = find_srvconf(RAD_DTLS, (struct sockaddr *)&from, NULL);
+       conf = find_srvconf(handle, (struct sockaddr *)&from, NULL);
        if (!conf) {
            debug(DBG_WARN, "udpdtlsclientrd: got packet from wrong or unknown DTLS peer %s, ignoring", addr2string((struct sockaddr *)&from));
            recv(s, buf, 4, 0);
@@ -614,7 +666,7 @@ void addserverextradtls(struct clsrvconf *conf) {
     switch (conf->addrinfo->ai_family) {
     case AF_INET:
        if (client4_sock < 0) {
-           client4_sock = bindtoaddr(getsrcprotores(RAD_DTLS), AF_INET, 0, 1);
+           client4_sock = bindtoaddr(srcres, AF_INET, 0, 1);
            if (client4_sock < 0)
                debugx(1, DBG_ERR, "addserver: failed to create client socket for server %s", conf->host);
        }
@@ -622,7 +674,7 @@ void addserverextradtls(struct clsrvconf *conf) {
        break;
     case AF_INET6:
        if (client6_sock < 0) {
-           client6_sock = bindtoaddr(getsrcprotores(RAD_DTLS), AF_INET6, 0, 1);
+           client6_sock = bindtoaddr(srcres, AF_INET6, 0, 1);
            if (client6_sock < 0)
                debugx(1, DBG_ERR, "addserver: failed to create client socket for server %s", conf->host);
        }
@@ -635,6 +687,11 @@ void addserverextradtls(struct clsrvconf *conf) {
 
 void initextradtls() {
     pthread_t cl4th, cl6th;
+
+    if (srcres) {
+       freeaddrinfo(srcres);
+       srcres = NULL;
+    }
     
     if (client4_sock >= 0)
        if (pthread_create(&cl4th, NULL, udpdtlsclientrd, (void *)&client4_sock))