Changeset 3231 for pjproject/branches/projects/cli/pjlib-util/src/pjlib-util/cli_console.c

Timestamp:

Jun 30, 2010 5:29:59 AM (14 years ago)

Author:

ming

Message:

Implemented CLI (re #1098)

• pjlib-util:
  • implement telnet CLI
• pjsip-apps/samples:
  • sample CLI demo application
• build:
  • VS6 and Makefile

File:

• pjproject/branches/projects/cli/pjlib-util/src/pjlib-util/cli_console.c (modified) (9 diffs)

pjproject/branches/projects/cli/pjlib-util/src/pjlib-util/cli_console.c

@@ -22 +22 @@
 #include <pj/assert.h>
 #include <pj/errno.h>
+#include <pj/log.h>
 #include <pj/os.h>
 #include <pj/pool.h>
@@ -44 +45 @@
 };
 
+static void cli_console_write_log(pj_cli_front_end *fe, int level,
+                                  const char *data, int len)
+{
+    struct cli_console_fe * cfe = (struct cli_console_fe *)fe;
+
+    if (cfe->sess->log_level > level)
+        printf("%.*s", len, data);
+}
+
+
 static void cli_console_quit(pj_cli_front_end *fe, pj_cli_sess *req)
 {
@@ -65 +76 @@
     cli_console_quit(fe, NULL);
 
+    if (cfe->input_thread)
+        pj_thread_destroy(cfe->input_thread);
     pj_sem_destroy(cfe->thread_sem);
     pj_sem_destroy(cfe->input.sem);
@@ -90 +103 @@
 
     pool = pj_pool_create(pj_cli_get_param(cli)->pf, "console_fe",
-                          256, 256, NULL);
+                          PJ_CLI_CONSOLE_POOL_SIZE, PJ_CLI_CONSOLE_POOL_INC,
+                          NULL);
+    if (!pool)
+        return PJ_ENOMEM;
     sess = PJ_POOL_ZALLOC_T(pool, pj_cli_sess);
     fe = PJ_POOL_ZALLOC_T(pool, struct cli_console_fe);
-    if (!sess || !fe)
-        return PJ_ENOMEM;
 
     if (!param) {
@@ -102 +116 @@
     sess->fe = &fe->base;
     sess->log_level = param->log_level;
+    sess->op = PJ_POOL_ZALLOC_T(pool, struct pj_cli_sess_op);
+    fe->base.op = PJ_POOL_ZALLOC_T(pool, struct pj_cli_front_end_op);
     fe->base.cli = cli;
     fe->base.type = PJ_CLI_CONSOLE_FRONT_END;
-    fe->base.op = PJ_POOL_ZALLOC_T(pool, struct pj_cli_front_end_op);
+    fe->base.op->on_write_log = &cli_console_write_log;
     fe->base.op->on_quit = &cli_console_quit;
     fe->base.op->on_destroy = &cli_console_destroy;
@@ -128 +144 @@
         fgets(fe->input.buf, fe->input.maxlen, stdin);
         for (i = pj_ansi_strlen(fe->input.buf) - 1; i >= 0; i--) {
-            if (fe->input.buf[i] == '\n')
+            if (fe->input.buf[i] == '\n' || fe->input.buf[i] == '\r')
                 fe->input.buf[i] = 0;
             else
@@ -137 +153 @@
         pj_sem_wait(fe->thread_sem);
     }
-    pj_sem_post(fe->input.sem);
     fe->input_thread = NULL;
 
@@ -155 +170 @@
 
     if (!fe->input_thread) {
-        if (pj_thread_create(fe->pool, NULL, &readline_thread, fe,
-                             0, 0, &fe->input_thread) != PJ_SUCCESS)
-        {
-            return PJ_EUNKNOWN;
-        }
+        pj_status_t status;
+
+        status = pj_thread_create(fe->pool, NULL, &readline_thread, fe,
+                                  0, 0, &fe->input_thread);
+        if (status != PJ_SUCCESS)
+            return status;
     } else {
         /* Wake up readline thread */
@@ -166 +182 @@
 
     pj_sem_wait(fe->input.sem);
-    
-    return (fe->thread_quit ? PJ_CLI_EEXIT : PJ_SUCCESS);
+
+    return (pj_cli_is_quitting(fe->base.cli)? PJ_CLI_EEXIT : PJ_SUCCESS);
 }