added subjectaltname cert checks, incl regexp uri

[radsecproxy.git] / radsecproxy.h

diff --git a/radsecproxy.h b/radsecproxy.h
index c6b2b19..2516074 100644 (file)
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Stig Venaas <venaas@uninett.no>
+ * Copyright (C) 2006, 2007 Stig Venaas <venaas@uninett.no>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -67,37 +67,40 @@ struct reply {
 };
 
 struct replyq {
-    struct reply *replies;
-    int count;
-    int size;
-    pthread_mutex_t count_mutex;
-    pthread_cond_t count_cond;
+    struct list *replies;
+    pthread_mutex_t mutex;
+    pthread_cond_t cond;
 };
 
-struct peer {
+struct clsrvconf {
+    char *name;
     char type; /* U for UDP, T for TLS */
     char *host;
     char *port;
     char *secret;
-    SSL *ssl;
+    regex_t *certuriregex;
+    uint8_t statusserver;
     SSL_CTX *ssl_ctx;
     struct addrinfo *addrinfo;
+    struct client *clients;
+    struct server *servers;
 };
 
 struct client {
-    struct peer peer;
+    struct clsrvconf *conf;
+    SSL *ssl;
     struct replyq *replyq;
 };
 
 struct server {
-    struct peer peer;
+    struct clsrvconf *conf;
     int sock;
+    SSL *ssl;
     pthread_mutex_t lock;
     pthread_t clientth;
     struct timeval lastconnecttry;
     uint8_t connectionok;
     int nextid;
-    uint8_t statusserver;
     struct request *requests;
     uint8_t newrq;
     pthread_mutex_t newrq_mutex;
@@ -108,7 +111,7 @@ struct realm {
     char *name;
     char *message;
     regex_t regex;
-    struct server *server;
+    struct clsrvconf *srvconf;
 };
 
 struct tls {
@@ -128,9 +131,8 @@ struct tls {
                             sizeof(struct sockaddr_in) : \
                             sizeof(struct sockaddr_in6))
 
-void errx(char *format, ...);
-void err(char *format, ...);
 char *stringcopy(char *s, int len);
 char *addr2string(struct sockaddr *addr, socklen_t len);
+void printfchars(char *prefixfmt, char *prefix, char *charfmt, char *chars, int len);
 int bindport(int type, char *port);
 int connectport(int type, char *host, char *port);