Move configure_fticks to fticks.c.

3 files changed, 75 insertions, 66 deletions

diff --git a/fticks.c b/fticks.c
index 98022cd..c3b9c05 100644
--- a/fticks.c
+++ b/fticks.c
@@ -51,6 +51,75 @@ hash(const uint8_t *in,
     }
 }
 
+int
+fticks_configure(struct options *options,
+		 uint8_t **reportingp,
+		 uint8_t **macp,
+		 uint8_t **keyp)
+{
+    int r = 0;
+    const char *reporting = (const char *) *reportingp;
+    const char *mac = (const char *) *macp;
+
+    if (reporting == NULL)
+	goto out;
+
+    if (strcasecmp(reporting, "None") == 0)
+	options->fticks_reporting = RSP_FTICKS_REPORTING_NONE;
+    else if (strcasecmp(reporting, "Basic") == 0)
+	options->fticks_reporting = RSP_FTICKS_REPORTING_BASIC;
+    else if (strcasecmp(reporting, "Full") == 0)
+	options->fticks_reporting = RSP_FTICKS_REPORTING_FULL;
+    else {
+	debugx(1, DBG_ERR, "config error: invalid FTicksReporting value: %s",
+	       reporting);
+	r = 1;
+	goto out;
+    }
+
+    if (strcasecmp(mac, "Static") == 0)
+	options->fticks_mac = RSP_FTICKS_MAC_STATIC;
+    else if (strcasecmp(mac, "Original") == 0)
+	options->fticks_mac = RSP_FTICKS_MAC_ORIGINAL;
+    else if (strcasecmp(mac, "VendorHashed") == 0)
+	options->fticks_mac = RSP_FTICKS_MAC_VENDOR_HASHED;
+    else if (strcasecmp(mac, "VendorKeyHashed") == 0)
+	options->fticks_mac = RSP_FTICKS_MAC_VENDOR_KEY_HASHED;
+    else if (strcasecmp(mac, "FullyHashed") == 0)
+	options->fticks_mac = RSP_FTICKS_MAC_FULLY_HASHED;
+    else if (strcasecmp(mac, "FullyKeyHashed") == 0)
+	options->fticks_mac = RSP_FTICKS_MAC_FULLY_KEY_HASHED;
+    else {
+	debugx(1, DBG_ERR, "config error: invalid FTicksMAC value: %s", mac);
+	r = 1;
+	goto out;
+    }
+
+    if (*keyp == NULL
+	&& (options->fticks_mac == RSP_FTICKS_MAC_VENDOR_KEY_HASHED
+	    || options->fticks_mac == RSP_FTICKS_MAC_FULLY_KEY_HASHED)) {
+	debugx(1, DBG_ERR,
+	       "config error: FTicksMAC %s requires an FTicksKey", mac);
+	options->fticks_mac = RSP_FTICKS_MAC_STATIC;
+	r = 1;
+	goto out;
+    }
+
+    if (*keyp != NULL)
+	options->fticks_key = *keyp;
+
+out:
+    if (*reportingp != NULL) {
+	free(*reportingp);
+	*reportingp = NULL;
+    }
+    if (*macp != NULL) {
+	free(*macp);
+	*macp = NULL;
+    }
+    return r;
+}
+
 /** Hash the MAC in \a IN, keying with \a KEY if it's not NULL.
 
     \a IN and \a KEY are NULL terminated strings.
diff --git a/fticks.h b/fticks.h
index b749d98..ec1ed9a 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,6 +1,10 @@
 /* Copyright (C) 2011 NORDUnet A/S
  * See LICENSE for information about licensing.
  */
+int fticks_configure(struct options *options,
+		     uint8_t **reportingp,
+		     uint8_t **macp,
+		     uint8_t **keyp);
 void fticks_hashmac(const uint8_t *in,
 		    const uint8_t *key,
 		    size_t out_len,
diff --git a/radsecproxy.c b/radsecproxy.c
index 2227193..69da4dc 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -3008,71 +3008,6 @@ int setprotoopts(uint8_t type, char **listenargs, char *sourcearg) {
     return 1;
 }
 
-/* FIXME: Move to fticks.c.  */
-int configure_fticks(uint8_t **reportingp, uint8_t **macp, uint8_t **keyp) {
-    int r = 0;
-    const char *reporting = (const char *) *reportingp;
-    const char *mac = (const char *) *macp;
-
-    if (reporting == NULL)
-	goto out;
-
-    if (strcasecmp(reporting, "None") == 0)
-	options.fticks_reporting = RSP_FTICKS_REPORTING_NONE;
-    else if (strcasecmp(reporting, "Basic") == 0)
-	options.fticks_reporting = RSP_FTICKS_REPORTING_BASIC;
-    else if (strcasecmp(reporting, "Full") == 0)
-	options.fticks_reporting = RSP_FTICKS_REPORTING_FULL;
-    else {
-	debugx(1, DBG_ERR, "config error: invalid FTicksReporting value: %s",
-	       reporting);
-	r = 1;
-	goto out;
-    }
-
-    if (strcasecmp(mac, "Static") == 0)
-	options.fticks_mac = RSP_FTICKS_MAC_STATIC;
-    else if (strcasecmp(mac, "Original") == 0)
-	options.fticks_mac = RSP_FTICKS_MAC_ORIGINAL;
-    else if (strcasecmp(mac, "VendorHashed") == 0)
-	options.fticks_mac = RSP_FTICKS_MAC_VENDOR_HASHED;
-    else if (strcasecmp(mac, "VendorKeyHashed") == 0)
-	options.fticks_mac = RSP_FTICKS_MAC_VENDOR_KEY_HASHED;
-    else if (strcasecmp(mac, "FullyHashed") == 0)
-	options.fticks_mac = RSP_FTICKS_MAC_FULLY_HASHED;
-    else if (strcasecmp(mac, "FullyKeyHashed") == 0)
-	options.fticks_mac = RSP_FTICKS_MAC_FULLY_KEY_HASHED;
-    else {
-	debugx(1, DBG_ERR, "config error: invalid FTicksMAC value: %s", mac);
-	r = 1;
-	goto out;
-    }
-
-    if (*keyp == NULL
-	&& (options.fticks_mac == RSP_FTICKS_MAC_VENDOR_KEY_HASHED
-	    || options.fticks_mac == RSP_FTICKS_MAC_FULLY_KEY_HASHED)) {
-	debugx(1, DBG_ERR,
-	       "config error: FTicksMAC %s requires an FTicksKey", mac);
-	options.fticks_mac = RSP_FTICKS_MAC_STATIC;
-	r = 1;
-	goto out;
-    }
-
-    if (*keyp != NULL)
-	options.fticks_key = *keyp;
-
-out:
-    if (*reportingp != NULL) {
-	free(*reportingp);
-	*reportingp = NULL;
-    }
-    if (*macp != NULL) {
-	free(*macp);
-	*macp = NULL;
-    }
-    return r;
-}
-
 void getmainconfig(const char *configfile) {
     long int addttl = LONG_MIN, loglevel = LONG_MIN;
     struct gconffile *cfs;
@@ -3154,7 +3089,8 @@ void getmainconfig(const char *configfile) {
     if (!setttlattr(&options, DEFAULT_TTL_ATTR))
     	debugx(1, DBG_ERR, "Failed to set TTLAttribute, exiting");
 
-    configure_fticks(&fticks_reporting_str, &fticks_mac_str, &fticks_key_str);
+    fticks_configure(&options, &fticks_reporting_str, &fticks_mac_str,
+		     &fticks_key_str);
 
     for (i = 0; i < RAD_PROTOCOUNT; i++)
 	if (listenargs[i] || sourcearg[i])