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

Timestamp:

Mar 20, 2008 4:32:06 PM (16 years ago)

Author:

bennylp

Message:

More ticket #485: client and server self tested

File:

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

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

@@ -62 +62 @@
     char    *user_name;
     char    *password;
-    char    *nonce;
     pj_bool_t use_fingerprint;
 } o;
@@ -136 +135 @@
 
         CHECK( pj_gethostip(pj_AF_INET(), &g.peer[i].addr) );
-        pj_sockaddr_set_port(&g.peer[0].addr, port);
+        pj_sockaddr_set_port(&g.peer[i].addr, port);
 
     }
@@ -266 +265 @@
         cred.data.static_cred.data_type = 0;
         cred.data.static_cred.data = pj_str(o.password);
-        cred.data.static_cred.nonce = pj_str(o.nonce);
+        //cred.data.static_cred.nonce = pj_str(o.nonce);
     } else {
         PJ_LOG(2,(THIS_FILE, "Warning: no credential is set"));
@@ -287 +286 @@
     if (g.udp_rel) {
         pj_turn_udp_destroy(g.udp_rel);
-        g.udp_rel = NULL;
     }
 }
@@ -310 +308 @@
                           pj_turn_state_t new_state)
 {
+    PJ_LOG(3,(THIS_FILE, "State %s --> %s", pj_turn_state_name(old_state), 
+              pj_turn_state_name(new_state)));
+
     if (new_state == PJ_TURN_STATE_READY) {
         pj_turn_session_info info;
         pj_turn_udp_get_info(udp_rel, &info);
         pj_memcpy(&g.relay_addr, &info.relay_addr, sizeof(pj_sockaddr));
+    } else if (new_state > PJ_TURN_STATE_READY && g.udp_rel) {
+        PJ_LOG(3,(THIS_FILE, "Relay shutting down.."));
+        g.udp_rel = NULL;
     }
 }
@@ -380 +384 @@
            relay_addr);
     puts("|                                   | 0  Send data to relay address  |");
-    puts("| A      Allocate relay             +--------------------------------+        ");
-    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",
+    puts("| a      Allocate relay             +--------------------------------+        ");
+    puts("| s,ss   Send data to peer 0/1      |             PEER-1             |");
+    puts("| b,bb   BindChannel to peer 0/1    |                                |");
+    printf("| x      Delete allocation          | Address: %-21s |\n",
           peer1_addr);
     puts("+-----------------------------------+                                |");
@@ -406 +410 @@
         
         switch (input[0]) {
-        case 'A':
+        case 'a':
             create_relay();
             break;
-        case 'S':
+        case 's':
             if (g.udp_rel == NULL) {
                 puts("Error: no relay");
                 continue;
             }
-            if (input[1] != '0' && input[1] != '1') {
-                puts("Usage: S0 or S1");
-                continue;
-            }
-            peer = &g.peer[input[1]-'0'];
+            if (input[1]!='s')
+                peer = &g.peer[0];
+            else
+                peer = &g.peer[1];
+
             strcpy(input, "Hello from client");
             status = pj_turn_udp_sendto(g.udp_rel, input, strlen(input)+1, 
@@ -426 +430 @@
                 my_perror("turn_udp_sendto() failed", status);
             break;
-        case 'B':
+        case 'b':
             if (g.udp_rel == NULL) {
                 puts("Error: no relay");
                 continue;
             }
-            if (input[1] != '0' && input[1] != '1') {
-                puts("Usage: B0 or B1");
-                continue;
-            }
-            peer = &g.peer[input[1]-'0'];
+            if (input[1]!='b')
+                peer = &g.peer[0];
+            else
+                peer = &g.peer[1];
+
             status = pj_turn_udp_bind_channel(g.udp_rel, &peer->addr,
                                               pj_sockaddr_get_len(&peer->addr));
@@ -441 +445 @@
                 my_perror("turn_udp_bind_channel() failed", status);
             break;
-        case 'X':
+        case 'x':
             if (g.udp_rel == NULL) {
                 puts("Error: no relay");
@@ -450 +454 @@
         case '0':
         case '1':
-            peer = &g.peer[input[1]-'0'];
+            peer = &g.peer[input[0]-'0'];
             sprintf(input, "Hello from peer%d", input[0]-'0');
             len = strlen(input)+1;
@@ -474 +478 @@
     puts(" --username, -u    Set username of the credential");
     puts(" --password, -p    Set password of the credential");
-    puts(" --nonce, -N       Set NONCE");   
     puts(" --fingerprint, -F Use fingerprint for outgoing requests");
     puts(" --help, -h");
@@ -485 +488 @@
         { "username",   1, 0, 'u'},
         { "password",   1, 0, 'p'},
-        { "nonce",      1, 0, 'N'},
         { "fingerprint",0, 0, 'F'},
         { "data",       1, 0, 'D'},
@@ -505 +507 @@
             o.password = pj_optarg;
             break;
-        case 'N':
-            o.nonce = pj_optarg;
-            break;
         case 'h':
             usage();
@@ -538 +537 @@
         goto on_return;
     
-    if ((status=create_relay()) != 0)
-        goto on_return;
+    //if ((status=create_relay()) != 0)
+    //  goto on_return;
     
     console_main();