summaryrefslogtreecommitdiffstats
path: root/Handler
diff options
context:
space:
mode:
authortriatmoko2011-07-13 17:44:32 +0200
committertriatmoko2011-07-13 17:44:32 +0200
commit291eebfd1ae7846bdd072c4ac49a8c332d319dbb (patch)
treeab163d37d5cfa90f8af16d028f043e54668b54a4 /Handler
parentedit sip handler. (diff)
downloadgsm-selftest-291eebfd1ae7846bdd072c4ac49a8c332d319dbb.tar.gz
gsm-selftest-291eebfd1ae7846bdd072c4ac49a8c332d319dbb.tar.xz
gsm-selftest-291eebfd1ae7846bdd072c4ac49a8c332d319dbb.zip
edit error code to be general.
Diffstat (limited to 'Handler')
-rw-r--r--Handler/sipCall.py29
-rw-r--r--Handler/sipReceiver.py17
2 files changed, 23 insertions, 23 deletions
diff --git a/Handler/sipCall.py b/Handler/sipCall.py
index dfbd7b3..420e465 100644
--- a/Handler/sipCall.py
+++ b/Handler/sipCall.py
@@ -12,14 +12,15 @@ from datetime import datetime
import string
-stop ="false"
+stop =False
+
server = "132.230.4.8"
username = "mpselftest1"
password = "1mpselftest"
LOG_LEVEL=2
current_call = None
-success = ""
+status = None
# Logging callback
@@ -43,7 +44,7 @@ class MyCallCallback(pj.CallCallback):
def on_state(self):
global current_call
- global success
+ global status
if self.call.info().state <> pj.CallState.DISCONNECTED:
if self.call.info().state_text == "CONNECTING":
@@ -52,8 +53,8 @@ class MyCallCallback(pj.CallCallback):
print "CALL CONFIRMED and ESTABLISH", self.call.info().state_text
sleep(5)
current_call.hangup()
- success = "true"
- server.sendData(success)
+ status = 200
+ server.sendData(status)
else:
sleep(1)
@@ -62,10 +63,10 @@ class MyCallCallback(pj.CallCallback):
if self.call.info().last_reason == "Busy Here":
- print "Destination Number is Busy or offline"
+ print "486 Busy Here"
print ""
- success = "false"
- server.sendData(success)
+ status = 486
+ server.sendData(status)
if self.call.info().state == pj.CallState.DISCONNECTED:
current_call = None
@@ -85,7 +86,7 @@ def make_call(uri):
lib = pj.Lib()
-while stop <> "true":
+while stop <> True:
lib.init(log_cfg = pj.LogConfig(level=LOG_LEVEL, callback=log_cb))
@@ -135,12 +136,12 @@ while stop <> "true":
current_call = make_call(number)
break
- if data == "terminated": # will terminate the handler if controller send terminate message
- stop = "true"
+ if data == "487": # will terminate the handler if controller send terminate message
+ stop = True
break
except ValueError:
- print "error when sending message"
+ print "813 General socket layer error: Failed send message"
server.closeConnection()
del server
@@ -149,7 +150,7 @@ while stop <> "true":
else:
Regis_status= "Bad"
- print "error when register"
+ print "488 Not Acceptable Here"
lib.destroy()
lib = None
@@ -159,7 +160,7 @@ while stop <> "true":
server.closeConnection()
del server
except ValueError:
- print "Exception: " + str(e)
+ print "404 Not Found (User not found)" + str(e)
print "Goodbye"
sleep(3)
diff --git a/Handler/sipReceiver.py b/Handler/sipReceiver.py
index ec26acc..9428325 100644
--- a/Handler/sipReceiver.py
+++ b/Handler/sipReceiver.py
@@ -9,14 +9,14 @@ import classServer
from time import sleep
from datetime import datetime
-stop ="false"
+stop = False
server = "132.230.4.8"
username = "mpselftest2"
password = "2mpselftest"
LOG_LEVEL=2
current_call = None
-success = None
+status = None
global accept
accept = None
@@ -60,8 +60,7 @@ class MyAccountCallback(pj.AccountCallback):
current_call.answer(200)
sleep(4)
current_call.hangup()
- accept = True
- success = True
+ status = 200
server.sendData(success)
class MyCallCallback(pj.CallCallback):
@@ -76,7 +75,7 @@ class MyCallCallback(pj.CallCallback):
if self.call.info().state == pj.CallState.CONNECTING:
print self.call.info().state_text
- success = True
+ status = 200
if self.call.info().state == pj.CallState.DISCONNECTED:
current_call = None
@@ -118,10 +117,11 @@ try:
server.sendData('ready')#send message to controller that the handler ready
- while stop <> "true":
+ while stop <> True:
data = server.receiveData()#waiting message from controller
- if data == "terminated":
+ if data == "487":
+ stop = True
break
if current_call == None:
@@ -142,8 +142,7 @@ try:
server.closeConnection()
del server
else:
- Regis_status= "Bad"
- print "error when register"
+ print "488 Not Acceptable Here"
lib.destroy()
lib = None