interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote branch 'origin/develop' into feature/check_examples

This commit is contained in:
Craig E. Despeaux 2014-01-10 10:29:14 -05:00
parent f15e147982 722a27bfef
commit 6a1b48052b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/general.c
View File

@ -10,7 +10,7 @@
/* /*
* Copyright (c) 2013, Versign, Inc. * Copyright (c) 2013, Versign, Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
@ -196,7 +196,7 @@ ub_resolve_callback(void *arg, int err, ldns_buffer * result, int sec,
*/ */
if (netreq->state == NET_REQ_NOT_SENT) { if (netreq->state == NET_REQ_NOT_SENT) {
/* just do a very short timer since this was called immediately. /* just do a very short timer since this was called immediately.
* we can make this less hacky, but it gets interesting when multiple * we can make this less hacky, but it gets interesting when multiple
* netreqs need to be issued and some resolve immediately vs. not. * netreqs need to be issued and some resolve immediately vs. not.
*/ */
struct timeval tv; struct timeval tv;
@ -329,13 +329,18 @@ getdns_general(struct getdns_context *context,
{ {
int extcheck = GETDNS_RETURN_GOOD; int extcheck = GETDNS_RETURN_GOOD;
if (!context || !context->event_base_async || callback == NULL) { if (!context || !context->event_base_async) {
/* Can't do async without an event loop /* Can't do async without an event loop
* or callback * or callback
*/ */
return GETDNS_RETURN_BAD_CONTEXT; return GETDNS_RETURN_BAD_CONTEXT;
} }
/* ensure callback is not NULL */
if (!callback) {
return GETDNS_RETURN_INVALID_PARAMETER;
}
extcheck = validate_extensions(extensions); extcheck = validate_extensions(extensions);
if (extcheck != GETDNS_RETURN_GOOD) if (extcheck != GETDNS_RETURN_GOOD)
return extcheck; return extcheck;