diff options
| -rw-r--r-- | ares/CHANGES | 4 | ||||
| -rw-r--r-- | ares/RELEASE-NOTES | 2 | ||||
| -rw-r--r-- | ares/ares.h | 10 | ||||
| -rw-r--r-- | ares/ares_strerror.c | 3 |
4 files changed, 13 insertions, 6 deletions
diff --git a/ares/CHANGES b/ares/CHANGES index f76edc858..e05755a79 100644 --- a/ares/CHANGES +++ b/ares/CHANGES @@ -1,5 +1,9 @@ Changelog for the c-ares project +* October 23, 2009 (Yang Tse) +- John Engelhart noticed an unreleased problem relative to a duplicate + ARES_ECANCELLED error code value and missing error code description. + * October 7, 2009 (Yang Tse) - Overhauled ares__get_hostent() Fixing out of bounds memory overwrite triggered with malformed /etc/hosts file. Improving parsing of /etc/hosts diff --git a/ares/RELEASE-NOTES b/ares/RELEASE-NOTES index 215c4d2ee..52c6c2947 100644 --- a/ares/RELEASE-NOTES +++ b/ares/RELEASE-NOTES @@ -24,6 +24,6 @@ Fixed: Thanks go to these friendly people for their efforts and contributions: Phil Blundell, Japheth Cleaver, Yang Tse, Gregor Jasny, Joshua Kwan, - Timo Teras, Jakub Hrozek + Timo Teras, Jakub Hrozek, John Engelhart Have fun! diff --git a/ares/ares.h b/ares/ares.h index ad7c4d57a..d7c0ad293 100644 --- a/ares/ares.h +++ b/ares/ares.h @@ -86,7 +86,6 @@ extern "C" { #define ARES_ENOMEM 15 #define ARES_EDESTRUCTION 16 #define ARES_EBADSTR 17 -#define ARES_ECANCELLED 21 /* ares_getnameinfo error codes */ #define ARES_EBADFLAGS 18 @@ -96,11 +95,14 @@ extern "C" { #define ARES_EBADHINTS 20 /* Uninitialized library error code */ -#define ARES_ENOTINITIALIZED 21 +#define ARES_ENOTINITIALIZED 21 /* introduced in 1.6.1 */ /* ares_library_init error codes */ -#define ARES_ELOADIPHLPAPI 22 -#define ARES_EADDRGETNETWORKPARAMS 23 +#define ARES_ELOADIPHLPAPI 22 /* introduced in 1.6.1 */ +#define ARES_EADDRGETNETWORKPARAMS 23 /* introduced in 1.6.1 */ + +/* More error codes */ +#define ARES_ECANCELLED 24 /* introduced in 1.6.1 */ /* Flag values */ #define ARES_FLAG_USEVC (1 << 0) diff --git a/ares/ares_strerror.c b/ares/ares_strerror.c index 597ec64b6..1265cee09 100644 --- a/ares/ares_strerror.c +++ b/ares/ares_strerror.c @@ -46,7 +46,8 @@ const char *ares_strerror(int code) "Illegal hints flags specified", "c-ares library initialization not yet performed", "Error loading iphlpapi.dll", - "Could not find GetNetworkParams function" + "Could not find GetNetworkParams function", + "DNS query cancelled" }; if(code >= 0 && code < (int)(sizeof(errtext) / sizeof(*errtext))) |