1 files changed, 260 insertions, 242 deletions

diff --git a/accel-pptpd/ppp/ppp_ipcp.c b/accel-pptpd/ppp/ppp_ipcp.c
index f8d0a3f5..c46b1bdb 100644
--- a/accel-pptpd/ppp/ppp_ipcp.c
+++ b/accel-pptpd/ppp/ppp_ipcp.c
@@ -41,14 +41,12 @@ static void ipcp_options_init(struct ppp_ipcp_t *ipcp)
 
 	ipcp->conf_req_len = sizeof(struct ipcp_hdr_t);
 	
-	list_for_each_entry(h,&option_handlers,entry)
-	{
-		lopt=h->init(ipcp);
-		if (lopt)
-		{
-			lopt->h=h;
-			list_add_tail(&lopt->entry,&ipcp->options);
-			ipcp->conf_req_len+=lopt->len;
+	list_for_each_entry(h,&option_handlers,entry) {
+		lopt = h->init(ipcp);
+		if (lopt) {
+			lopt->h = h;
+			list_add_tail(&lopt->entry, &ipcp->options);
+			ipcp->conf_req_len += lopt->len;
 		}
 	}
 }
@@ -57,40 +55,39 @@ static void ipcp_options_free(struct ppp_ipcp_t *ipcp)
 {
 	struct ipcp_option_t *lopt;
 
-	while(!list_empty(&ipcp->options))
-	{
-		lopt=list_entry(ipcp->options.next,typeof(*lopt),entry);
+	while (!list_empty(&ipcp->options)) {
+		lopt = list_entry(ipcp->options.next, typeof(*lopt), entry);
 		list_del(&lopt->entry);
-		lopt->h->free(ipcp,lopt);
+		lopt->h->free(ipcp, lopt);
 	}
 }
 
 static struct ppp_layer_data_t *ipcp_layer_init(struct ppp_t *ppp)
 {
-	struct ppp_ipcp_t *ipcp=_malloc(sizeof(*ipcp));
-	memset(ipcp,0,sizeof(*ipcp));
+	struct ppp_ipcp_t *ipcp = _malloc(sizeof(*ipcp));
+	memset(ipcp, 0, sizeof(*ipcp));
 	
 	log_ppp_debug("ipcp_layer_init\n");
 
-	ipcp->ppp=ppp;
-	ipcp->fsm.ppp=ppp;
+	ipcp->ppp = ppp;
+	ipcp->fsm.ppp = ppp;
 	
-	ipcp->hnd.proto=PPP_IPCP;
-	ipcp->hnd.recv=ipcp_recv;
+	ipcp->hnd.proto = PPP_IPCP;
+	ipcp->hnd.recv = ipcp_recv;
 	
-	ppp_register_unit_handler(ppp,&ipcp->hnd);
+	ppp_register_unit_handler(ppp, &ipcp->hnd);
 
 	ipcp->fsm.proto = PPP_IPCP;
 	ppp_fsm_init(&ipcp->fsm);
 
-	ipcp->fsm.layer_up=ipcp_layer_up;
-	ipcp->fsm.layer_finished=ipcp_layer_down;
-	ipcp->fsm.send_conf_req=send_conf_req;
-	ipcp->fsm.send_conf_ack=send_conf_ack;
-	ipcp->fsm.send_conf_nak=send_conf_nak;
-	ipcp->fsm.send_conf_rej=send_conf_rej;
-	ipcp->fsm.send_term_req=send_term_req;
-	ipcp->fsm.send_term_ack=send_term_ack;
+	ipcp->fsm.layer_up = ipcp_layer_up;
+	ipcp->fsm.layer_finished = ipcp_layer_down;
+	ipcp->fsm.send_conf_req = send_conf_req;
+	ipcp->fsm.send_conf_ack = send_conf_ack;
+	ipcp->fsm.send_conf_nak = send_conf_nak;
+	ipcp->fsm.send_conf_rej = send_conf_rej;
+	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);
@@ -100,7 +97,7 @@ static struct ppp_layer_data_t *ipcp_layer_init(struct ppp_t *ppp)
 
 int ipcp_layer_start(struct ppp_layer_data_t *ld)
 {
-	struct ppp_ipcp_t *ipcp=container_of(ld,typeof(*ipcp),ld);
+	struct ppp_ipcp_t *ipcp = container_of(ld, typeof(*ipcp), ld);
 	
 	log_ppp_debug("ipcp_layer_start\n");
 
@@ -114,21 +111,21 @@ int ipcp_layer_start(struct ppp_layer_data_t *ld)
 
 void ipcp_layer_finish(struct ppp_layer_data_t *ld)
 {
-	struct ppp_ipcp_t *ipcp=container_of(ld,typeof(*ipcp),ld);
+	struct ppp_ipcp_t *ipcp = container_of(ld, typeof(*ipcp), ld);
 	
 	log_ppp_debug("ipcp_layer_finish\n");
 
 	ipcp->fsm.fsm_state = FSM_Closed;
-	ppp_layer_finished(ipcp->ppp,&ipcp->ld);
+	ppp_layer_finished(ipcp->ppp, &ipcp->ld);
 }
 
 void ipcp_layer_free(struct ppp_layer_data_t *ld)
 {
-	struct ppp_ipcp_t *ipcp=container_of(ld,typeof(*ipcp),ld);
+	struct ppp_ipcp_t *ipcp = container_of(ld, typeof(*ipcp), ld);
 	
 	log_ppp_debug("ipcp_layer_free\n");
 		
-	ppp_unregister_handler(ipcp->ppp,&ipcp->hnd);
+	ppp_unregister_handler(ipcp->ppp, &ipcp->hnd);
 	ipcp_options_free(ipcp);
 	ppp_fsm_free(&ipcp->fsm);
 
@@ -137,19 +134,23 @@ void ipcp_layer_free(struct ppp_layer_data_t *ld)
 
 static void ipcp_layer_up(struct ppp_fsm_t *fsm)
 {
-	struct ppp_ipcp_t *ipcp=container_of(fsm,typeof(*ipcp),fsm);
+	struct ppp_ipcp_t *ipcp = container_of(fsm, typeof(*ipcp), fsm);
+
 	log_ppp_debug("ipcp_layer_started\n");
+
 	if (!ipcp->started) {
 		ipcp->started = 1;
-		ppp_layer_started(ipcp->ppp,&ipcp->ld);
+		ppp_layer_started(ipcp->ppp, &ipcp->ld);
 	}
 }
 
 static void ipcp_layer_down(struct ppp_fsm_t *fsm)
 {
-	struct ppp_ipcp_t *ipcp=container_of(fsm,typeof(*ipcp),fsm);
+	struct ppp_ipcp_t *ipcp = container_of(fsm, typeof(*ipcp), fsm);
+
 	log_ppp_debug("ipcp_layer_finished\n");
-	ppp_layer_finished(ipcp->ppp,&ipcp->ld);
+
+	ppp_layer_finished(ipcp->ppp, &ipcp->ld);
 	if (ipcp->started)
 		ipcp->started = 0;
 	else
@@ -159,56 +160,54 @@ static void ipcp_layer_down(struct ppp_fsm_t *fsm)
 static void print_ropt(struct recv_opt_t *ropt)
 {
 	int i;
-	uint8_t *ptr=(uint8_t*)ropt->hdr;
+	uint8_t *ptr = (uint8_t*)ropt->hdr;
 
-	log_ppp_debug(" <");
-	for(i=0; i<ropt->len; i++)
-	{
-		log_ppp_debug(" %x",ptr[i]);
+	log_ppp_info("<");
+	for (i = 0; i < ropt->len; i++) {
+		log_ppp_info(" %x", ptr[i]);
 	}
-	log_ppp_debug(" >");
+	log_ppp_info(" >");
 }
 
 static int send_conf_req(struct ppp_fsm_t *fsm)
 {
-	struct ppp_ipcp_t *ipcp=container_of(fsm,typeof(*ipcp),fsm);
-	uint8_t *buf=_malloc(ipcp->conf_req_len), *ptr=buf;
-	struct ipcp_hdr_t *ipcp_hdr=(struct ipcp_hdr_t*)ptr;
+	struct ppp_ipcp_t *ipcp = container_of(fsm, typeof(*ipcp), fsm);
+	uint8_t *buf = _malloc(ipcp->conf_req_len), *ptr = buf;
+	struct ipcp_hdr_t *ipcp_hdr = (struct ipcp_hdr_t*)ptr;
 	struct ipcp_option_t *lopt;
 	int n;
 
-	ipcp_hdr->proto=htons(PPP_IPCP);
-	ipcp_hdr->code=CONFREQ;
-	ipcp_hdr->id=++ipcp->fsm.id;
-	ipcp_hdr->len=0;
+	ipcp_hdr->proto = htons(PPP_IPCP);
+	ipcp_hdr->code = CONFREQ;
+	ipcp_hdr->id = ++ipcp->fsm.id;
+	ipcp_hdr->len = 0;
 	
-	ptr+=sizeof(*ipcp_hdr);
+	ptr += sizeof(*ipcp_hdr);
 
-	list_for_each_entry(lopt,&ipcp->options,entry)
-	{
+	list_for_each_entry(lopt, &ipcp->options, entry) {
 		n = lopt->h->send_conf_req(ipcp, lopt, ptr);
 		if (n < 0)
 			return -1;
 		if (n) {
-			ptr+=n;
+			ptr += n;
 			lopt->print = 1;
 		} else
 			lopt->print = 0;
 	}
 
 	if (conf_ppp_verbose) {
-		log_ppp_debug("send [IPCP ConfReq id=%x", ipcp_hdr->id);
-		list_for_each_entry(lopt,&ipcp->options,entry){
+		log_ppp_info("send [IPCP ConfReq id=%x", ipcp_hdr->id);
+		list_for_each_entry(lopt,&ipcp->options,entry) {
 			if (lopt->print) {
-				log_ppp_debug(" ");
-				lopt->h->print(log_ppp_debug,lopt,NULL);
+				log_ppp_info(" ");
+				lopt->h->print(log_ppp_debug, lopt, NULL);
 			}
 		}
-		log_ppp_debug("]\n");
+		log_ppp_info("]\n");
 	}
 
-	ipcp_hdr->len=htons((ptr-buf)-2);
-	ppp_unit_send(ipcp->ppp,ipcp_hdr,ptr-buf);
+	ipcp_hdr->len = htons(ptr - buf - 2);
+	ppp_unit_send(ipcp->ppp, ipcp_hdr, ptr - buf);
 
 	_free(buf);
 
@@ -217,139 +216,155 @@ static int send_conf_req(struct ppp_fsm_t *fsm)
 
 static void send_conf_ack(struct ppp_fsm_t *fsm)
 {
-	struct ppp_ipcp_t *ipcp=container_of(fsm,typeof(*ipcp),fsm);
-	struct ipcp_hdr_t *hdr=(struct ipcp_hdr_t*)ipcp->ppp->unit_buf;
+	struct ppp_ipcp_t *ipcp = container_of(fsm, typeof(*ipcp), fsm);
+	struct ipcp_hdr_t *hdr = (struct ipcp_hdr_t*)ipcp->ppp->unit_buf;
 
-	hdr->code=CONFACK;
-	log_ppp_debug("send [IPCP ConfAck id=%x ]\n",ipcp->fsm.recv_id);
+	hdr->code = CONFACK;
 
-	ppp_unit_send(ipcp->ppp,hdr,ntohs(hdr->len)+2);
+	if (conf_ppp_verbose)
+		log_ppp_info("send [IPCP ConfAck id=%x]\n", ipcp->fsm.recv_id);
+
+	ppp_unit_send(ipcp->ppp, hdr, ntohs(hdr->len) + 2);
 }
 
 static void send_conf_nak(struct ppp_fsm_t *fsm)
 {
-	struct ppp_ipcp_t *ipcp=container_of(fsm,typeof(*ipcp),fsm);
-	uint8_t *buf=_malloc(ipcp->conf_req_len), *ptr=buf;
-	struct ipcp_hdr_t *ipcp_hdr=(struct ipcp_hdr_t*)ptr;
+	struct ppp_ipcp_t *ipcp = container_of(fsm, typeof(*ipcp), fsm);
+	uint8_t *buf = _malloc(ipcp->conf_req_len), *ptr = buf;
+	struct ipcp_hdr_t *ipcp_hdr = (struct ipcp_hdr_t*)ptr;
 	struct recv_opt_t *ropt;
 
-	log_ppp_debug("send [IPCP ConfNak id=%x",ipcp->fsm.recv_id);
+	if (conf_ppp_verbose)
+		log_ppp_info("send [IPCP ConfNak id=%x", ipcp->fsm.recv_id);
 
-	ipcp_hdr->proto=htons(PPP_IPCP);
-	ipcp_hdr->code=CONFNAK;
-	ipcp_hdr->id=ipcp->fsm.recv_id;
-	ipcp_hdr->len=0;
+	ipcp_hdr->proto = htons(PPP_IPCP);
+	ipcp_hdr->code = CONFNAK;
+	ipcp_hdr->id = ipcp->fsm.recv_id;
+	ipcp_hdr->len = 0;
 	
-	ptr+=sizeof(*ipcp_hdr);
+	ptr += sizeof(*ipcp_hdr);
 
-	list_for_each_entry(ropt,&ipcp->ropt_list,entry)
-	{
-		if (ropt->state==IPCP_OPT_NAK)
-		{
-			log_ppp_debug(" ");
-			ropt->lopt->h->print(log_ppp_debug,ropt->lopt,NULL);
-			ptr+=ropt->lopt->h->send_conf_nak(ipcp,ropt->lopt,ptr);
+	list_for_each_entry(ropt, &ipcp->ropt_list, entry) {
+		if (ropt->state == IPCP_OPT_NAK) {
+			if (conf_ppp_verbose) {
+				log_ppp_info(" ");
+				ropt->lopt->h->print(log_ppp_info, ropt->lopt, NULL);
+			}
+			ptr += ropt->lopt->h->send_conf_nak(ipcp, ropt->lopt, ptr);
 		}
 	}
 	
-	log_ppp_debug("]\n");
+	if (conf_ppp_verbose)
+		log_ppp_info("]\n");
 
-	ipcp_hdr->len=htons((ptr-buf)-2);
-	ppp_unit_send(ipcp->ppp,ipcp_hdr,ptr-buf);
+	ipcp_hdr->len = htons(ptr-buf-2);
+	ppp_unit_send(ipcp->ppp, ipcp_hdr, ptr - buf);
 
 	_free(buf);
 }
 
 static void send_conf_rej(struct ppp_fsm_t *fsm)
 {
-	struct ppp_ipcp_t *ipcp=container_of(fsm,typeof(*ipcp),fsm);
-	uint8_t *buf=_malloc(ipcp->ropt_len + sizeof(struct ipcp_hdr_t)), *ptr=buf;
-	struct ipcp_hdr_t *ipcp_hdr=(struct ipcp_hdr_t*)ptr;
+	struct ppp_ipcp_t *ipcp = container_of(fsm, typeof(*ipcp), fsm);
+	uint8_t *buf = _malloc(ipcp->ropt_len + sizeof(struct ipcp_hdr_t)), *ptr = buf;
+	struct ipcp_hdr_t *ipcp_hdr = (struct ipcp_hdr_t*)ptr;
 	struct recv_opt_t *ropt;
 
-	log_ppp_debug("send [IPCP ConfRej id=%x ",ipcp->fsm.recv_id);
+	if (conf_ppp_verbose)
+		log_ppp_info("send [IPCP ConfRej id=%x", ipcp->fsm.recv_id);
 
-	ipcp_hdr->proto=htons(PPP_IPCP);
-	ipcp_hdr->code=CONFREJ;
-	ipcp_hdr->id=ipcp->fsm.recv_id;
-	ipcp_hdr->len=0;
+	ipcp_hdr->proto = htons(PPP_IPCP);
+	ipcp_hdr->code = CONFREJ;
+	ipcp_hdr->id = ipcp->fsm.recv_id;
+	ipcp_hdr->len = 0;
 
-	ptr+=sizeof(*ipcp_hdr);
+	ptr += sizeof(*ipcp_hdr);
 
-	list_for_each_entry(ropt,&ipcp->ropt_list,entry)
-	{
-		if (ropt->state==IPCP_OPT_REJ)
-		{
-			log_ppp_debug(" ");
-			if (ropt->lopt)	ropt->lopt->h->print(log_ppp_debug,ropt->lopt,(uint8_t*)ropt->hdr);
-			else print_ropt(ropt);
-			memcpy(ptr,ropt->hdr,ropt->len);
-			ptr+=ropt->len;
+	list_for_each_entry(ropt, &ipcp->ropt_list, entry) {
+		if (ropt->state == IPCP_OPT_REJ) {
+			if (conf_ppp_verbose) {
+				log_ppp_info(" ");
+				if (ropt->lopt)
+					ropt->lopt->h->print(log_ppp_info, ropt->lopt, (uint8_t*)ropt->hdr);
+				else
+					print_ropt(ropt);
+			}
+			memcpy(ptr, ropt->hdr, ropt->len);
+			ptr += ropt->len;
 		}
 	}
 
-	log_ppp_debug("]\n");
+	if (conf_ppp_verbose)
+		log_ppp_info("]\n");
 
-	ipcp_hdr->len=htons((ptr-buf)-2);
-	ppp_unit_send(ipcp->ppp,ipcp_hdr,ptr-buf);
+	ipcp_hdr->len = htons(ptr - buf - 2);
+	ppp_unit_send(ipcp->ppp, ipcp_hdr, ptr-buf);
 
 	_free(buf);
 }
 
-static int ipcp_recv_conf_req(struct ppp_ipcp_t *ipcp,uint8_t *data,int size)
+static int ipcp_recv_conf_req(struct ppp_ipcp_t *ipcp, uint8_t *data, int size)
 {
 	struct ipcp_opt_hdr_t *hdr;
 	struct recv_opt_t *ropt;
 	struct ipcp_option_t *lopt;
-	int r,ret=1;
+	int r,ret = 1;
 
-	ipcp->ropt_len=size;
+	ipcp->ropt_len = size;
 
-	while(size>0)
-	{
-		hdr=(struct ipcp_opt_hdr_t *)data;
-
-		ropt=_malloc(sizeof(*ropt));
-		memset(ropt,0,sizeof(*ropt));
-		if (hdr->len>size) ropt->len=size;
-		else ropt->len=hdr->len;
-		ropt->hdr=hdr;
-		ropt->state=IPCP_OPT_NONE;
-		list_add_tail(&ropt->entry,&ipcp->ropt_list);
-
-		data+=ropt->len;
-		size-=ropt->len;
+	while (size > 0) {
+		hdr = (struct ipcp_opt_hdr_t *)data;
+
+		ropt = _malloc(sizeof(*ropt));
+		memset(ropt, 0, sizeof(*ropt));
+
+		if (hdr->len > size)
+			ropt->len = size;
+		else
+			ropt->len = hdr->len;
+		ropt->hdr = hdr;
+		ropt->state = IPCP_OPT_NONE;
+		list_add_tail(&ropt->entry, &ipcp->ropt_list);
+
+		data += ropt->len;
+		size -= ropt->len;
 	}
 	
-	list_for_each_entry(lopt,&ipcp->options,entry)
+	list_for_each_entry(lopt, &ipcp->options, entry)
 		lopt->state=IPCP_OPT_NONE;
 
-	log_ppp_debug("recv [IPCP ConfReq id=%x",ipcp->fsm.recv_id);
-	list_for_each_entry(ropt,&ipcp->ropt_list,entry)
-	{
-		list_for_each_entry(lopt,&ipcp->options,entry)
-		{
-			if (lopt->id==ropt->hdr->id)
-			{
-				log_ppp_debug(" ");
-				lopt->h->print(log_ppp_debug,lopt,(uint8_t*)ropt->hdr);
-				r=lopt->h->recv_conf_req(ipcp,lopt,(uint8_t*)ropt->hdr);
-				lopt->state=r;
-				ropt->state=r;
-				ropt->lopt=lopt;
-				if (r<ret) ret=r;
+	if (conf_ppp_verbose)
+		log_ppp_info("recv [IPCP ConfReq id=%x", ipcp->fsm.recv_id);
+
+	list_for_each_entry(ropt, &ipcp->ropt_list, entry) {
+		list_for_each_entry(lopt, &ipcp->options, entry) {
+			if (lopt->id == ropt->hdr->id) {
+				if (conf_ppp_verbose) {
+					log_ppp_info(" ");
+					lopt->h->print(log_ppp_info, lopt, (uint8_t*)ropt->hdr);
+				}
+				r = lopt->h->recv_conf_req(ipcp, lopt, (uint8_t*)ropt->hdr);
+				lopt->state = r;
+				ropt->state = r;
+				ropt->lopt = lopt;
+				if (r < ret)
+					ret = r;
 				break;
 			}	
 		}
 		if (!ropt->lopt)
 		{
-			log_ppp_debug(" ");
-			print_ropt(ropt);
-			ropt->state=IPCP_OPT_REJ;
-			ret=IPCP_OPT_REJ;
+			if (conf_ppp_verbose) {
+				log_ppp_debug(" ");
+				print_ropt(ropt);
+			}
+			ropt->state = IPCP_OPT_REJ;
+			ret = IPCP_OPT_REJ;
 		}
 	}
-	log_ppp_debug("]\n");
+
+	if (conf_ppp_verbose)
+		log_ppp_info("]\n");
 
 	/*list_for_each_entry(lopt,&ipcp->options,entry)
 	{
@@ -368,130 +383,136 @@ static void ipcp_free_conf_req(struct ppp_ipcp_t *ipcp)
 {
 	struct recv_opt_t *ropt;
 
-	while(!list_empty(&ipcp->ropt_list))
-	{
-		ropt=list_entry(ipcp->ropt_list.next,typeof(*ropt),entry);
+	while (!list_empty(&ipcp->ropt_list)) {
+		ropt = list_entry(ipcp->ropt_list.next, typeof(*ropt), entry);
 		list_del(&ropt->entry);
 		_free(ropt);
 	}
 }
 
-static int ipcp_recv_conf_rej(struct ppp_ipcp_t *ipcp,uint8_t *data,int size)
+static int ipcp_recv_conf_rej(struct ppp_ipcp_t *ipcp, uint8_t *data, int size)
 {
 	struct ipcp_opt_hdr_t *hdr;
 	struct ipcp_option_t *lopt;
-	int res=0;
+	int res = 0;
 
-	log_ppp_debug("recv [IPCP ConfRej id=%x",ipcp->fsm.recv_id);
+	if (conf_ppp_verbose)
+		log_ppp_info("recv [IPCP ConfRej id=%x", ipcp->fsm.recv_id);
 
-	if (ipcp->fsm.recv_id!=ipcp->fsm.id)
-	{
-		log_ppp_debug(": id mismatch ]\n");
+	if (ipcp->fsm.recv_id != ipcp->fsm.id) {
+		if (conf_ppp_verbose)
+			log_ppp_info(": id mismatch ]\n");
 		return 0;
 	}
 
-	while(size>0)
-	{
-		hdr=(struct ipcp_opt_hdr_t *)data;
+	while (size > 0) {
+		hdr = (struct ipcp_opt_hdr_t *)data;
 		
-		list_for_each_entry(lopt,&ipcp->options,entry)
-		{
-			if (lopt->id==hdr->id)
-			{
+		list_for_each_entry(lopt, &ipcp->options, entry) {
+			if (lopt->id == hdr->id) {
 				if (!lopt->h->recv_conf_rej)
-					res=-1;
-				else if (lopt->h->recv_conf_rej(ipcp,lopt,data))
-					res=-1;
+					res = -1;
+				else if (lopt->h->recv_conf_rej(ipcp, lopt, data))
+					res = -1;
 				break;
 			}
 		}
 
-		data+=hdr->len;
-		size-=hdr->len;
+		data += hdr->len;
+		size -= hdr->len;
 	}
-	log_ppp_debug("]\n");
+
+	if (conf_ppp_verbose)
+		log_ppp_info("]\n");
+
 	return res;
 }
 
-static int ipcp_recv_conf_nak(struct ppp_ipcp_t *ipcp,uint8_t *data,int size)
+static int ipcp_recv_conf_nak(struct ppp_ipcp_t *ipcp, uint8_t *data, int size)
 {
 	struct ipcp_opt_hdr_t *hdr;
 	struct ipcp_option_t *lopt;
-	int res=0;
+	int res = 0;
 
-	log_ppp_debug("recv [IPCP ConfNak id=%x",ipcp->fsm.recv_id);
+	if (conf_ppp_verbose)
+		log_ppp_info("recv [IPCP ConfNak id=%x", ipcp->fsm.recv_id);
 
-	if (ipcp->fsm.recv_id!=ipcp->fsm.id)
-	{
-		log_ppp_debug(": id mismatch ]\n");
+	if (ipcp->fsm.recv_id != ipcp->fsm.id) {
+		if (conf_ppp_verbose)
+			log_ppp_info(": id mismatch ]\n");
 		return 0;
 	}
 
-	while(size>0)
-	{
-		hdr=(struct ipcp_opt_hdr_t *)data;
+	while (size > 0) {
+		hdr = (struct ipcp_opt_hdr_t *)data;
 		
-		list_for_each_entry(lopt,&ipcp->options,entry)
-		{
-			if (lopt->id==hdr->id)
-			{
-				log_ppp_debug(" ");
-				lopt->h->print(log_ppp_debug,lopt,data);
-				if (lopt->h->recv_conf_nak(ipcp,lopt,data))
-					res=-1;
+		list_for_each_entry(lopt, &ipcp->options, entry) {
+			if (lopt->id == hdr->id) {
+				if (conf_ppp_verbose) {
+					log_ppp_info(" ");
+					lopt->h->print(log_ppp_info,lopt,data);
+				}
+				if (lopt->h->recv_conf_nak(ipcp, lopt, data))
+					res =- 1;
 				break;
 			}
 		}
 
-		data+=hdr->len;
-		size-=hdr->len;
+		data += hdr->len;
+		size -= hdr->len;
 	}
-	log_ppp_debug("]\n");
+
+	if (conf_ppp_verbose)
+		log_ppp_info("]\n");
+
 	return res;
 }
 
-static int ipcp_recv_conf_ack(struct ppp_ipcp_t *ipcp,uint8_t *data,int size)
+static int ipcp_recv_conf_ack(struct ppp_ipcp_t *ipcp, uint8_t *data, int size)
 {
 	struct ipcp_opt_hdr_t *hdr;
 	struct ipcp_option_t *lopt;
-	int res=0;
+	int res = 0;
 
-	log_ppp_debug("recv [IPCP ConfAck id=%x",ipcp->fsm.recv_id);
+	if (conf_ppp_verbose)
+		log_ppp_info("recv [IPCP ConfAck id=%x", ipcp->fsm.recv_id);
 
-	if (ipcp->fsm.recv_id!=ipcp->fsm.id)
-	{
-		log_ppp_debug(": id mismatch ]\n");
+	if (ipcp->fsm.recv_id != ipcp->fsm.id) {
+		if (conf_ppp_verbose)
+			log_ppp_info(": id mismatch ]\n");
 		return 0;
 	}
 
-	while(size>0)
-	{
-		hdr=(struct ipcp_opt_hdr_t *)data;
+	while (size > 0) {
+		hdr = (struct ipcp_opt_hdr_t *)data;
 		
-		list_for_each_entry(lopt,&ipcp->options,entry)
-		{
-			if (lopt->id==hdr->id)
-			{
-				log_ppp_debug(" ");
-				lopt->h->print(log_ppp_debug,lopt,data);
+		list_for_each_entry(lopt, &ipcp->options, entry) {
+			if (lopt->id == hdr->id) {
+				if (conf_ppp_verbose) {
+					log_ppp_info(" ");
+					lopt->h->print(log_ppp_info, lopt, data);
+				}
 				if (!lopt->h->recv_conf_ack)
 					break;
-				if (lopt->h->recv_conf_ack(ipcp,lopt,data))
-					res=-1;
+				if (lopt->h->recv_conf_ack(ipcp, lopt, data))
+					res = -1;
 				break;
 			}
 		}
 
-		data+=hdr->len;
-		size-=hdr->len;
+		data += hdr->len;
+		size -= hdr->len;
 	}
-	log_ppp_debug("]\n");
+
+	if (conf_ppp_verbose)
+		log_ppp_info("]\n");
+
 	return res;
 }
 
 static void send_term_req(struct ppp_fsm_t *fsm)
 {
-	struct ppp_ipcp_t *ipcp=container_of(fsm,typeof(*ipcp),fsm);
+	struct ppp_ipcp_t *ipcp = container_of(fsm, typeof(*ipcp), fsm);
 	struct ipcp_hdr_t hdr = {
 		.proto = htons(PPP_IPCP),
 		.code = TERMREQ,
@@ -499,14 +520,15 @@ static void send_term_req(struct ppp_fsm_t *fsm)
 		.len = htons(4),
 	};
 
-	log_ppp_debug("send [IPCP TermReq id=%i \"\"]\n",hdr.id);
+	if (conf_ppp_verbose)
+		log_ppp_info("send [IPCP TermReq id=%i]\n", hdr.id);
 
 	ppp_unit_send(ipcp->ppp, &hdr, 6);
 }
 
 static void send_term_ack(struct ppp_fsm_t *fsm)
 {
-	struct ppp_ipcp_t *ipcp=container_of(fsm,typeof(*ipcp),fsm);
+	struct ppp_ipcp_t *ipcp = container_of(fsm, typeof(*ipcp), fsm);
 	struct ipcp_hdr_t hdr = {
 		.proto = htons(PPP_IPCP),
 		.code = TERMACK,
@@ -514,7 +536,8 @@ static void send_term_ack(struct ppp_fsm_t *fsm)
 		.len = htons(4),
 	};
 
-	log_ppp_debug("send [IPCP TermAck id=%i \"\"]\n", hdr.id);
+	if (conf_ppp_verbose)
+		log_ppp_info("send [IPCP TermAck id=%i]\n", hdr.id);
 	
 	ppp_unit_send(ipcp->ppp, &hdr, 6);
 }
@@ -522,36 +545,31 @@ static void send_term_ack(struct ppp_fsm_t *fsm)
 static void ipcp_recv(struct ppp_handler_t*h)
 {
 	struct ipcp_hdr_t *hdr;
-	struct ppp_ipcp_t *ipcp=container_of(h,typeof(*ipcp),hnd);
+	struct ppp_ipcp_t *ipcp = container_of(h, typeof(*ipcp), hnd);
 	int r;
-	char *term_msg;
 
-	if (ipcp->fsm.fsm_state==FSM_Initial || ipcp->fsm.fsm_state==FSM_Closed)
-	{
-		log_ppp_warn("IPCP: discaring packet\n");
+	if (ipcp->fsm.fsm_state == FSM_Initial || ipcp->fsm.fsm_state == FSM_Closed) {
+		if (conf_ppp_verbose)
+			log_ppp_warn("IPCP: discaring packet\n");
 		return;
 	}
 
-	if (ipcp->ppp->unit_buf_size<PPP_HEADERLEN+2)
-	{
+	if (ipcp->ppp->unit_buf_size < PPP_HEADERLEN + 2) {
 		log_ppp_warn("IPCP: short packet received\n");
 		return;
 	}
 
-	hdr=(struct ipcp_hdr_t *)ipcp->ppp->unit_buf;
-	if (ntohs(hdr->len)<PPP_HEADERLEN)
-	{
+	hdr = (struct ipcp_hdr_t *)ipcp->ppp->unit_buf;
+	if (ntohs(hdr->len) < PPP_HEADERLEN) {
 		log_ppp_warn("IPCP: short packet received\n");
 		return;
 	}
 
-	ipcp->fsm.recv_id=hdr->id;
-	switch(hdr->code)
-	{
+	ipcp->fsm.recv_id = hdr->id;
+	switch(hdr->code) {
 		case CONFREQ:
-			r=ipcp_recv_conf_req(ipcp,(uint8_t*)(hdr+1),ntohs(hdr->len)-PPP_HDRLEN);
-			switch(r)
-			{
+			r = ipcp_recv_conf_req(ipcp,(uint8_t*)(hdr + 1), ntohs(hdr->len) - PPP_HDRLEN);
+			switch(r) {
 				case IPCP_OPT_ACK:
 					ppp_fsm_recv_conf_req_ack(&ipcp->fsm);
 					break;
@@ -563,41 +581,40 @@ static void ipcp_recv(struct ppp_handler_t*h)
 					break;
 			}
 			ipcp_free_conf_req(ipcp);
-			if (r==IPCP_OPT_FAIL)
+			if (r == IPCP_OPT_FAIL)
 				ppp_terminate(ipcp->ppp, 0);
 			break;
 		case CONFACK:
-			if (ipcp_recv_conf_ack(ipcp,(uint8_t*)(hdr+1),ntohs(hdr->len)-PPP_HDRLEN))
+			if (ipcp_recv_conf_ack(ipcp,(uint8_t*)(hdr + 1), ntohs(hdr->len) - PPP_HDRLEN))
 				ppp_terminate(ipcp->ppp, 0);
 			else
 				ppp_fsm_recv_conf_ack(&ipcp->fsm);
 			break;
 		case CONFNAK:
-			ipcp_recv_conf_nak(ipcp,(uint8_t*)(hdr+1),ntohs(hdr->len)-PPP_HDRLEN);
+			ipcp_recv_conf_nak(ipcp,(uint8_t*)(hdr + 1), ntohs(hdr->len) - PPP_HDRLEN);
 			ppp_fsm_recv_conf_rej(&ipcp->fsm);
 			break;
 		case CONFREJ:
-			if (ipcp_recv_conf_rej(ipcp,(uint8_t*)(hdr+1),ntohs(hdr->len)-PPP_HDRLEN))
+			if (ipcp_recv_conf_rej(ipcp, (uint8_t*)(hdr + 1), ntohs(hdr->len) - PPP_HDRLEN))
 				ppp_terminate(ipcp->ppp, 0);
 			else
 				ppp_fsm_recv_conf_rej(&ipcp->fsm);
 			break;
 		case TERMREQ:
-			term_msg=_strndup((char*)(hdr+1),ntohs(hdr->len) - 4);
-			log_ppp_debug("recv [IPCP TermReq id=%x \"%s\"]\n",hdr->id,term_msg);
-			_free(term_msg);
+			if (conf_ppp_verbose)
+				log_ppp_info("recv [IPCP TermReq id=%x]\n", hdr->id);
 			ppp_fsm_recv_term_req(&ipcp->fsm);
 			ppp_terminate(ipcp->ppp, 0);
 			break;
 		case TERMACK:
-			term_msg=_strndup((char*)(hdr+1),ntohs(hdr->len) - 4);
-			log_ppp_debug("recv [IPCP TermAck id=%x \"%s\"]\n",hdr->id,term_msg);
-			_free(term_msg);
+			if (conf_ppp_verbose)
+				log_ppp_info("recv [IPCP TermAck id=%x]\n", hdr->id);
 			ppp_fsm_recv_term_ack(&ipcp->fsm);
 			ppp_terminate(ipcp->ppp, 0);
 			break;
 		case CODEREJ:
-			log_ppp_debug("recv [IPCP CodeRej id=%x]\n",hdr->id);
+			if (conf_ppp_verbose)
+				log_ppp_info("recv [IPCP CodeRej id=%x]\n", hdr->id);
 			ppp_fsm_recv_code_rej_bad(&ipcp->fsm);
 			break;
 		default:
@@ -614,20 +631,21 @@ int ipcp_option_register(struct ipcp_option_handler_t *h)
 		if (p->id==h->id) 
 			return -1;*/
 	
-	list_add_tail(&h->entry,&option_handlers);
+	list_add_tail(&h->entry, &option_handlers);
 
 	return 0;
 }
 
-static struct ppp_layer_t ipcp_layer=
+static struct ppp_layer_t ipcp_layer =
 {
-	.init=ipcp_layer_init,
-	.start=ipcp_layer_start,
-	.finish=ipcp_layer_finish,
-	.free=ipcp_layer_free,
+	.init   = ipcp_layer_init,
+	.start  = ipcp_layer_start,
+	.finish = ipcp_layer_finish,
+	.free   = ipcp_layer_free,
 };
 
 static void __init ipcp_init(void)
 {
-	ppp_register_layer("ipcp",&ipcp_layer);
+	ppp_register_layer("ipcp", &ipcp_layer);
 }
+