radius: add support for MS-Primary-DNS-Server/MS-Secondary-DNS-Server attributes

2 files changed, 17 insertions, 3 deletions

diff --git a/accel-pppd/ppp/ipcp_opt_dns.c b/accel-pppd/ppp/ipcp_opt_dns.c
index 4427b0ec..19183eb7 100644
--- a/accel-pppd/ppp/ipcp_opt_dns.c
+++ b/accel-pppd/ppp/ipcp_opt_dns.c
@@ -37,6 +37,7 @@ static struct ipcp_option_handler_t dns1_opt_hnd=
 	.free=dns_free,
 	.print=dns1_print,
 };
+
 static struct ipcp_option_handler_t dns2_opt_hnd=
 {
 	.init=dns2_init,
@@ -139,6 +140,17 @@ static void dns2_print(void (*print)(const char *fmt,...),struct ipcp_option_t *
 	print("<dns2 %s>",inet_ntoa(in));
 }
 
+static void ev_dns(struct ev_dns_t *ev)
+{
+	struct dns_option_t *dns_opt;
+
+	dns_opt = container_of(ipcp_find_option(ev->ppp, &dns1_opt_hnd), typeof(*dns_opt), opt);
+	dns_opt->addr = ev->dns1;
+
+	dns_opt = container_of(ipcp_find_option(ev->ppp, &dns2_opt_hnd), typeof(*dns_opt), opt);
+	dns_opt->addr = ev->dns2;
+}
+
 static void load_config(void)
 {
 	char *opt;
@@ -159,6 +171,8 @@ static void dns_opt_init()
 
 	load_config();
 	triton_event_register_handler(EV_CONFIG_RELOAD, (triton_event_func)load_config);
+
+	triton_event_register_handler(EV_DNS, (triton_event_func)ev_dns);
 }
 
 DEFINE_INIT(4, dns_opt_init);
diff --git a/accel-pppd/ppp/ppp_ipcp.c b/accel-pppd/ppp/ppp_ipcp.c
index 8af84caa..625358aa 100644
--- a/accel-pppd/ppp/ppp_ipcp.c
+++ b/accel-pppd/ppp/ppp_ipcp.c
@@ -91,6 +91,9 @@ static struct ppp_layer_data_t *ipcp_layer_init(struct ppp_t *ppp)
 	
 	ppp_register_unit_handler(ppp, &ipcp->hnd);
 
+	INIT_LIST_HEAD(&ipcp->options);
+	ipcp_options_init(ipcp);
+
 	ipcp->fsm.proto = PPP_IPCP;
 	ppp_fsm_init(&ipcp->fsm);
 
@@ -104,7 +107,6 @@ static struct ppp_layer_data_t *ipcp_layer_init(struct ppp_t *ppp)
 	ipcp->fsm.send_term_req = send_term_req;
 	ipcp->fsm.send_term_ack = send_term_ack;
 
-	INIT_LIST_HEAD(&ipcp->options);
 	INIT_LIST_HEAD(&ipcp->ropt_list);
 
 	ipcp->ld.passive = conf_ipv4 == IPV4_ALLOW || conf_ipv4 == IPV4_DENY;
@@ -128,8 +130,6 @@ int ipcp_layer_start(struct ppp_layer_data_t *ld)
 	
 	log_ppp_debug("ipcp_layer_start\n");
 
-	ipcp_options_init(ipcp);
-
 	ipcp->starting = 1;
 
 	if (conf_ipv4 != IPV4_DENY) {