From d4876bd244d70a9cc6c1d5f4e4de23552c5ff4da Mon Sep 17 00:00:00 2001 From: Dmitry Kozlov Date: Fri, 8 Oct 2010 20:32:09 +0400 Subject: fixed some incorrect logging --- accel-pptpd/CMakeLists.txt | 3 --- accel-pptpd/extra/pppd_compat.c | 2 +- accel-pptpd/ppp/ppp_ccp.c | 2 +- accel-pptpd/ppp/ppp_ipcp.c | 4 ++-- accel-pptpd/ppp/ppp_lcp.c | 14 +++++++------- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/accel-pptpd/CMakeLists.txt b/accel-pptpd/CMakeLists.txt index 8242d490..b234cbaa 100644 --- a/accel-pptpd/CMakeLists.txt +++ b/accel-pptpd/CMakeLists.txt @@ -36,9 +36,6 @@ ADD_EXECUTABLE(accel-pptpd memdebug.c ) -SET( FALSE) -SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - TARGET_LINK_LIBRARIES(accel-pptpd triton rt pthread ssl crypto) set_property(TARGET accel-pptpd PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE) set_property(TARGET accel-pptpd PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) diff --git a/accel-pptpd/extra/pppd_compat.c b/accel-pptpd/extra/pppd_compat.c index 8dd35028..ad0da57c 100644 --- a/accel-pptpd/extra/pppd_compat.c +++ b/accel-pptpd/extra/pppd_compat.c @@ -218,7 +218,7 @@ static void ev_radius_coa(struct ev_radius_t *ev) sigchld_register_handler(&pd->ip_change_hnd); sigchld_unlock(); if (conf_verbose) - log_ppp_debug("pppd_compat: ip-change started (pid %i)\n", pid); + log_ppp_info("pppd_compat: ip-change started (pid %i)\n", pid); triton_context_schedule(pd->ppp->ctrl->ctx); if (!ev->res) ev->res = pd->ip_change_res; diff --git a/accel-pptpd/ppp/ppp_ccp.c b/accel-pptpd/ppp/ppp_ccp.c index 163881b3..5d779f59 100644 --- a/accel-pptpd/ppp/ppp_ccp.c +++ b/accel-pptpd/ppp/ppp_ccp.c @@ -102,7 +102,7 @@ static struct ppp_layer_data_t *ccp_layer_init(struct ppp_t *ppp) INIT_LIST_HEAD(&ccp->options); ccp_options_init(ccp); - ccp->passive = 1; + ccp->passive = 0; ccp->fsm.proto = PPP_CCP; ppp_fsm_init(&ccp->fsm); diff --git a/accel-pptpd/ppp/ppp_ipcp.c b/accel-pptpd/ppp/ppp_ipcp.c index 90e2b9c4..fecbc687 100644 --- a/accel-pptpd/ppp/ppp_ipcp.c +++ b/accel-pptpd/ppp/ppp_ipcp.c @@ -202,7 +202,7 @@ static int send_conf_req(struct ppp_fsm_t *fsm) list_for_each_entry(lopt,&ipcp->options,entry) { if (lopt->print) { log_ppp_info(" "); - lopt->h->print(log_ppp_debug, lopt, NULL); + lopt->h->print(log_ppp_info, lopt, NULL); } } log_ppp_info("]\n"); @@ -357,7 +357,7 @@ static int ipcp_recv_conf_req(struct ppp_ipcp_t *ipcp, uint8_t *data, int size) if (!ropt->lopt) { if (conf_ppp_verbose) { - log_ppp_debug(" "); + log_ppp_info(" "); print_ropt(ropt); } ropt->state = IPCP_OPT_REJ; diff --git a/accel-pptpd/ppp/ppp_lcp.c b/accel-pptpd/ppp/ppp_lcp.c index 08fd359e..6c5c2fe6 100644 --- a/accel-pptpd/ppp/ppp_lcp.c +++ b/accel-pptpd/ppp/ppp_lcp.c @@ -186,11 +186,11 @@ static void print_ropt(struct recv_opt_t *ropt) int i; uint8_t *ptr = (uint8_t*)ropt->hdr; - log_ppp_debug("<"); + 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) @@ -223,11 +223,11 @@ static int send_conf_req(struct ppp_fsm_t *fsm) log_ppp_info("send [LCP ConfReq id=%x", lcp_hdr->id); list_for_each_entry(lopt,&lcp->options,entry) { if (lopt->print) { - log_ppp_debug(" "); - lopt->h->print(log_ppp_debug, lopt, NULL); + log_ppp_info(" "); + lopt->h->print(log_ppp_info, lopt, NULL); } } - log_ppp_debug("]\n"); + log_ppp_info("]\n"); } lcp_hdr->len = htons(ptr - buf - 2); @@ -272,7 +272,7 @@ static void send_conf_nak(struct ppp_fsm_t *fsm) struct lcp_option_t *lopt; if (conf_ppp_verbose) - log_ppp_debug("send [LCP ConfNak id=%x", lcp->fsm.recv_id); + log_ppp_info("send [LCP ConfNak id=%x", lcp->fsm.recv_id); lcp_hdr->proto = htons(PPP_LCP); lcp_hdr->code = CONFNAK; @@ -286,7 +286,7 @@ static void send_conf_nak(struct ppp_fsm_t *fsm) ptr+=lopt->h->send_conf_nak(lcp,lopt,ptr); if (conf_ppp_verbose) { - log_ppp_debug(" "); + log_ppp_info(" "); lopt->h->print(log_ppp_info, lopt, NULL); } } -- cgit v1.2.3