From 7584e0edd7d87cab241030dd61a7ab29e357a26d Mon Sep 17 00:00:00 2001 From: Stas Shtin Date: Wed, 14 Apr 2010 21:37:24 +0400 Subject: [PATCH] Config server fixes --- src/ipypbx/controllers.py | 5 ++--- src/ipypbx/http.py | 14 +++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/ipypbx/controllers.py b/src/ipypbx/controllers.py index 61fc6f9..7bdceb2 100644 --- a/src/ipypbx/controllers.py +++ b/src/ipypbx/controllers.py @@ -218,7 +218,7 @@ class ConnectionController(BaseController): local_port = None server = http.FreeswitchConfigServer() - server.setSocket(local_ip_address, local_port) + server.setSocketData(local_ip_address, local_port) server.startServer() self.servers.append(server) @@ -248,9 +248,8 @@ class ConnectionController(BaseController): """ Add a new config server. """ - server = http.FreeswitchConfigServer(self) - server.setSocket(host, port) + server.setSocketData(host, port) server.startServer() self.servers.append(server) diff --git a/src/ipypbx/http.py b/src/ipypbx/http.py index 927eb9f..68b1234 100644 --- a/src/ipypbx/http.py +++ b/src/ipypbx/http.py @@ -31,7 +31,7 @@ class FreeswitchConfigServer(QtNetwork.QTcpServer): self.httpRequestParser = HttpRequestParser() - def setSocket(self, host, port): + def setSocketData(self, host, port): """ Set host and port for socket to listen on. """ @@ -63,17 +63,17 @@ class FreeswitchConfigServer(QtNetwork.QTcpServer): self.stopServer() self.startServer() - def clientConnecting(self, socket): + def clientConnecting(self): """ Handle client connection. """ if self.hasPendingConnections(): - connectingClient = self.server.nextPendingConnection() - connectingClient.readyRead.connect(self.receiveData) + self.socket = self.nextPendingConnection() + self.socket.readyRead.connect(self.receiveData) - def receiveData(self, socket): - while socket.canReadLine(): - line = socket.readLine().strip() + def receiveData(self): + while self.socket.canReadLine(): + line = str(self.socket.readLine()).strip() class HttpParseError(Exception): -- 1.7.9.5