Do save vendor part of MAC for FTicksMac VendorHashed and VendorKeyHashed.

[libradsec.git] / radsecproxy.c

diff --git a/radsecproxy.c b/radsecproxy.c
index 519d514..69da4dc 100644 (file)
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -78,6 +78,7 @@
 #include "tcp.h"
 #include "tls.h"
 #include "dtls.h"
+#include "fticks.h"
 
 static struct options options;
 static struct list *clconfs, *srvconfs;
@@ -1691,6 +1692,9 @@ void replyh(struct server *server, unsigned char *buf) {
     debug(msg->code == RAD_Access_Accept || msg->code == RAD_Access_Reject || msg->code == RAD_Accounting_Response ? DBG_WARN : DBG_INFO,
          "replyh: passing %s to client %s (%s)", radmsgtype2string(msg->code), from->conf->name, addr2string(from->addr));
 
+    if (options.fticks_reporting && from->conf->fticks_viscountry != NULL)
+       fticks_log(&options, from, msg, rqout);
+
     radmsg_free(rqout->rq->msg);
     rqout->rq->msg = msg;
     sendreply(newrqref(rqout->rq));
@@ -2660,22 +2664,24 @@ int confclient_cb(struct gconffile **cf, void *arg, char *block, char *opt, char
     memset(conf, 0, sizeof(struct clsrvconf));
     conf->certnamecheck = 1;
 
-    if (!getgenericconfig(cf, block,
-                         "type", CONF_STR, &conftype,
-                         "host", CONF_MSTR, &conf->hostsrc,
-                         "secret", CONF_STR, &conf->secret,
+    if (!getgenericconfig(
+           cf, block,
+           "type", CONF_STR, &conftype,
+           "host", CONF_MSTR, &conf->hostsrc,
+           "secret", CONF_STR, &conf->secret,
 #if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
-                         "tls", CONF_STR, &conf->tls,
-                         "matchcertificateattribute", CONF_STR, &conf->matchcertattr,
-                         "CertificateNameCheck", CONF_BLN, &conf->certnamecheck,
+           "tls", CONF_STR, &conf->tls,
+           "matchcertificateattribute", CONF_STR, &conf->matchcertattr,
+           "CertificateNameCheck", CONF_BLN, &conf->certnamecheck,
 #endif
-                         "DuplicateInterval", CONF_LINT, &dupinterval,
-                         "addTTL", CONF_LINT, &addttl,
-                         "rewrite", CONF_STR, &rewriteinalias,
-                         "rewriteIn", CONF_STR, &conf->confrewritein,
-                         "rewriteOut", CONF_STR, &conf->confrewriteout,
-                         "rewriteattribute", CONF_STR, &conf->confrewriteusername,
-                         NULL
+           "DuplicateInterval", CONF_LINT, &dupinterval,
+           "addTTL", CONF_LINT, &addttl,
+           "rewrite", CONF_STR, &rewriteinalias,
+           "rewriteIn", CONF_STR, &conf->confrewritein,
+           "rewriteOut", CONF_STR, &conf->confrewriteout,
+           "rewriteattribute", CONF_STR, &conf->confrewriteusername,
+           "fticksVISCOUNTRY", CONF_STR, &conf->fticks_viscountry,
+           NULL
            ))
        debugx(1, DBG_ERR, "configuration error");
 
@@ -3007,6 +3013,9 @@ void getmainconfig(const char *configfile) {
     struct gconffile *cfs;
     char **listenargs[RAD_PROTOCOUNT];
     char *sourcearg[RAD_PROTOCOUNT];
+    uint8_t *fticks_reporting_str = NULL;
+    uint8_t *fticks_mac_str = NULL;
+    uint8_t *fticks_key_str = NULL;
     int i;
 
     cfs = openconfigfile(configfile);
@@ -3030,36 +3039,40 @@ void getmainconfig(const char *configfile) {
     if (!rewriteconfs)
        debugx(1, DBG_ERR, "malloc failed");
 
-    if (!getgenericconfig(&cfs, NULL,
+    if (!getgenericconfig(
+           &cfs, NULL,
 #ifdef RADPROT_UDP
-                         "ListenUDP", CONF_MSTR, &listenargs[RAD_UDP],
-                         "SourceUDP", CONF_STR, &sourcearg[RAD_UDP],
+           "ListenUDP", CONF_MSTR, &listenargs[RAD_UDP],
+           "SourceUDP", CONF_STR, &sourcearg[RAD_UDP],
 #endif
 #ifdef RADPROT_TCP
-                         "ListenTCP", CONF_MSTR, &listenargs[RAD_TCP],
-                         "SourceTCP", CONF_STR, &sourcearg[RAD_TCP],
+           "ListenTCP", CONF_MSTR, &listenargs[RAD_TCP],
+           "SourceTCP", CONF_STR, &sourcearg[RAD_TCP],
 #endif
 #ifdef RADPROT_TLS
-                         "ListenTLS", CONF_MSTR, &listenargs[RAD_TLS],
-                         "SourceTLS", CONF_STR, &sourcearg[RAD_TLS],
+           "ListenTLS", CONF_MSTR, &listenargs[RAD_TLS],
+           "SourceTLS", CONF_STR, &sourcearg[RAD_TLS],
 #endif
 #ifdef RADPROT_DTLS
-                         "ListenDTLS", CONF_MSTR, &listenargs[RAD_DTLS],
-                         "SourceDTLS", CONF_STR, &sourcearg[RAD_DTLS],
+           "ListenDTLS", CONF_MSTR, &listenargs[RAD_DTLS],
+           "SourceDTLS", CONF_STR, &sourcearg[RAD_DTLS],
 #endif
-                         "TTLAttribute", CONF_STR, &options.ttlattr,
-                         "addTTL", CONF_LINT, &addttl,
-                         "LogLevel", CONF_LINT, &loglevel,
-                         "LogDestination", CONF_STR, &options.logdestination,
-                         "LoopPrevention", CONF_BLN, &options.loopprevention,
-                         "Client", CONF_CBK, confclient_cb, NULL,
-                         "Server", CONF_CBK, confserver_cb, NULL,
-                         "Realm", CONF_CBK, confrealm_cb, NULL,
+           "TTLAttribute", CONF_STR, &options.ttlattr,
+           "addTTL", CONF_LINT, &addttl,
+           "LogLevel", CONF_LINT, &loglevel,
+           "LogDestination", CONF_STR, &options.logdestination,
+           "LoopPrevention", CONF_BLN, &options.loopprevention,
+           "Client", CONF_CBK, confclient_cb, NULL,
+           "Server", CONF_CBK, confserver_cb, NULL,
+           "Realm", CONF_CBK, confrealm_cb, NULL,
 #if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
-                         "TLS", CONF_CBK, conftls_cb, NULL,
+           "TLS", CONF_CBK, conftls_cb, NULL,
 #endif
-                         "Rewrite", CONF_CBK, confrewrite_cb, NULL,
-                         NULL
+           "Rewrite", CONF_CBK, confrewrite_cb, NULL,
+           "FTicksReporting", CONF_STR, &fticks_reporting_str,
+           "FTicksMAC", CONF_STR, &fticks_mac_str,
+           "FTicksKey", CONF_STR, &fticks_key_str,
+           NULL
            ))
        debugx(1, DBG_ERR, "configuration error");
 
@@ -3076,6 +3089,9 @@ void getmainconfig(const char *configfile) {
     if (!setttlattr(&options, DEFAULT_TTL_ATTR))
        debugx(1, DBG_ERR, "Failed to set TTLAttribute, exiting");
 
+    fticks_configure(&options, &fticks_reporting_str, &fticks_mac_str,
+                    &fticks_key_str);
+
     for (i = 0; i < RAD_PROTOCOUNT; i++)
        if (listenargs[i] || sourcearg[i])
            setprotoopts(i, listenargs[i], sourcearg[i]);