gfwleak/pangu-ntc-radius-plug
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop-export-version' into 'master'

Browse Source 
Develop export version

See merge request PanGu/ntc_radius_plug!3
This commit is contained in:
刘学利
2020-11-10 11:39:11 +08:00
parent 57ab95aa62 6efe7dc77f
commit 4572abb146
6 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@@ -67,7 +67,6 @@ develop_build_release:
BUILD_TYPE: RelWithDebInfo
PACKAGE: 1
UPLOAD_RPM: 1
ASAN_OPTION: ADDRESS
TESTING_VERSION_BUILD: 1
PULP3_REPO_NAME: tsg-testing-x86_64.el7
PULP3_DIST_NAME: tsg-testing-x86_64.el7

5
ci/travis.sh
View File

@@ -37,6 +37,11 @@ if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
yum install -y $INSTALL_DEPENDENCY_LIBRARY
source /etc/profile.d/framework.sh
fi
if [ $ASAN_OPTION ];then
source /opt/rh/devtoolset-7/enable
fi
mkdir build || true
cd build

1
cmake/preInstall.sh
View File

@@ -23,4 +23,5 @@ if [[ -z `grep -rn '\[RADIUS_PLUG\]' ${DST}/${CONFILE}` ]];then
sed -i '/\[RADIUS_PLUG\]/a\COLLECT_TOPIC=RADIUS-RECORD-LOG' ${DST}/${CONFILE}
sed -i '/\[RADIUS_PLUG\]/a\BROKERLIST=127.0.0.1:9092' ${DST}/${CONFILE}
sed -i '/\[RADIUS_PLUG\]/a\DEVICE_ID=0' ${DST}/${CONFILE}
sed -i '/\[RADIUS_PLUG\]/a\PACKET_TYPE_FLAG=16' ${DST}/${CONFILE}
fi

2
cmake/preUninstall.sh
View File

@@ -8,5 +8,5 @@ if [ $1 == 0 ]; then
touch ${DST}/${CONFILE}
sed -i '/fw_mail_plug.inf/d' ${DST}/plug/conflist.inf
sed -i '/\[RADIUS_PLUG\]/,+7d' ${DST}/${CONFILE}
sed -i '/\[RADIUS_PLUG\]/,+8d' ${DST}/${CONFILE}
fi

12
src/ntc_radius_plug.cpp
View File

@@ -51,7 +51,6 @@ static int NTC_RADIUS_PLUG_VERSION_20191211=0;
const char *config_file="conf/radius/radius.conf";
g_ntc_radius_plug_t g_ntc_radius_plug;
void set_one_maat_rule(Maat_rule_t *maat_rule)
{
maat_rule->action=1;
@@ -341,6 +340,13 @@ char NTC_RADIUS_PLUG_ENTRY(stSessionInfo *session_info, void **pme, int thread_s
int payload_len=0,index=0;
char *payload=NULL;
radius_info_t *radius_info=(radius_info_t *)session_info->app_info;
if(!((g_ntc_radius_plug.interesting_type>>(radius_info->header.code))&0x1))
{
return PROT_STATE_GIVEME;
}
cJSON *radius_info_object=cJSON_CreateObject();
streamInfo2jsonObject(radius_info_object, stream);
@@ -381,7 +387,7 @@ char NTC_RADIUS_PLUG_ENTRY(stSessionInfo *session_info, void **pme, int thread_s
cJSON_Delete(radius_debug);
radius_debug = NULL;
return APP_STATE_GIVEME;
return PROT_STATE_GIVEME;
}
int NTC_RADIUS_PLUG_INIT(void)
@@ -402,6 +408,8 @@ int NTC_RADIUS_PLUG_INIT(void)
MESA_load_profile_string_def(config_file, "RADIUS_PLUG", "BROKERLIST", g_ntc_radius_plug.brokerlist, sizeof(g_ntc_radius_plug.brokerlist), "127.0.0.1:9092");
MESA_load_profile_int_def(config_file, "RADIUS_PLUG", "DEVICE_ID", &g_ntc_radius_plug.device_id, 0);
MESA_load_profile_int_def(config_file, "RADIUS_PLUG", "PACKET_TYPE_FLAG", &g_ntc_radius_plug.interesting_type, 0x10);
g_ntc_radius_plug.logger = MESA_create_runtime_log_handle(g_ntc_radius_plug.pathname, g_ntc_radius_plug.level);
if(g_ntc_radius_plug.logger == NULL)
{

1
src/ntc_radius_plug.h
View File

@@ -9,6 +9,7 @@ extern "C"
typedef struct _ntc_radius_plug
{
int interesting_type;
int level;
int service_id;
int device_id;