rename for consistency

diff --git a/src/modules/proto_dhcpv4/all.mk b/src/modules/proto_dhcpv4/all.mk
index 1a16cbc160a8b3d4f923d159658ffc4ceff001e8..475c59b80d04d574083359035ee61ba6302edd25 100644 (file)
--- a/src/modules/proto_dhcpv4/all.mk
+++ b/src/modules/proto_dhcpv4/all.mk
@@ -1 +1 @@
-SUBMAKEFILES := proto_dhcpv4.mk proto_dhcpv4_udp.mk dhcpclient.mk proto_dhcpv4_base.mk
+SUBMAKEFILES := proto_dhcpv4.mk proto_dhcpv4_udp.mk dhcpclient.mk proto_dhcpv4_process.mk

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4.c b/src/modules/proto_dhcpv4/proto_dhcpv4.c
index 48d8039e8179a6731963eec44175c6436df04328..4a83682fbf497135bbe5df2b1b9cdd70f65dc8a3 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4.c
@@ -115,15 +115,15 @@ static int type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent,
                      CONF_ITEM *ci, UNUSED CONF_PARSER const *rule)
 {
        static char const *type_lib_table[] = {
-               [FR_DHCP_DISCOVER]      = "base",
-               [FR_DHCP_OFFER]         = "base",
-               [FR_DHCP_REQUEST]       = "base",
-               [FR_DHCP_DECLINE]       = "base",
-               [FR_DHCP_ACK]           = "base",
-               [FR_DHCP_NAK]           = "base",
-               [FR_DHCP_RELEASE]       = "base",
-               [FR_DHCP_INFORM]        = "base",
-               [FR_DHCP_LEASE_QUERY]   = "base",
+               [FR_DHCP_DISCOVER]      = "process",
+               [FR_DHCP_OFFER]         = "process",
+               [FR_DHCP_REQUEST]       = "process",
+               [FR_DHCP_DECLINE]       = "process",
+               [FR_DHCP_ACK]           = "process",
+               [FR_DHCP_NAK]           = "process",
+               [FR_DHCP_RELEASE]       = "process",
+               [FR_DHCP_INFORM]        = "process",
+               [FR_DHCP_LEASE_QUERY]   = "process",
        };
 
        char const              *type_str = cf_pair_value(cf_item_to_pair(ci));

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c b/src/modules/proto_dhcpv4/proto_dhcpv4_process.c
similarity index 96%
rename from src/modules/proto_dhcpv4/proto_dhcpv4_base.c
rename to src/modules/proto_dhcpv4/proto_dhcpv4_process.c
index b4c77a88fc4c928f3d47a14a7025153d68e5f8e8..c91088e1c6207ac13190e9576e09dc2e791ef7ec 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_process.c
@@ -16,7 +16,7 @@
 
 /**
  * $Id$
- * @file proto_dhcpv4/proto_dhcpv4_base.c
+ * @file proto_dhcpv4/proto_dhcpv4_process.c
  * @brief Base DORA, etc. DHCPV4 processing.
  *
  * @copyright 2018 The Freeradius server project.
@@ -33,8 +33,8 @@
 
 static fr_dict_t const *dict_dhcpv4;
 
-extern fr_dict_autoload_t proto_dhcpv4_base_dict[];
-fr_dict_autoload_t proto_dhcpv4_base_dict[] = {
+extern fr_dict_autoload_t proto_dhcpv4_process_dict[];
+fr_dict_autoload_t proto_dhcpv4_process_dict[] = {
        { .out = &dict_dhcpv4, .proto = "dhcpv4" },
        { NULL }
 };
@@ -42,8 +42,8 @@ fr_dict_autoload_t proto_dhcpv4_base_dict[] = {
 static fr_dict_attr_t const *attr_message_type;
 static fr_dict_attr_t const *attr_yiaddr;
 
-extern fr_dict_attr_autoload_t proto_dhcpv4_base_dict_attr[];
-fr_dict_attr_autoload_t proto_dhcpv4_base_dict_attr[] = {
+extern fr_dict_attr_autoload_t proto_dhcpv4_process_dict_attr[];
+fr_dict_attr_autoload_t proto_dhcpv4_process_dict_attr[] = {
        { .out = &attr_message_type, .name = "DHCP-Message-Type", .type = FR_TYPE_UINT8, .dict = &dict_dhcpv4},
        { .out = &attr_yiaddr, .name = "DHCP-Your-IP-Address", .type = FR_TYPE_IPV4_ADDR, .dict = &dict_dhcpv4},
        { NULL }
@@ -356,10 +356,10 @@ static virtual_server_compile_t compile_list[] = {
 };
 
 
-extern fr_app_worker_t proto_dhcpv4_base;
-fr_app_worker_t proto_dhcpv4_base = {
+extern fr_app_worker_t proto_dhcpv4_process;
+fr_app_worker_t proto_dhcpv4_process = {
        .magic          = RLM_MODULE_INIT,
-       .name           = "dhcpv4_base",
+       .name           = "dhcpv4_process",
        .entry_point    = mod_process,
        .compile_list   = compile_list,
 };

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_base.mk b/src/modules/proto_dhcpv4/proto_dhcpv4_process.mk
similarity index 67%
rename from src/modules/proto_dhcpv4/proto_dhcpv4_base.mk
rename to src/modules/proto_dhcpv4/proto_dhcpv4_process.mk
index c36ab549831b32f6d41122c0b70f0c064c4d4b2f..b421d4f82ccf6befcfbc2b8b2c126fc711dd8ffc 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_base.mk
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_process.mk
@@ -1,9 +1,9 @@
-TARGETNAME     := proto_dhcpv4_base
+TARGETNAME     := proto_dhcpv4_process
 
 ifneq "$(TARGETNAME)" ""
 TARGET         := $(TARGETNAME).a
 endif
 
-SOURCES                := proto_dhcpv4_base.c
+SOURCES                := proto_dhcpv4_process.c
 
 TGT_PREREQS    := libfreeradius-util.a libfreeradius-radius.a libfreeradius-dhcpv4.a