Correctie lange antwoorden (1500).
- Extra check op '\r' in recv en loop totdat die gevonden is. - decode verplaats naar recv functie.
This commit is contained in:
21
lmwsip.py
21
lmwsip.py
@@ -107,7 +107,10 @@ send a sip command to the server
|
||||
|
||||
recieve a answer from the sip server
|
||||
"""
|
||||
return(self._socket.recv(4096))
|
||||
buf=""
|
||||
while re.search("\r$", buf) == None:
|
||||
buf += self._socket.recv(4096).decode('utf-8')
|
||||
return(buf)
|
||||
|
||||
def login(self):
|
||||
"""login()
|
||||
@@ -118,8 +121,8 @@ Raises a LmwLoginFailure exception on failure
|
||||
li="LI " + self.user + "," + self.password + "\r"
|
||||
self.send(li)
|
||||
d = self.recv()
|
||||
if (d.decode('ascii')[0] != '!'):
|
||||
raise LmwLoginFailure(self.user + ":" + d.decode('ascii'))
|
||||
if (d[0] != '!'):
|
||||
raise LmwLoginFailure(self.user + ":" + d)
|
||||
|
||||
def ti(self):
|
||||
"""ti()
|
||||
@@ -131,9 +134,9 @@ Raises a LmwCmdWarn of failure
|
||||
ti="TI " + self.meetnet + "\r"
|
||||
self.send(ti)
|
||||
d = self.recv()
|
||||
if (d.decode('ascii')[0] != '!'):
|
||||
raise LmwCmdWarn("TI " + self.meetnet +":" + d.decode('ascii'))
|
||||
return (d.decode('ascii')[2:-1])
|
||||
if (d('ascii')[0] != '!'):
|
||||
raise LmwCmdWarn("TI " + self.meetnet +":" + d)
|
||||
return (d[2:-1])
|
||||
|
||||
def cmd(self, process, location, parameter, time_delta, day,
|
||||
time_of_day, cmd_type="DATA"):
|
||||
@@ -166,9 +169,9 @@ Returns:
|
||||
|
||||
self.send(cmdstr)
|
||||
d = self.recv()
|
||||
if (d.decode('ascii')[0] != '!'):
|
||||
raise LmwCmdWarn(d.decode('ascii'))
|
||||
return (d.decode('ascii')[2:-1])
|
||||
if (d[0] != '!'):
|
||||
raise LmwCmdWarn(d)
|
||||
return (d[2:-1])
|
||||
|
||||
def value(self, process, location, parameter, day = None,
|
||||
time_of_day = None):
|
||||
|
Reference in New Issue
Block a user