X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=dtls.c;h=d99c55de585299adc2a4c696551d4cf900a36fc4;hb=c1f196080a7cb867afd3dee50e2910899cbf5f46;hp=49519ecce7a91278f649becb4d49fb592e8b5768;hpb=6068df237753e20c504c954504858585d5105a46;p=libradsec.git diff --git a/dtls.c b/dtls.c index 49519ec..d99c55d 100644 --- a/dtls.c +++ b/dtls.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Stig Venaas + * Copyright (C) 2008-2009 Stig Venaas * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,6 +33,7 @@ #ifdef RADPROT_DTLS #include "debug.h" #include "util.h" +#include "hostport.h" static void setprotoopts(struct commonprotoopts *opts); static char **getlistenerargs(); @@ -87,29 +88,28 @@ static char **getlistenerargs() { struct sessioncacheentry { pthread_mutex_t mutex; - struct queue *rbios; + struct gqueue *rbios; struct timeval expiry; }; struct dtlsservernewparams { struct sessioncacheentry *sesscache; int sock; - struct sockaddr_storage addr; + struct sockaddr_storage addr; }; void dtlssetsrcres() { if (!srcres) - srcres = resolve_hostport_addrinfo(handle, protoopts ? protoopts->sourcearg : NULL); - + srcres = resolvepassiveaddrinfo(protoopts ? protoopts->sourcearg : NULL, NULL, protodefs.socktype); } -int udp2bio(int s, struct queue *q, int cnt) { +int udp2bio(int s, struct gqueue *q, int cnt) { unsigned char *buf; BIO *rbio; if (cnt < 1) return 0; - + buf = malloc(cnt); if (!buf) { unsigned char err; @@ -139,7 +139,7 @@ int udp2bio(int s, struct queue *q, int cnt) { return 1; } -BIO *getrbio(SSL *ssl, struct queue *q, int timeout) { +BIO *getrbio(SSL *ssl, struct gqueue *q, int timeout) { BIO *rbio; struct timeval now; struct timespec to; @@ -159,10 +159,10 @@ BIO *getrbio(SSL *ssl, struct queue *q, int timeout) { return rbio; } -int dtlsread(SSL *ssl, struct queue *q, unsigned char *buf, int num, int timeout) { +int dtlsread(SSL *ssl, struct gqueue *q, unsigned char *buf, int num, int timeout) { int len, cnt; BIO *rbio; - + for (len = 0; len < num; len += cnt) { cnt = SSL_read(ssl, buf + len, num - len); if (cnt <= 0) @@ -171,7 +171,7 @@ int dtlsread(SSL *ssl, struct queue *q, unsigned char *buf, int num, int timeout rbio = getrbio(ssl, q, timeout); if (!rbio) return 0; - BIO_free(ssl->rbio); + BIO_free(ssl->rbio); ssl->rbio = rbio; cnt = 0; continue; @@ -190,7 +190,7 @@ int dtlsread(SSL *ssl, struct queue *q, unsigned char *buf, int num, int timeout } /* accept if acc == 1, else connect */ -SSL *dtlsacccon(uint8_t acc, SSL_CTX *ctx, int s, struct sockaddr *addr, struct queue *rbios) { +SSL *dtlsacccon(uint8_t acc, SSL_CTX *ctx, int s, struct sockaddr *addr, struct gqueue *rbios) { SSL *ssl; int i, res; unsigned long error; @@ -199,7 +199,7 @@ SSL *dtlsacccon(uint8_t acc, SSL_CTX *ctx, int s, struct sockaddr *addr, struct ssl = SSL_new(ctx); if (!ssl) return NULL; - + mem0bio = BIO_new(BIO_s_mem()); BIO_set_mem_eof_return(mem0bio, -1); wbio = BIO_new_dgram(s, BIO_NOCLOSE); @@ -226,7 +226,7 @@ SSL *dtlsacccon(uint8_t acc, SSL_CTX *ctx, int s, struct sockaddr *addr, struct return NULL; } -unsigned char *raddtlsget(SSL *ssl, struct queue *rbios, int timeout) { +unsigned char *raddtlsget(SSL *ssl, struct gqueue *rbios, int timeout) { int cnt, len; unsigned char buf[4], *rad; @@ -244,21 +244,21 @@ unsigned char *raddtlsget(SSL *ssl, struct queue *rbios, int timeout) { continue; } memcpy(rad, buf, 4); - + cnt = dtlsread(ssl, rbios, rad + 4, len - 4, timeout); if (cnt < 1) { debug(DBG_DBG, cnt ? "raddtlsget: connection lost" : "raddtlsget: timeout"); free(rad); return NULL; } - + if (len >= 20) break; - + free(rad); debug(DBG_WARN, "raddtlsget: packet smaller than minimum radius size"); } - + debug(DBG_DBG, "raddtlsget: got %d bytes", len); return rad; } @@ -267,15 +267,15 @@ void *dtlsserverwr(void *arg) { int cnt; unsigned long error; struct client *client = (struct client *)arg; - struct queue *replyq; + struct gqueue *replyq; struct request *reply; - + debug(DBG_DBG, "dtlsserverwr: starting for %s", addr2string(client->addr)); replyq = client->replyq; for (;;) { pthread_mutex_lock(&replyq->mutex); while (!list_first(replyq->entries)) { - if (client->ssl) { + if (client->ssl) { debug(DBG_DBG, "dtlsserverwr: waiting for signal"); pthread_cond_wait(&replyq->cond, &replyq->mutex); debug(DBG_DBG, "dtlsserverwr: got signal"); @@ -305,7 +305,7 @@ void dtlsserverrd(struct client *client) { struct request *rq; uint8_t *buf; pthread_t dtlsserverwrth; - + debug(DBG_DBG, "dtlsserverrd: starting for %s", addr2string(client->addr)); if (pthread_create(&dtlsserverwrth, NULL, dtlsserverwr, (void *)client)) { @@ -332,7 +332,7 @@ void dtlsserverrd(struct client *client) { break; } } - + /* stop writer by setting ssl to NULL and give signal in case waiting for data */ client->ssl = NULL; @@ -392,7 +392,7 @@ void *dtlsservernew(void *arg) { if (cert) X509_free(cert); - exit: +exit: if (ssl) { SSL_shutdown(ssl); SSL_free(ssl); @@ -413,7 +413,7 @@ void cacheexpire(struct hash *cache, struct timeval *last) { struct timeval now; struct hash_entry *he; struct sessioncacheentry *e; - + gettimeofday(&now, NULL); if (now.tv_sec - last->tv_sec < 19) return; @@ -448,12 +448,12 @@ void *udpdtlsserverrd(void *arg) { pthread_t dtlsserverth; struct hash *sessioncache; struct sessioncacheentry *cacheentry; - + sessioncache = hash_create(); if (!sessioncache) debugx(1, DBG_ERR, "udpdtlsserverrd: malloc failed"); gettimeofday(&lastexpiry, NULL); - + for (;;) { FD_ZERO(&readfds); FD_SET(s, &readfds); @@ -531,6 +531,7 @@ int dtlsconnect(struct server *server, struct timeval *when, int timeout, char * time_t elapsed; X509 *cert; SSL_CTX *ctx = NULL; + struct hostportres *hp; debug(DBG_DBG, "dtlsconnect: called from %s", text); pthread_mutex_lock(&server->lock); @@ -541,6 +542,7 @@ int dtlsconnect(struct server *server, struct timeval *when, int timeout, char * return 1; } + hp = (struct hostportres *)list_first(server->conf->hostports)->data; for (;;) { gettimeofday(&now, NULL); elapsed = now.tv_sec - server->lastconnecttry.tv_sec; @@ -566,28 +568,28 @@ int dtlsconnect(struct server *server, struct timeval *when, int timeout, char * sleep(60); } else server->lastconnecttry.tv_sec = now.tv_sec; /* no sleep at startup */ - debug(DBG_WARN, "dtlsconnect: trying to open DTLS connection to %s port %s", server->conf->host, server->conf->port); + debug(DBG_WARN, "dtlsconnect: trying to open DTLS connection to %s port %s", hp->host, hp->port); SSL_free(server->ssl); server->ssl = NULL; ctx = tlsgetctx(handle, server->conf->tlsconf); if (!ctx) continue; - server->ssl = dtlsacccon(0, ctx, server->sock, server->conf->addrinfo->ai_addr, server->rbios); + server->ssl = dtlsacccon(0, ctx, server->sock, hp->addrinfo->ai_addr, server->rbios); if (!server->ssl) continue; debug(DBG_DBG, "dtlsconnect: DTLS: ok"); - + cert = verifytlscert(server->ssl); if (!cert) continue; - + if (verifyconfcert(cert, server->conf)) break; X509_free(cert); } X509_free(cert); - debug(DBG_WARN, "dtlsconnect: DTLS connection to %s port %s up", server->conf->host, server->conf->port); + debug(DBG_WARN, "dtlsconnect: DTLS connection to %s port %s up", hp->host, hp->port); server->connectionok = 1; gettimeofday(&server->lastconnecttry, NULL); pthread_mutex_unlock(&server->lock); @@ -608,7 +610,7 @@ int clientradputdtls(struct server *server, unsigned char *rad) { debug(DBG_ERR, "clientradputdtls: DTLS: %s", ERR_error_string(error, NULL)); return 0; } - debug(DBG_DBG, "clientradputdtls: Sent %d bytes, Radius packet of length %d to DTLS peer %s", cnt, len, conf->host); + debug(DBG_DBG, "clientradputdtls: Sent %d bytes, Radius packet of length %d to DTLS peer %s", cnt, len, conf->name); return 1; } @@ -620,7 +622,7 @@ void *udpdtlsclientrd(void *arg) { socklen_t fromlen = sizeof(from); struct clsrvconf *conf; fd_set readfds; - + for (;;) { FD_ZERO(&readfds); FD_SET(s, &readfds); @@ -631,7 +633,7 @@ void *udpdtlsclientrd(void *arg) { debug(DBG_WARN, "udpdtlsclientrd: recv failed"); continue; } - + 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)); @@ -648,7 +650,7 @@ void *dtlsclientrd(void *arg) { unsigned char *buf; struct timeval lastconnecttry; int secs; - + for (;;) { /* yes, lastconnecttry is really necessary */ lastconnecttry = server->lastconnecttry; @@ -665,12 +667,12 @@ void *dtlsclientrd(void *arg) { } void addserverextradtls(struct clsrvconf *conf) { - switch (conf->addrinfo->ai_family) { + switch (((struct hostportres *)list_first(conf->hostports)->data)->addrinfo->ai_family) { case AF_INET: if (client4_sock < 0) { 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); + debugx(1, DBG_ERR, "addserver: failed to create client socket for server %s", conf->name); } conf->servers->sock = client4_sock; break; @@ -678,7 +680,7 @@ void addserverextradtls(struct clsrvconf *conf) { if (client6_sock < 0) { 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); + debugx(1, DBG_ERR, "addserver: failed to create client socket for server %s", conf->name); } conf->servers->sock = client6_sock; break; @@ -694,7 +696,7 @@ void initextradtls() { freeaddrinfo(srcres); srcres = NULL; } - + if (client4_sock >= 0) if (pthread_create(&cl4th, NULL, udpdtlsclientrd, (void *)&client4_sock)) debugx(1, DBG_ERR, "pthread_create failed"); @@ -707,3 +709,7 @@ const struct protodefs *dtlsinit(uint8_t h) { return NULL; } #endif + +/* Local Variables: */ +/* c-file-style: "stroustrup" */ +/* End: */