supports new server and realm config methods as well as argument for config file...

[libradsec.git] / radsecproxy.h

diff --git a/radsecproxy.h b/radsecproxy.h
index 27cb1d4..797fa53 100644 (file)
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -6,19 +6,21 @@
  * copyright notice and this permission notice appear in all copies.
  */
 
-#define RADLEN(x) ntohs(((uint16_t *)(x))[1])
+#define DEBUG_LEVEL 3
 
-#define SOCKADDR_SIZE(addr) ((addr).ss_family == AF_INET ? \
-                            sizeof(struct sockaddr_in) : \
-                            sizeof(struct sockaddr_in6))
+#define CONFIG_MAIN "/etc/radsecproxy/radsecproxy.conf"
+#define CONFIG_SERVERS "/etc/radsecproxy/servers.conf"
+#define CONFIG_CLIENTS "/etc/radsecproxy/clients.conf"
 
-#define MAX_PEERS 256
-/* MAX_REQUESTS is 256 due to Radius' 8 bit ID field */
+/* MAX_REQUESTS must be 256 due to Radius' 8 bit ID field */
 #define MAX_REQUESTS 256
 #define DEFAULT_TLS_SECRET "mysecret"
 #define DEFAULT_UDP_PORT "1812"
 #define DEFAULT_TLS_PORT "2083"
-
+#define REQUEST_EXPIRY 20
+#define REQUEST_RETRIES 3
+#define MAX_CERT_DEPTH 5
+#define STATUS_SERVER_PERIOD 25
 #define RAD_Access_Request 1
 #define RAD_Access_Accept 2
 #define RAD_Access_Reject 3
@@ -30,18 +32,40 @@
 
 #define RAD_Attr_User_Name 1
 #define RAD_Attr_User_Password 2
+#define RAD_Attr_Vendor_Specific 26
+#define RAD_Attr_Tunnel_Password 69
+#define RAD_Attr_Message_Authenticator 80
+
+#define RAD_VS_ATTR_MS_MPPE_Send_Key 16
+#define RAD_VS_ATTR_MS_MPPE_Recv_Key 17
 
 #define RAD_Attr_Type 0
 #define RAD_Attr_Length 1
 #define RAD_Attr_Value 2
 
-/* requests that a client will send */
+#define CONF_STR 1
+#define CONF_CBK 2
+
+struct options {
+    char *tlscacertificatefile;
+    char *tlscacertificatepath;
+    char *tlscertificatefile;
+    char *tlscertificatekeyfile;
+    char *tlscertificatekeypassword;
+    char *listenudp;
+    char *listentcp;
+    char *logdestination;
+    uint8_t loglevel;
+    uint8_t statusserver;
+};
+
+/* requests that our client will send */
 struct request {
     unsigned char *buf;
     uint8_t tries;
     uint8_t received;
-    struct timeval timeout;
-    struct peer *from;
+    struct timeval expiry;
+    struct client *from;
     uint8_t origid; /* used by servwr */
     char origauth[16]; /* used by servwr */
     struct sockaddr_storage fromsa; /* used by udpservwr */
@@ -66,25 +90,43 @@ struct peer {
     char *host;
     char *port;
     char *secret;
-    SSL *sslcl, *sslsrv;
+    SSL *ssl;
+    struct addrinfo *addrinfo;
+};
+
+struct client {
+    struct peer peer;
+    struct replyq *replyq;
+};
+
+struct server {
+    struct peer peer;
+    int sock;
     pthread_mutex_t lock;
     pthread_t clientth;
-    int sockcl;
-    struct addrinfo *addrinfo;
-    /* requests and newrq* are requests passed from servers to clients */
+    struct timeval lastconnecttry;
+    uint8_t connectionok;
+    int nextid;
     struct request *requests;
     uint8_t newrq;
     pthread_mutex_t newrq_mutex;
     pthread_cond_t newrq_cond;
-    /* repl* are replies passed from clients to tls servers */
-    struct replyq *replyq;
-    int replycount;
-    pthread_mutex_t replycount_mutex;
-    pthread_cond_t replycount_cond;
 };
 
+struct realm {
+    char *name;
+    struct server *server;
+};
+
+#define RADLEN(x) ntohs(((uint16_t *)(x))[1])
+
+#define SOCKADDR_SIZE(addr) ((addr).ss_family == AF_INET ? \
+                            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);
 int bindport(int type, char *port);
 int connectport(int type, char *host, char *port);