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

Timestamp:

Apr 13, 2009 8:54:10 AM (15 years ago)

Author:

bennylp

Message:

Ticket #780: Update TURN from draft 09 to draft 13:

• new rules for permissions:
  • permission must be created and refreshed explicitly with CreatePermission?
  • transmitting data does not refresh permission
• attributes changed/added: XOR-PEER-ADDRESS, XOR-RELAYED-ADDRESS, EVEN-PORT, DONT-FRAGMENT
• attribute(s) removed: REQUESTED-PROPS
• new status codes: 401 (Forbidden), 507 (Insufficient Capacity)
• removed status codes: 443 (Invalid IP address), 444 (Invalid Port), 508 (Insufficient Port Capacity)

File:

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

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

@@ -139 +139 @@
         char name[] = "peer0";
         pj_uint16_t port;
+        pj_stun_sock_cfg ss_cfg;
         pj_str_t server;
 
@@ -147 +148 @@
         g.peer[i].mapped_addr.addr.sa_family = pj_AF_INET();
 
+        pj_stun_sock_cfg_default(&ss_cfg);
+#if 1
+        /* make reading the log easier */
+        ss_cfg.ka_interval = 300;
+#endif
+
         name[strlen(name)-1] = '0'+i;
         status = pj_stun_sock_create(&g.stun_config, name, pj_AF_INET(), 
-                                     &stun_sock_cb, NULL,
+                                     &stun_sock_cb, &ss_cfg,
                                      &g.peer[i], &g.peer[i].stun_sock);
         if (status != PJ_SUCCESS) {
@@ -416 +423 @@
 
     puts("\n");
-    puts("+====================================================================+");
-    puts("|             CLIENT                |             PEER-0             |");
-    puts("|                                   |                                |");
-    printf("| State     : %-12s          | Address: %-21s |\n",
+    puts("+=====================================================================+");
+    puts("|             CLIENT                 |             PEER-0             |");
+    puts("|                                    |                                |");
+    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  |");
-    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",
+    puts("|                                    | 0  Send data to relay address  |");
+    puts("| a      Allocate relay              |                                |");
+    puts("| p,pp   Set permission for peer 0/1 +--------------------------------+");
+    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("+-----------------------------------+                                |");
-    puts("| q  Quit                  d  Dump  | 1  Send data to relay adderss  |");
-    puts("+-----------------------------------+--------------------------------+");
+    puts("+------------------------------------+                                |");
+    puts("| q  Quit                  d  Dump   | 1  Send data to relay adderss  |");
+    puts("+------------------------------------+--------------------------------+");
     printf(">>> ");
     fflush(stdout);
@@ -488 +496 @@
             if (status != PJ_SUCCESS)
                 my_perror("turn_udp_bind_channel() failed", status);
+            break;
+        case 'p':
+            if (g.relay == NULL) {
+                puts("Error: no relay");
+                continue;
+            }
+            if (input[1]!='p')
+                peer = &g.peer[0];
+            else
+                peer = &g.peer[1];
+
+            status = pj_turn_sock_set_perm(g.relay, 1, &peer->mapped_addr, 1);
+            if (status != PJ_SUCCESS)
+                my_perror("pj_turn_sock_set_perm() failed", status);
             break;
         case 'x':