diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-10-23 15:49:05 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-10-23 15:49:05 +0000 |
| commit | b53526b1a90e39051498285f3fbf468a7cd8a414 (patch) | |
| tree | d217117523b1e397a78b91f1eccfa0170fc023bb | |
| parent | e199ec677f849d3afad1001346e2d49779b11274 (diff) | |
| download | c-ares-b53526b1a90e39051498285f3fbf468a7cd8a414.tar.gz c-ares-b53526b1a90e39051498285f3fbf468a7cd8a414.tar.bz2 c-ares-b53526b1a90e39051498285f3fbf468a7cd8a414.zip | |
John Engelhart noticed an unreleased problem relative to a duplicate
ARES_ECANCELLED error code value and missing error code description.
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | RELEASE-NOTES | 2 | ||||
| -rw-r--r-- | ares.h | 10 | ||||
| -rw-r--r-- | ares_strerror.c | 3 |
4 files changed, 13 insertions, 6 deletions
@@ -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/RELEASE-NOTES b/RELEASE-NOTES index 215c4d2..52c6c29 100644 --- a/RELEASE-NOTES +++ b/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! @@ -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_strerror.c b/ares_strerror.c index 597ec64..1265cee 100644 --- a/ares_strerror.c +++ b/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))) |