Partial fix for problem in SF buf #487458

Rev 1.20 introduced a call to getpeername() in the dispatcher
constructor.  This only works for a connected socket.  Apparently
earlier versions of the code worked with un-connected sockets, e.g. a
listening socket.

It's not clear that the code is supposed to accept these sockets,
because it sets self.connected = 1 when passed a socket.  But it's
also not clear that it should be a fatal error to pass a listening
socket.

The solution, for now, is to put a try/except around the getpeername()
call and continue if it fails.  The self.addr attribute is used
primarily (only?) to produce a nice repr for the object, so it hardly
matters.  If there is a real error on a connected socket, it's likely
that subsequent calls will fail too.
This commit is contained in:
Jeremy Hylton 2001-12-14 16:15:11 +00:00
parent 81feb6c201
commit 2a05bc72d6
1 changed files with 7 additions and 1 deletions

View File

@ -212,7 +212,13 @@ class dispatcher:
# I think it should inherit this anyway
self.socket.setblocking (0)
self.connected = 1
self.addr = sock.getpeername()
# XXX Does the constructor require that the socket passed
# be connected?
try:
self.addr = sock.getpeername()
except socket.error:
# The addr isn't crucial
pass
else:
self.socket = None