Changeset bf8ee39 for protocols/skype/skyped.py

Timestamp:

2011-06-16T21:59:06Z (13 years ago)

Author:

unknown <vmiklos@…>

Branches:

master

Children:

2ff0f37

Parents:

370899f (diff), 05d964c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge IPv6 and groupchat fixes from hrubi.

File:

• protocols/skype/skyped.py (modified) (2 diffs)

protocols/skype/skyped.py

@@ -180 +180 @@
 def server(host, port, skype = None):
         global options
-        sock = socket.socket()
+        if ":" in host:
+                sock = socket.socket(socket.AF_INET6)
+        else:
+                sock = socket.socket()
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((host, port))
@@ -360 +363 @@
         -d      --debug         enable debug messages
         -h      --help          this help
-        -H      --host          set the tcp host (default: %s)
+        -H      --host          set the tcp host, supports IPv4 and IPv6 (default: %s)
         -l      --log           set the log file in background mode (default: none)
         -n      --nofork        don't run as daemon in the background