mirror of
https://github.com/Oibaf66/frodo-wii.git
synced 2024-11-10 21:55:11 +01:00
Send out registered data as well
This commit is contained in:
parent
bd21f7fb78
commit
3c24a37ac3
@ -82,6 +82,9 @@ def DataEntry:
|
|||||||
def get_key(self):
|
def get_key(self):
|
||||||
return self.key
|
return self.key
|
||||||
|
|
||||||
|
def get_metadata(self):
|
||||||
|
return self.metadata
|
||||||
|
|
||||||
def get_data(self):
|
def get_data(self):
|
||||||
return self.data
|
return self.data
|
||||||
|
|
||||||
@ -327,11 +330,27 @@ class Peer:
|
|||||||
self.srv.log_connection(self.name, self.country)
|
self.srv.log_connection(self.name, self.country)
|
||||||
|
|
||||||
# Send list of peers if this is not a master
|
# Send list of peers if this is not a master
|
||||||
|
registered_data = []
|
||||||
lp = ListPeersPacket(FRODO_NETWORK_PROTOCOL_VERSION)
|
lp = ListPeersPacket(FRODO_NETWORK_PROTOCOL_VERSION)
|
||||||
|
|
||||||
for peer in self.srv.peers.itervalues():
|
for peer in self.srv.peers.itervalues():
|
||||||
if peer != self: # and peer.is_master:
|
if peer == self:
|
||||||
|
continue
|
||||||
|
# Don't add peers which haven't sent their screenshots yet
|
||||||
|
# (yes, it's quite unlikely, but anyway)
|
||||||
|
try:
|
||||||
|
entry = self.srv.data_store.get_entry(peer.screenshot_key)
|
||||||
|
registered_data.append(entry)
|
||||||
|
except KeyError, e:
|
||||||
|
log_info("Peer %s hasn't sent it's screenshot yet: %s" % (peer.name, str(e)))
|
||||||
|
continue
|
||||||
lp.add_peer(peer)
|
lp.add_peer(peer)
|
||||||
|
|
||||||
|
# First send the registry data
|
||||||
|
for entry in registered_data:
|
||||||
|
rp = RegisterDataPacket(entry.get_key(), entry.get_metadata(), entry.get_data())
|
||||||
|
self.send_packet(rp.marshal())
|
||||||
|
|
||||||
# And send the packet to this peer
|
# And send the packet to this peer
|
||||||
log_info("Sending list of peers (%d) to %s:%d" % (lp.n_peers,
|
log_info("Sending list of peers (%d) to %s:%d" % (lp.n_peers,
|
||||||
self.addr[0], self.addr[1]) )
|
self.addr[0], self.addr[1]) )
|
||||||
|
Loading…
Reference in New Issue
Block a user