sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include the sender in the message

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-05-11 22:19:52 -04:00
parent 18f9a43716
commit ed53316f4f
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
p2p/Group.py
View File

@ -71,7 +71,7 @@ class LocalGroup(Group):
return self._services[(name, stype)] return self._services[(name, stype)]
def get_buddy(self, name): def get_buddy(self, name):
return self._buddy[name] return self._buddies[name]
def _add_buddy(self, buddy): def _add_buddy(self, buddy):
bid = buddy.get_nick_name() bid = buddy.get_nick_name()

15
p2p/StreamReader.py
View File

@ -4,9 +4,9 @@ class StreamReaderRequestHandler(object):
def __init__(self, reader): def __init__(self, reader):
self._reader = reader self._reader = reader
def message(self, message): def message(self, nick_name, message):
address = network.get_authinfo() address = network.get_authinfo()
self._reader.recv(address[0], message) self._reader.recv(nick_name, message)
return True return True
class StreamReader: class StreamReader:
@ -33,10 +33,9 @@ class StreamReader:
p2p_server.register_instance(StreamReaderRequestHandler(self)) p2p_server.register_instance(StreamReaderRequestHandler(self))
def _recv_multicast(self, msg): def _recv_multicast(self, msg):
self._recv(msg['addr'], msg['data']) [ nick_name, data ] = msg['data'].split(" |**| ", 2)
self._recv(nick_name, data)
def _recv(self, address, data): def _recv(self, nick_name, data):
owner = self._group.get_owner() if nick_name != self._group.get_owner().get_nick_name():
if address != owner.get_service().get_address(): self._callback(self._group.get_buddy(nick_name), data)
buddy = self._group.get_buddy_from_address(address)
self._callback(buddy, data)

6
p2p/StreamWriter.py
View File

@ -28,7 +28,8 @@ class StreamWriter:
def _unicast_write(self, data): def _unicast_write(self, data):
try: try:
self._uclient.message(data) nick_name = self._group.get_owner().get_nick_name()
self._uclient.message(nick_name, data)
return True return True
except (socket.error, xmlrpclib.Fault, xmlrpclib.ProtocolError), e: except (socket.error, xmlrpclib.Fault, xmlrpclib.ProtocolError), e:
traceback.print_exc() traceback.print_exc()
@ -38,4 +39,5 @@ class StreamWriter:
self._mclient = network.GroupClient(self._address, self._port) self._mclient = network.GroupClient(self._address, self._port)
def _multicast_write(self, data): def _multicast_write(self, data):
self._mclient.send_msg(data) nick_name = self._group.get_owner().get_nick_name()
self._mclient.send_msg(nick_name + " |**| " + data)