diff options
Diffstat (limited to 'accel-pppd/ppp/ipcp_opt_dns.c')
| -rw-r--r-- | accel-pppd/ppp/ipcp_opt_dns.c | 111 |
1 files changed, 56 insertions, 55 deletions
diff --git a/accel-pppd/ppp/ipcp_opt_dns.c b/accel-pppd/ppp/ipcp_opt_dns.c index 245960c7..bd5114ac 100644 --- a/accel-pppd/ppp/ipcp_opt_dns.c +++ b/accel-pppd/ppp/ipcp_opt_dns.c @@ -19,8 +19,8 @@ static void dns_free(struct ppp_ipcp_t *ipcp, struct ipcp_option_t *opt); static int dns_send_conf_req(struct ppp_ipcp_t *ipcp, struct ipcp_option_t *opt, uint8_t *ptr); static int dns_send_conf_nak(struct ppp_ipcp_t *ipcp, struct ipcp_option_t *opt, uint8_t *ptr); static int dns_recv_conf_req(struct ppp_ipcp_t *ipcp, struct ipcp_option_t *opt, uint8_t *ptr); -static void dns1_print(void (*print)(const char *fmt,...),struct ipcp_option_t*, uint8_t *ptr); -static void dns2_print(void (*print)(const char *fmt,...),struct ipcp_option_t*, uint8_t *ptr); +static void dns1_print(void (*print)(const char *fmt, ...), struct ipcp_option_t *, uint8_t *ptr); +static void dns2_print(void (*print)(const char *fmt, ...), struct ipcp_option_t *, uint8_t *ptr); struct dns_option_t { @@ -28,49 +28,53 @@ struct dns_option_t in_addr_t addr; }; -static struct ipcp_option_handler_t dns1_opt_hnd= +static struct ipcp_option_handler_t dns1_opt_hnd = { - .init=dns1_init, - .send_conf_req=dns_send_conf_req, - .send_conf_nak=dns_send_conf_nak, - .recv_conf_req=dns_recv_conf_req, - .free=dns_free, - .print=dns1_print, + .init = dns1_init, + .send_conf_req = dns_send_conf_req, + .send_conf_nak = dns_send_conf_nak, + .recv_conf_req = dns_recv_conf_req, + .free = dns_free, + .print = dns1_print, }; -static struct ipcp_option_handler_t dns2_opt_hnd= +static struct ipcp_option_handler_t dns2_opt_hnd = { - .init=dns2_init, - .send_conf_req=dns_send_conf_req, - .send_conf_nak=dns_send_conf_nak, - .recv_conf_req=dns_recv_conf_req, - .free=dns_free, - .print=dns2_print, + .init = dns2_init, + .send_conf_req = dns_send_conf_req, + .send_conf_nak = dns_send_conf_nak, + .recv_conf_req = dns_recv_conf_req, + .free = dns_free, + .print = dns2_print, }; static struct ipcp_option_t *dns1_init(struct ppp_ipcp_t *ipcp) { - struct dns_option_t *dns_opt=_malloc(sizeof(*dns_opt)); - memset(dns_opt,0,sizeof(*dns_opt)); - dns_opt->opt.id=CI_DNS1; - dns_opt->opt.len=6; + struct dns_option_t *dns_opt = _malloc(sizeof(*dns_opt)); + + memset(dns_opt, 0, sizeof(*dns_opt)); + dns_opt->opt.id = CI_DNS1; + dns_opt->opt.len = 6; + dns_opt->addr = conf_dns1; return &dns_opt->opt; } static struct ipcp_option_t *dns2_init(struct ppp_ipcp_t *ipcp) { - struct dns_option_t *dns_opt=_malloc(sizeof(*dns_opt)); - memset(dns_opt,0,sizeof(*dns_opt)); - dns_opt->opt.id=CI_DNS2; - dns_opt->opt.len=6; + struct dns_option_t *dns_opt = _malloc(sizeof(*dns_opt)); + + memset(dns_opt, 0, sizeof(*dns_opt)); + dns_opt->opt.id = CI_DNS2; + dns_opt->opt.len = 6; + dns_opt->addr = conf_dns2; return &dns_opt->opt; } static void dns_free(struct ppp_ipcp_t *ipcp, struct ipcp_option_t *opt) { - struct dns_option_t *dns_opt=container_of(opt,typeof(*dns_opt),opt); + struct dns_option_t *dns_opt = container_of(opt, typeof(*dns_opt), opt); _free(dns_opt); } @@ -82,62 +86,59 @@ static int dns_send_conf_req(struct ppp_ipcp_t *ipcp, struct ipcp_option_t *opt, static int dns_send_conf_nak(struct ppp_ipcp_t *ipcp, struct ipcp_option_t *opt, uint8_t *ptr) { - struct dns_option_t *dns_opt=container_of(opt,typeof(*dns_opt),opt); - struct ipcp_opt32_t *opt32=(struct ipcp_opt32_t*)ptr; - opt32->hdr.id=dns_opt->opt.id; - opt32->hdr.len=6; - opt32->val=dns_opt->addr; + struct dns_option_t *dns_opt = container_of(opt, typeof(*dns_opt), opt); + struct ipcp_opt32_t *opt32 = (struct ipcp_opt32_t *)ptr; + opt32->hdr.id = dns_opt->opt.id; + opt32->hdr.len = 6; + opt32->val = dns_opt->addr; return 6; } static int dns_recv_conf_req(struct ppp_ipcp_t *ipcp, struct ipcp_option_t *opt, uint8_t *ptr) { - struct dns_option_t *dns_opt=container_of(opt,typeof(*dns_opt),opt); - struct ipcp_opt32_t *opt32=(struct ipcp_opt32_t*)ptr; + struct dns_option_t *dns_opt = container_of(opt, typeof(*dns_opt), opt); + struct ipcp_opt32_t *opt32 = (struct ipcp_opt32_t *)ptr; if (opt32->hdr.len != 6) return IPCP_OPT_REJ; - if (!dns_opt->addr) - { - if (dns_opt->opt.id == CI_DNS1 && conf_dns1) dns_opt->addr=conf_dns1; - else if (dns_opt->opt.id == CI_DNS2 && conf_dns2) dns_opt->addr=conf_dns2; - - if (!dns_opt->addr) - { - dns_opt->addr=opt32->val; - return IPCP_OPT_ACK; - } + if (!dns_opt->addr) { + dns_opt->addr = opt32->val; + return IPCP_OPT_ACK; } - if (dns_opt->addr==opt32->val) + if (dns_opt->addr == opt32->val) return IPCP_OPT_ACK; return IPCP_OPT_NAK; } -static void dns1_print(void (*print)(const char *fmt,...),struct ipcp_option_t *opt, uint8_t *ptr) +static void dns1_print(void (*print)(const char *fmt, ...), struct ipcp_option_t *opt, uint8_t *ptr) { - struct dns_option_t *dns_opt=container_of(opt,typeof(*dns_opt),opt); - struct ipcp_opt32_t *opt32=(struct ipcp_opt32_t*)ptr; + struct dns_option_t *dns_opt = container_of(opt, typeof(*dns_opt), opt); + struct ipcp_opt32_t *opt32 = (struct ipcp_opt32_t *)ptr; struct in_addr in; - if (ptr) in.s_addr=opt32->val; - else in.s_addr=dns_opt->addr; + if (ptr) + in.s_addr = opt32->val; + else + in.s_addr = dns_opt->addr; - print("<dns1 %s>",inet_ntoa(in)); + print("<dns1 %s>", inet_ntoa(in)); } -static void dns2_print(void (*print)(const char *fmt,...),struct ipcp_option_t *opt, uint8_t *ptr) +static void dns2_print(void (*print)(const char *fmt, ...), struct ipcp_option_t *opt, uint8_t *ptr) { - struct dns_option_t *dns_opt=container_of(opt,typeof(*dns_opt),opt); - struct ipcp_opt32_t *opt32=(struct ipcp_opt32_t*)ptr; + struct dns_option_t *dns_opt = container_of(opt, typeof(*dns_opt), opt); + struct ipcp_opt32_t *opt32 = (struct ipcp_opt32_t *)ptr; struct in_addr in; - if (ptr) in.s_addr=opt32->val; - else in.s_addr=dns_opt->addr; + if (ptr) + in.s_addr = opt32->val; + else + in.s_addr = dns_opt->addr; - print("<dns2 %s>",inet_ntoa(in)); + print("<dns2 %s>", inet_ntoa(in)); } static void ev_dns(struct ev_dns_t *ev) |