Changeset 972 for pjproject/trunk/pjsip-apps/src/py_pjsua/pjsua_app.py

Timestamp:

Feb 18, 2007 11:49:14 PM (17 years ago)

Author:

bennylp

Message:

Fixed various bugs in Python module

File:

• pjproject/trunk/pjsip-apps/src/py_pjsua/pjsua_app.py (modified) (10 diffs)

pjproject/trunk/pjsip-apps/src/py_pjsua/pjsua_app.py

@@ -37 +37 @@
 g_rec_port = 0
 
+# Utility: display PJ error and exit
+#
+def err_exit(title, rc):
+    py_pjsua.perror(THIS_FILE, title, rc)
+    exit(1)
+
+
+# Logging function (also callback, called by pjsua-lib)
+#
+def log_cb(level, str, len):
+    if level <= C_LOG_LEVEL:
+        print str,
+
+def write_log(level, str):
+    log_cb(level, str + "\n", 0)
+
+
 # Utility to get call info
 #
@@ -85 +102 @@
 def on_reg_state(acc_id):
         acc_info = py_pjsua.acc_get_info(acc_id)
+        if acc_info.has_registration != 0:
+                cmd = "registration"
+        else:
+                cmd = "unregistration"
         if acc_info.status != 0 and acc_info.status != 200:
-                write_log(3, "Account (un)registration failed: rc=" + `acc_info.status` + " " + acc_info.status_text)
-        else:
-                write_log(3, "Account successfully (un)registered")
+                write_log(3, "Account " + cmd + " failed: rc=" + `acc_info.status` + " " + acc_info.status_text)
+        else:
+                write_log(3, "Account " + cmd + " success")
 
 
@@ -123 +144 @@
         write_log(3, "IM indication: " + strfrom + " " + str_t)
 
-# on call transfer status
+# Received the status of previous call transfer request
 #
 def on_call_transfer_status(call_id,status_code,status_text,final,p_cont):
@@ -137 +158 @@
                 p_cont = 0
 
-# on call transfer request
+# Callback on incoming call transfer request
 #               
 def on_call_transfer_request(call_id, dst, code):
         write_log(3, "Call transfer request from " + `call_id` + " to " + dst + " with code " + `code`)
-
-# Utility: display PJ error and exit
-#
-def err_exit(title, rc):
-    py_pjsua.perror(THIS_FILE, title, rc)
-    exit(1)
-
-
-# Logging function (also callback, called by pjsua-lib)
-#
-def log_cb(level, str, len):
-    if level <= C_LOG_LEVEL:
-        print str,
-
-def write_log(level, str):
-    log_cb(level, str + "\n", 0)
-
 
 #
@@ -330 +334 @@
 
 def conf_list():
-        
-        
         ports = None
-
         print "Conference ports : "
-
-        
         ports = py_pjsua.enum_conf_ports()
 
@@ -401 +400 @@
         else:
                 write_log(3, "No current call")
-                
+
 def xfer_call():
         global g_current_call
@@ -507 +506 @@
 
 
+# Print account and buddy list
+def print_acc_buddy_list():
+        global g_acc_id
+        
+        acc_ids = py_pjsua.enum_accs()
+        print "Account list:"
+        for acc_id in acc_ids:
+                acc_info = py_pjsua.acc_get_info(acc_id)
+                if acc_info.has_registration == 0:
+                        acc_status = acc_info.status_text
+                else:
+                        acc_status = `acc_info.status` + "/" + acc_info.status_text + " (expires=" + `acc_info.expires` + ")"
+
+                if acc_id == g_acc_id:
+                        print " *",
+                else:
+                        print "  ",
+
+                print "[" + `acc_id` + "] " + acc_info.acc_uri + ": " + acc_status
+                print "       Presence status: ",
+                if acc_info.online_status != 0:
+                        print "Online"
+                else:
+                        print "Invisible"
+
+        if py_pjsua.get_buddy_count() > 0:
+                print ""
+                print "Buddy list:"
+                buddy_ids = py_pjsua.enum_buddies()
+                for buddy_id in buddy_ids:
+                        bi = py_pjsua.buddy_get_info(buddy_id)
+                        print "   [" + `buddy_id` + "] " + bi.status_text + " " + bi.uri
+        
+                
 # Print application menu
 #
 def print_menu():
+        print ""
+        print ">>>"
+        print_acc_buddy_list()
         print """
 +============================================================================+
@@ -525 +561 @@
 |  X  Xfer with Replaces       |                          |                  |
 |                              | cl  List ports           |  d  Dump status  |
-|                              | cc  Connect port         |                  |
+|                              | cc  Connect port         | dd  Dump detail  |
 |                              | cd  Disconnect port      |                  |
 |                              | +p  Add file player      |                  |
 |------------------------------+ +r  Add file recorder    |                  |
 |  q  Quit application         |                          |                  |
-+============================================================================+
-        """
-        print "Choice: ", 
++============================================================================+"""
+        print "You have " + `py_pjsua.call_get_count()` + " active call(s)"
+        print ">>>", 
 
 # Menu
@@ -592 +628 @@
                                 continue
             
+                        bc.uri = bc.uri.replace("\n", "")
                         bc.subscribe = 1
                         status, buddy_id = py_pjsua.buddy_add(bc)
@@ -714 +751 @@
                                 py_pjsua.acc_set_registration(g_acc_id, 0)
                 elif choice[0] == "d":
-                        
-                        write_log(3, "Start dumping application states : ")
-                        write_log(3, "Dumping invite sessions : ")
-
-                        if py_pjsua.call_get_count() == 0:
-                                write_log(3, "  - no sessions -")
-                        else:
-                                for i in range(0, g_ua_cfg.max_calls):
-                                        if py_pjsua.call_is_active(i):
-                                                buf = py_pjsua.call_dump(i, 1, 1024, "  ")
-                                                write_log(3, buf)       
-                        py_pjsua.pres_dump(1)
-                        write_log(3, "Dump complete")
+                        py_pjsua.dump(choice[1] == "d")
                 elif choice[0] == "a":
                         if g_current_call != py_pjsua.PJSUA_INVALID_ID: