X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=radsecproxy.h;h=184231b03a249a2cc559e38b7bd25dfb37b5dda0;hb=271907e96102091be52bd8ae2ba32426e0658e04;hp=37942725a224623dada9f0e7489c7ae043df1346;hpb=67902f98c988aba120a3abb4250fb483f7d3139a;p=libradsec.git

diff --git a/radsecproxy.h b/radsecproxy.h
index 3794272..184231b 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,16 +1,22 @@
 /*
  * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
+ * Copyright (C) 2010,2011 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 3
+#define DEBUG_LEVEL 2
 
 #define CONFIG_MAIN "/etc/radsecproxy.conf"
 
@@ -32,13 +38,32 @@
 #define RAD_DTLS 3
 #define RAD_PROTOCOUNT 4
 
+enum rsp_fticks_reporting_type {
+    RSP_FTICKS_REPORTING_NONE = 0, /* Default.  */
+    RSP_FTICKS_REPORTING_BASIC,
+    RSP_FTICKS_REPORTING_FULL
+};
+
+enum rsp_fticks_mac_type {
+    RSP_FTICKS_MAC_STATIC = 0,
+    RSP_FTICKS_MAC_ORIGINAL,
+    RSP_FTICKS_MAC_VENDOR_HASHED,
+    RSP_FTICKS_MAC_VENDOR_KEY_HASHED, /* Default.  */
+    RSP_FTICKS_MAC_FULLY_HASHED,
+    RSP_FTICKS_MAC_FULLY_KEY_HASHED
+};
+
 struct options {
     char *logdestination;
+    char *ftickssyslogfacility;
     char *ttlattr;
     uint32_t ttlattrtype[2];
     uint8_t addttl;
     uint8_t loglevel;
     uint8_t loopprevention;
+    enum rsp_fticks_reporting_type fticks_reporting;
+    enum rsp_fticks_mac_type fticks_mac;
+    uint8_t *fticks_key;
 };
 
 struct commonprotoopts {
@@ -79,7 +104,7 @@ struct clsrvconf {
     char *name;
     uint8_t type; /* RAD_UDP/RAD_TLS/RAD_TCP */
     const struct protodefs *pdef;
-    char *hostsrc;
+    char **hostsrc;
     char *portsrc;
     struct list *hostports;
     char *secret;
@@ -98,12 +123,15 @@ struct clsrvconf {
     uint8_t dupinterval;
     uint8_t certnamecheck;
     uint8_t addttl;
+    uint8_t loopprevention;
     struct rewrite *rewritein;
     struct rewrite *rewriteout;
     pthread_mutex_t *lock; /* only used for updating clients so far */
     struct tls *tlsconf;
     struct list *clients;
     struct server *servers;
+    char *fticks_viscountry;
+    char *fticks_visinst;
 };
 
 #include "tlscommon.h"
@@ -209,3 +237,8 @@ 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" */
+/* End: */