diff options
| author | Brian Hill <cbh@theexperienceengine.com> | 2018-03-21 16:51:46 -0400 |
|---|---|---|
| committer | Brian May <brian@linuxpenguins.xyz> | 2018-03-22 07:59:10 +1100 |
| commit | 9715a1d6f253bc81f549b6a9f39b33a9c0ab5836 (patch) | |
| tree | cd9965eca66c52eebb6680eeb7c15155ee6f8a75 | |
| parent | 8bfc03b2560269aebed48bff46d4105b6605f47c (diff) | |
Preserve peer and port properly
| -rw-r--r-- | sshuttle/server.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sshuttle/server.py b/sshuttle/server.py index 4cb1e8b..a401c59 100644 --- a/sshuttle/server.py +++ b/sshuttle/server.py @@ -168,11 +168,13 @@ class DnsProxy(Handler): self.tries = 0 self.request = request self.peers = {} + self.to_ns_peer = None + self.to_ns_port = None if to_nameserver is None: self.to_nameserver = None else: - peer, port = to_nameserver.split("@") - self.to_nameserver = self._addrinfo(peer, port) + self.to_ns_peer, self.to_ns_port = to_nameserver.split("@") + self.to_nameserver = self._addrinfo(self.to_ns_peer, self.to_ns_port) self.try_send() @staticmethod @@ -190,12 +192,11 @@ class DnsProxy(Handler): if self.to_nameserver is None: _, peer = resolvconf_random_nameserver() port = 53 - family, sockaddr = self._addrinfo(peer, port) else: - _, peer = self.to_nameserver - port = 53 - family, sockaddr = self.to_nameserver + peer = self.to_ns_peer + port = int(self.to_ns_port) + family, sockaddr = self._addrinfo(peer, port) sock = socket.socket(family, socket.SOCK_DGRAM) sock.setsockopt(socket.SOL_IP, socket.IP_TTL, 42) sock.connect(sockaddr) |