Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Defensive programming around fetching the CS port

Browse Source
This commit is contained in:
Charles Haley 2012-09-20 11:36:44 +02:00
parent 482d360024
commit c9e4eb68cd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/devices/smart_device_app/driver.py
View File

@ -99,10 +99,15 @@ class ConnectionListener (Thread):
try: try:
packet = self.driver.broadcast_socket.recvfrom(100) packet = self.driver.broadcast_socket.recvfrom(100)
remote = packet[1] remote = packet[1]
content_server_port = ConfigProxy(content_server_config())['port'] content_server_port = b'';
try :
content_server_port = \
str(ConfigProxy(content_server_config())['port'])
except:
pass
message = str(self.driver.ZEROCONF_CLIENT_STRING + b' (on ' + message = str(self.driver.ZEROCONF_CLIENT_STRING + b' (on ' +
str(socket.gethostname().partition('.')[0]) + str(socket.gethostname().partition('.')[0]) +
b');' + str(content_server_port) + b');' + content_server_port +
b',' + str(self.driver.port)) b',' + str(self.driver.port))
self.driver._debug('received broadcast', packet, message) self.driver._debug('received broadcast', packet, message)
self.driver.broadcast_socket.sendto(message, remote) self.driver.broadcast_socket.sendto(message, remote)