Changeset 1879 for pjproject/trunk/pjnath/src/pjturn-srv/server.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-srv/server.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjturn-srv/server.c

@@ -136 +136 @@
     /* Init ports settings */
     srv->ports.min_udp = srv->ports.next_udp = MIN_PORT;
-    srv->ports.max_tcp = MAX_PORT;
+    srv->ports.max_udp = MAX_PORT;
     srv->ports.min_tcp = srv->ports.next_tcp = MIN_PORT;
     srv->ports.max_tcp = MAX_PORT;
@@ -266 +266 @@
     }
 
+    /* Destroy all allocations FIRST */
+    if (srv->tables.alloc) {
+        it = pj_hash_first(srv->tables.alloc, &itbuf);
+        while (it != NULL) {
+            pj_turn_allocation *alloc = (pj_turn_allocation*)
+                                        pj_hash_this(srv->tables.alloc, it);
+            pj_hash_iterator_t *next = pj_hash_next(srv->tables.alloc, it);
+            pj_turn_allocation_destroy(alloc);
+            it = next;
+        }
+    }
+    
     /* Destroy all listeners and STUN sessions associated with them. */
     for (i=0; i<srv->core.lis_cnt; ++i) {
@@ -277 +289 @@
         }
     }
-
-    /* Destroy all allocations */
-    if (srv->tables.alloc) {
-        it = pj_hash_first(srv->tables.alloc, &itbuf);
-        while (it != NULL) {
-            pj_turn_allocation *alloc = (pj_turn_allocation*)
-                                        pj_hash_this(srv->tables.alloc, it);
-            pj_turn_allocation_destroy(alloc);
-            it = pj_hash_next(srv->tables.alloc, it);
-        }
-    }
-    
 
     /* Destroy hash tables (well, sort of) */