summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRefik Hadzialic2011-07-14 12:14:03 +0200
committerRefik Hadzialic2011-07-14 12:14:03 +0200
commit660c497481af9d614f81d87c5a809910e159d769 (patch)
treee3faf51196ecc2b5cbbe8d07d9aee480b6f965c4
parentModified an error return number since it was the same as another error return... (diff)
parentMerge branch 'master' of lab.ks.uni-freiburg.de:lsfks/projekte/gsm-selftest (diff)
downloadgsm-selftest-660c497481af9d614f81d87c5a809910e159d769.tar.gz
gsm-selftest-660c497481af9d614f81d87c5a809910e159d769.tar.xz
gsm-selftest-660c497481af9d614f81d87c5a809910e159d769.zip
Merge branch 'master' of lab.ks.uni-freiburg.de:lsfks/projekte/gsm-selftest
-rw-r--r--Controller/Controller-SecondType.py44
-rw-r--r--Handler/localsipReceiver.py163
-rw-r--r--Handler/sipCall.py29
-rw-r--r--Handler/sipReceiver.py20
4 files changed, 205 insertions, 51 deletions
diff --git a/Controller/Controller-SecondType.py b/Controller/Controller-SecondType.py
index a33ac30..b7d9881 100644
--- a/Controller/Controller-SecondType.py
+++ b/Controller/Controller-SecondType.py
@@ -18,9 +18,9 @@ passw = 'randompasswordSQL' #default password we agree with this password befo
host = 'localhost'
dbname = 'gsmselftesting'
-stop = "False"
-status = ""
-dbSStatus = ""
+stop = False
+status = None
+dbSStatus = None
sipNum = "4661929"
landlnNum = "076145875681"
@@ -30,7 +30,6 @@ sipCall = "sipCall.py"
sipRec = "sipReceiver.py"
landlnCall = "landlineCall.py"
landlnRec = "landlineReceiver.py"
-localSipCall = "localsipCall.py"
localSipRec = "localsipReceiver.py"
rz1Call = "rz1Call.py"
rz1Rec = "rz1Receiver.py
@@ -52,12 +51,9 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
global resultDest
global x
global y
- portOrig = None
- resultOrig= None
- resultDest = None
-
- repeatTest = ""
+
+ print "====================== Preparing Test ======================"
try:
@@ -68,8 +64,10 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
if dest =="gsmBox2":
portOrig = 50096
-
- print "GSM server handler", x.connect()
+
+ print ""
+ print "Connecting to Caller handler"
+ print "Caller handler status :", x.connect()
x.sendData('hello server please wakeup the handler and be caller')
else:
@@ -98,6 +96,7 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
x = classClient.Connection(origAdd,portOrig)
print ""
+ print "Connecting to Caller handler"
print "Caller handler status:", x.connect()
x.sendData('hello Handler')
@@ -110,12 +109,11 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
#think about time out
if origHandler == "ready":
- print "Caller handler ready"
+ print "Caller handler : Ready"
print ""
try:
y = None
global portDest
- portDest = None
if dest =="gsmBox1" or dest =="gsmBox2":
@@ -126,7 +124,8 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
portDest = 50103
y = classClient.Connection(destAdd,portDest)
- print "GSM handler", y.connect()
+ print "Connecting to Receiver handler"
+ print "Receiver handler status: ", y.connect()
y.sendData('hello server please wakeup the handler and be receiver')
else:
@@ -152,8 +151,9 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
#portDest = 50108
y = classClient.Connection(destAdd,portDest)
- print "Destination handler status:", y.connect()
- y.sendData('hello Receiver, caller number')
+ print "Connecting to Receiver handler"
+ print "Receiver handler status:", y.connect()
+ y.sendData('hello Receiver')
#wait respond from destination handler
while 1:
@@ -164,9 +164,9 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
if destHandler == "ready":
- print "Destination handler ready"
+ print "Receiver handler : Ready"
print ""
- x.sendData("start ")#send message to handler to start the call
+ x.sendData("start")#send message to handler to start the call
sleep(1)
x.sendData(destNo)
@@ -175,8 +175,10 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
x.connect()
#wait respond from both of handler
+ print "------------ Test Result ------------"
+ print ""
while 1:
- sleep(5)
+ sleep(4)
x.connect()
sleep(0.5)
resultOrig = x.receiveData()
@@ -275,7 +277,9 @@ if dbStatus == 1:
callFrom = item[1]
callTo = item[2]
- print "call from to ", taskID , callFrom , callTo
+ print "Test ID : " , taskID
+ print "Caller : " , callFrom
+ print "Receiver : " , callTo
if callFrom == "sip":
if sipServerStatus == 0:
diff --git a/Handler/localsipReceiver.py b/Handler/localsipReceiver.py
new file mode 100644
index 0000000..81d7a51
--- /dev/null
+++ b/Handler/localsipReceiver.py
@@ -0,0 +1,163 @@
+import sys
+import pjsua as pj
+import string
+import classServer
+
+from time import sleep
+from datetime import datetime
+
+stop = False
+server = "132.230.4.8"
+username = "mpselftest2"
+password = "2mpselftest"
+
+LOG_LEVEL=2
+current_call = None
+status = None
+global accept
+accept = None
+
+
+# Logging
+def log_cb(level, str, len):
+ print str, "SIP Handler Receiver Log"
+
+
+
+class MyAccountCallback(pj.AccountCallback):
+
+ global success
+
+ def __init__(self, account=None):
+ pj.AccountCallback.__init__(self, account)
+
+ def on_incoming_call(self, call):
+ global current_call
+ global number
+
+ if current_call:
+ call.answer(486, "Busy")
+ return
+
+ number = call.info().remote_uri
+
+ current_call = call
+
+ call_cb = MyCallCallback(current_call)
+ current_call.set_callback(call_cb)
+
+ current_call.answer(180)
+ print "accept call"
+
+ if current_call <> None:
+ accept = True
+
+ if accept == True:
+ sleep(0.5)
+ current_call.answer(200)
+ sleep(4)
+ current_call.hangup()
+ status = 200
+ server.sendData(success)
+
+class MyCallCallback(pj.CallCallback):
+
+ def __init__(self, call=None):
+ pj.CallCallback.__init__(self, call)
+
+
+ def on_state(self):
+ global current_call
+ global success
+
+ if self.call.info().state == pj.CallState.CONNECTING:
+ print self.call.info().state_text
+ status = 200
+
+ if self.call.info().state == pj.CallState.DISCONNECTED:
+ current_call = None
+ print '701 The called party has hung up'
+
+
+lib = pj.Lib()
+
+try:
+
+ server = classServer.ServerHandler(50104)
+ tried = server.openSocket()
+
+ if server.error != 'No error':
+ print server.error
+ if server.error == '[Errno 98] Address already in use':
+ print 'one should try to kill the port'
+ print server.killPort()
+ server.closeConection()
+
+ lib.init(log_cfg = pj.LogConfig(level=LOG_LEVEL, callback=log_cb))
+ transport = lib.create_transport(pj.TransportType.UDP, pj.TransportConfig(0))
+
+ print "\nListening on", transport.info().host,
+ print "port", transport.info().port, "\n"
+
+
+ lib.start()
+ lib.set_null_snd_dev()
+
+
+
+ try:
+ acc_cfg = pj.AccountConfig("132.230.252.228", "4976120397897", "hB8M3WyFt61C")
+ acc = lib.create_account(acc_cfg, cb=MyAccountCallback())
+
+ if acc.info().reg_status < 700:
+
+ my_sip_uri = "sip:" + transport.info().host + ":" + str(transport.info().port)
+
+ server.sendData('ready')
+
+ while stop <> True:
+
+ data = server.receiveData()
+
+ if data == "487":
+ stop = True
+ break
+
+ if current_call == None:
+ accept = None
+ continue
+ else:
+ print "Incoming call from :", number
+
+
+
+
+ transport = None
+ acc.delete()
+ acc = None
+ lib.destroy()
+ lib = None
+ server.closeConnection()
+
+ else:
+ print "Bad Register"
+
+ lib.destroy()
+ lib = None
+ acc = None
+ server.closeConnection()
+
+
+ except pj.Error, e:
+ print "401 Unauthorized " +str(e)
+ lib.destroy()
+ lib = None
+ server.closeConnection()
+
+
+except pj.Error, e:
+ print "Exception: " + str(e)
+ lib.destroy()
+ lib = None
+ server.closeConnection()
+ del server
diff --git a/Handler/sipCall.py b/Handler/sipCall.py
index 566659a..1d626ac 100644
--- a/Handler/sipCall.py
+++ b/Handler/sipCall.py
@@ -1,9 +1,5 @@
import sys
import pjsua as pj
-import socket
-import time
-import MySQLdb
-import subprocess
import classServer
@@ -14,28 +10,25 @@ import string
stop =False
-server = "132.230.4.8"
-username = "mpselftest1"
-password = "1mpselftest"
LOG_LEVEL=2
current_call = None
status = None
-# Logging callback
+# Logging
def log_cb(level, str, len):
print str, "SIP log"
-# Callback to receive events from account
+# Receive events from account
class MyAccountCallback(pj.AccountCallback):
def __init__(self, account=None):
pj.AccountCallback.__init__(self, account)
-# Callback to receive events from Call
+# Receive events from Call
class MyCallCallback(pj.CallCallback):
def __init__(self, call=None):
@@ -72,7 +65,7 @@ class MyCallCallback(pj.CallCallback):
current_call = None
print 'Current call Disconnected'
-
+#Function to make call
def make_call(uri):
try:
print "Making call to", uri
@@ -97,7 +90,7 @@ while stop <> True:
lib.start()
lib.set_null_snd_dev()
- # open socket connection and connect to the controller
+
server = classServer.ServerHandler(50097)
tried = server.openSocket()
@@ -118,25 +111,25 @@ while stop <> True:
my_sip_uri = "sip:" + transport.info().host + ":" + str(transport.info().port)
print my_sip_uri
- server.sendData('ready')#send message to controller
+ server.sendData('ready')
print "Status: ", server.connected
while 1:
try:
- data = server.receiveData() # waiting mode, until receiver start message or terminate message
+ data = server.receiveData()
- if data == "start": # if receiver start message, handler start to call destination
+ if data == "start":
while 1:
- num = server.receiveData() # waiting destination number
+ num = server.receiveData()
if num <> "":
number = "sip:"+num+"@132.230.4.8"
current_call = make_call(number)
break
- if data == "487": # will terminate the handler if controller send terminate message
+ if data == "487":
stop = True
break
@@ -160,7 +153,7 @@ while stop <> True:
server.closeConnection()
del server
except ValueError:
- print "401 Unauthorized" + str(e)
+ print "401 Unauthorized " + str(e)
print "Goodbye"
sleep(3)
diff --git a/Handler/sipReceiver.py b/Handler/sipReceiver.py
index 4bc8e18..e5cbba4 100644
--- a/Handler/sipReceiver.py
+++ b/Handler/sipReceiver.py
@@ -1,8 +1,5 @@
import sys
import pjsua as pj
-import socket
-import time
-import os
import string
import classServer
@@ -10,9 +7,6 @@ from time import sleep
from datetime import datetime
stop = False
-server = "132.230.4.8"
-username = "mpselftest2"
-password = "2mpselftest"
LOG_LEVEL=2
current_call = None
@@ -21,7 +15,7 @@ global accept
accept = None
-# Logging callback
+# Logging
def log_cb(level, str, len):
print str, "SIP Handler Receiver Log"
@@ -85,7 +79,7 @@ class MyCallCallback(pj.CallCallback):
lib = pj.Lib()
try:
- #open socket connection to the controller
+
server = classServer.ServerHandler(50104)
tried = server.openSocket()
@@ -102,12 +96,12 @@ try:
print "\nListening on", transport.info().host,
print "port", transport.info().port, "\n"
- # Start the library
+
lib.start()
lib.set_null_snd_dev()
- # Create local account
+
try:
acc_cfg = pj.AccountConfig("132.230.4.8", "mpselftest2", "2mpselftest")
acc = lib.create_account(acc_cfg, cb=MyAccountCallback())
@@ -116,11 +110,11 @@ try:
my_sip_uri = "sip:" + transport.info().host + ":" + str(transport.info().port)
- server.sendData('ready')#send message to controller that the handler ready
+ server.sendData('ready')
while stop <> True:
- data = server.receiveData()#waiting message from controller
+ data = server.receiveData()
if data == "487":
stop = True
@@ -134,7 +128,7 @@ try:
- # Shutdown the library
+
transport = None
acc.delete()
acc = None