summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kozlov <xeb@mail.ru>2010-12-23 01:31:36 +0300
committerDmitry Kozlov <xeb@mail.ru>2010-12-23 01:31:36 +0300
commita4c8dd27efa38c5e0a5be2e067e02ebfe207629a (patch)
tree601d29c6ed44246bc9db760dd1e4c238e66bedc4
parent5d87e39182189250bfa035f0ae9a48c94fe74903 (diff)
downloadaccel-ppp-a4c8dd27efa38c5e0a5be2e067e02ebfe207629a.tar.gz
accel-ppp-a4c8dd27efa38c5e0a5be2e067e02ebfe207629a.zip
ppp,radius,cli: set Acct-Terminate-Cause=NAS-Request for sessions terminated by cli
-rw-r--r--accel-pptpd/cli/std_cmd.c4
-rw-r--r--accel-pptpd/ppp/ppp.h3
-rw-r--r--accel-pptpd/radius/acct.c3
3 files changed, 7 insertions, 3 deletions
diff --git a/accel-pptpd/cli/std_cmd.c b/accel-pptpd/cli/std_cmd.c
index f7e4b65c..58fd76b3 100644
--- a/accel-pptpd/cli/std_cmd.c
+++ b/accel-pptpd/cli/std_cmd.c
@@ -238,12 +238,12 @@ static void show_ses_help(char * const *fields, int fields_cnt, void *client)
static void ppp_terminate_soft(struct ppp_t *ppp)
{
- ppp_terminate(ppp, TERM_ADMIN_RESET, 0);
+ ppp_terminate(ppp, TERM_NAS_REQUEST, 0);
}
static void ppp_terminate_hard(struct ppp_t *ppp)
{
- ppp_terminate(ppp, TERM_ADMIN_RESET, 1);
+ ppp_terminate(ppp, TERM_NAS_REQUEST, 1);
}
static void terminate_help(char * const *fields, int fields_cnt, void *client);
diff --git a/accel-pptpd/ppp/ppp.h b/accel-pptpd/ppp/ppp.h
index d7f98160..38e07074 100644
--- a/accel-pptpd/ppp/ppp.h
+++ b/accel-pptpd/ppp/ppp.h
@@ -51,7 +51,8 @@
#define TERM_ADMIN_RESET 3
#define TERM_USER_ERROR 4
#define TERM_NAS_ERROR 5
-#define TERM_AUTH_ERROR 6
+#define TERM_NAS_REQUEST 6
+#define TERM_AUTH_ERROR 7
struct ppp_t;
diff --git a/accel-pptpd/radius/acct.c b/accel-pptpd/radius/acct.c
index 06c17447..9d951e4e 100644
--- a/accel-pptpd/radius/acct.c
+++ b/accel-pptpd/radius/acct.c
@@ -271,6 +271,9 @@ void rad_acct_stop(struct radius_pd_t *rpd)
case TERM_NAS_ERROR:
rad_packet_add_val(rpd->acct_req->pack, "Acct-Terminate-Cause", "NAS-Error");
break;
+ case TERM_NAS_REQUEST:
+ rad_packet_add_val(rpd->acct_req->pack, "Acct-Terminate-Cause", "NAS-Request");
+ break;
}
rad_packet_change_val(rpd->acct_req->pack, "Acct-Status-Type", "Stop");
req_set_stat(rpd->acct_req, rpd->ppp);