diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2008-05-13 20:48:48 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2008-05-13 20:48:48 +0000 |
| commit | 76c251513e73d9fd940ed4df8a9b73ca587559f8 (patch) | |
| tree | a2c4924599df991cb31af9f7edc7bb534850541d /ares/ares_init.c | |
| parent | 80afddacc8ee850c7e591f8d73427042f4d9db12 (diff) | |
- Introducing millisecond resolution support for the timeout option. See
ares_init_options()'s ARES_OPT_TIMEOUTMS.
Diffstat (limited to 'ares/ares_init.c')
| -rw-r--r-- | ares/ares_init.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ares/ares_init.c b/ares/ares_init.c index 9b655a867..278181362 100644 --- a/ares/ares_init.c +++ b/ares/ares_init.c @@ -1,6 +1,7 @@ /* $Id$ */ /* Copyright 1998 by the Massachusetts Institute of Technology. + * Copyright (C) 2007-2008 by Daniel Stenberg * * Permission to use, copy, modify, and distribute this * software and its documentation for any purpose and without @@ -254,13 +255,16 @@ int ares_save_options(ares_channel channel, struct ares_options *options, if (!ARES_CONFIG_CHECK(channel)) return ARES_ENODATA; - (*optmask) = (ARES_OPT_FLAGS|ARES_OPT_TIMEOUT|ARES_OPT_TRIES|ARES_OPT_NDOTS| + (*optmask) = (ARES_OPT_FLAGS|ARES_OPT_TRIES|ARES_OPT_NDOTS| ARES_OPT_UDP_PORT|ARES_OPT_TCP_PORT|ARES_OPT_SOCK_STATE_CB| ARES_OPT_SERVERS|ARES_OPT_DOMAINS|ARES_OPT_LOOKUPS| - ARES_OPT_SORTLIST); + ARES_OPT_SORTLIST|ARES_OPT_TIMEOUTMS); /* Copy easy stuff */ options->flags = channel->flags; + + /* We return full millisecond resolution but that's only because we don't + set the ARES_OPT_TIMEOUT anymore, only the new ARES_OPT_TIMEOUTMS */ options->timeout = channel->timeout; options->tries = channel->tries; options->ndots = channel->ndots; @@ -328,8 +332,10 @@ static int init_by_options(ares_channel channel, /* Easy stuff. */ if ((optmask & ARES_OPT_FLAGS) && channel->flags == -1) channel->flags = options->flags; - if ((optmask & ARES_OPT_TIMEOUT) && channel->timeout == -1) + if ((optmask & ARES_OPT_TIMEOUTMS) && channel->timeout == -1) channel->timeout = options->timeout; + else if ((optmask & ARES_OPT_TIMEOUT) && channel->timeout == -1) + channel->timeout = options->timeout * 1000; if ((optmask & ARES_OPT_TRIES) && channel->tries == -1) channel->tries = options->tries; if ((optmask & ARES_OPT_NDOTS) && channel->ndots == -1) |