Changeset 3232

Timestamp:

Jul 1, 2010 10:25:47 AM (14 years ago)

Author:

ming

Message:

Re #1098:
Fixed failure in socket binding of CLI telnet daemon.

Location:

pjproject/branches/projects/cli

Files:

• pjlib-util/src/pjlib-util/cli_telnet.c (modified) (3 diffs)
• pjsip-apps/src/samples/clidemo.c (modified) (4 diffs)

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

@@ -441 +441 @@
     pj_sock_t sock = PJ_INVALID_SOCKET;
     pj_activesock_cb asock_cb;
-    pj_sockaddr addr;
+    pj_sockaddr_in addr;
     pj_status_t sstatus;
 
@@ -472 +472 @@
             goto on_exit;
         fe->own_ioqueue = PJ_TRUE;
-
+    }
+
+    sstatus = pj_mutex_create_recursive(pool, "mutex_telnet_fe", &fe->mutex);
+    if (sstatus != PJ_SUCCESS)
+        goto on_exit;
+
+    /* Start telnet daemon */
+    sstatus = pj_sock_socket(pj_AF_INET(), pj_SOCK_STREAM(), 0, 
+                             &sock);
+    if (sstatus != PJ_SUCCESS)
+        goto on_exit;
+
+    pj_sockaddr_in_init(&addr, NULL, fe->cfg.port);
+
+    sstatus = pj_sock_bind(sock, &addr, sizeof(addr));
+    if (sstatus == PJ_SUCCESS) {
+        pj_sockaddr_in addr;
+        int addr_len = sizeof(addr);
+
+        sstatus = pj_sock_getsockname(sock, &addr, &addr_len);
+        if (sstatus != PJ_SUCCESS)
+            goto on_exit;
+        fe->cfg.port = pj_sockaddr_in_get_port(&addr);
+        PJ_LOG(3, (THIS_FILE, "CLI telnet daemon listening at port %d",
+               fe->cfg.port));
+    } else {
+        PJ_LOG(3, (THIS_FILE, "Failed binding the socket"));
+        goto on_exit;
+    }
+
+    sstatus = pj_sock_listen(sock, 4);
+    if (sstatus != PJ_SUCCESS)
+        goto on_exit;
+
+    pj_bzero(&asock_cb, sizeof(asock_cb));
+    asock_cb.on_accept_complete = &telnet_fe_on_accept;
+    sstatus = pj_activesock_create(pool, sock, pj_SOCK_STREAM(),
+                                   NULL, fe->cfg.ioqueue,
+                                   &asock_cb, fe, &fe->asock);
+    if (sstatus != PJ_SUCCESS)
+        goto on_exit;
+
+    sstatus = pj_activesock_start_accept(fe->asock, pool);
+    if (sstatus != PJ_SUCCESS)
+        goto on_exit;
+
+    if (fe->own_ioqueue) {
         /* Create our own worker thread */
         sstatus = pj_thread_create(pool, "worker_telnet_fe",
@@ -481 +527 @@
     }
 
-    sstatus = pj_mutex_create_recursive(pool, "mutex_telnet_fe", &fe->mutex);
-    if (sstatus != PJ_SUCCESS)
-        goto on_exit;
-
-    /* Start telnet daemon */
-    sstatus = pj_sock_socket(pj_AF_INET(), pj_SOCK_STREAM(), 0, 
-                             &sock);
-    if (sstatus != PJ_SUCCESS)
-        goto on_exit;
-
-    pj_sockaddr_init(pj_AF_INET(), &addr, NULL, fe->cfg.port);
-
-    sstatus = pj_sock_bind(sock, &addr, sizeof(addr));
-    if (sstatus != PJ_SUCCESS)
-        goto on_exit;
-
-    sstatus = pj_sock_listen(sock, 4);
-    if (sstatus != PJ_SUCCESS)
-        goto on_exit;
-
-    pj_bzero(&asock_cb, sizeof(asock_cb));
-    asock_cb.on_accept_complete = &telnet_fe_on_accept;
-    sstatus = pj_activesock_create(pool, sock, pj_SOCK_STREAM(),
-                                   NULL, fe->cfg.ioqueue,
-                                   &asock_cb, fe, &fe->asock);
-    if (sstatus != PJ_SUCCESS)
-        goto on_exit;
-
-    sstatus = pj_activesock_start_accept(fe->asock, pool);
-    if (sstatus != PJ_SUCCESS)
-        goto on_exit;
-
     pj_cli_register_front_end(cli, &fe->base);
 

pjproject/branches/projects/cli/pjsip-apps/src/samples/clidemo.c

@@ -30 +30 @@
 #define THIS_FILE       "clidemo.c"
 
+/* Set this to 1 if you want to let the system assign a port
+ * for the CLI telnet daemon.
+ * Default: 1
+ */
+#define USE_RANDOM_PORT 1
+
 struct cmd_xml_t {
     char * xml;
@@ -128 +134 @@
     pjlib_util_init();
 
-    pj_log_set_log_func(&log_writer);
-
     /*
      * Create CLI app.
@@ -158 +162 @@
     pj_cli_telnet_cfg_default(&tcfg);
 //    tcfg.passwd = pj_str("pjsip");
+#if USE_RANDOM_PORT
+    tcfg.port = 0;
+#endif
     status = pj_cli_telnet_create(cli, &tcfg, NULL);
     if (status != PJ_SUCCESS)
@@ -196 +203 @@
     if (status != PJ_SUCCESS)
         return status;
+
+    pj_log_set_log_func(&log_writer);
 
     /*