oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

some cleanup

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5252 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-11-26 16:10:14 +00:00
parent dd33475500
commit 69b8e5577d
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/roken/resolve.c
View File

@@ -110,10 +110,9 @@ parse_reply(unsigned char *data, int len)
struct dns_reply *r; struct dns_reply *r;
struct resource_record **rr; struct resource_record **rr;
r = (struct dns_reply*)malloc(sizeof(struct dns_reply)); r = calloc(1, sizeof(*r));
if (r == NULL) if (r == NULL)
return NULL; return NULL;
memset(r, 0, sizeof(struct dns_reply));
p = data; p = data;
memcpy(&r->h, p, sizeof(HEADER)); memcpy(&r->h, p, sizeof(HEADER));
@@ -242,22 +241,19 @@ parse_reply(unsigned char *data, int len)
return r; return r;
} }
struct dns_reply * static dns_lookup_int(const char *domain, int rr_class, int rr_type)
dns_lookup(const char *domain, const char *type_name)
{ {
unsigned char reply[1024]; unsigned char reply[1024];
int len; int len;
int type;
struct dns_reply *r = NULL; struct dns_reply *r = NULL;
u_long old_options = 0; u_long old_options = 0;
type = string_to_type(type_name);
if (_resolve_debug) { if (_resolve_debug) {
old_options = _res.options; old_options = _res.options;
_res.options |= RES_DEBUG; _res.options |= RES_DEBUG;
fprintf(stderr, "dns_lookup(%s, %s)\n", domain, type_name); fprintf(stderr, "dns_lookup(%s, %s)\n", domain, type_name);
} }
len = res_search(domain, C_IN, type, reply, sizeof(reply)); len = res_search(domain, rr_type, rr_type, reply, sizeof(reply));
if (_resolve_debug) { if (_resolve_debug) {
_res.options = old_options; _res.options = old_options;
fprintf(stderr, "dns_lookup(%s, %s) --> %d\n", domain, type_name, len); fprintf(stderr, "dns_lookup(%s, %s) --> %d\n", domain, type_name, len);
@@ -267,6 +263,21 @@ dns_lookup(const char *domain, const char *type_name)
return r; return r;
} }
struct dns_reply *
dns_lookup(const char *domain, const char *type_name)
{
int type;
type = string_to_type(type_name);
if(type == -1) {
if(_resolve_debug)
fprintf(stderr, "dns_lookup: unknown resource type: `%s'\n",
type_name);
return NULL;
}
return dns_lookup_int(domain, C_IN, type);
}
#else /* NOT defined(HAVE_RES_SEARCH) && defined(HAVE_DN_EXPAND) */ #else /* NOT defined(HAVE_RES_SEARCH) && defined(HAVE_DN_EXPAND) */
struct dns_reply * struct dns_reply *