X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fipypbx%2Fcontrollers.py;fp=src%2Fipypbx%2Fcontrollers.py;h=414eae0258c01a4a91e2f29f9ccf9ee4c7a46529;hb=4fdc99d65147304630cfa10319f178dc2b79862d;hp=2063db9006d4b0409ffd7f061e13db215ed8102f;hpb=2b781fbd1012bcb87ccfee07f56b2b575e24b8ee;p=ipypbx diff --git a/src/ipypbx/controllers.py b/src/ipypbx/controllers.py index 2063db9..414eae0 100644 --- a/src/ipypbx/controllers.py +++ b/src/ipypbx/controllers.py @@ -220,19 +220,32 @@ class ConnectionController(BaseController): for row in range(self.model.rowCount()): # Get local IP address and port from the table for each row. - server = http.FreeswitchConfigServer(self) + server = http.FreeswitchConfigServer(self.parent(), ) server.setSocketData(*self.getSocketData(row)) server.startServer() self.servers.append(server) def getSocketData(self, row): - local_ip_address = self.model.record(row).value( - 'local_ip_address').toString() - local_port, _ok = self.model.record(row).value( - 'local_port').toInt() + """ + Return socket data for given row number. + """ + record = self.model.record(row) + + # Local IP address. + local_ip_address = record.value('local_ip_address').toString() + + # Local port. + local_port, _ok = record.value('local_port').toInt() if not _ok: local_port = None - return local_ip_address, local_port + + # Connection ID. + connection_id, _ok = record.value('id').toInt() + if not _ok: + connection_id = None + + print local_ip_address, local_port, connection_id + return local_ip_address, local_port, connection_id def connectionChange(self, index): """ @@ -252,14 +265,14 @@ class ConnectionController(BaseController): """ New connection added. """ - self.addServer() + self.addServer(*self.getSocketData(row)) - def addServer(self, host=None, port=None): + def addServer(self, host=None, port=None, connection_id=None): """ Add a new config server. """ - server = http.FreeswitchConfigServer(self) - server.setSocketData(host, port) + server = http.FreeswitchConfigServer(self.model) + server.setSocketData(host, port, connection_id) server.startServer() self.servers.append(server)