Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply fix from the google group thread to get up and running on Mac OS 10.9 #32

Open
wants to merge 22 commits into
base: master
Choose a base branch
from

Conversation

imhuntingwabbits
Copy link

.../GdX-zk95iOwJ

apenwarr and others added 22 commits January 2, 2012 18:19
I guess we were causing the kernel to syslog on every single packet on
MacOS.  Oops.
If the subprocess was trying to write to its stdout/stderr, its process
would never actually finish because it was blocked waiting for us to read
it, but we were blocked on waitpid().  Instead, use waitpid(WNOHANG) and
continually read from the subprocess (which should be a blocking operation)
until it exits.
Not sure if this will fix anything, but it might stop the problem reported
on some MacOS versions where the firewall doesn't get cleaned up correctly.
(apenwarr: also updates to the matching, latest minimal/do)
This makes it easier (possible?) to generate sshuttle.8 from sshuttle.md on
MacOS.  We also import the git-enhanced version numbering magic so the
generated manpage can have a real version number.
Now that we imported the feature from redo, might as well use it.
On top of the bug that already existed in 10.6, Lion also makes the sysctl
needed to fix the problem into a read-only variable, so we have to actually
change it at kernel boot time and force people to reboot.  Nice job, Apple.
And make sshuttle exit with a well-defined exit code (111) if it needs to
reboot.
If the expected arch directory doesn't exist, give up and don't specify arch at
all. Currently it expands to '*' which fails.

[slightly modified by apenwarr]
Add some documentation about the int() vs long() and the reason behind
_shl().  Instead of "from __future__ import generators", just don't use
generators.
There were still a few conditions under some OSes that would cause
firewall.py to terminate without cleaning up the firewall settings.  'pkill
sshuttle' was one of them.  Ignore a couple more signals to further ensure a
correct cleanup.

(This only affects sshuttle --firewall, which is a subprocess of the main
sshuttle process.  The firewall is supposed to exit automatically whenever
the client exits, and so far that part seems to work reliably.)
(Slightly modified by apenwarr)
I've been meaning to add this patch for a long time, but it's especially
important once we add FQDN support to --auto-hosts.  Basically, auto-hosts
will still discover all the hostnames it can, but we'll only add them to
/etc/hosts if their IP address is in one of the routed subnet ranges.  That
prevents polluting the /etc/hosts file with cruft.
(slightly modified by apenwarr)
* fqdn:
  hostwatch: handle fully qualified domain names
  auto-hosts: don't add hosts that aren't being routed by sshuttle.
@thshdw
Copy link

thshdw commented Jan 14, 2014

If the fix your referencing is http://www.macstadium.com/blog/osx-10-9-mavericks-bugs/ this is something you would have to manually modify on your system, or wait until it gets patched by apple.

@imhuntingwabbits
Copy link
Author

Nope, that's a different issue.

Hasimir added a commit to Hasimir/sshuttle that referenced this pull request Jun 24, 2015
* Merging pull request apenwarr#32.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants