Changeset 256

Timestamp:

Mar 1, 2006 8:47:16 PM (18 years ago)

Author:

bennylp

Message:

Option to dump summary/detail

File:

• pjproject/trunk/pjsip-apps/src/pjsua/main.c (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/main.c

@@ -210 +210 @@
     puts("|  M  Make multiple calls      |  s  Subscribe presence   | rr  (Re-)register |");
     puts("|  a  Answer call              |  u  Unsubscribe presence | ru  Unregister    |");
-    puts("|  h  Hangup call              |  t  ToGgle Online status |  d  Dump status   |");
-    puts("|  H  Hold call                |                          | dc  Dump config   |");
+    puts("|  h  Hangup call  (ha=all)    |  t  ToGgle Online status |                   |");
+    puts("|  H  Hold call                |                          |                   |");
     puts("|  v  re-inVite (release hold) +--------------------------+-------------------+");
     puts("|  ]  Select next dialog       |     Conference Command   |                   |");
-    puts("|  [  Select previous dialog   | cl  List ports           |                   |");
-    puts("|  x  Xfer call                | cc  Connect port         |                   |");
-    puts("|  #  Send DTMF string         | cd  Disconnect port      |                   |");
+    puts("|  [  Select previous dialog   | cl  List ports           |  d  Dump status   |");
+    puts("|  x  Xfer call                | cc  Connect port         | dd  Dump detailed |");
+    puts("|  #  Send DTMF string         | cd  Disconnect port      | dc  Dump config   |");
     puts("+------------------------------+--------------------------+-------------------+");
     puts("|  q  QUIT                                                                    |");
@@ -405 +405 @@
             printf("(You currently have %d calls)\n", pjsua.call_cnt);
             
+            if (!simple_input("Number of calls", menuin, sizeof(menuin)))
+                continue;
+
+            count = atoi(menuin);
+            if (count < 1)
+                continue;
+
             ui_input_url("Make call", buf, sizeof(buf), &result);
             if (result.nb_result != NO_NB) {
@@ -415 +422 @@
                 uri =  result.uri_result;
             }
-
-            if (!simple_input("Number of calls", menuin, sizeof(menuin)))
-                continue;
-
-            count = atoi(menuin);
-            if (count < 1)
-                continue;
 
             for (i=0; i<atoi(menuin); ++i) {
@@ -485 +485 @@
                 continue;
 
+            } else if (menuin[1] == 'a') {
+                
+                /* Hangup all calls */
+                pjsua_call_hangup_all();
+
             } else {
+
+                /* Hangup current calls */
                 pjsua_call_hangup(current_call, PJSIP_SC_DECLINE);
             }
@@ -726 +733 @@
                               len, settings));
             } else {
-                pjsua_dump();
+                pjsua_dump(menuin[1]=='d');
             }
             break;