Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
N
nexdpi
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
sysadmin
nexdpi
Commits
2cc2ab51
Commit
2cc2ab51
authored
Apr 24, 2021
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding external json mean cope with type conversion...
parent
36705048
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
dpi
dpi
+4
-4
No files found.
dpi
View file @
2cc2ab51
...
@@ -121,9 +121,9 @@ class NexDPI():
...
@@ -121,9 +121,9 @@ class NexDPI():
ipset_list
=
Cats
[
cname
][
'ipset'
]
+
"6"
ipset_list
=
Cats
[
cname
][
'ipset'
]
+
"6"
else
:
else
:
ipset_list
=
Cats
[
cname
][
'ipset'
]
ipset_list
=
Cats
[
cname
][
'ipset'
]
if
not
aname
.
startswith
(
Cats
[
cname
][
'nostart'
])
and
not
sername
in
Cats
[
cname
][
'noapps'
]
:
if
not
aname
.
startswith
(
tuple
(
Cats
[
cname
][
'nostart'
]))
and
not
sername
in
list
(
Cats
[
cname
][
'noapps'
])
:
sh
(
"ipset test "
+
ipset_list
+
" "
+
triplet
+
" >/dev/null 2>&1 || ipset add "
+
ipset_list
+
" "
+
triplet
+
" timeout "
+
Cats
[
cname
][
'timeout'
]
+
" > /dev/null 2>&1"
)
sh
(
"ipset test "
+
ipset_list
+
" "
+
triplet
+
" >/dev/null 2>&1 || ipset add "
+
ipset_list
+
" "
+
triplet
+
" timeout "
+
Cats
[
cname
][
'timeout'
]
+
" > /dev/null 2>&1"
)
if
sername
in
Cats
[
cname
][
'knownapps'
]
:
if
sername
in
list
(
Cats
[
cname
][
'knownapps'
])
:
self
.
isknown
=
True
self
.
isknown
=
True
continue
continue
...
@@ -133,9 +133,9 @@ class NexDPI():
...
@@ -133,9 +133,9 @@ class NexDPI():
ipset_list
=
appd
[
'ipset'
]
+
"6"
ipset_list
=
appd
[
'ipset'
]
+
"6"
else
:
else
:
ipset_list
=
appd
[
'ipset'
]
ipset_list
=
appd
[
'ipset'
]
if
not
aname
.
startswith
(
appd
[
'nostart'
]
):
if
not
aname
.
startswith
(
tuple
(
appd
[
'nostart'
])
):
sh
(
"ipset test "
+
ipset_list
+
" "
+
triplet
+
" >/dev/null 2>&1 || ipset add "
+
ipset_list
+
" "
+
triplet
+
" timeout "
+
appd
[
'timeout'
]
+
" > /dev/null 2>&1"
)
sh
(
"ipset test "
+
ipset_list
+
" "
+
triplet
+
" >/dev/null 2>&1 || ipset add "
+
ipset_list
+
" "
+
triplet
+
" timeout "
+
appd
[
'timeout'
]
+
" > /dev/null 2>&1"
)
if
aname
.
startswith
(
appd
[
'knowstarts'
]
):
if
aname
.
startswith
(
tuple
(
appd
[
'knowstarts'
])
):
self
.
isknown
=
True
self
.
isknown
=
True
continue
continue
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment