diff options
| author | Vladislav Grishenko <themiron@mail.ru> | 2018-06-03 04:23:59 +0500 |
|---|---|---|
| committer | Vladislav Grishenko <themiron@mail.ru> | 2018-06-03 04:23:59 +0500 |
| commit | 0d454ad7102506ecd12a36239f6604f7e4b57aae (patch) | |
| tree | d76d1a8df4e5be205c1fbc3ee432fca4652ddebd /accel-pppd | |
| parent | 3b5a479a573f27a1efddb01351d61d142bb46a11 (diff) | |
| download | accel-ppp-0d454ad7102506ecd12a36239f6604f7e4b57aae.tar.gz accel-ppp-0d454ad7102506ecd12a36239f6604f7e4b57aae.zip | |
sstp: add snmp support
Diffstat (limited to 'accel-pppd')
| -rw-r--r-- | accel-pppd/ctrl/sstp/sstp.c | 6 | ||||
| -rw-r--r-- | accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt | 28 | ||||
| -rw-r--r-- | accel-pppd/extra/net-snmp/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | accel-pppd/extra/net-snmp/agent.c | 2 | ||||
| -rw-r--r-- | accel-pppd/extra/net-snmp/sessionTable_enums.h | 1 |
5 files changed, 35 insertions, 3 deletions
diff --git a/accel-pppd/ctrl/sstp/sstp.c b/accel-pppd/ctrl/sstp/sstp.c index cfebf4f..3f3f48c 100644 --- a/accel-pppd/ctrl/sstp/sstp.c +++ b/accel-pppd/ctrl/sstp/sstp.c @@ -2409,6 +2409,12 @@ static int show_stat_exec(const char *cmd, char * const *fields, int fields_cnt, return CLI_CMD_OK; } +void __export sstp_get_stat(unsigned int **starting, unsigned int **active) +{ + *starting = &stat_starting; + *active = &stat_active; +} + static void load_config(void) { int ipmode; diff --git a/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt b/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt index b536a9b..e175771 100644 --- a/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt +++ b/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt @@ -34,7 +34,8 @@ statPPTP OBJECT IDENTIFIER ::= { accelPPPStat 3 } statL2TP OBJECT IDENTIFIER ::= { accelPPPStat 4 } statPPPOE OBJECT IDENTIFIER ::= { accelPPPStat 5 } statIPOE OBJECT IDENTIFIER ::= { accelPPPStat 6 } ---statRadius OBJECT IDENTIFIER ::= { accelPPPStat 6 } +statSSTP OBJECT IDENTIFIER ::= { accelPPPStat 7 } +--statRadius OBJECT IDENTIFIER ::= { accelPPPStat 8 } statCoreUpTime OBJECT-TYPE @@ -177,6 +178,26 @@ statIPOEActive OBJECT-TYPE "count of active connections" ::= { statIPOE 2 } +-- +-- SSTP stats +-- + +statSSTPStarting OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "count of connections which are + in starting phase" + ::= { statSSTP 1 } + +statSSTPActive OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "count of active connections" + ::= { statSSTP 2 } -- -- PPP session table @@ -252,8 +273,9 @@ sesType OBJECT-TYPE SYNTAX INTEGER { pptp(1), l2tp(2), - pppoe(3) - ipoe(4) + pppoe(3), + ipoe(4), + sstp(6) } MAX-ACCESS read-only STATUS current diff --git a/accel-pppd/extra/net-snmp/CMakeLists.txt b/accel-pppd/extra/net-snmp/CMakeLists.txt index 5feaec6..737f0b2 100644 --- a/accel-pppd/extra/net-snmp/CMakeLists.txt +++ b/accel-pppd/extra/net-snmp/CMakeLists.txt @@ -11,6 +11,7 @@ SET(sources statPPPOE.c statPPTP.c statIPOE.c + statSSTP.c terminate.c shutdown.c exec_cli.c diff --git a/accel-pppd/extra/net-snmp/agent.c b/accel-pppd/extra/net-snmp/agent.c index 162cdbc..4cc04c1 100644 --- a/accel-pppd/extra/net-snmp/agent.c +++ b/accel-pppd/extra/net-snmp/agent.c @@ -17,6 +17,7 @@ #include "statL2TP.h" #include "statPPPOE.h" #include "statIPOE.h" +#include "statSSTP.h" #include "terminate.h" #include "shutdown.h" #include "sessionTable.h" @@ -108,6 +109,7 @@ static void *snmp_thread(void *a) init_statL2TP(); init_statPPPOE(); init_statIPOE(); + init_statSSTP(); init_terminate(); init_shutdown(); init_sessionTable(); diff --git a/accel-pppd/extra/net-snmp/sessionTable_enums.h b/accel-pppd/extra/net-snmp/sessionTable_enums.h index 74268ee..fff47fe 100644 --- a/accel-pppd/extra/net-snmp/sessionTable_enums.h +++ b/accel-pppd/extra/net-snmp/sessionTable_enums.h @@ -45,6 +45,7 @@ extern "C" { #define SESTYPE_L2TP 2 #define SESTYPE_PPPOE 3 #define SESTYPE_IPOE 4 +#define SESTYPE_SSTP 6 #endif /* SESTYPE_ENUMS */ |