moved more stuff from rqout to rq

git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@382 e88ac4ed-0b26-0410-9574-a7f39faa03bf

dtls.c

@@ -274,11 +274,9 @@ void dtlsserverrd(struct client *client) {
 	rq->buf = buf;
 	rq->from = client;
 	if (!radsrv(rq)) {
-	    freerq(rq);
 	    debug(DBG_ERR, "dtlsserverrd: message authentication/validation failed, closing connection from %s", client->conf->host);
 	    break;
 	}
-	freerq(rq);
     }
     
     /* stop writer by setting ssl to NULL and give signal in case waiting for data */

radsecproxy.h

@@ -46,6 +46,7 @@ struct request {
     struct timeval created;
     uint8_t refcount;
     uint8_t *buf;
+    struct radmsg *msg;
     struct client *from;
     struct sockaddr_storage fromsa; /* used by udpservwr */
     int fromudpsock; /* used by udpservwr */
@@ -56,12 +57,9 @@ struct request {
 
 /* requests that our client will send */
 struct rqout {
-    pthread_mutex_t *lock; /* used when modifying buf/msg/rq */
-    unsigned char *buf;
-    struct radmsg *msg;
+    pthread_mutex_t *lock;
     struct request *rq;
     uint8_t tries;
-    uint8_t received;
     struct timeval expiry;
 };
 

tcp.c

@@ -249,11 +249,9 @@ void tcpserverrd(struct client *client) {
 	rq->buf = buf;
 	rq->from = client;
 	if (!radsrv(rq)) {
-	    freerq(rq);
 	    debug(DBG_ERR, "tcpserverrd: message authentication/validation failed, closing connection from %s", client->conf->host);
 	    break;
 	}
-	freerq(rq);
     }
 
     /* stop writer by setting s to -1 and give signal in case waiting for data */

tls.c

@@ -302,11 +302,9 @@ void tlsserverrd(struct client *client) {
 	rq->buf = buf;
 	rq->from = client;
 	if (!radsrv(rq)) {
-	    freerq(rq);
 	    debug(DBG_ERR, "tlsserverrd: message authentication/validation failed, closing connection from %s", client->conf->host);
 	    break;
 	}
-	freerq(rq);
     }
     
     /* stop writer by setting ssl to NULL and give signal in case waiting for data */

udp.c

@@ -196,7 +196,6 @@ void *udpserverrd(void *arg) {
 	rq->buf = radudpget(*sp, &rq->from, NULL, &rq->fromsa);
 	rq->fromudpsock = *sp;
 	radsrv(rq);
-	freerq(rq);
     }
     free(sp);
 }