static int client6_sock = -1;
static struct queue *server_replyq = NULL;
+static struct addrinfo *srcres = NULL;
+
+void udpsetsrcres(char *source) {
+ if (!srcres)
+ srcres = resolve_hostport_addrinfo(RAD_UDP, source);
+}
+
+void removeudpclientfromreplyq(struct client *c) {
+ struct list_node *n;
+ struct request *r;
+
+ /* lock the common queue and remove replies for this client */
+ pthread_mutex_lock(&c->replyq->mutex);
+ for (n = list_first(c->replyq->entries); n; n = list_next(n)) {
+ r = (struct request *)n->data;
+ if (r->from == c)
+ r->from = NULL;
+ }
+ pthread_mutex_unlock(&c->replyq->mutex);
+}
+
/* exactly one of client and server must be non-NULL */
/* return who we received from in *client or *server */
/* return from in sa if not NULL */
struct clsrvconf *p;
struct list_node *node;
fd_set readfds;
+ struct client *c = NULL;
+ struct timeval now;
for (;;) {
if (rad) {
debug(DBG_DBG, "radudpget: packet was padded with %d bytes", cnt - len);
if (client) {
+ *client = NULL;
pthread_mutex_lock(p->lock);
- for (node = list_first(p->clients); node; node = list_next(node))
- if (addr_equal((struct sockaddr *)&from, ((struct client *)node->data)->addr))
- break;
- if (node) {
- *client = (struct client *)node->data;
- pthread_mutex_unlock(p->lock);
+ for (node = list_first(p->clients); node;) {
+ c = (struct client *)node->data;
+ node = list_next(node);
+ if (s != c->sock)
+ continue;
+ gettimeofday(&now, NULL);
+ if (!*client && addr_equal((struct sockaddr *)&from, c->addr)) {
+ c->expiry = now.tv_sec + 60;
+ *client = c;
+ }
+ if (c->expiry >= now.tv_sec)
+ continue;
+
+ debug(DBG_DBG, "radudpget: removing expired client (%s)", addr2string(c->addr));
+ removeudpclientfromreplyq(c);
+ c->replyq = NULL; /* stop removeclient() from removing common udp replyq */
+ removelockedclient(c);
break;
}
- fromcopy = addr_copy((struct sockaddr *)&from);
- if (!fromcopy) {
- pthread_mutex_unlock(p->lock);
- continue;
- }
- *client = addclient(p, 0);
if (!*client) {
- free(fromcopy);
- pthread_mutex_unlock(p->lock);
- continue;
+ fromcopy = addr_copy((struct sockaddr *)&from);
+ if (!fromcopy) {
+ pthread_mutex_unlock(p->lock);
+ continue;
+ }
+ c = addclient(p, 0);
+ if (!c) {
+ free(fromcopy);
+ pthread_mutex_unlock(p->lock);
+ continue;
+ }
+ c->sock = s;
+ c->addr = fromcopy;
+ gettimeofday(&now, NULL);
+ c->expiry = now.tv_sec + 60;
+ *client = c;
}
- (*client)->addr = fromcopy;
pthread_mutex_unlock(p->lock);
} else if (server)
*server = p->servers;
int clientradputudp(struct server *server, unsigned char *rad) {
size_t len;
- struct sockaddr_storage sa;
- struct sockaddr *sap;
struct clsrvconf *conf = server->conf;
- uint16_t port;
len = RADLEN(rad);
- port = port_get(conf->addrinfo->ai_addr);
-
- if (*rad == RAD_Accounting_Request) {
- sap = (struct sockaddr *)&sa;
- memcpy(sap, conf->addrinfo->ai_addr, conf->addrinfo->ai_addrlen);
- port_set(sap, ++port);
- } else
- sap = conf->addrinfo->ai_addr;
-
- if (sendto(server->sock, rad, len, 0, sap, conf->addrinfo->ai_addrlen) >= 0) {
- debug(DBG_DBG, "clienradputudp: sent UDP of length %d to %s port %d", len, conf->host, port);
+ if (sendto(server->sock, rad, len, 0, conf->addrinfo->ai_addr, conf->addrinfo->ai_addrlen) >= 0) {
+ debug(DBG_DBG, "clienradputudp: sent UDP of length %d to %s port %d", len, conf->host, port_get(conf->addrinfo->ai_addr));
return 1;
}
pthread_cond_wait(&replyq->cond, &replyq->mutex);
debug(DBG_DBG, "udp server writer, got signal");
}
+ /* do this with lock, udpserverrd may set from = NULL if from expires */
+ if (reply->from)
+ memcpy(&to, reply->from->addr, SOCKADDRP_SIZE(reply->from->addr));
pthread_mutex_unlock(&replyq->mutex);
-
- memcpy(&to, reply->from->addr, SOCKADDRP_SIZE(reply->from->addr));
- port_set((struct sockaddr *)&to, reply->udpport);
- if (sendto(reply->udpsock, reply->replybuf, RADLEN(reply->replybuf), 0, (struct sockaddr *)&to, SOCKADDR_SIZE(to)) < 0)
- debug(DBG_WARN, "udpserverwr: send failed");
+ if (reply->from) {
+ port_set((struct sockaddr *)&to, reply->udpport);
+ if (sendto(reply->udpsock, reply->replybuf, RADLEN(reply->replybuf), 0, (struct sockaddr *)&to, SOCKADDR_SIZE(to)) < 0)
+ debug(DBG_WARN, "udpserverwr: send failed");
+ }
+ debug(DBG_DBG, "udpserverwr: refcount %d", reply->refcount);
freerq(reply);
}
}
switch (conf->addrinfo->ai_family) {
case AF_INET:
if (client4_sock < 0) {
- client4_sock = bindtoaddr(getsrcprotores(RAD_UDP), 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);
}
break;
case AF_INET6:
if (client6_sock < 0) {
- client6_sock = bindtoaddr(getsrcprotores(RAD_UDP), 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);
}
void initextraudp() {
pthread_t cl4th, cl6th, srvth;
+
+ if (srcres) {
+ freeaddrinfo(srcres);
+ srcres = NULL;
+ }
if (client4_sock >= 0)
if (pthread_create(&cl4th, NULL, udpclientrd, (void *)&client4_sock))
projects / radsecproxy.git / blobdiff