move to C99 initializers

in preparation for adding fields to the compile struct

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
index b1d475210e101d1f48f7de98b4ece8919e6e1824..f419b7922b21553d7d4fb16ad36078978043daf0 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
@@ -282,22 +282,74 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
 
 static virtual_server_compile_t compile_list[] = {
-       { "recv", "DHCP-Discover",      MOD_POST_AUTH },
-       { "send", "DHCP-Offer",         MOD_POST_AUTH },
-       { "recv", "DHCP-Request",       MOD_POST_AUTH },
-
-       { "send", "DHCP-Ack",           MOD_POST_AUTH },
-       { "send", "DHCP-NAK",           MOD_POST_AUTH },
-       { "send", "DHCP-Decline",       MOD_POST_AUTH },
-
-       { "recv", "DHCP-Release",       MOD_POST_AUTH },
-       { "recv", "DHCP-Inform",        MOD_POST_AUTH },
-       { "send", "Do-Not-Respond",     MOD_POST_AUTH },
-
-       { "recv", "DHCP-Lease-Query",   MOD_POST_AUTH },
-       { "send", "DHCP-Lease-Unassigned", MOD_POST_AUTH },
-       { "send", "DHCP-Lease-Unknown", MOD_POST_AUTH },
-       { "send", "DHCP-Lease-Active",  MOD_POST_AUTH },
+       {
+               .name = "recv",
+               .name2 = "DHCP-Discover",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "DHCP-Offer",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "recv",
+               .name2 = "DHCP-Request",
+               .component = MOD_POST_AUTH,
+       },
+
+       {
+               .name = "send",
+               .name2 = "DHCP-Ack",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "DHCP-NAK",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "DHCP-Decline",
+               .component = MOD_POST_AUTH,
+       },
+
+       {
+               .name = "recv",
+               .name2 = "DHCP-Release",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "recv",
+               .name2 = "DHCP-Inform",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Do-Not-Respond",
+               .component = MOD_POST_AUTH,
+       },
+
+       {
+               .name = "recv",
+               .name2 = "DHCP-Lease-Query",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "DHCP-Lease-Unassigned",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "DHCP-Lease-Unknown",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "DHCP-Lease-Active",
+               .component = MOD_POST_AUTH,
+       },
 
        COMPILE_TERMINATOR
 };

diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c
index 8c34d8f423db64ae42c4b519745299426325ff89..25728908b0e8b93d9365a021540f5a397ddb0576 100644 (file)
--- a/src/modules/proto_radius/proto_radius_acct.c
+++ b/src/modules/proto_radius/proto_radius_acct.c
@@ -240,11 +240,31 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
 
 static virtual_server_compile_t compile_list[] = {
-       { "recv", "Accounting-Request", MOD_PREACCT },
-       { "send", "Accounting-Response", MOD_ACCOUNTING },
-       { "send", "Do-Not-Respond",     MOD_POST_AUTH },
-       { "send", "Protocol-Error",     MOD_POST_AUTH },
-       { "accounting", CF_IDENT_ANY,   MOD_ACCOUNTING },
+       {
+               .name = "recv",
+               .name2 = "Accounting-Request", 
+               .component = MOD_PREACCT,
+       },
+       {
+               .name = "send",
+               .name2 = "Accounting-Response",
+               .component = MOD_ACCOUNTING,
+       },
+       {
+               .name = "send",
+               .name2 = "Do-Not-Respond",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Protocol-Error",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "accounting",
+               .name2 = CF_IDENT_ANY,
+               .component = MOD_ACCOUNTING,
+       },
 
        COMPILE_TERMINATOR
 };

diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c
index 7581f076714eb284d472dbedafd74d7191b56c40..e39cbabcd720bc1d296ef03c126ce631deeff66c 100644 (file)
--- a/src/modules/proto_radius/proto_radius_auth.c
+++ b/src/modules/proto_radius/proto_radius_auth.c
@@ -632,13 +632,41 @@ static fr_io_final_t mod_process(void const *instance, REQUEST *request, fr_io_a
 }
 
 static virtual_server_compile_t compile_list[] = {
-       { "recv", "Access-Request",     MOD_AUTHORIZE },
-       { "send", "Access-Accept",      MOD_POST_AUTH },
-       { "send", "Access-Challenge",   MOD_POST_AUTH },
-       { "send", "Access-Reject",      MOD_POST_AUTH },
-       { "send", "Do-Not-Respond",     MOD_POST_AUTH },
-       { "send", "Protocol-Error",     MOD_POST_AUTH },
-       { "authenticate", CF_IDENT_ANY, MOD_AUTHENTICATE },
+       {
+               .name = "recv",
+               .name2 = "Access-Request",
+               .component = MOD_AUTHORIZE,
+       },
+       {
+               .name = "send",
+               .name2 = "Access-Accept",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Access-Challenge",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Access-Reject",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Do-Not-Respond",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Protocol-Error",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "authenticate",
+               .name2 = CF_IDENT_ANY,
+               .component = MOD_AUTHENTICATE,
+       },
 
        COMPILE_TERMINATOR
 };

diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c
index e60d5c7231405eaa9a5b64cabcebb9d5cad4f577..3e8bb382996b5615f0f76bc0e6bbc4d56883cb43 100644 (file)
--- a/src/modules/proto_radius/proto_radius_coa.c
+++ b/src/modules/proto_radius/proto_radius_coa.c
@@ -228,14 +228,45 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 }
 
 static virtual_server_compile_t compile_list[] = {
-       { "recv", "CoA-Request",        MOD_RECV_COA },
-       { "send", "CoA-ACK",            MOD_SEND_COA },
-       { "send", "CoA-NAK",            MOD_SEND_COA },
-       { "recv", "Disconnect-Request", MOD_RECV_COA },
-       { "send", "Disconnect-ACK",     MOD_SEND_COA },
-       { "send", "Disconnect-NAK",     MOD_SEND_COA },
-       { "send", "Protocol-Error",     MOD_POST_AUTH },
-       { "send", "Do-Not-Respond",     MOD_POST_AUTH },
+       {
+               .name = "recv",
+               .name2 = "CoA-Request",\
+               .component = MOD_RECV_COA,
+       },
+       {
+               .name = "send",
+               .name2 = "CoA-ACK",
+               .component = MOD_SEND_COA,
+       },
+       {
+               .name = "send",.name2 = "CoA-NAK",
+               .component = MOD_SEND_COA,
+       },
+       {
+               .name = "recv",
+               .name2 = "Disconnect-Request",
+               .component = MOD_RECV_COA,
+       },
+       {
+               .name = "send",
+               .name2 = "Disconnect-ACK",
+               .component = MOD_SEND_COA,
+       },
+       {
+               .name = "send",
+               .name2 = "Disconnect-NAK",
+               .component = MOD_SEND_COA,
+       },
+       {
+               .name = "send",
+               .name2 = "Protocol-Error",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Do-Not-Respond",
+               .component = MOD_POST_AUTH,
+       },
 
        COMPILE_TERMINATOR
 };

diff --git a/src/modules/proto_radius/proto_radius_dynamic_client.c b/src/modules/proto_radius/proto_radius_dynamic_client.c
index 9b18ff52353cd1993efe309d0a5f27a6d3c71ca3..bd9c1e24eade01938f386f94b87236c896c285ef 100644 (file)
--- a/src/modules/proto_radius/proto_radius_dynamic_client.c
+++ b/src/modules/proto_radius/proto_radius_dynamic_client.c
@@ -205,9 +205,21 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
 
 static virtual_server_compile_t compile_list[] = {
-       { "new", "client",              MOD_AUTHORIZE },
-       { "add", "client",              MOD_POST_AUTH },
-       { "deny", "client",             MOD_POST_AUTH },
+       {
+               .name = "new",
+               .name2 = "client",
+               .component = MOD_AUTHORIZE,
+       },
+       {
+               .name = "add",
+               .name2 = "client",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "deny",
+               .name2 = "client",
+               .component = MOD_POST_AUTH,
+       },
 
        COMPILE_TERMINATOR
 };

diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c
index fbc1d7b90e81ca3e077e899052c84b79ad387bf5..40d54235d9a92d3c1b65b41d52274d486d553611 100644 (file)
--- a/src/modules/proto_radius/proto_radius_status.c
+++ b/src/modules/proto_radius/proto_radius_status.c
@@ -196,11 +196,31 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
 
 static virtual_server_compile_t compile_list[] = {
-       { "recv", "Status-Server",      MOD_AUTHORIZE },
-       { "send", "Access-Accept",      MOD_POST_AUTH },
-       { "send", "Access-Reject",      MOD_POST_AUTH },
-       { "send", "Do-Not-Respond",     MOD_POST_AUTH },
-       { "send", "Protocol-Error",     MOD_POST_AUTH },
+       {
+               .name = "recv",
+               .name2 = "Status-Server",
+               .component = MOD_AUTHORIZE,
+       },
+       {
+               .name = "send",
+               .name2 = "Access-Accept",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Access-Reject",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Do-Not-Respond",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Protocol-Error",
+               .component = MOD_POST_AUTH,
+       },
 
        COMPILE_TERMINATOR
 };

diff --git a/src/modules/proto_vmps/proto_vmps_all.c b/src/modules/proto_vmps/proto_vmps_all.c
index 630338d89ca2e128827f1931445d44866bad2c75..327d31359a3adb1e6d611f235b48c38d66c808e9 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps_all.c
+++ b/src/modules/proto_vmps/proto_vmps_all.c
@@ -204,11 +204,31 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
 
 static virtual_server_compile_t compile_list[] = {
-       { "recv", "Join-Request",       MOD_AUTHORIZE },
-       { "send", "Join-Response",      MOD_POST_AUTH },
-       { "recv", "Reconfirm-Request",  MOD_AUTHORIZE },
-       { "send", "Reconfirm-Response", MOD_POST_AUTH },
-       { "send", "Do-Not-Respond",     MOD_POST_AUTH },
+       {
+               .name = "recv",
+               .name2 = "Join-Request",
+               .component = MOD_AUTHORIZE,
+       },
+       {
+               .name = "send",
+               .name2 = "Join-Response",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "recv",
+               .name2 = "Reconfirm-Request",
+               .component = MOD_AUTHORIZE,
+       },
+       {
+               .name = "send",
+               .name2 = "Reconfirm-Response",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "send",
+               .name2 = "Do-Not-Respond",
+               .component = MOD_POST_AUTH,
+       },
 
        COMPILE_TERMINATOR
 };

diff --git a/src/modules/proto_vmps/proto_vmps_dynamic_client.c b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
index 4794398f85bfb34c35ea62aad4ee9f6691890103..498281bbc94991c7bf7414dfd4f2cf691534c222 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps_dynamic_client.c
+++ b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
@@ -199,9 +199,21 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
 
 static virtual_server_compile_t compile_list[] = {
-       { "new", "client",              MOD_AUTHORIZE },
-       { "add", "client",              MOD_POST_AUTH },
-       { "deny", "client",             MOD_POST_AUTH },
+       {
+               .name = "new",
+               .name2 = "client",
+               .component = MOD_AUTHORIZE,
+       },
+       {
+               .name = "add",
+               .name2 = "client",
+               .component = MOD_POST_AUTH,
+       },
+       {
+               .name = "deny",
+               .name2 = "client",
+               .component = MOD_POST_AUTH,
+       },
 
        COMPILE_TERMINATOR
 };