Ignore:
Timestamp:
2011-06-16T21:59:06Z (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/skype/skyped.py

    r370899f rbf8ee39  
    180180def server(host, port, skype = None):
    181181        global options
    182         sock = socket.socket()
     182        if ":" in host:
     183                sock = socket.socket(socket.AF_INET6)
     184        else:
     185                sock = socket.socket()
    183186        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
    184187        sock.bind((host, port))
     
    360363        -d      --debug         enable debug messages
    361364        -h      --help          this help
    362         -H      --host          set the tcp host (default: %s)
     365        -H      --host          set the tcp host, supports IPv4 and IPv6 (default: %s)
    363366        -l      --log           set the log file in background mode (default: none)
    364367        -n      --nofork        don't run as daemon in the background
Note: See TracChangeset for help on using the changeset viewer.