projects
/
ipypbx
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Match POST data, not headers
[ipypbx]
/
src
/
ipypbx
/
http.py
diff --git
a/src/ipypbx/http.py
b/src/ipypbx/http.py
index
f168c53
..
dff9b24
100644
(file)
--- a/
src/ipypbx/http.py
+++ b/
src/ipypbx/http.py
@@
-23,14
+23,17
@@
class FreeswitchConfigServer(QtNetwork.QTcpServer):
"""
TCP server that receives config requests from freeswitch.
"""
"""
TCP server that receives config requests from freeswitch.
"""
- def __init__(self, parent=None):
+ def __init__(self, parent):
super(FreeswitchConfigServer, self).__init__(parent)
self.host = None
self.port = None
self.is_running = False
super(FreeswitchConfigServer, self).__init__(parent)
self.host = None
self.port = None
self.is_running = False
+ self.generators = [
+ GenClass(self.parent().model) for GenClass in (
+ SofiaConfGenerator,)]
- self.httpRequestParser = HttpRequestParser()
+ self.httpRequestParser = HttpRequestParser(self)
def setSocketData(self, host, port):
"""
def setSocketData(self, host, port):
"""
@@
-47,7
+50,6
@@
class FreeswitchConfigServer(QtNetwork.QTcpServer):
# Restart server if necessary.
if needs_restart:
# Restart server if necessary.
if needs_restart:
- print 'restartin', self.host, self.port
self.restartServer()
def startServer(self):
self.restartServer()
def startServer(self):
@@
-103,8
+105,8
@@
class HttpRequestParser(object):
HTTP_DONE = range(6)
HTTP_STATES = ['NONE', 'REQUEST', 'HEADERS', 'EMPTY', 'MESSAGE', 'DONE']
HTTP_DONE = range(6)
HTTP_STATES = ['NONE', 'REQUEST', 'HEADERS', 'EMPTY', 'MESSAGE', 'DONE']
- def __init__(self):
- super(HttpRequestParser, self).__init__()
+ def __init__(self, parent):
+ self.parent = parent
self.reset()
def reset(self):
self.reset()
def reset(self):
@@
-173,11
+175,13
@@
class HttpRequestParser(object):
print k, '=>', v
print
print k, '=>', v
print
- for generator in self.generators:
- if generator.canHandle(self.headers):
+ for generator in self.parent.generators:
+ if generator.canHandle(self.data):
self.state += 1
self.state += 1
- return generator.generateConfig(self.headers)
-
+ print generator.generateConfig(self.headers)
+ else:
+ print 'No generator found'
+
class FreeswitchConfigGenerator(object):
class FreeswitchConfigGenerator(object):
@@
-193,6
+197,7
@@
class FreeswitchConfigGenerator(object):
def canHandle(self, params):
for key, value in self.param_match.iteritems():
def canHandle(self, params):
for key, value in self.param_match.iteritems():
+ print key, value, params.get(key, None)
if params.get(key, None) != value:
return False
else:
if params.get(key, None) != value:
return False
else: