summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/30-07-2011/SIPHandler.py
diff options
context:
space:
mode:
Diffstat (limited to 'For Weekly Test/30-07-2011/SIPHandler.py')
-rw-r--r--For Weekly Test/30-07-2011/SIPHandler.py66
1 files changed, 27 insertions, 39 deletions
diff --git a/For Weekly Test/30-07-2011/SIPHandler.py b/For Weekly Test/30-07-2011/SIPHandler.py
index 96fe4de..50c94a3 100644
--- a/For Weekly Test/30-07-2011/SIPHandler.py
+++ b/For Weekly Test/30-07-2011/SIPHandler.py
@@ -87,22 +87,24 @@ def greeting():
status = 'OK'
else:
status = 'NOT OK'
- logger.logEvent('cant connect to Controller')
+ logger.logEvent('Cant connect to Controller')
sys.exit(1)
-def initLogFile():
- global nameOfLogFile
- nameOfLogFile = sys.argv[1]
-
- if sys.argv[1] == 'sip':
+def initLogFile(sipServer):
+
+ global logger
+
+ if sipServer == '132.230.4.8':
nameOfLogFile = 'SIP handler.log'
- elif sys.argv[1] == 'landline':
+ elif sipServer == 'sipgate.de':
nameOfLogFile = 'Landline handler.log'
- elif sys.argv[1] == 'unisip':
+ elif sipServer == '132.230.252.228':
nameOfLogFile = 'University SIP handler.log'
+ logger = LogFileClass.Logging(nameOfLogFile)
+
def initState():
global message
global state
@@ -119,42 +121,28 @@ def initState():
num = message[7:]
def initHandler():
- global acc_cfg
- global handler
global sipServer
+ global username
+ global password
- handler = sys.argv[1]
-
-
- if handler == 'sip':
- logger.logEvent('Beeing SIP')
- acc_cfg = pj.AccountConfig("132.230.4.8","mpselftest1","1mpselftest")
- sipServer = '132.230.4.8'
-
- elif handler == 'landline':
- logger.logEvent('Beeing Landline')
- acc_cfg = pj.AccountConfig("sipgate.de","1289459","MMW9AX")
- sipServer = 'sipgate.de'
-
- elif handler == 'unisip':
- logger.logEvent('Beeing University SIP')
- acc_cfg = pj.AccountConfig("132.230.252.228", "4976120397897", "hB8M3WyFt61C")
- sipServer = '132.230.252.228'
+ accConf = sys.argv[1]
+ username = accConf[0:accConf.find(':')]
- else:
- logger.logEvent('Unknown Message')
- server.sendData('Unknown Message')
- server.closeConnection()
- sys.exit(1)
+ line = accConf[accConf.find(':')+1:]
+ password = line[0:line.find(':')]
+ newLine = line[line.find(':')+1:]
+ sipServer = newLine[0:newLine.find(':')]
lib = pj.Lib()
stop = False
-initLogFile()
-logger = LogFileClass.Logging(nameOfLogFile)
+initHandler()
+
+initLogFile(sipServer)
+
logger.logEvent('')
while stop <> True:
@@ -168,14 +156,14 @@ while stop <> True:
lib.set_null_snd_dev()
greeting()
- initHandler()
+
try:
initState()
+ acc_cfg = pj.AccountConfig(str(sipServer),str(username),str(password))
logger.logEvent('Register Account to SIP server')
acc = lib.create_account(acc_cfg, cb=Account())
-
-
+
if acc.info().reg_status < 700:
if state =='RECEIVER':
@@ -185,7 +173,7 @@ while stop <> True:
while 1:
- data = server.receiveData(3)
+ data = server.receiveData(1)
if data == 'RECEIVE START':
logger.logEvent(data)
@@ -202,7 +190,7 @@ while stop <> True:
while 1:
- data = server.receiveData(3)
+ data = server.receiveData(1)
if data == 'CALL START':
if num <> '':