Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sshuttle
Project
Project
Details
Activity
Releases
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pub
sshuttle
Commits
50a6e872
Commit
50a6e872
authored
Dec 05, 2015
by
Brian May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use Xtoken if not set
parent
ed0a92e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
pf.py
sshuttle/methods/pf.py
+3
-2
No files found.
sshuttle/methods/pf.py
View file @
50a6e872
...
@@ -24,7 +24,7 @@ def pfctl(args, stdin=None):
...
@@ -24,7 +24,7 @@ def pfctl(args, stdin=None):
return
o
return
o
_pf_context
=
{
'started_by_sshuttle'
:
False
,
'Xtoken'
:
''
}
_pf_context
=
{
'started_by_sshuttle'
:
False
,
'Xtoken'
:
None
}
# This are some classes and functions used to support pf in yosemite.
# This are some classes and functions used to support pf in yosemite.
...
@@ -227,7 +227,8 @@ class Method(BaseMethod):
...
@@ -227,7 +227,8 @@ class Method(BaseMethod):
else
:
else
:
pfctl
(
'-a sshuttle -F all'
)
pfctl
(
'-a sshuttle -F all'
)
if
sys
.
platform
==
"darwin"
:
if
sys
.
platform
==
"darwin"
:
pfctl
(
'-X
%
s'
%
_pf_context
[
'Xtoken'
])
if
_pf_context
[
'Xtoken'
]
is
not
None
:
pfctl
(
'-X
%
s'
%
_pf_context
[
'Xtoken'
])
elif
_pf_context
[
'started_by_sshuttle'
]:
elif
_pf_context
[
'started_by_sshuttle'
]:
pfctl
(
'-d'
)
pfctl
(
'-d'
)
...
...
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