Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9e15ca03
authored
Oct 29, 2013
by
Bach Dániel
Committed by
Bach Dániel
Oct 29, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
firewall: fix missing str() in host2vlan()
parent
9f9a260f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
circle/firewall/fw.py
+2
-2
circle/firewall/tasks/local_tasks.py
+2
-2
No files found.
circle/firewall/fw.py
View file @
9e15ca03
...
@@ -37,9 +37,9 @@ class Firewall:
...
@@ -37,9 +37,9 @@ class Firewall:
return
return
if
self
.
proto
==
6
and
host
.
ipv6
:
if
self
.
proto
==
6
and
host
.
ipv6
:
ipaddr
=
host
.
ipv6
+
'/112'
ipaddr
=
str
(
host
.
ipv6
)
+
'/112'
else
:
else
:
ipaddr
=
host
.
ipv4
ipaddr
=
str
(
host
.
ipv4
)
dport_sport
=
self
.
dportsport
(
rule
)
dport_sport
=
self
.
dportsport
(
rule
)
...
...
circle/firewall/tasks/local_tasks.py
View file @
9e15ca03
...
@@ -47,10 +47,10 @@ def reloadtask(type='Host'):
...
@@ -47,10 +47,10 @@ def reloadtask(type='Host'):
if
type
in
[
"Host"
,
"Record"
,
"Domain"
,
"Vlan"
]:
if
type
in
[
"Host"
,
"Record"
,
"Domain"
,
"Vlan"
]:
cache
.
add
(
"dns_lock"
,
"true"
,
30
)
cache
.
add
(
"dns_lock"
,
"true"
,
30
)
if
type
==
"Host"
:
if
type
in
[
"Host"
,
"Vlan"
]
:
cache
.
add
(
"dhcp_lock"
,
"true"
,
30
)
cache
.
add
(
"dhcp_lock"
,
"true"
,
30
)
if
type
in
[
"Host"
,
"Rule"
,
"Firewall"
]:
if
type
in
[
"Host"
,
"Rule"
,
"Firewall"
,
"Vlan"
]:
cache
.
add
(
"firewall_lock"
,
"true"
,
30
)
cache
.
add
(
"firewall_lock"
,
"true"
,
30
)
if
type
==
"Blacklist"
:
if
type
==
"Blacklist"
:
...
...
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