Changeset 1869 for pjproject/trunk/pjnath/src/pjturn-client/client_main.c

Timestamp:

Mar 14, 2008 5:56:11 PM (16 years ago)

Author:

bennylp

Message:

More ticket #485: initial test on TURN client/server

File:

• pjproject/trunk/pjnath/src/pjturn-client/client_main.c (modified) (4 diffs)

pjproject/trunk/pjnath/src/pjturn-client/client_main.c

@@ -133 +133 @@
         len = sizeof(addr);
         CHECK( pj_sock_getsockname(g.peer[i].sock, &addr, &len) );
-        port = pj_sockaddr_get_port(&g.peer[i].addr);
+        port = pj_sockaddr_get_port(&addr);
 
         CHECK( pj_gethostip(pj_AF_INET(), &g.peer[i].addr) );
@@ -358 +358 @@
         pj_turn_udp_get_info(g.udp_rel, &info);
         strcpy(client_state, pj_turn_state_name(info.state));
-        pj_sockaddr_print(&info.relay_addr, relay_addr, sizeof(relay_addr), 3);
+        if (info.state >= PJ_TURN_STATE_READY)
+            pj_sockaddr_print(&info.relay_addr, relay_addr, sizeof(relay_addr), 3);
+        else
+            strcpy(relay_addr, "0.0.0.0:0");
     } else {
         strcpy(client_state, "NULL");
@@ -372 +375 @@
     puts("|             CLIENT                |             PEER-0             |");
     puts("|                                   |                                |");
-    printf("| State     : %12s          | Address: %21s |\n",
+    printf("| State     : %-12s          | Address: %-21s |\n",
            client_state, peer0_addr);
-    printf("| Relay addr: %21s |                                |\n",
+    printf("| Relay addr: %-21s |                                |\n",
            relay_addr);
     puts("|                                   | 0  Send data to relay address  |");
@@ -380 +383 @@
     puts("| S[01]  Send data to peer 0/1      |             PEER-1             |");
     puts("| B[01]  BindChannel to peer 0/1    |                                |");
-    printf("| X      Delete allocation          | Address: %21s |\n",
+    printf("| X      Delete allocation          | Address: %-21s |\n",
           peer1_addr);
     puts("+-----------------------------------+                                |");