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

Timestamp:

Feb 8, 2006 10:44:25 PM (18 years ago)

Author:

bennylp

Message:

Finished invite session UAS implementation

File:

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

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

@@ -19 +19 @@
 #include "pjsua.h"
 #include "getopt.h"
-
-
-/* For debugging, disable threading. */
-//#define NO_WORKER_THREAD
-
-#ifdef NO_WORKER_THREAD
-#include <conio.h>
-#endif
+#include <stdlib.h>
+
 
 #define THIS_FILE       "main.c"
@@ -69 +63 @@
     puts("Console keys:");
     puts("  m    Make a call");
+    puts("  a    Answer incoming call");
     puts("  h    Hangup current call");
     puts("  q    Quit");
@@ -75 +70 @@
 }
 
+static pj_bool_t input(const char *title, char *buf, pj_size_t len)
+{
+    char *p;
+
+    printf("%s (empty to cancel): ", title); fflush(stdout);
+    fgets(buf, len, stdin);
+
+    /* Remove trailing newlines. */
+    for (p=buf; ; ++p) {
+        if (*p=='\r' || *p=='\n') *p='\0';
+        else if (!*p) break;
+    }
+
+    if (!*buf)
+        return PJ_FALSE;
+    
+    return PJ_TRUE;
+}
+
 static void ui_console_main(void)
 {
-    char keyin[10];
     char buf[128];
-    char *p;
     pjsip_inv_session *inv;
 
@@ -86 +98 @@
     for (;;) {
 
-#ifdef NO_WORKER_THREAD
-        pj_time_val timeout = { 0, 10 };
-        pjsip_endpt_handle_events (pjsua.endpt, &timeout);
-
-        if (kbhit())
-            fgets(keyin, sizeof(keyin), stdin);
-#else
         ui_help();
-        fgets(keyin, sizeof(keyin), stdin);
-#endif
-
-        switch (keyin[0]) {
+        fgets(buf, sizeof(buf), stdin);
+
+        switch (buf[0]) {
 
         case 'm':
@@ -107 +111 @@
 
 #if 1
-            printf("Enter URL to call: "); fflush(stdout);
-            fgets(buf, sizeof(buf), stdin);
-
-            if (buf[0]=='\r' || buf[0]=='\n') {
-                /* Cancelled. */
-                puts("<cancelled>");
+            /* Make call! : */
+            if (!input("Enter URL to call", buf, sizeof(buf)))
+                continue;
+            pjsua_invite(buf, &inv);
+
+#else
+
+            pjsua_invite("sip:localhost:5061", &inv);
+#endif
+            break;
+
+
+        case 'a':
+
+            if (inv_session == NULL || inv_session->role != PJSIP_ROLE_UAS ||
+                inv_session->state >= PJSIP_INV_STATE_CONNECTING) 
+            {
+                puts("No pending incoming call");
                 fflush(stdout);
                 continue;
-            }
-
-            /* Remove trailing newlines. */
-            for (p=buf; ; ++p) {
-                if (*p=='\r' || *p=='\n') *p='\0';
-                else if (!*p) break;
-            }
-            /* Make call! : */
-
-            pjsua_invite(buf, &inv);
-
-#else
-
-            pjsua_invite("sip:localhost:5061", &inv);
-#endif
-            break;
-
+
+            } else {
+                pj_status_t status;
+                pjsip_tx_data *tdata;
+
+                if (!input("Answer with code (100-699)", buf, sizeof(buf)))
+                    continue;
+                
+                status = pjsip_inv_answer(inv_session, atoi(buf), NULL, NULL, 
+                                          &tdata);
+                if (status == PJ_SUCCESS)
+                    status = pjsip_inv_send_msg(inv_session, tdata, NULL);
+
+                if (status != PJ_SUCCESS)
+                    pjsua_perror("Unable to create/send response", status);
+            }
+
+            break;
 
         case 'h':
@@ -673 +690 @@
 
 
-#ifdef NO_WORKER_THREAD
-    pjsua.thread_cnt = 0;
-#endif
-
-
     /* Initialize pjsua (to create pool etc).
      */