summaryrefslogtreecommitdiffstats
path: root/For Weekly Test
diff options
context:
space:
mode:
Diffstat (limited to 'For Weekly Test')
-rw-r--r--For Weekly Test/20-07-2011/landlineCall.py117
-rw-r--r--For Weekly Test/20-07-2011/landlineReceiver.py62
-rw-r--r--For Weekly Test/20-07-2011/localsipReceiver.py2
-rw-r--r--For Weekly Test/20-07-2011/sipCall.py5
4 files changed, 82 insertions, 104 deletions
diff --git a/For Weekly Test/20-07-2011/landlineCall.py b/For Weekly Test/20-07-2011/landlineCall.py
index e25f251..fcdf4fe 100644
--- a/For Weekly Test/20-07-2011/landlineCall.py
+++ b/For Weekly Test/20-07-2011/landlineCall.py
@@ -1,27 +1,13 @@
import sys
import pjsua as pj
import classServer
+import LogFileClass
+logger = LogFileClass.Logging('landlineCallHandler.log')
from time import sleep
-<<<<<<< HEAD
-LOG_LEVEL = 2
-current_call = None
-is486 = False
-isConfirmed = False
-isRinging = False
-isConnected = False
-isStopped = False
-firstTime502 = True
-firstTime100 = True
-firstTime408 = True
-TIMEOUT_LIMIT = 30
-
-# Logging callback
-=======
->>>>>>> 3c2c4f14c0dd26f03e5f664d91d51c62b617de7d
def log_cb(level, str, len):
- print str, "SIP log"
+ print str, "landline log"
# Receive events from Call
class MyCallCallback(pj.CallCallback):
@@ -31,19 +17,24 @@ class MyCallCallback(pj.CallCallback):
if self.call.info().state <> pj.CallState.DISCONNECTED:
if self.call.info().state_text == "CONNECTING":
- print "CALL : ", self.call.info().state_text
+ logger.logEvent("Call Connecting")
sleep(1)
if self.call.info().state <> pj.CallState.DISCONNECTED:
+ logger.logEvent("will Hangup call")
current_call.hangup()
-
+
+ logger.logEvent('200')
server.sendData('200')
else:
sleep(0.5)
if self.call.info().last_reason == "Busy Here":
+ logger.logEvent('Number busy or Offline')
server.sendData('486')
+ logger.logEvent('486')
if self.call.info().state == pj.CallState.DISCONNECTED:
+ logger.logEvent('Call Disconnected')
current_call = None
@@ -56,12 +47,14 @@ def make_call(uri):
except pj.Error, e:
print "408 " + str(e)
+ logger.logEvent('408')
return None
lib = pj.Lib()
stop =False
current_call = None
+logger.logEvent('')
while stop <> True:
@@ -69,112 +62,74 @@ while stop <> True:
lib.init(log_cfg = pj.LogConfig(level=1, callback=log_cb))
transport = lib.create_transport(pj.TransportType.UDP, pj.TransportConfig(0))
-<<<<<<< HEAD
- if acc.info().reg_status == 502:
- if firstTime502:
- print "CONNECTION ERROR!!"
- print "Please check your internet connection!\n"
- firstTime502 = False
-
- acc.delete()
- lib.destroy()
- lib = None
- acc = None
-# server.sendData('NOT ready')
- continue
-=======
lib.start()
lib.set_null_snd_dev()
->>>>>>> 3c2c4f14c0dd26f03e5f664d91d51c62b617de7d
- server = classServer.ServerHandler(50099)
- tried = server.openSocket()
-
-<<<<<<< HEAD
- while acc.info().reg_status == 408:
- if firstTime408:
- print "408: REGISTRATION FAILED DUE TO TIMEOUT!!"
- print "I will try to check again if I can be successful to register!"
- firstTime408 = False
-# server.sendData('NOT ready')
-
+ server = classServer.ServerHandler(50099)
+ logger.logEvent('Connect to Controller via port 50099')
+ conn = server.openSocket()
- if acc.info().reg_status == 200:
- print ("REGISTRATION IS SUCCESSFUL") #server.sendData('ready')
-
- while 1:
-# try:
- print "Waiting for server(at the moment YOU!) to send command here:" #This line should be deleted further!
- startStop = sys.stdin.readline().rstrip("\r\n") #startStop = server.receiveData()
-
- if startStop == "start":
- timeCounterRinging = 0
- firstTimeRinging = True
-
- while 1:
- #number = server.receiveData()
- print "Please enter the number to call:" #This line should be deleted further!
- number = sys.stdin.readline().rstrip("\r\n")#This line should be deleted further!
- if number <> "":
- numberToCall = "sip:"+number+"@"+server
- current_call = make_call(numberToCall)
-=======
try:
+ logger.logEvent('Register Account to sipgate.de server')
acc_cfg = pj.AccountConfig("sipgate.de","1289459","MMW9AX")
acc = lib.create_account(acc_cfg, cb=pj.AccountCallback())
+
if acc.info().reg_status < 700:
server.sendData('ready')
- print "Status: ", server.connected
+ logger.logEvent('Handler Ready')
while 1:
try:
- data = server.receiveData()
+ data = server.receiveData(0)
event = data[0:5]
num = data[6:]
+
if event == "start" and num <> "":
-
- server.closeConnection()
- tried = server.openSocket()
->>>>>>> 3c2c4f14c0dd26f03e5f664d91d51c62b617de7d
-
+
+ logger.logEvent(event)
+ logger.logEvent('Make a call to: ' + num)
number = "sip:"+num+"@sipgate.de"
current_call = make_call(number)
if data == "487":
stop = True
+ logger.logEvent('Terminate')
break
except ValueError:
- print "813 General socket layer error: Failed send message"
+ logger.logEvent("error: Failed retrive message from Controller")
+ logger.logEvent('999')
server.closeConnection()
- del server
+ logger.logEvent('Close Connection to the Controller')
+
server.closeConnection()
- del server
+ logger.logEvent('Close Connection to the Controller')
else:
- Regis_status= "Bad"
- print "488 Not Acceptable Here"
+ logger.logEvent("488 Not Acceptable Here")
lib.destroy()
lib = None
acc = None
- server.closeConnection()
- del server
+ server.closeConnection()
+ logger.logEvent('Close Connection to the Controller')
except ValueError:
print "401 Unauthorized " + str(e)
+ logger.logEvent("401 Unauthorized ")
-print "Goodbye"
+logger.logEvent("Goodbye")
sleep(3)
acc.delete()
+logger.logEvent('Un-Rigester SIP Account')
lib.destroy()
server.closeConnection()
-del server
+logger.logEvent('Close Connection to the Controller')
lib = None
acc = None
diff --git a/For Weekly Test/20-07-2011/landlineReceiver.py b/For Weekly Test/20-07-2011/landlineReceiver.py
index 470b4c6..ba02562 100644
--- a/For Weekly Test/20-07-2011/landlineReceiver.py
+++ b/For Weekly Test/20-07-2011/landlineReceiver.py
@@ -1,12 +1,14 @@
import sys
import pjsua as pj
import classServer
-from time import sleep
+import LogFileClass
+from time import sleep
+logger = LogFileClass.Logging('LandlineRecHandler.log')
def log_cb(level, str, len):
- print str, "SIP Handler Receiver Log"
+ print str, "landline Handler Receiver Log"
class MyAccountCallback(pj.AccountCallback):
@@ -14,27 +16,28 @@ class MyAccountCallback(pj.AccountCallback):
def on_incoming_call(self, call):
current_call = call
-
- sleep(1)
- call.answer(200)
+ logger.logEvent(current_call)
+ sleep(0.5)
+ call.answer(200)
+ logger.logEvent("Answer call")
sleep(0.5)
if current_call <> None:
- print "hangup the call"
+ logger.logEvent("Hangup call")
call.hangup()
- print "send result"
server.sendData('200')
-
-
+ logger.logEvent('200')
lib = pj.Lib()
stop = False
+logger.logEvent('')
try:
server = classServer.ServerHandler(50106)
- tried = server.openSocket()
+ logger.logEvent('Connect to Controller via port 50106')
+ conn = server.openSocket()
lib.init(log_cfg = pj.LogConfig(level=1, callback=log_cb))
transport = lib.create_transport(pj.TransportType.UDP, pj.TransportConfig(0))
@@ -43,47 +46,66 @@ try:
lib.set_null_snd_dev()
try:
+ logger.logEvent('Register Account to sipgate.de server')
acc_cfg = pj.AccountConfig("sipgate.de","1289459","MMW9AX")
acc = lib.create_account(acc_cfg, cb=MyAccountCallback())
-
+
if acc.info().reg_status < 700:
+ logger.logEvent(acc.info().reg_status)
server.sendData('ready')
+ logger.logEvent('Handler Ready')
while stop <> True:
data = server.receiveData(0)
if data == "487":
+ logger.logEvent('Terminate')
stop = True
break
transport = None
acc.delete()
+ logger.logEvent('Un-Rigester SIP Account')
acc = None
lib.destroy()
lib = None
server.closeConnection()
+ logger.logEvent('Close Connection to the Controller')
else:
- print "Bad Register"
-
+ logger.logEvent("488 Not Acceptable Here")
lib.destroy()
+
lib = None
acc = None
- server.closeConnection()
+
+ server.closeConnection()
+ logger.logEvent('Close Connection to the Controller')
except pj.Error, e:
print "401 Unauthorized " +str(e)
+ logger.logEvent("401 Unauthorized ")
+
lib.destroy()
lib = None
+
server.closeConnection()
-
+ logger.logEvent('Close Connection to the Controller')
except pj.Error, e:
- print "Exception: " + str(e)
- lib.destroy()
- lib = None
- server.closeConnection()
- del server
+ print "Exception: " + str(e)
+ logger.logEvent(str(e))
+
+ lib.destroy()
+
+ lib = None
+ server.closeConnection()
+ logger.logEvent('Close Connection to the Controller')
+
+
+
+
+
diff --git a/For Weekly Test/20-07-2011/localsipReceiver.py b/For Weekly Test/20-07-2011/localsipReceiver.py
index c4f92e2..eb95ce0 100644
--- a/For Weekly Test/20-07-2011/localsipReceiver.py
+++ b/For Weekly Test/20-07-2011/localsipReceiver.py
@@ -37,7 +37,7 @@ try:
server = classServer.ServerHandler(50107)
logger.logEvent('Connect to Controller via port 50107')
- tried = server.openSocket()
+ conn = server.openSocket()
lib.init(log_cfg = pj.LogConfig(level=1, callback=log_cb))
transport = lib.create_transport(pj.TransportType.UDP, pj.TransportConfig(0))
diff --git a/For Weekly Test/20-07-2011/sipCall.py b/For Weekly Test/20-07-2011/sipCall.py
index 2835b88..51ae240 100644
--- a/For Weekly Test/20-07-2011/sipCall.py
+++ b/For Weekly Test/20-07-2011/sipCall.py
@@ -68,7 +68,7 @@ while stop <> True:
server = classServer.ServerHandler(50097)
logger.logEvent('Connect to Controller via port 50097')
- tried = server.openSocket()
+ conn = server.openSocket()
try:
logger.logEvent('Register Account to SIP server')
@@ -100,7 +100,8 @@ while stop <> True:
break
except ValueError:
- logger.logEvent("813 General socket layer error: Failed send message")
+ logger.logEvent("error: Failed retrive message from Controller")
+ logger.logEvent('999')
server.closeConnection()
logger.logEvent('Close Connection to the Controller')