Changeset 2340 for pjproject/trunk

Timestamp:

Oct 2, 2008 5:54:40 PM (16 years ago)

Author:

bennylp

Message:

Ticket #654: Error when falling back to secondary TURN server (thanks Nicolas Fauvel for the report)

Location:

pjproject/trunk/pjnath/src

Files:

• pjnath/turn_session.c (modified) (1 diff)
• pjturn-client/client_main.c (modified) (8 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_session.c

@@ -1075 +1075 @@
 
         PJ_LOG(4,(sess->obj_name, "Trying next server"));
-
-        status = pj_turn_session_alloc(sess, NULL);
+        set_state(sess, PJ_TURN_STATE_RESOLVED);
+        break;
 
     } while (status != PJ_SUCCESS);

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

@@ -49 +49 @@
     pj_bool_t            quit;
 
+    pj_dns_resolver     *resolver;
+
     pj_turn_sock        *relay;
     pj_sockaddr          relay_addr;
@@ -65 +67 @@
     pj_bool_t    use_fingerprint;
     char        *stun_server;
+    char        *nameserver;
 } o;
 
@@ -244 +247 @@
     }
 
+    /* Create DNS resolver if configured */
+    if (o.nameserver) {
+        pj_str_t ns = pj_str(o.nameserver);
+
+        status = pj_dns_resolver_create(&g.cp.factory, "resolver", 0, 
+                                        g.stun_config.timer_heap, 
+                                        g.stun_config.ioqueue, &g.resolver);
+        if (status != PJ_SUCCESS) {
+            PJ_LOG(1,(THIS_FILE, "Error creating resolver (err=%d)", status));
+            return status;
+        }
+
+        status = pj_dns_resolver_set_ns(g.resolver, 1, &ns, NULL);
+        if (status != PJ_SUCCESS) {
+            PJ_LOG(1,(THIS_FILE, "Error configuring nameserver (err=%d)", status));
+            return status;
+        }
+    }
+
     pj_bzero(&rel_cb, sizeof(rel_cb));
     rel_cb.on_rx_data = &turn_on_rx_data;
@@ -268 +290 @@
                             &srv,                                /* srv addr */
                             (o.srv_port?atoi(o.srv_port):PJ_STUN_PORT),/* def port */
-                            NULL,                                /* resolver */
+                            g.resolver,                          /* resolver */
                             (o.user_name?&cred:NULL),            /* credential */
                             NULL)                                /* alloc param */
@@ -503 +525 @@
     puts(" --password, -p PASSWD Set password of the credential to PASSWD");
     puts(" --fingerprint, -F     Use fingerprint for outgoing requests");
-    puts(" --stun-srv, -S        Use this STUN srv instead of TURN for Binding discovery");
+    puts(" --stun-srv, -S  NAME  Use this STUN srv instead of TURN for Binding discovery");
+    puts(" --nameserver, -N IP   Activate DNS SRV, use this DNS server");
     puts(" --help, -h");
 }
@@ -516 +539 @@
         { "tcp",        0, 0, 'T'},
         { "help",       0, 0, 'h'},
-        { "stun-srv",   1, 0, 'S'}
+        { "stun-srv",   1, 0, 'S'},
+        { "nameserver", 1, 0, 'N'}
     };
     int c, opt_id;
@@ -522 +546 @@
     pj_status_t status;
 
-    while((c=pj_getopt_long(argc,argv, "r:u:p:S:hFT", long_options, &opt_id))!=-1) {
+    while((c=pj_getopt_long(argc,argv, "r:u:p:S:N:hFT", long_options, &opt_id))!=-1) {
         switch (c) {
         case 'r':
@@ -544 +568 @@
         case 'S':
             o.stun_server = pj_optarg;
+            break;
+        case 'N':
+            o.nameserver = pj_optarg;
             break;
         default: