renamed rpf to loopprevention

git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@277 e88ac4ed-0b26-0410-9574-a7f39faa03bf

diff --git a/radsecproxy.c b/radsecproxy.c
index a4090d8..b6a278d 100644 (file)
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1968,8 +1968,8 @@ void radsrv(struct request *rq) {
        goto exit;
     }
     
-    if (options.rpf && !strcmp(rq->from->conf->name, to->conf->name)) {
-       debug(DBG_INFO, "radsrv: RPF failed, not forwarding request from client %s to server %s, discarding",
+    if (options.loopprevention && !strcmp(rq->from->conf->name, to->conf->name)) {
+       debug(DBG_INFO, "radsrv: Loop prevented, not forwarding request from client %s to server %s, discarding",
              rq->from->conf->name, to->conf->name);
        goto exit;
     }
@@ -2374,7 +2374,7 @@ void *clientwr(void *arg) {
                conf->addrinfo = NULL;
            }
            /* add this once realm removal in place
-           free(conf);
+            freeclsrvconf(conf);
            server->conf = NULL;
            */
        }
@@ -3524,7 +3524,7 @@ void getmainconfig(const char *configfile) {
                          "SourceTCP", CONF_STR, &options.sourcetcp,
                          "LogLevel", CONF_STR, &loglevel,
                          "LogDestination", CONF_STR, &options.logdestination,
-                         "RPFCheck", CONF_BLN, &options.rpf,
+                         "LoopPrevention", CONF_BLN, &options.loopprevention,
                          "Client", CONF_CBK, confclient_cb, NULL,
                          "Server", CONF_CBK, confserver_cb, NULL,
                          "Realm", CONF_CBK, confrealm_cb, NULL,

diff --git a/radsecproxy.h b/radsecproxy.h
index 10009fc..682805f 100644 (file)
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -47,7 +47,7 @@ struct options {
     char *sourcetcp;
     char *logdestination;
     uint8_t loglevel;
-    uint8_t rpf;
+    uint8_t loopprevention;
 };
 
 /* requests that our client will send */