From 3e61cb3f8d58f64c8023e95bf74341e6bc61560e Mon Sep 17 00:00:00 2001 From: Dmitry Kozlov Date: Wed, 22 Sep 2010 22:53:59 +0400 Subject: log: log_file rewrited to use aio log: simplified engine various bug fixes --- accel-pptpd/radius/dict/dictionary.rfc2865 | 2 +- accel-pptpd/radius/req.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'accel-pptpd/radius') diff --git a/accel-pptpd/radius/dict/dictionary.rfc2865 b/accel-pptpd/radius/dict/dictionary.rfc2865 index 3abe1b2b..7e5bf583 100644 --- a/accel-pptpd/radius/dict/dictionary.rfc2865 +++ b/accel-pptpd/radius/dict/dictionary.rfc2865 @@ -6,7 +6,7 @@ # $Id: dictionary.rfc2865,v 1.3 2005/08/10 20:59:40 aland Exp $ # ATTRIBUTE User-Name 1 string -ATTRIBUTE User-Password 2 string encrypt=1 +ATTRIBUTE User-Password 2 octets ATTRIBUTE CHAP-Password 3 octets ATTRIBUTE NAS-IP-Address 4 ipaddr ATTRIBUTE NAS-Port 5 integer diff --git a/accel-pptpd/radius/req.c b/accel-pptpd/radius/req.c index ac41f199..6b812f11 100644 --- a/accel-pptpd/radius/req.c +++ b/accel-pptpd/radius/req.c @@ -173,10 +173,11 @@ out_err: static void req_wakeup(struct rad_req_t *req) { - triton_context_wakeup(req->rpd->ppp->ctrl->ctx); + struct triton_context_t *ctx = req->rpd->ppp->ctrl->ctx; triton_timer_del(&req->timeout); triton_md_unregister_handler(&req->hnd); triton_context_unregister(&req->ctx); + triton_context_wakeup(ctx); } static int rad_req_read(struct triton_md_handler_t *h) { @@ -200,6 +201,8 @@ int rad_req_wait(struct rad_req_t *req, int timeout) req->timeout.expire = rad_req_timeout; triton_context_register(&req->ctx, req->rpd->ppp); + req->ctx.fname=__FILE__; + req->ctx.line=__LINE__; triton_md_register_handler(&req->ctx, &req->hnd); if (triton_md_enable_handler(&req->hnd, MD_MODE_READ)) return -1; -- cgit v1.2.3