Changeset 1323

Timestamp:

May 30, 2007 3:20:56 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #311: PJSIP resolver is not destroyed on shutdown (thanks Martin Peterzon)

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util/resolver.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_endpoint.c (modified) (1 diff)

pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

@@ -364 +364 @@
     }
 
-    if (resolver->own_ioqueue && resolver->ioqueue) {
-        pj_ioqueue_destroy(resolver->ioqueue);
-        resolver->ioqueue = NULL;
-    }
-
     if (resolver->udp_key != NULL) {
         pj_ioqueue_unregister(resolver->udp_key);
@@ -376 +371 @@
         pj_sock_close(resolver->udp_sock);
         resolver->udp_sock = PJ_INVALID_SOCKET;
+    }
+
+    if (resolver->own_ioqueue && resolver->ioqueue) {
+        pj_ioqueue_destroy(resolver->ioqueue);
+        resolver->ioqueue = NULL;
     }
 

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -578 +578 @@
         mod = prev;
     }
+
+    /* Destroy resolver */
+    pjsip_resolver_destroy(endpt->resolver);
 
     /* Shutdown and destroy all transports. */