mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

checkpoint; add dns_dispatch_getsocket() to return the socket being used

Browse Source
This commit is contained in:
Michael Graff
1999-07-09 20:32:12 +00:00
parent 3ce0769857
commit c16cc434ef
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/dns/dispatch.c
View File

@@ -204,6 +204,8 @@ hash(dns_dispatch_t *disp, isc_sockaddr_t *dest, dns_messageid_t id)
ret = id; ret = id;
ret &= disp->qid_mask; ret &= disp->qid_mask;
INSIST(ret < disp->qid_hashsize);
return (ret); return (ret);
} }
@@ -214,13 +216,13 @@ hash(dns_dispatch_t *disp, isc_sockaddr_t *dest, dns_messageid_t id)
static dns_messageid_t static dns_messageid_t
randomid(dns_dispatch_t *disp) randomid(dns_dispatch_t *disp)
{ {
disp->qid_state++; disp->qid_state += 7;
return ((dns_messageid_t)disp->qid_state); return ((dns_messageid_t)disp->qid_state);
} }
/* /*
* Called when refcount reaches 0 at any time. * Called when refcount reaches 0 (and safe to destroy)
*/ */
static void static void
destroy(dns_dispatch_t *disp) destroy(dns_dispatch_t *disp)
@@ -254,7 +256,7 @@ destroy(dns_dispatch_t *disp)
isc_mempool_destroy(&disp->bpool); isc_mempool_destroy(&disp->bpool);
isc_mempool_destroy(&disp->epool); isc_mempool_destroy(&disp->epool);
isc_mem_put(disp->mctx, disp->qid_table, isc_mem_put(disp->mctx, disp->qid_table,
disp->qid_hashsize * sizeof(void *)); disp->qid_hashsize * sizeof(dns_displist_t));
isc_mem_put(disp->mctx, disp, sizeof(dns_dispatch_t)); isc_mem_put(disp->mctx, disp, sizeof(dns_dispatch_t));
} }
@@ -271,6 +273,9 @@ bucket_search(dns_dispatch_t *disp, isc_sockaddr_t *dest, dns_messageid_t id,
while (res != NULL) { while (res != NULL) {
if ((res->id == id) && isc_sockaddr_equal(dest, &res->host)) if ((res->id == id) && isc_sockaddr_equal(dest, &res->host))
return (res); return (res);
printf("lengths (%d, %d), ids (%d, %d)\n",
dest->length, res->host.length,
res->id, id);
res = ISC_LIST_NEXT(res, link); res = ISC_LIST_NEXT(res, link);
} }
@@ -465,6 +470,9 @@ udp_recv(isc_task_t *task, isc_event_t *ev_in)
/* response */ /* response */
bucket = hash(disp, &ev->address, id); bucket = hash(disp, &ev->address, id);
resp = bucket_search(disp, &ev->address, id, bucket); resp = bucket_search(disp, &ev->address, id, bucket);
printf("Search for response in bucket %d: %s\n",
bucket, (resp == NULL ? "NOT FOUND" : "FOUND"));
if (resp == NULL) { if (resp == NULL) {
free_buffer(disp, ev->region.base, ev->region.length); free_buffer(disp, ev->region.base, ev->region.length);
goto restart; goto restart;
@@ -817,6 +825,8 @@ dns_dispatch_addresponse(dns_dispatch_t *disp, isc_sockaddr_t *dest,
ISC_LINK_INIT(res, link); ISC_LINK_INIT(res, link);
ISC_LIST_APPEND(disp->qid_table[bucket], res, link); ISC_LIST_APPEND(disp->qid_table[bucket], res, link);
printf("Inserted response into bucket %d\n", bucket);
startrecv(disp); startrecv(disp);
UNLOCK(&disp->lock); UNLOCK(&disp->lock);
@@ -1143,3 +1153,11 @@ do_cancel(dns_dispatch_t *disp, dns_dispentry_t *resp)
ev->buffer.length = 0; ev->buffer.length = 0;
ISC_TASK_SEND(resp->task, (isc_event_t **)&ev); ISC_TASK_SEND(resp->task, (isc_event_t **)&ev);
} }
isc_socket_t *
dns_dispatch_getsocket(dns_dispatch_t *disp)
{
REQUIRE(VALID_DISPATCH(disp));
return (disp->socket);
}

6
lib/dns/include/dns/dispatch.h
View File

@@ -263,6 +263,12 @@ dns_dispatch_detach(dns_dispatch_t **dispp);
* < mumble > * < mumble >
*/ */
isc_socket_t *
dns_dispatch_getsocket(dns_dispatch_t *disp);
/*
* Return the socket associated with this dispatcher
*/
ISC_LANG_ENDDECLS ISC_LANG_ENDDECLS
#endif /* DNS_DISPATCH_H */ #endif /* DNS_DISPATCH_H */