Rewrite of the network stuff. Stuff broke likely.
parent
3233c69c53
commit
d1161437d2
@ -1,4 +1,41 @@
|
||||
from network import *
|
||||
|
||||
class StreamReaderRequestHandler(object):
|
||||
def __init__(self, reader):
|
||||
self._reader = reader
|
||||
|
||||
def message(self, message):
|
||||
address = network.get_authinfo()
|
||||
self._reader.recv(address[0], message)
|
||||
return True
|
||||
|
||||
class StreamReader:
|
||||
def __init__(service, callback):
|
||||
self._service == service
|
||||
def __init__(self, group, service_name):
|
||||
self._group = group
|
||||
self._service_name = service_name
|
||||
|
||||
self._service = group.get_service_from_name(service_name)
|
||||
if self._service.is_multicast():
|
||||
self._setup_multicast()
|
||||
else:
|
||||
self._setup_unicast()
|
||||
|
||||
def set_listener(self, callback):
|
||||
self._callback = callback
|
||||
|
||||
def _setup_multicast(self):
|
||||
address = self._service.get_address()
|
||||
port = self._service.get_port()
|
||||
server = GroupServer(address, port, self._recv_multicast)
|
||||
server.start()
|
||||
|
||||
def _setup_unicast(self):
|
||||
p2p_server = GlibXMLRPCServer(("", self._service.get_port()))
|
||||
p2p_server.register_instance(StreamReaderRequestHandler(self))
|
||||
|
||||
def _recv_multicast(self, msg):
|
||||
self._recv(msg['addr'], msg['data'])
|
||||
|
||||
def _recv(self, address, data):
|
||||
buddy = self._group.get_buddy_from_address(address)
|
||||
self._callback(buddy, data)
|
||||
|
@ -1,6 +1,40 @@
|
||||
import socket
|
||||
|
||||
import network
|
||||
|
||||
class StreamWriter:
|
||||
def __init__(service):
|
||||
self._service = service
|
||||
def __init__(self, group, service_name):
|
||||
self._group = group
|
||||
self._service_name = service_name
|
||||
self._service = group.get_service_from_name(service_name)
|
||||
self._address = self._service.get_address()
|
||||
self._port = self._service.get_port()
|
||||
|
||||
if self._service.is_multicast():
|
||||
self._setup_multicast()
|
||||
else:
|
||||
self._setup_unicast()
|
||||
|
||||
def write(self, data):
|
||||
pass
|
||||
if self._service.is_multicast():
|
||||
self._multicast_write(data)
|
||||
else:
|
||||
self._unicast_write(data)
|
||||
|
||||
def _setup_unicast(self):
|
||||
xmlrpc_addr = "http://%s:%d" % (self._address, self._port)
|
||||
self._uclient = xmlrpclib.ServerProxy(xmlrpc_addr)
|
||||
|
||||
def _unicast_write(self, data):
|
||||
try:
|
||||
self._uclient.message(data)
|
||||
return True
|
||||
except (socket.error, xmlrpclib.Fault, xmlrpclib.ProtocolError), e:
|
||||
traceback.print_exc()
|
||||
return False
|
||||
|
||||
def _setup_multicast(self):
|
||||
self._mclient = network.GroupClient(self._address, self._port)
|
||||
|
||||
def _multicast_write(self, data):
|
||||
self._mclient.send_msg(data)
|
||||
|
Loading…
Reference in New Issue