renamed struct queue to gqueue due to solaris defining queue

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

diff --git a/dtls.c b/dtls.c
index 49519ec..6496338 100644 (file)
--- a/dtls.c
+++ b/dtls.c
@@ -87,7 +87,7 @@ static char **getlistenerargs() {
 
 struct sessioncacheentry {
     pthread_mutex_t mutex;
-    struct queue *rbios;
+    struct gqueue *rbios;
     struct timeval expiry;
 };
 
@@ -103,7 +103,7 @@ void dtlssetsrcres() {
     
 }
 
-int udp2bio(int s, struct queue *q, int cnt) {
+int udp2bio(int s, struct gqueue *q, int cnt) {
     unsigned char *buf;
     BIO *rbio;
 
@@ -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,7 +159,7 @@ 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;
     
@@ -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;
@@ -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;
 
@@ -267,7 +267,7 @@ 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));

diff --git a/radsecproxy.c b/radsecproxy.c
index 1ec76b9..f1bcee5 100644 (file)
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -351,10 +351,10 @@ struct clsrvconf *find_clconf_type(uint8_t type, struct list_node **cur) {
     return NULL;
 }
 
-struct queue *newqueue() {
-    struct queue *q;
+struct gqueue *newqueue() {
+    struct gqueue *q;
     
-    q = malloc(sizeof(struct queue));
+    q = malloc(sizeof(struct gqueue));
     if (!q)
        debugx(1, DBG_ERR, "malloc failed");
     q->entries = list_create();
@@ -365,7 +365,7 @@ struct queue *newqueue() {
     return q;
 }
 
-void removequeue(struct queue *q) {
+void removequeue(struct gqueue *q) {
     struct list_node *entry;
 
     if (!q)
@@ -380,7 +380,7 @@ void removequeue(struct queue *q) {
     free(q);
 }
 
-void freebios(struct queue *q) {
+void freebios(struct gqueue *q) {
     BIO *bio;
     
     pthread_mutex_lock(&q->mutex);

diff --git a/radsecproxy.h b/radsecproxy.h
index 5bba34a..9c61ca7 100644 (file)
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -69,7 +69,7 @@ struct rqout {
     struct timeval expiry;
 };
 
-struct queue {
+struct gqueue {
     struct list *entries;
     pthread_mutex_t mutex;
     pthread_cond_t cond;
@@ -114,8 +114,8 @@ struct client {
     int sock;
     SSL *ssl;
     struct request *rqs[MAX_REQUESTS];
-    struct queue *replyq;
-    struct queue *rbios; /* for dtls */
+    struct gqueue *replyq;
+    struct gqueue *rbios; /* for dtls */
     struct sockaddr *addr;
     time_t expiry; /* for udp */
 };
@@ -138,7 +138,7 @@ struct server {
     uint8_t newrq;
     pthread_mutex_t newrq_mutex;
     pthread_cond_t newrq_cond;
-    struct queue *rbios; /* for dtls */
+    struct gqueue *rbios; /* for dtls */
 };
 
 struct realm {
@@ -202,8 +202,8 @@ struct clsrvconf *find_clconf_type(uint8_t type, struct list_node **cur);
 struct client *addclient(struct clsrvconf *conf, uint8_t lock);
 void removelockedclient(struct client *client);
 void removeclient(struct client *client);
-struct queue *newqueue();
-void freebios(struct queue *q);
+struct gqueue *newqueue();
+void freebios(struct gqueue *q);
 struct request *newrequest();
 void freerq(struct request *rq);
 int radsrv(struct request *rq);

diff --git a/tcp.c b/tcp.c
index c0a266c..00c796d 100644 (file)
--- a/tcp.c
+++ b/tcp.c
@@ -237,7 +237,7 @@ void *tcpclientrd(void *arg) {
 void *tcpserverwr(void *arg) {
     int cnt;
     struct client *client = (struct client *)arg;
-    struct queue *replyq;
+    struct gqueue *replyq;
     struct request *reply;
     
     debug(DBG_DBG, "tcpserverwr: starting for %s", addr2string(client->addr));

diff --git a/tls.c b/tls.c
index d49e94b..fa43aea 100644 (file)
--- a/tls.c
+++ b/tls.c
@@ -299,7 +299,7 @@ void *tlsserverwr(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, "tlsserverwr: starting for %s", addr2string(client->addr));

diff --git a/udp.c b/udp.c
index 54cc97b..2c8ca7f 100644 (file)
--- a/udp.c
+++ b/udp.c
@@ -64,7 +64,7 @@ static const struct protodefs protodefs = {
 
 static int client4_sock = -1;
 static int client6_sock = -1;
-static struct queue *server_replyq = NULL;
+static struct gqueue *server_replyq = NULL;
 
 static struct addrinfo *srcres = NULL;
 static uint8_t handle;
@@ -290,7 +290,7 @@ void *udpserverrd(void *arg) {
 }
 
 void *udpserverwr(void *arg) {
-    struct queue *replyq = (struct queue *)arg;
+    struct gqueue *replyq = (struct gqueue *)arg;
     struct request *reply;
     struct sockaddr_storage to;