summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvenaas <venaas>2007-02-15 12:26:26 +0000
committervenaas <venaas@e88ac4ed-0b26-0410-9574-a7f39faa03bf>2007-02-15 12:26:26 +0000
commit6fd042c5e1c780facc94a77d4f924921ee6b09a1 (patch)
tree887bf5432b109a082b74580944e90c7101fa2152
parentd5fef766258bec5659b56e82bf7281a792fc59f6 (diff)
fixed clientwr bug when receiving new request while not waiting for one
git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@58 e88ac4ed-0b26-0410-9574-a7f39faa03bf
-rw-r--r--Makefile6
-rw-r--r--radsecproxy.c6
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ebca44f..6a72e8e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
CFLAGS = -g -Wall -pedantic -pthread
LDFLAGS = -lssl
-OBJ = util.o
+OBJ = util.o radsecproxy.o
all: radsecproxy
-radsecproxy: $(OBJ)
- $(CC) $(CFLAGS) $(OBJ) $(LDFLAGS) -o radsecproxy radsecproxy.c
+radsecproxy: $(OBJ) radsecproxy.o
+ $(CC) $(CFLAGS) $(OBJ) $(LDFLAGS) -o radsecproxy
clean:
rm -f $(OBJ) radsecproxy
diff --git a/radsecproxy.c b/radsecproxy.c
index 30b4227..c2c2368 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1294,9 +1294,11 @@ void *clientwr(void *arg) {
printf("clientwr: got new request\n");
server->newrq = 0;
}
- }
+ } else
+ server->newrq = 0;
pthread_mutex_unlock(&server->newrq_mutex);
-
+
+ printf("clientwr: processing request queue\n");
for (i = 0; i < MAX_REQUESTS; i++) {
pthread_mutex_lock(&server->newrq_mutex);
while (!server->requests[i].buf && i < MAX_REQUESTS)