Changeset 201 for pjproject/trunk/pjsip/src/pjsua/main.c

Timestamp:

Feb 19, 2006 3:37:19 PM (19 years ago)

Author:

bennylp

Message:

SIMPLE test with FWD, and added more info in UI

File:

• pjproject/trunk/pjsip/src/pjsua/main.c (modified) (9 diffs)

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

@@ -99 +99 @@
 static void keystroke_help(void)
 {
-
-    printf(">>>>\nOnline status: %s\n", 
+    char reg_status[128];
+
+    if (pjsua.regc == NULL) {
+        pj_ansi_strcpy(reg_status, " -not registered to server-");
+    } else if (pjsua.regc_last_err != PJ_SUCCESS) {
+        pj_strerror(pjsua.regc_last_err, reg_status, sizeof(reg_status));
+    } else if (pjsua.regc_last_code>=200 && pjsua.regc_last_code<=699) {
+
+        pjsip_regc_info info;
+
+        pjsip_regc_get_info(pjsua.regc, &info);
+
+        pj_snprintf(reg_status, sizeof(reg_status),
+                    "%s (%.*s;expires=%d)",
+                    pjsip_get_status_text(pjsua.regc_last_code)->ptr,
+                    (int)info.server_uri.slen,
+                    info.server_uri.ptr,
+                    info.next_reg);
+
+    } else {
+        pj_sprintf(reg_status, "in progress (%d)", pjsua.regc_last_code);
+    }
+
+    printf(">>>>\nRegistration status: %s\n", reg_status);
+    printf("Online status: %s\n", 
            (pjsua.online_status ? "Online" : "Invisible"));
     print_buddy_list();
@@ -109 +132 @@
     puts("|                              |                          |                   |");
     puts("|  m  Make new call            |  i  Send IM              |  o  Send OPTIONS  |");
-    puts("|  a  Answer call              |  s  Subscribe presence   |  d  Dump status   |");
-    puts("|  h  Hangup call              |  u  Unsubscribe presence |  d1 Dump detailed |");
-    puts("|  ]  Select next dialog       |  t  Toggle Online status |                   |");
+    puts("|  a  Answer call              |  s  Subscribe presence   |  R  (Re-)register |");
+    puts("|  h  Hangup call              |  u  Unsubscribe presence |  r  Unregister    |");
+    puts("|  ]  Select next dialog       |  t  Toggle Online status |  d  Dump status   |");
     puts("|  [  Select previous dialog   |                          |                   |");
     puts("+-----------------------------------------------------------------------------+");
@@ -224 +247 @@
 
         if ((status=pjsua_verify_sip_url(buf)) != PJ_SUCCESS) {
-            pjsua_perror("Invalid URL", status);
+            pjsua_perror(THIS_FILE, "Invalid URL", status);
             return;
         }
@@ -291 +314 @@
 
                 if (status != PJ_SUCCESS)
-                    pjsua_perror("Unable to create/send response", status);
+                    pjsua_perror(THIS_FILE, "Unable to create/send response", 
+                                 status);
             }
 
@@ -311 +335 @@
                                                PJSIP_SC_DECLINE, NULL, &tdata);
                 if (status != PJ_SUCCESS) {
-                    pjsua_perror("Failed to create end session message", status);
+                    pjsua_perror(THIS_FILE, 
+                                 "Failed to create end session message", 
+                                 status);
                     continue;
                 }
@@ -317 +343 @@
                 status = pjsip_inv_send_msg(inv_session->inv, tdata, NULL);
                 if (status != PJ_SUCCESS) {
-                    pjsua_perror("Failed to send end session message", status);
+                    pjsua_perror(THIS_FILE, 
+                                 "Failed to send end session message", 
+                                 status);
                     continue;
                 }
@@ -353 +381 @@
             }
 
+            break;
+
+        case 'R':
+            pjsua_regc_update(PJ_TRUE);
+            break;
+            
+        case 'r':
+            pjsua_regc_update(PJ_FALSE);
             break;
 
@@ -501 +537 @@
  * Display error message for the specified error code.
  */
-void pjsua_perror(const char *title, pj_status_t status)
+void pjsua_perror(const char *sender, const char *title, 
+                  pj_status_t status)
 {
     char errmsg[PJ_ERR_MSG_SIZE];
@@ -507 +544 @@
     pj_strerror(status, errmsg, sizeof(errmsg));
 
-    PJ_LOG(1,(THIS_FILE, "%s: %s [code=%d]", title, errmsg, status));
+    PJ_LOG(1,(sender, "%s: %s [code=%d]", title, errmsg, status));
 }