Changeset 1239 for pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

Timestamp:

May 1, 2007 12:25:01 PM (17 years ago)

Author:

bennylp

Message:

Ported PJLIB-UTIL and PJNATH to Symbian

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c (modified) (14 diffs)

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

@@ -244 +244 @@
 
     /* Create pool and name */
-    resv = pj_pool_zalloc(pool, sizeof(struct pj_dns_resolver));
+    resv = PJ_POOL_ZALLOC_T(pool, struct pj_dns_resolver);
     resv->pool = pool;
     resv->udp_sock = PJ_INVALID_SOCKET;
@@ -338 +338 @@
         it = pj_hash_first(resolver->hquerybyid, &it_buf);
         while (it) {
-            pj_dns_async_query *q = pj_hash_this(resolver->hquerybyid, it);
+            pj_dns_async_query *q = (pj_dns_async_query *)
+                                    pj_hash_this(resolver->hquerybyid, it);
             pj_dns_async_query *cq;
             if (q->cb)
@@ -498 +499 @@
         pj_bzero(q, sizeof(*q));
     } else {
-        q = pj_pool_zalloc(resolver->pool, sizeof(*q));
+        q = PJ_POOL_ZALLOC_T(resolver->pool, pj_dns_async_query);
     }
 
@@ -658 +659 @@
      */
     hval = 0;
-    cache = pj_hash_get(resolver->hrescache, &key, sizeof(key), &hval);
+    cache = (struct cached_res *) pj_hash_get(resolver->hrescache, &key, 
+                                              sizeof(key), &hval);
     if (cache) {
         /* We've found a cached entry. */
@@ -703 +705 @@
 
     /* Next, check if we have pending query on the same resource */
-    q = pj_hash_get(resolver->hquerybyres, &key, sizeof(key), NULL);
+    q = (pj_dns_async_query *) pj_hash_get(resolver->hquerybyres, &key, 
+                                           sizeof(key), NULL);
     if (q) {
         /* Yes, there's another pending query to the same key.
@@ -942 +945 @@
     /* If status is unsuccessful, clear the same entry from the cache */
     if (status != PJ_SUCCESS) {
-        cache = pj_hash_get(resolver->hrescache, key, sizeof(*key), &hval);
+        cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key, 
+                                                  sizeof(*key), &hval);
         if (cache)
             pj_list_push_back(&resolver->res_free_nodes, cache);
@@ -977 +981 @@
     /* If TTL is zero, clear the same entry in the hash table */
     if (ttl == 0) {
-        cache = pj_hash_get(resolver->hrescache, key, sizeof(*key), &hval);
+        cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key, 
+                                                  sizeof(*key), &hval);
         if (cache)
             pj_list_push_back(&resolver->res_free_nodes, cache);
@@ -985 +990 @@
 
     /* Get a cache response entry */
-    cache = pj_hash_get(resolver->hrescache, key, sizeof(*key), &hval);
+    cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key, 
+                                              sizeof(*key), &hval);
     if (cache == NULL) {
         if (!pj_list_empty(&resolver->res_free_nodes)) {
@@ -991 +997 @@
             pj_list_erase(cache);
         } else {
-            cache = pj_pool_zalloc(resolver->pool, sizeof(*cache));
+            cache = PJ_POOL_ZALLOC_T(resolver->pool, struct cached_res);
         }
     }
@@ -1041 +1047 @@
     PJ_UNUSED_ARG(timer_heap);
 
-    q = entry->user_data;
+    q = (pj_dns_async_query *) entry->user_data;
     resolver = q->resolver;
 
@@ -1125 +1131 @@
 
 
-    resolver = pj_ioqueue_get_user_data(key);
+    resolver = (pj_dns_resolver *) pj_ioqueue_get_user_data(key);
     pj_mutex_lock(resolver->mutex);
 
@@ -1188 +1194 @@
 
     /* Find the query based on the transaction ID */
-    q = pj_hash_get(resolver->hquerybyid, &dns_pkt->hdr.id, 
+    q = (pj_dns_async_query*) 
+        pj_hash_get(resolver->hquerybyid, &dns_pkt->hdr.id,
                     sizeof(dns_pkt->hdr.id), NULL);
     if (!q) {
@@ -1372 +1379 @@
         it = pj_hash_first(resolver->hrescache, &itbuf);
         while (it) {
-            struct cached_res *cache = pj_hash_this(resolver->hrescache, it);
+            struct cached_res *cache;
+            cache = (struct cached_res*)pj_hash_this(resolver->hrescache, it);
             PJ_LOG(3,(resolver->name.ptr, 
                       "   Type %s: %s",
@@ -1390 +1398 @@
         while (it) {
             struct pj_dns_async_query *q;
-            q = pj_hash_this(resolver->hquerybyid, it);
+            q = (pj_dns_async_query*) pj_hash_this(resolver->hquerybyid, it);
             PJ_LOG(3,(resolver->name.ptr, 
                       "   Type %s: %s",