Skip to content
Snippets Groups Projects
Commit 7968b864 authored by jkerdreu's avatar jkerdreu
Browse files

Drop set/get for hops/addr/port

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/fork@1767 b32b6428-25c9-4566-ad07-03861ab6144f
parent a7a2a23e
No related branches found
No related tags found
No related merge requests found
......@@ -42,8 +42,8 @@ class State(Enum):
class NetworkConnector(object):
UDP_MAX_SIZE = 65507
def __init__(self, address, port, hops):
self.address = address
def __init__(self, addr, port, hops):
self.addr = addr
self.port = port
self.hops = hops
self.state = State.disconnected
......@@ -55,7 +55,7 @@ class NetworkConnector(object):
self.network_error(e)
def __connect(self):
logger.info("Connecting to %s:%s" % (self.address, self.port))
logger.info("Connecting to %s:%s" % (self.addr, self.port))
# TBD add bind_addr attrib
bind_addr = ''
......@@ -64,7 +64,7 @@ class NetworkConnector(object):
# #formac os ???
self.__sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self.__sock.bind((bind_addr, self.port))
mreq = struct.pack('4sl',socket.inet_aton(self.address),socket.INADDR_ANY)
mreq = struct.pack('4sl',socket.inet_aton(self.addr),socket.INADDR_ANY)
self.__sock.setsockopt(socket.IPPROTO_IP,socket.IP_ADD_MEMBERSHIP,mreq)
self.__sock.setsockopt(socket.IPPROTO_IP,socket.IP_MULTICAST_TTL,self.hops)
self.state = State.connected
......@@ -74,12 +74,6 @@ class NetworkConnector(object):
self.state = State.disconnected
self.__sock.close()
def sethops(self, value):
self.hops = value
def gethops(self):
return self.hops
def is_connected(self):
return self.state == State.connected
......@@ -103,7 +97,7 @@ class NetworkConnector(object):
def send(self, message):
if not self.is_connected(): self.connect()
try:
self.__sock.sendto(codecs.encode(message), (self.address, self.port))
self.__sock.sendto(codecs.encode(message), (self.addr, self.port))
except Exception as e:
self.network_error(e)
......@@ -112,8 +106,3 @@ class NetworkConnector(object):
logger.info("Network error, reconnect..%s" % msg)
time.sleep(5)
def getaddr(self):
return self.address
def getport(self):
return self.port
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment