Changeset 9ce44dd

Timestamp:

2012-04-22T21:48:09Z (13 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

3c88759

Parents:

e93fa05

Message:

skyped: set FD_CLOEXEC on listening socket

Skype4Py uses os.execlp() to spawn skype if it is not yet started, this leaks
our listening FD to skype process and can't get it back even if we ourself exit
meanwhile.

and we can't startup again:
error: [Errno 98] Address already in use

Patch-by: Elan Ruusamäe <glen@…>

File:

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

protocols/skype/skyped.py

@@ -32 +32 @@
 from ConfigParser import ConfigParser, NoOptionError
 from traceback import print_exception
+from fcntl import fcntl, F_SETFD, FD_CLOEXEC
 import ssl
 
@@ -185 +186 @@
                 sock = socket.socket()
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        fcntl(sock, F_SETFD, FD_CLOEXEC);
         sock.bind((host, port))
         sock.listen(1)
+
         if hasgobject:
                 gobject.io_add_watch(sock, gobject.IO_IN, listener)