Merge 03f133be43 into 04925d8004

Merge pull request #601 from deavmi/patch-2
Allow binding to IPv6 (if present)
2024-11-21 21:20:17 +00:00 · 2024-11-20 10:59:48 -03:00 · 2024-11-20 14:28:46 +01:00 · 2024-11-20 14:28:34 +01:00 · 2024-11-04 13:25:55 +02:00 · 2024-11-04 13:25:46 +02:00
1 changed files with 8 additions and 1 deletions
--- a/RNS/Interfaces/TCPInterface.py
+++ b/RNS/Interfaces/TCPInterface.py
@ -200,7 +200,9 @@ class TCPClientInterface(Interface):
            if initial:
                RNS.log("Establishing TCP connection for "+str(self)+"...", RNS.LOG_DEBUG)

-            self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            addrInfo=socket.getaddrinfo(self.target_ip, self.target_port)
+            addrFam=addrInfo[0]
+            self.socket = socket.socket(addrFam, socket.SOCK_STREAM)
            self.socket.settimeout(TCPClientInterface.INITIAL_CONNECT_TIMEOUT)
            self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
            self.socket.connect((self.target_ip, self.target_port))
@ -412,6 +414,11 @@ class TCPServerInterface(Interface):
    def get_address_for_if(name):
        import RNS.vendor.ifaddr.niwrapper as netinfo
        ifaddr = netinfo.ifaddresses(name)
+
+        # IPv6 preference (if present)
+        if(netinfo.AF_INET6 in ifaddr):
+            return ifaddr[netinfo.AF_INET6][0]["addr"]
+        
        return ifaddr[netinfo.AF_INET][0]["addr"]

    @staticmethod
Author	SHA1	Message	Date
jacobeva	8be98dd5e7	Merge `03f133be43` into `04925d8004`	2024-11-20 10:59:48 -03:00
markqvist	04925d8004	Merge pull request #601 from deavmi/patch-2 Allow binding to IPv6 (if present)	2024-11-20 14:28:46 +01:00
markqvist	4284084fef	Merge pull request #600 from deavmi/patch-1 Determine AF FAMILY from getaddrinfo BEFORE socket ctor	2024-11-20 14:28:34 +01:00
Tristan B. Velloza Kildaire	63ad2afe3f	Reapply "Allow binding to IPv6 (if present)" This reverts commit `61712d322a`.	2024-11-04 13:25:55 +02:00
Tristan B. Velloza Kildaire	61712d322a	Revert "Allow binding to IPv6 (if present)" This reverts commit `f55004a574`.	2024-11-04 13:25:46 +02:00
Tristan B. Velloza Kildaire	3599066356	Revert "Test" This reverts commit `18c2a38b97`.	2024-11-04 13:05:27 +02:00
Tristan B. Velloza Kildaire	18c2a38b97	Test	2024-11-04 13:02:45 +02:00
Tristan B. Velloza Kildaire	f55004a574	Allow binding to IPv6 (if present) If an interface has an IPv6 address record associated with it then, and only then, prefer that. Otherwise AF_INET is used (Ipv4 address)	2024-11-03 17:54:59 +02:00
Tristan B. Velloza Kildaire	1768ddc459	Determine AF FAMILY from getaddrinfo BEFORE socket ctor Before we call the `socket.socket(...)` constructor function, let us first provide `self.target_ip` and `self.target_port` to `socket.getaddrinfo(...)` (static function) and then get the AF family from it. Then we pass this into the ctor	2024-11-03 14:37:28 +02:00