Changeset 1495 for pjproject/trunk/pjnath/src/pjstun-client/client_main.c

Timestamp:

Oct 12, 2007 12:14:27 PM (17 years ago)

Author:

bennylp

Message:

Ticket #399: Initial implementation of tool to perform NAT type detection/classification

File:

• pjproject/trunk/pjnath/src/pjstun-client/client_main.c (modified) (9 diffs)

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

@@ -50 +50 @@
     char                 data_buf[256];
     char                *data;
+    pj_bool_t            detect;
+    pj_status_t          detect_result;
 } g;
 
@@ -153 +155 @@
 
         pj_timer_heap_poll(g.th, NULL);
+        pj_ioqueue_poll(g.stun_config.ioqueue, &timeout);
 
         PJ_FD_ZERO(&readset);
@@ -331 +334 @@
     }
 
+    status = pj_ioqueue_create(g.pool, 16, &g.stun_config.ioqueue);
+    if (status != PJ_SUCCESS)
+        return status;
+
     status = pj_thread_create(g.pool, "stun", &worker_thread, NULL, 
                               0, 0, &g.thread);
@@ -588 +595 @@
 }
 
+
+static void nat_detect_cb(void *user_data,
+                          const pj_stun_nat_detect_result *res)
+{
+    g.detect_result = res->status;
+
+    if (res->status == PJ_SUCCESS) {
+        PJ_LOG(3,(THIS_FILE, "NAT successfully detected as %s", res->nat_type_name));
+    } else {
+        PJ_LOG(2,(THIS_FILE, "Error detecting NAT type: %s", res->status_text));
+    }
+}
+
+static pj_status_t perform_detection()
+{
+    pj_status_t status;
+
+    g.detect_result = PJ_EPENDING;
+    status = pj_stun_detect_nat_type(&g.srv_addr, &g.stun_config, NULL, 
+                                     &nat_detect_cb);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    while (g.detect_result == PJ_EPENDING)
+        pj_thread_sleep(100);
+
+    status = g.detect_result;
+
+    return status;
+}
+
+
 static void menu(void)
 {
     puts("Menu:");
+    puts("  d       Perform NAT detection");
     printf("  pr      Set peer address (currently %s:%d)\n",
            pj_inet_ntoa(g.peer_addr.sin_addr), pj_ntohs(g.peer_addr.sin_port));
@@ -617 +657 @@
         fgets(input, sizeof(input), stdin);
         
-        if (0) {
+        if (input[0] == 'd' && (input[1]=='\r' || input[1]=='\n')) {
+
+            perform_detection();
 
         } else if (input[0]=='d' && input[1]=='t') {
@@ -664 +706 @@
     puts("");
     puts("and OPTIONS:");
+    puts(" --detect, -d      Perform NAT type detection first");
     puts(" --realm, -r       Set realm of the credential");
     puts(" --username, -u    Set username of the credential");
@@ -677 +720 @@
 {
     struct pj_getopt_option long_options[] = {
+        { "detect",     0, 0, 'd'},
         { "realm",      1, 0, 'r'},
         { "username",   1, 0, 'u'},
@@ -693 +737 @@
     pj_ansi_strcpy(g.data, "Hello world");
 
-    while((c=pj_getopt_long(argc,argv, "r:u:p:N:hF", long_options, &opt_id))!=-1) {
+    while((c=pj_getopt_long(argc,argv, "r:u:p:N:dhF", long_options, &opt_id))!=-1) {
         switch (c) {
+        case 'd':
+            g.detect = PJ_TRUE;
+            break;
         case 'r':
             o.realm = pj_optarg;
@@ -744 +791 @@
         goto on_return;
     
+    if (g.detect) {
+        status = perform_detection();
+        if (status != PJ_SUCCESS)
+            goto on_return;
+    }
+
     console_main();