X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=radsecproxy.h;h=6542e99b66681a9096317a4652e0dbaceea1f17c;hb=refs%2Fheads%2Flicensing-nogpl;hp=03ae54c0d05b0cfa4bf360eddfd214bb019d5bf3;hpb=66743827eea20b870a0319660a4a5eb32bfe32ca;p=libradsec.git

diff --git a/radsecproxy.h b/radsecproxy.h
index 03ae54c..6542e99 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <sys/time.h>
 #include <stdint.h>
@@ -18,7 +13,7 @@
 
 #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
@@ -45,16 +40,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;
@@ -63,6 +60,8 @@ struct options {
     enum rsp_fticks_reporting_type fticks_reporting;
     enum rsp_fticks_mac_type fticks_mac;
     uint8_t *fticks_key;
+    uint8_t ipv4only;
+    uint8_t ipv6only;
 };
 
 struct commonprotoopts {
@@ -104,6 +103,7 @@ struct clsrvconf {
     uint8_t type; /* RAD_UDP/RAD_TLS/RAD_TCP */
     const struct protodefs *pdef;
     char **hostsrc;
+    int hostaf;
     char *portsrc;
     struct list *hostports;
     char *secret;
@@ -130,6 +130,7 @@ struct clsrvconf {
     struct list *clients;
     struct server *servers;
     char *fticks_viscountry;
+    char *fticks_visinst;
 };
 
 #include "tlscommon.h"
@@ -157,6 +158,10 @@ struct server {
     uint8_t connectionok;
     uint8_t lostrqs;
     uint8_t dynstartup;
+    uint8_t dynfailing;
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+    uint8_t in_use;
+#endif
     char *dynamiclookuparg;
     int nextid;
     struct timeval lastrcv;