Browse Source

make the extra double \r\n at the end part of the join..

[git-p4: depot-paths = "//depot/": change = 721]
replace/5b80aeb26dc425aaddcd5182126c969e5cc04cbb
John-Mark Gurney 19 years ago
parent
commit
28d473c4a6
1 changed files with 4 additions and 7 deletions
  1. +4
    -7
      SSDP.py

+ 4
- 7
SSDP.py View File

@@ -84,12 +84,10 @@ class SSDPServer(DatagramProtocol):
for k, v in self.known[headers['st']].items():
response.append('%s: %s' % (k, v))

response.extend(('', ''))
delay = random.randint(0, int(headers['mx']))
log.msg('responding in %d with: %s' % (delay, response))

# TODO: we should wait random(headers['mx'])
reactor.callLater(delay, self.transport.write,
string.join(response, '\r\n') + '\r\n\r\n', (host, port))
'\r\n'.join(response), (host, port))

def register(self, usn, st, location):
"""Register a service or device that this SSDP server will
@@ -119,9 +117,8 @@ class SSDPServer(DatagramProtocol):
stcpy['NT'] = stcpy['ST']
del stcpy['ST']
resp.extend(map(lambda x: ': '.join(x), stcpy.iteritems()))
log.msg(repr(resp))
self.transport.write(
string.join(resp, '\r\n') + '\r\n\r\n', (SSDP_ADDR, SSDP_PORT))
resp.extend(('', ''))
self.transport.write('\r\n'.join(resp), (SSDP_ADDR, SSDP_PORT))

def notifyReceived(self, headers, (host, port)):
"""Process a presence announcement. We just remember the


Loading…
Cancel
Save