From 5cf93f33f2350ed3b92f73ead1d2829a6883810a Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Tue, 5 Oct 2010 17:51:23 +0400 Subject: tidied logs --- accel-pptpd/ppp/ppp_auth.c | 203 +++++++++++++++++++++------------------------ 1 file changed, 96 insertions(+), 107 deletions(-) (limited to 'accel-pptpd/ppp/ppp_auth.c') diff --git a/accel-pptpd/ppp/ppp_auth.c b/accel-pptpd/ppp/ppp_auth.c index ada01ad4..65ca223f 100644 --- a/accel-pptpd/ppp/ppp_auth.c +++ b/accel-pptpd/ppp/ppp_auth.c @@ -12,7 +12,7 @@ #include "memdebug.h" static LIST_HEAD(auth_handlers); -static int extra_opt_len=0; +static int extra_opt_len = 0; static struct lcp_option_t *auth_init(struct ppp_lcp_t *lcp); static void auth_free(struct ppp_lcp_t *lcp, struct lcp_option_t *opt); @@ -21,7 +21,7 @@ static int auth_recv_conf_req(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, u static int auth_recv_conf_nak(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, uint8_t *ptr); static int auth_recv_conf_rej(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, uint8_t *ptr); static int auth_recv_conf_ack(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, uint8_t *ptr); -static void auth_print(void (*print)(const char *fmt,...),struct lcp_option_t*, uint8_t *ptr); +static void auth_print(void (*print)(const char *fmt,...), struct lcp_option_t*, uint8_t *ptr); static struct ppp_layer_data_t *auth_layer_init(struct ppp_t*); static int auth_layer_start(struct ppp_layer_data_t *); @@ -44,25 +44,25 @@ struct auth_layer_data_t int started:1; }; -static struct lcp_option_handler_t auth_opt_hnd= +static struct lcp_option_handler_t auth_opt_hnd = { - .init=auth_init, - .send_conf_req=auth_send_conf_req, - .send_conf_nak=auth_send_conf_req, - .recv_conf_req=auth_recv_conf_req, - .recv_conf_nak=auth_recv_conf_nak, - .recv_conf_rej=auth_recv_conf_rej, - .recv_conf_ack=auth_recv_conf_ack, - .free=auth_free, - .print=auth_print, + .init = auth_init, + .send_conf_req = auth_send_conf_req, + .send_conf_nak = auth_send_conf_req, + .recv_conf_req = auth_recv_conf_req, + .recv_conf_nak = auth_recv_conf_nak, + .recv_conf_rej = auth_recv_conf_rej, + .recv_conf_ack = auth_recv_conf_ack, + .free = auth_free, + .print = auth_print, }; -static struct ppp_layer_t auth_layer= +static struct ppp_layer_t auth_layer = { - .init=auth_layer_init, - .start=auth_layer_start, - .finish=auth_layer_finish, - .free=auth_layer_free, + .init = auth_layer_init, + .start = auth_layer_start, + .finish = auth_layer_finish, + .free = auth_layer_free, }; static struct lcp_option_t *auth_init(struct ppp_lcp_t *lcp) @@ -71,18 +71,17 @@ static struct lcp_option_t *auth_init(struct ppp_lcp_t *lcp) struct auth_data_t *d; struct auth_layer_data_t *ad; - ad=container_of(ppp_find_layer_data(lcp->ppp,&auth_layer),typeof(*ad),ld); + ad = container_of(ppp_find_layer_data(lcp->ppp, &auth_layer), typeof(*ad), ld); - ad->auth_opt.opt.id=CI_AUTH; - ad->auth_opt.opt.len=4+extra_opt_len; + ad->auth_opt.opt.id = CI_AUTH; + ad->auth_opt.opt.len = 4 + extra_opt_len; INIT_LIST_HEAD(&ad->auth_opt.auth_list); - list_for_each_entry(h,&auth_handlers,entry) - { - d=h->init(lcp->ppp); - d->h=h; - list_add_tail(&d->entry,&ad->auth_opt.auth_list); + list_for_each_entry(h, &auth_handlers, entry) { + d = h->init(lcp->ppp); + d->h = h; + list_add_tail(&d->entry, &ad->auth_opt.auth_list); } return &ad->auth_opt.opt; @@ -90,49 +89,47 @@ static struct lcp_option_t *auth_init(struct ppp_lcp_t *lcp) static void auth_free(struct ppp_lcp_t *lcp, struct lcp_option_t *opt) { - struct auth_option_t *auth_opt=container_of(opt,typeof(*auth_opt),opt); + struct auth_option_t *auth_opt = container_of(opt, typeof(*auth_opt), opt); struct auth_data_t *d; - while(!list_empty(&auth_opt->auth_list)) - { - d=list_entry(auth_opt->auth_list.next,typeof(*d),entry); + while(!list_empty(&auth_opt->auth_list)) { + d = list_entry(auth_opt->auth_list.next, typeof(*d), entry); list_del(&d->entry); - d->h->free(lcp->ppp,d); + d->h->free(lcp->ppp, d); } } static int auth_send_conf_req(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, uint8_t *ptr) { - struct auth_option_t *auth_opt=container_of(opt,typeof(*auth_opt),opt); - struct lcp_opt16_t *opt16=(struct lcp_opt16_t*)ptr; + struct auth_option_t *auth_opt = container_of(opt, typeof(*auth_opt), opt); + struct lcp_opt16_t *opt16 = (struct lcp_opt16_t*)ptr; struct auth_data_t *d; int n; - if (list_empty(&auth_opt->auth_list)) return 0; + if (list_empty(&auth_opt->auth_list)) + return 0; - if (!auth_opt->auth || auth_opt->auth->state==LCP_OPT_NAK) - { - list_for_each_entry(d,&auth_opt->auth_list,entry) - { - if (d->state==LCP_OPT_NAK || d->state==LCP_OPT_REJ) + if (!auth_opt->auth || auth_opt->auth->state == LCP_OPT_NAK) { + list_for_each_entry(d, &auth_opt->auth_list, entry) { + if (d->state == LCP_OPT_NAK || d->state == LCP_OPT_REJ) continue; - auth_opt->auth=d; + auth_opt->auth = d; break; } } - opt16->hdr.id=CI_AUTH; - opt16->val=htons(auth_opt->auth->proto); - n=auth_opt->auth->h->send_conf_req(lcp->ppp,auth_opt->auth,(uint8_t*)(opt16+1)); - opt16->hdr.len=4+n; + opt16->hdr.id = CI_AUTH; + opt16->val = htons(auth_opt->auth->proto); + n = auth_opt->auth->h->send_conf_req(lcp->ppp, auth_opt->auth, (uint8_t*)(opt16 + 1)); + opt16->hdr.len = 4 + n; - return 4+n; + return 4 + n; } static int auth_recv_conf_req(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, uint8_t *ptr) { - struct auth_option_t *auth_opt=container_of(opt,typeof(*auth_opt),opt); - struct lcp_opt16_t *opt16=(struct lcp_opt16_t*)ptr; + struct auth_option_t *auth_opt = container_of(opt,typeof(*auth_opt),opt); + struct lcp_opt16_t *opt16 = (struct lcp_opt16_t*)ptr; struct auth_data_t *d; int r; @@ -143,112 +140,104 @@ static int auth_recv_conf_req(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, u return LCP_OPT_ACK; - list_for_each_entry(d,&auth_opt->auth_list,entry) - { - if (d->proto==ntohs(opt16->val)) - { - r=d->h->recv_conf_req(lcp->ppp,d,(uint8_t*)(opt16+1)); - if (r==LCP_OPT_FAIL) + list_for_each_entry(d, &auth_opt->auth_list, entry) { + if (d->proto == ntohs(opt16->val)) { + r = d->h->recv_conf_req(lcp->ppp, d, (uint8_t*)(opt16 + 1)); + if (r == LCP_OPT_FAIL) return LCP_OPT_FAIL; - if (r==LCP_OPT_REJ) + if (r == LCP_OPT_REJ) break; - auth_opt->peer_auth=d; + auth_opt->peer_auth = d; return r; } } - list_for_each_entry(d,&auth_opt->auth_list,entry) - { - if (d->state!=LCP_OPT_NAK) - { - auth_opt->peer_auth=d; + list_for_each_entry(d, &auth_opt->auth_list, entry) { + if (d->state != LCP_OPT_NAK) { + auth_opt->peer_auth = d; return LCP_OPT_NAK; } } - log_ppp_msg("cann't negotiate authentication type\n"); + log_ppp_error("cann't negotiate authentication type\n"); return LCP_OPT_FAIL; } static int auth_recv_conf_ack(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, uint8_t *ptr) { - struct auth_option_t *auth_opt=container_of(opt,typeof(*auth_opt),opt); + struct auth_option_t *auth_opt = container_of(opt, typeof(*auth_opt), opt); - auth_opt->peer_auth=NULL; + auth_opt->peer_auth = NULL; return 0; } static int auth_recv_conf_nak(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, uint8_t *ptr) { - struct auth_option_t *auth_opt=container_of(opt,typeof(*auth_opt),opt); + struct auth_option_t *auth_opt = container_of(opt, typeof(*auth_opt), opt); struct auth_data_t *d; - if (!auth_opt->auth) - { + if (!auth_opt->auth) { log_ppp_error("auth: unexcepcted configure-nak\n"); return -1; } - auth_opt->auth->state=LCP_OPT_NAK; + auth_opt->auth->state = LCP_OPT_NAK; if (auth_opt->peer_auth) - auth_opt->auth=auth_opt->peer_auth; + auth_opt->auth = auth_opt->peer_auth; - list_for_each_entry(d,&auth_opt->auth_list,entry) - { - if (d->state!=LCP_OPT_NAK) + list_for_each_entry(d, &auth_opt->auth_list, entry) { + if (d->state != LCP_OPT_NAK) return 0; } - log_ppp_msg("cann't negotiate authentication type\n"); + log_ppp_error("cann't negotiate authentication type\n"); return -1; } static int auth_recv_conf_rej(struct ppp_lcp_t *lcp, struct lcp_option_t *opt, uint8_t *ptr) { - struct auth_option_t *auth_opt=container_of(opt,typeof(*auth_opt),opt); + struct auth_option_t *auth_opt = container_of(opt, typeof(*auth_opt), opt); struct auth_data_t *d; - if (!auth_opt->auth) - { + if (!auth_opt->auth) { log_ppp_error("auth: unexcepcted configure-reject\n"); return -1; } - auth_opt->auth->state=LCP_OPT_NAK; + + auth_opt->auth->state = LCP_OPT_NAK; if (auth_opt->peer_auth) - auth_opt->auth=auth_opt->peer_auth; + auth_opt->auth = auth_opt->peer_auth; - list_for_each_entry(d,&auth_opt->auth_list,entry) - { - if (d->state!=LCP_OPT_NAK) + list_for_each_entry(d, &auth_opt->auth_list, entry) { + if (d->state != LCP_OPT_NAK) return 0; } - log_ppp_msg("cann't negotiate authentication type\n"); + log_ppp_error("cann't negotiate authentication type\n"); return -1; } -static void auth_print(void (*print)(const char *fmt,...),struct lcp_option_t *opt, uint8_t *ptr) +static void auth_print(void (*print)(const char *fmt,...), struct lcp_option_t *opt, uint8_t *ptr) { - struct auth_option_t *auth_opt=container_of(opt,typeof(*auth_opt),opt); - struct lcp_opt16_t *opt16=(struct lcp_opt16_t*)ptr; + struct auth_option_t *auth_opt = container_of(opt, typeof(*auth_opt), opt); + struct lcp_opt16_t *opt16 = (struct lcp_opt16_t*)ptr; struct auth_data_t *d; - if (ptr) - { - list_for_each_entry(d,&auth_opt->auth_list,entry) - { - if (d->proto==ntohs(opt16->val)) + if (ptr) { + list_for_each_entry(d, &auth_opt->auth_list, entry) { + if (d->proto == ntohs(opt16->val) && (!d->h->check || d->h->check((uint8_t *)(opt16 + 1)))) goto print_d; } - print("",ntohs(opt16->val)); + print("", ntohs(opt16->val)); + return; + } else if (auth_opt->auth) + d = auth_opt->auth; + else return; - } - else if (auth_opt->auth) d=auth_opt->auth; - else return; print_d: - print("",d->h->name); + print("", d->h->name); } static struct ppp_layer_data_t *auth_layer_init(struct ppp_t *ppp) @@ -257,26 +246,26 @@ static struct ppp_layer_data_t *auth_layer_init(struct ppp_t *ppp) log_ppp_debug("auth_layer_init\n"); - memset(ad,0,sizeof(*ad)); + memset(ad, 0, sizeof(*ad)); - ad->ppp=ppp; + ad->ppp = ppp; return &ad->ld; } static int auth_layer_start(struct ppp_layer_data_t *ld) { - struct auth_layer_data_t *ad=container_of(ld,typeof(*ad),ld); + struct auth_layer_data_t *ad = container_of(ld,typeof(*ad),ld); log_ppp_debug("auth_layer_start\n"); ad->started = 1; if (ad->auth_opt.auth) - ad->auth_opt.auth->h->start(ad->ppp,ad->auth_opt.auth); + ad->auth_opt.auth->h->start(ad->ppp, ad->auth_opt.auth); else { log_ppp_debug("auth_layer_started\n"); - ppp_layer_started(ad->ppp,ld); + ppp_layer_started(ad->ppp, ld); } return 0; @@ -284,37 +273,37 @@ static int auth_layer_start(struct ppp_layer_data_t *ld) static void auth_layer_finish(struct ppp_layer_data_t *ld) { - struct auth_layer_data_t *ad=container_of(ld,typeof(*ad),ld); + struct auth_layer_data_t *ad = container_of(ld, typeof(*ad), ld); log_ppp_debug("auth_layer_finish\n"); if (ad->auth_opt.auth) - ad->auth_opt.auth->h->finish(ad->ppp,ad->auth_opt.auth); + ad->auth_opt.auth->h->finish(ad->ppp, ad->auth_opt.auth); ad->started = 0; log_ppp_debug("auth_layer_finished\n"); - ppp_layer_finished(ad->ppp,ld); + ppp_layer_finished(ad->ppp, ld); } static void auth_layer_free(struct ppp_layer_data_t *ld) { - struct auth_layer_data_t *ad=container_of(ld,typeof(*ad),ld); + struct auth_layer_data_t *ad = container_of(ld, typeof(*ad), ld); log_ppp_debug("auth_layer_free\n"); if (ad->started && ad->auth_opt.auth) - ad->auth_opt.auth->h->finish(ad->ppp,ad->auth_opt.auth); + ad->auth_opt.auth->h->finish(ad->ppp, ad->auth_opt.auth); _free(ad); } void __export auth_successed(struct ppp_t *ppp, char *username) { - struct auth_layer_data_t *ad=container_of(ppp_find_layer_data(ppp,&auth_layer),typeof(*ad),ld); + struct auth_layer_data_t *ad = container_of(ppp_find_layer_data(ppp, &auth_layer), typeof(*ad), ld); log_ppp_debug("auth_layer_started\n"); ppp->username = username; - ppp_layer_started(ppp,&ad->ld); + ppp_layer_started(ppp, &ad->ld); triton_event_fire(EV_PPP_AUTHORIZED, ppp); } @@ -325,13 +314,13 @@ void __export auth_failed(struct ppp_t *ppp) int __export ppp_auth_register_handler(struct ppp_auth_handler_t *h) { - list_add_tail(&h->entry,&auth_handlers); + list_add_tail(&h->entry, &auth_handlers); return 0; } static void __init ppp_auth_init() { - ppp_register_layer("auth",&auth_layer); + ppp_register_layer("auth", &auth_layer); lcp_option_register(&auth_opt_hnd); } -- cgit v1.2.3