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.

Sign up for GitHub

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

Jump to bottom

Alter codification for utf-8 in file server.py line 69 to solve issue #93 #41

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

Alter codification for utf-8 in file server.py line 69 to solve issue #93 #41

wants to merge 92 commits into from

Commits on May 12, 2011

  1. Initial version. Add tproxy support. Also see 

    http://groups.google.com/group/sshuttle/browse_thread/thread/e54d0916b79c1e4b.
    @brianmay
    brianmay committed May 12, 2011
    Configuration menu
    Copy the full SHA
    31534ba View commit details
    Browse the repository at this point in the history

Commits on May 18, 2011

  1. Support IPv4 and IPv6 at same time.

    @brianmay
    brianmay committed May 18, 2011
    Configuration menu
    Copy the full SHA
    2b68ea6 View commit details
    Browse the repository at this point in the history

  2. iptables table name varies depending on nat or tproxy, not ipv4 or ipv6.

    @brianmay
    brianmay committed May 18, 2011
    Configuration menu
    Copy the full SHA
    0ffbb9d View commit details
    Browse the repository at this point in the history

  3. Got table name wrong in previous commit.

    @brianmay
    brianmay committed May 18, 2011
    Configuration menu
    Copy the full SHA
    eadfaa8 View commit details
    Browse the repository at this point in the history

  4. Fix islocal function, now works with IPv6.

    @brianmay
    brianmay committed May 18, 2011
    Configuration menu
    Copy the full SHA
    6a4b9ec View commit details
    Browse the repository at this point in the history

  5. Fix firewall cleanup.

    @brianmay
    brianmay committed May 18, 2011
    Configuration menu
    Copy the full SHA
    39bdff0 View commit details
    Browse the repository at this point in the history

  6. Fix sorting. Excluded routes must be processed first.

    @brianmay
    brianmay committed May 18, 2011
    Configuration menu
    Copy the full SHA
    fd58960 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2011

  1. Fix IPv4 only test.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    ae552bf View commit details
    Browse the repository at this point in the history

  2. Fix stupid typo introduced by 2b68ea6.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    10247a0 View commit details
    Browse the repository at this point in the history

  3. New function to guess address family from IP address.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    edabb92 View commit details
    Browse the repository at this point in the history

  4. Fix error in DNS processing.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    86d7131 View commit details
    Browse the repository at this point in the history

  5. Fix handling of IPv4/IPv6 DNS servers.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    cccce91 View commit details
    Browse the repository at this point in the history

  6. Prepare for UDP handling. DNS port unlinked from redirector port.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    63cc20e View commit details
    Browse the repository at this point in the history

  7. Another DNS bug fixed.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    c2fd92e View commit details
    Browse the repository at this point in the history

  8. Change subnet sort order to how it was previously.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    6d276ab View commit details
    Browse the repository at this point in the history

  9. Revert brain dead function rename introduced in 

    39bdff0.
    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    9960110 View commit details
    Browse the repository at this point in the history

  10. Change order of parameters to make consistant with other functions.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    b6e6911 View commit details
    Browse the repository at this point in the history

  11. Process packets from external interfaces correctly with tproxy.

    @brianmay
    brianmay committed May 19, 2011
    Configuration menu
    Copy the full SHA
    acce884 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2011

  1. Listen on localhost only, by default.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    c90b58f View commit details
    Browse the repository at this point in the history

  2. Fix various ipv4/ipv6 issues.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    6d41830 View commit details
    Browse the repository at this point in the history

  3. Fix IPv6 address detection.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    f1b6185 View commit details
    Browse the repository at this point in the history

  4. Fix port detection.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    32d5b5c View commit details
    Browse the repository at this point in the history

  5. Change order of bind parameters for consistancy. IPv6 comes first.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    0489be5 View commit details
    Browse the repository at this point in the history

  6. Use ports, if any specified on command line. Don't assume IPv6 port 

    and IPv4 are the same.
    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    72bc745 View commit details
    Browse the repository at this point in the history

  7. Move code to expire connections into seperate function.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    d1f4a47 View commit details
    Browse the repository at this point in the history

  8. Minor changes in preparation for UDP support.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    c0e9f96 View commit details
    Browse the repository at this point in the history

  9. Seems silly converting native to network byte ordering and back again… 

    …. Fixed.
    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    0cb65df View commit details
    Browse the repository at this point in the history

  10. Delete mux channel after DNS timeout or response received.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    f8d536c View commit details
    Browse the repository at this point in the history

  11. No point listening on IPv6 port if not using tproxy.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    58cebf1 View commit details
    Browse the repository at this point in the history

  12. Explicit close of DNS port after timeout period.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    aba8147 View commit details
    Browse the repository at this point in the history

  13. Add FIXME commment.

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    8bedb24 View commit details
    Browse the repository at this point in the history

  14. TProxy UDP support. Requires PyXAPI for recvmsg().

    @brianmay
    brianmay committed May 21, 2011
    Configuration menu
    Copy the full SHA
    07219cb View commit details
    Browse the repository at this point in the history

Commits on May 22, 2011

  1. Fix IPv6 over UDP.

    @brianmay
    brianmay committed May 22, 2011
    Configuration menu
    Copy the full SHA
    c82147a View commit details
    Browse the repository at this point in the history

  2. Whoops. This change shouldn't have got through here.

    @brianmay
    brianmay committed May 22, 2011
    Configuration menu
    Copy the full SHA
    46d26d0 View commit details
    Browse the repository at this point in the history

  3. Don't guess the address family for TCP connections, pass it through.

    @brianmay
    brianmay committed May 22, 2011
    Configuration menu
    Copy the full SHA
    d881ed3 View commit details
    Browse the repository at this point in the history

  4. Make it clear same commands are TCP specific.

    @brianmay
    brianmay committed May 22, 2011
    Configuration menu
    Copy the full SHA
    ad57904 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'tproxy' into tproxy_udp

    @brianmay
    brianmay committed May 22, 2011
    Configuration menu
    Copy the full SHA
    9a4ff32 View commit details
    Browse the repository at this point in the history

  6. Redo this required change.

    @brianmay
    brianmay committed May 22, 2011
    Configuration menu
    Copy the full SHA
    1064f09 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2011

  1. Improved DNS debugging.

    @brianmay
    brianmay committed May 23, 2011
    Configuration menu
    Copy the full SHA
    f092e5e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'tproxy' into tproxy_udp 

    Conflicts:
	client.py
    @brianmay
    brianmay committed May 23, 2011
    Configuration menu
    Copy the full SHA
    738f941 View commit details
    Browse the repository at this point in the history

  3. Change debug messages.

    @brianmay
    brianmay committed May 23, 2011
    Configuration menu
    Copy the full SHA
    d730a5d View commit details
    Browse the repository at this point in the history

Commits on May 24, 2011

  1. Make UDP support optional.

    @brianmay
    brianmay committed May 24, 2011
    Configuration menu
    Copy the full SHA
    f9d7f40 View commit details
    Browse the repository at this point in the history

  2. Various random and obscure issues resolved.

    @brianmay
    brianmay committed May 24, 2011
    Configuration menu
    Copy the full SHA
    316301c View commit details
    Browse the repository at this point in the history

  3. Fix debugging.

    @brianmay
    brianmay committed May 24, 2011
    Configuration menu
    Copy the full SHA
    42bfa96 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2011

  1. Remove redundant family check.

    @brianmay
    brianmay committed May 25, 2011
    Configuration menu
    Copy the full SHA
    a88784e View commit details
    Browse the repository at this point in the history

  2. Fix broken parameter.

    @brianmay
    brianmay committed May 25, 2011
    Configuration menu
    Copy the full SHA
    0a6ebf8 View commit details
    Browse the repository at this point in the history

  3. Fix typos.

    @brianmay
    brianmay committed May 25, 2011
    Configuration menu
    Copy the full SHA
    655e6fe View commit details
    Browse the repository at this point in the history

Commits on May 31, 2011

  1. Merge in upstream changes.

    @brianmay
    brianmay committed May 31, 2011
    Configuration menu
    Copy the full SHA
    8754b81 View commit details
    Browse the repository at this point in the history

  2. Merge in upstream ad57904. 

    ssnet.py: deal with a possible connect/getsockopt(SO_ERROR) race.

Seems to affect Linux servers.  Ed Maste says the patch fixes it for him.
    @brianmay
    brianmay committed May 31, 2011
    Configuration menu
    Copy the full SHA
    1530624 View commit details
    Browse the repository at this point in the history

  3. Make variable name more consistant.

    @brianmay
    brianmay committed May 31, 2011
    Configuration menu
    Copy the full SHA
    a05e6d7 View commit details
    Browse the repository at this point in the history

  4. Pass mux to expires(...) function.

    @brianmay
    brianmay committed May 31, 2011
    Configuration menu
    Copy the full SHA
    466ecd9 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2011

  1. Test for wrong error value fixed.

    @brianmay
    brianmay committed Jun 6, 2011
    Configuration menu
    Copy the full SHA
    8de452c View commit details
    Browse the repository at this point in the history

  2. Cosmetic improvements.

    @brianmay
    brianmay committed Jun 6, 2011
    Configuration menu
    Copy the full SHA
    f073566 View commit details
    Browse the repository at this point in the history

  3. Add address family to automatically detected routes.

    @brianmay
    brianmay committed Jun 6, 2011
    Configuration menu
    Copy the full SHA
    cadf253 View commit details
    Browse the repository at this point in the history

  4. This was changed in 29d1fab, 

    but I don't understand why.
    @brianmay
    brianmay committed Jun 6, 2011
    Configuration menu
    Copy the full SHA
    a3dec98 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2011

  1. Make recvmsg work with different recvmsg libraries.

    @brianmay
    brianmay committed Jun 7, 2011
    Configuration menu
    Copy the full SHA
    ce5cfeb View commit details
    Browse the repository at this point in the history

  2. Pass 1 as parameter, not True. How did this ever work?

    @brianmay
    brianmay committed Jun 7, 2011
    Configuration menu
    Copy the full SHA
    cb761cf View commit details
    Browse the repository at this point in the history

  3. Variable name was wrong.

    @brianmay
    brianmay committed Jun 7, 2011
    Configuration menu
    Copy the full SHA
    ab74d91 View commit details
    Browse the repository at this point in the history

  4. Previous change to recvmsg made family go out of scope. Fixed.

    @brianmay
    brianmay committed Jun 7, 2011
    Configuration menu
    Copy the full SHA
    4ef5af5 View commit details
    Browse the repository at this point in the history

  5. We don't want to bind to the same port as the UDP listener. Really.

    @brianmay
    brianmay committed Jun 7, 2011
    Configuration menu
    Copy the full SHA
    0c75c60 View commit details
    Browse the repository at this point in the history

  6. Fix errno. Was fixed above, but not here.

    @brianmay
    brianmay committed Jun 7, 2011
    Configuration menu
    Copy the full SHA
    e4dc442 View commit details
    Browse the repository at this point in the history

  7. Improve debugging.

    @brianmay
    brianmay committed Jun 7, 2011
    Configuration menu
    Copy the full SHA
    0316c53 View commit details
    Browse the repository at this point in the history

  8. Closing of connections has to happen in main function.

    @brianmay
    brianmay committed Jun 7, 2011
    Configuration menu
    Copy the full SHA
    94cadd9 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2011

  1. Adjust whitespace.

    @brianmay
    brianmay committed Jun 9, 2011
    Configuration menu
    Copy the full SHA
    0068643 View commit details
    Browse the repository at this point in the history

  2. Make DNS work with tproxy.

    @brianmay
    brianmay committed Jun 9, 2011
    Configuration menu
    Copy the full SHA
    a4c5498 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2011

  1. Rename independent_listener to MultiListener.

    @brianmay
    brianmay committed Jun 16, 2011
    Configuration menu
    Copy the full SHA
    4693039 View commit details
    Browse the repository at this point in the history

  2. Fix style issues.

    @brianmay
    brianmay committed Jun 16, 2011
    Configuration menu
    Copy the full SHA
    f8de19d View commit details
    Browse the repository at this point in the history

  3. Rename parameter.

    @brianmay
    brianmay committed Jun 16, 2011
    Configuration menu
    Copy the full SHA
    2822b32 View commit details
    Browse the repository at this point in the history

  4. Merge in upstream suggestions.

    @brianmay
    brianmay committed Jun 16, 2011
    Configuration menu
    Copy the full SHA
    2e5e65a View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2011

  1. Fix typo.

    @brianmay
    brianmay committed Jun 20, 2011
    Configuration menu
    Copy the full SHA
    1c365b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2011

  1. Fix tproxy error.

    @brianmay
    brianmay committed Jun 24, 2011
    Configuration menu
    Copy the full SHA
    014ca7e View commit details
    Browse the repository at this point in the history

  2. Have firewall work out method used.

    @brianmay
    brianmay committed Jun 24, 2011
    Configuration menu
    Copy the full SHA
    9061aa3 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2011

  1. Cosmetic changes. 

    Use Exception instead of Fatal for errors that should never happen.
    @brianmay
    brianmay committed Jul 5, 2011
    Configuration menu
    Copy the full SHA
    b689e98 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2011

  1. Mostly cosmetic changes.

    @brianmay
    brianmay committed Jul 11, 2011
    Configuration menu
    Copy the full SHA
    89dcedf View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2011

  1. Fix UDP bugs.

    @brianmay
    brianmay committed Jul 19, 2011
    Configuration menu
    Copy the full SHA
    ca6e4d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2011

  1. Warn instead of crashing if any socket errors sending data.

    @brianmay
    brianmay committed Jul 28, 2011
    Configuration menu
    Copy the full SHA
    f8fe679 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2011

  1. Move towards IPv6 DNS support.

    @brianmay
    brianmay committed Aug 26, 2011
    Configuration menu
    Copy the full SHA
    8b159a5 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2012

  1. Fixed a bug where lack of IPv6 destination = fatal 

    There was a problem where trying to bind .v4 and .v6 listeners would set them
to None if there was nothing to bind (if, say, you weren't binding an IPv6
listener).  Later, the code then would try to call a member function of the
listener.  The member function would not do anything if there was no listener,
but trying to dereference None yielded the broken behavior.
    @jwyllie83
    jwyllie83 committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    7333723 View commit details
    Browse the repository at this point in the history

  2. Mass relocation of files to their own subdirectory

    @jwyllie83
    jwyllie83 committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    ca727a3 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2013

  1. Moved docs out of the src directory

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    32ea23e View commit details
    Browse the repository at this point in the history

  2. First version; still has debugging

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    e4aa4ef View commit details
    Browse the repository at this point in the history

  3. Added -s to accept subnets from a config file

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    7b0448b View commit details
    Browse the repository at this point in the history

  4. Adding more robust exit codes

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    0b1d403 View commit details
    Browse the repository at this point in the history

  5. Added the PyXAPI requirement to the readme

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    ac18009 View commit details
    Browse the repository at this point in the history

  6. Changed the file to be more "canonical"

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    ce5c3a3 View commit details
    Browse the repository at this point in the history

  7. Changed the sshuttle binary to point to install

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    5fa881f View commit details
    Browse the repository at this point in the history

  8. Sample tunnel configuration

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    901db36 View commit details
    Browse the repository at this point in the history

  9. Added a sample prefixes file

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    d390c99 View commit details
    Browse the repository at this point in the history

  10. Added a control file for the Debian package

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    e518238 View commit details
    Browse the repository at this point in the history

  11. Added a shell script to make a .deb package

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    4519307 View commit details
    Browse the repository at this point in the history

  12. Added some requirements

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    e32a4ef View commit details
    Browse the repository at this point in the history

  13. Added some Ubuntu notes

    @jwyllie83
    jwyllie83 committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    b3009b8 View commit details
    Browse the repository at this point in the history