Correct changelog entry for RADSECPROXY-33.

[libradsec.git] / radsecproxy.h

diff --git a/radsecproxy.h b/radsecproxy.h
index 2cd55ee..dc09b1e 100644 (file)
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,19 +1,24 @@
 /*
  * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010 NORDUnet A/S
+ * Copyright (C) 2010,2011,2012 NORDUnet A/S
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  */
 
+#include <sys/time.h>
+#include <stdint.h>
+#include <pthread.h>
+#include <regex.h>
+#include "list.h"
 #include "tlv11.h"
 #include "radmsg.h"
 #include "gconfig.h"
 
 #define DEBUG_LEVEL 2
 
-#define CONFIG_MAIN "/etc/radsecproxy.conf"
+#define CONFIG_MAIN SYSCONFDIR"/radsecproxy.conf"
 
 /* MAX_REQUESTS must be 256 due to Radius' 8 bit ID field */
 #define MAX_REQUESTS 256
@@ -40,16 +45,18 @@ enum rsp_fticks_reporting_type {
 };
 
 enum rsp_fticks_mac_type {
-    RSP_FTICKS_MAC_STATIC = 0, /* Default.  */
+    RSP_FTICKS_MAC_STATIC = 0,
     RSP_FTICKS_MAC_ORIGINAL,
     RSP_FTICKS_MAC_VENDOR_HASHED,
-    RSP_FTICKS_MAC_VENDOR_KEY_HASHED,
+    RSP_FTICKS_MAC_VENDOR_KEY_HASHED, /* Default.  */
     RSP_FTICKS_MAC_FULLY_HASHED,
     RSP_FTICKS_MAC_FULLY_KEY_HASHED
 };
 
 struct options {
+    char *pidfile;
     char *logdestination;
+    char *ftickssyslogfacility;
     char *ttlattr;
     uint32_t ttlattrtype[2];
     uint8_t addttl;
@@ -57,7 +64,7 @@ struct options {
     uint8_t loopprevention;
     enum rsp_fticks_reporting_type fticks_reporting;
     enum rsp_fticks_mac_type fticks_mac;
-    char *fticks_key;
+    uint8_t *fticks_key;
 };
 
 struct commonprotoopts {
@@ -124,6 +131,8 @@ struct clsrvconf {
     struct tls *tlsconf;
     struct list *clients;
     struct server *servers;
+    char *fticks_viscountry;
+    char *fticks_visinst;
 };
 
 #include "tlscommon.h"
@@ -151,6 +160,7 @@ struct server {
     uint8_t connectionok;
     uint8_t lostrqs;
     uint8_t dynstartup;
+    uint8_t dynfailing;
     char *dynamiclookuparg;
     int nextid;
     struct timeval lastrcv;
@@ -229,6 +239,7 @@ void freerq(struct request *rq);
 int radsrv(struct request *rq);
 void replyh(struct server *server, unsigned char *buf);
 struct addrinfo *resolve_hostport_addrinfo(uint8_t type, char *hostport);
+uint8_t *radattr2ascii(struct tlv *attr);
 
 /* Local Variables: */
 /* c-file-style: "stroustrup" */