Thanks for the explanation. Yeah, that looks fine to me. Here is the patch with that fix.
From b781d872e7bcc85b2892faed6198ff6c30cccb0c Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath <nathbap...@gmail.com> Date: Thu, 2 Dec 2021 23:51:31 +0530 Subject: [PATCH] headers: Add missing names in windns.h
Signed-off-by: Biswapriyo Nath <nathbap...@gmail.com> --- mingw-w64-headers/include/windns.h | 538 ++++++++++++++++++++++++++++- 1 file changed, 521 insertions(+), 17 deletions(-) diff --git a/mingw-w64-headers/include/windns.h b/mingw-w64-headers/include/windns.h index 0a33265..ce926e0 100644 --- a/mingw-w64-headers/include/windns.h +++ b/mingw-w64-headers/include/windns.h @@ -40,6 +40,7 @@ extern "C" { #undef IP6_ADDRESS_STRING_LENGTH #define IP6_ADDRESS_STRING_LENGTH (47) #define IP6_ADDRESS_STRING_BUFFER_LENGTH (48) +#define DNS_ADDRESS_STRING_LENGTH (IP6_ADDRESS_STRING_LENGTH) #define INLINE_WORD_FLIP(out,in) { WORD _in = (in); (out) = (_in << 8) | (_in >> 8); } #define INLINE_HTONS(out,in) INLINE_WORD_FLIP(out,in) @@ -83,13 +84,22 @@ extern "C" { BYTE Opcode : 4; BYTE IsResponse : 1; BYTE ResponseCode : 4; - BYTE Reserved : 3; + BYTE CheckingDisabled : 1; + BYTE AuthenticatedData : 1; + BYTE Reserved : 1; BYTE RecursionAvailable : 1; WORD QuestionCount; WORD AnswerCount; WORD NameServerCount; WORD AdditionalCount; - } DNS_HEADER,*PDNS_HEADER; + } DNS_HEADER, *PDNS_HEADER; + + typedef struct _DNS_HEADER_EXT { + WORD Reserved : 15; + WORD DnssecOk : 1; + BYTE chRcode; + BYTE chVersion; + } DNS_HEADER_EXT, *PDNS_HEADER_EXT; #define DNS_HEADER_FLAGS(pHead) (*((PWORD)(pHead)+1)) #define DNS_BYTE_FLIP_HEADER_COUNTS(pHeader) { PDNS_HEADER _head = (pHeader); INLINE_HTONS(_head->Xid,_head->Xid); INLINE_HTONS(_head->QuestionCount,_head->QuestionCount); INLINE_HTONS(_head->AnswerCount,_head->AnswerCount); INLINE_HTONS(_head->NameServerCount,_head->NameServerCount); INLINE_HTONS(_head->AdditionalCount,_head->AdditionalCount); } @@ -148,6 +158,7 @@ extern "C" { #define DNS_CLASS_NONE 0x00fe #define DNS_CLASS_ALL 0x00ff #define DNS_CLASS_ANY 0x00ff +#define DNS_CLASS_UNICAST_RESPONSE 0x8000 #define DNS_RCLASS_INTERNET 0x0100 #define DNS_RCLASS_CSNET 0x0200 @@ -156,6 +167,7 @@ extern "C" { #define DNS_RCLASS_NONE 0xfe00 #define DNS_RCLASS_ALL 0xff00 #define DNS_RCLASS_ANY 0xff00 +#define DNS_RCLASS_UNICAST_RESPONSE 0x0080 #define DNS_TYPE_ZERO 0x0000 #define DNS_TYPE_A 0x0001 @@ -199,6 +211,14 @@ extern "C" { #define DNS_TYPE_DNAME 0x0027 #define DNS_TYPE_SINK 0x0028 #define DNS_TYPE_OPT 0x0029 +#define DNS_TYPE_DS 0x002b +#define DNS_TYPE_RRSIG 0x002e +#define DNS_TYPE_NSEC 0x002f +#define DNS_TYPE_DNSKEY 0x0030 +#define DNS_TYPE_DHCID 0x0031 +#define DNS_TYPE_NSEC3 0x0032 +#define DNS_TYPE_NSEC3PARAM 0x0033 +#define DNS_TYPE_TLSA 0x0034 #define DNS_TYPE_UINFO 0x0064 #define DNS_TYPE_UID 0x0065 #define DNS_TYPE_GID 0x0066 @@ -257,6 +277,14 @@ extern "C" { #define DNS_RTYPE_DNAME 0x2700 #define DNS_RTYPE_SINK 0x2800 #define DNS_RTYPE_OPT 0x2900 +#define DNS_RTYPE_DS 0x2b00 +#define DNS_RTYPE_RRSIG 0x2e00 +#define DNS_RTYPE_NSEC 0x2f00 +#define DNS_RTYPE_DNSKEY 0x3000 +#define DNS_RTYPE_DHCID 0x3100 +#define DNS_RTYPE_NSEC3 0x3200 +#define DNS_RTYPE_NSEC3PARAM 0x3300 +#define DNS_RTYPE_TLSA 0x3400 #define DNS_RTYPE_UINFO 0x6400 #define DNS_RTYPE_UID 0x6500 #define DNS_RTYPE_GID 0x6600 @@ -286,9 +314,19 @@ extern "C" { #define DNS_ATMA_MAX_RECORD_LENGTH (DNS_ATMA_MAX_ADDR_LENGTH+1) #define DNSSEC_ALGORITHM_RSAMD5 1 +#define DNSSEC_ALGORITHM_RSASHA1 5 +#define DNSSEC_ALGORITHM_RSASHA1_NSEC3 7 +#define DNSSEC_ALGORITHM_RSASHA256 8 +#define DNSSEC_ALGORITHM_RSASHA512 10 +#define DNSSEC_ALGORITHM_ECDSAP256_SHA256 13 +#define DNSSEC_ALGORITHM_ECDSAP384_SHA384 14 #define DNSSEC_ALGORITHM_NULL 253 #define DNSSEC_ALGORITHM_PRIVATE 254 +#define DNSSEC_DIGEST_ALGORITHM_SHA1 1 +#define DNSSEC_DIGEST_ALGORITHM_SHA256 2 +#define DNSSEC_DIGEST_ALGORITHM_SHA384 4 + #define DNSSEC_PROTOCOL_NONE 0 #define DNSSEC_PROTOCOL_TLS 1 #define DNSSEC_PROTOCOL_EMAIL 2 @@ -343,10 +381,25 @@ extern "C" { #define IS_QWORD_ALIGNED(p) (!((UINT_PTR)(p) & (UINT_PTR)7)) typedef enum { - DnsConfigPrimaryDomainName_W,DnsConfigPrimaryDomainName_A,DnsConfigPrimaryDomainName_UTF8,DnsConfigAdapterDomainName_W, - DnsConfigAdapterDomainName_A,DnsConfigAdapterDomainName_UTF8,DnsConfigDnsServerList,DnsConfigSearchList, - DnsConfigAdapterInfo,DnsConfigPrimaryHostNameRegistrationEnabled,DnsConfigAdapterHostNameRegistrationEnabled,DnsConfigAddressRegistrationMaxCount, - DnsConfigHostName_W,DnsConfigHostName_A,DnsConfigHostName_UTF8,DnsConfigFullHostName_W,DnsConfigFullHostName_A,DnsConfigFullHostName_UTF8 + DnsConfigPrimaryDomainName_W, + DnsConfigPrimaryDomainName_A, + DnsConfigPrimaryDomainName_UTF8, + DnsConfigAdapterDomainName_W, + DnsConfigAdapterDomainName_A, + DnsConfigAdapterDomainName_UTF8, + DnsConfigDnsServerList, + DnsConfigSearchList, + DnsConfigAdapterInfo, + DnsConfigPrimaryHostNameRegistrationEnabled, + DnsConfigAdapterHostNameRegistrationEnabled, + DnsConfigAddressRegistrationMaxCount, + DnsConfigHostName_W, + DnsConfigHostName_A, + DnsConfigHostName_UTF8, + DnsConfigFullHostName_W, + DnsConfigFullHostName_A, + DnsConfigFullHostName_UTF8, + DnsConfigNameServer } DNS_CONFIG_TYPE; #define DNS_CONFIG_FLAG_ALLOC (0x00000001) @@ -433,7 +486,6 @@ extern "C" { } DNS_AAAA_DATA,*PDNS_AAAA_DATA; typedef struct { - PWSTR pNameSigner; WORD wTypeCovered; BYTE chAlgorithm; BYTE chLabelCount; @@ -441,12 +493,12 @@ extern "C" { DWORD dwExpiration; DWORD dwTimeSigned; WORD wKeyTag; - WORD Pad; + WORD wSignatureLength; + PWSTR pNameSigner; BYTE Signature[1]; - } DNS_SIG_DATAW,*PDNS_SIG_DATAW; + } DNS_SIG_DATAW, *PDNS_SIG_DATAW, DNS_RRSIG_DATAW, *PDNS_RRSIG_DATAW; typedef struct { - PSTR pNameSigner; WORD wTypeCovered; BYTE chAlgorithm; BYTE chLabelCount; @@ -454,16 +506,81 @@ extern "C" { DWORD dwExpiration; DWORD dwTimeSigned; WORD wKeyTag; - WORD Pad; + WORD wSignatureLength; + PSTR pNameSigner; BYTE Signature[1]; - } DNS_SIG_DATAA,*PDNS_SIG_DATAA; + } DNS_SIG_DATAA, *PDNS_SIG_DATAA, DNS_RRSIG_DATAA, *PDNS_RRSIG_DATAA; typedef struct { WORD wFlags; BYTE chProtocol; BYTE chAlgorithm; + WORD wKeyLength; + WORD wPad; BYTE Key[1]; - } DNS_KEY_DATA,*PDNS_KEY_DATA; + } DNS_KEY_DATA, *PDNS_KEY_DATA, DNS_DNSKEY_DATA, *PDNS_DNSKEY_DATA; + + typedef struct { + DWORD dwByteCount; + BYTE DHCID[1]; + } DNS_DHCID_DATA, *PDNS_DHCID_DATA; + + typedef struct { + PWSTR pNextDomainName; + WORD wTypeBitMapsLength; + WORD wPad; + BYTE TypeBitMaps[1]; + } DNS_NSEC_DATAW, *PDNS_NSEC_DATAW; + + typedef struct { + PSTR pNextDomainName; + WORD wTypeBitMapsLength; + WORD wPad; + BYTE TypeBitMaps[1]; + } DNS_NSEC_DATAA, *PDNS_NSEC_DATAA; + + typedef struct { + BYTE chAlgorithm; + BYTE bFlags; + WORD wIterations; + BYTE bSaltLength; + BYTE bHashLength; + WORD wTypeBitMapsLength; + BYTE chData[1]; + } DNS_NSEC3_DATA, *PDNS_NSEC3_DATA; + + typedef struct { + BYTE chAlgorithm; + BYTE bFlags; + WORD wIterations; + BYTE bSaltLength; + BYTE bPad[3]; + BYTE pbSalt[1]; + } DNS_NSEC3PARAM_DATA, *PDNS_NSEC3PARAM_DATA; + + typedef struct { + BYTE bCertUsage; + BYTE bSelector; + BYTE bMatchingType; + WORD bCertificateAssociationDataLength; + BYTE bPad[3]; + BYTE bCertificateAssociationData[1]; + } DNS_TLSA_DATA, *PDNS_TLSA_DATA; + + typedef struct { + WORD wKeyTag; + BYTE chAlgorithm; + BYTE chDigestType; + WORD wDigestLength; + WORD wPad; + BYTE Digest[1]; + } DNS_DS_DATA, *PDNS_DS_DATA; + + typedef struct { + WORD wDataLength; + WORD wPad; + BYTE Data[1]; + } DNS_OPT_DATA, *PDNS_OPT_DATA; typedef struct { WORD wVersion; @@ -503,6 +620,24 @@ extern "C" { WORD Pad; } DNS_SRV_DATAA,*PDNS_SRV_DATAA; + typedef struct { + WORD wOrder; + WORD wPreference; + PWSTR pFlags; + PWSTR pService; + PWSTR pRegularExpression; + PWSTR pReplacement; + } DNS_NAPTR_DATAW, *PDNS_NAPTR_DATAW; + + typedef struct { + WORD wOrder; + WORD wPreference; + PSTR pFlags; + PSTR pService; + PSTR pRegularExpression; + PSTR pReplacement; + } DNS_NAPTR_DATAA, *PDNS_NAPTR_DATAA; + typedef struct { BYTE AddressType; BYTE Address[DNS_ATMA_MAX_ADDR_LENGTH ]; @@ -568,6 +703,11 @@ extern "C" { WINBOOL bPacketPointers; } DNS_TSIG_DATAA,*PDNS_TSIG_DATAA; + typedef struct { + DWORD dwByteCount; + BYTE bData[1]; + } DNS_UNKNOWN_DATA, *PDNS_UNKNOWN_DATA; + typedef struct { DWORD dwMappingFlag; DWORD dwLookupTimeout; @@ -606,6 +746,12 @@ extern "C" { __MINGW_TYPEDEF_AW(PDNS_NXT_DATA) __MINGW_TYPEDEF_AW(DNS_SRV_DATA) __MINGW_TYPEDEF_AW(PDNS_SRV_DATA) + __MINGW_TYPEDEF_AW(DNS_NAPTR_DATA) + __MINGW_TYPEDEF_AW(PDNS_NAPTR_DATA) + __MINGW_TYPEDEF_AW(DNS_RRSIG_DATA) + __MINGW_TYPEDEF_AW(PDNS_RRSIG_DATA) + __MINGW_TYPEDEF_AW(DNS_NSEC_DATA) + __MINGW_TYPEDEF_AW(PDNS_NSEC_DATA) __MINGW_TYPEDEF_AW(DNS_TKEY_DATA) __MINGW_TYPEDEF_AW(PDNS_TKEY_DATA) __MINGW_TYPEDEF_AW(DNS_TSIG_DATA) @@ -617,6 +763,16 @@ extern "C" { #define DNS_NULL_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_NULL_DATA,Data) + (ByteCount)) #define DNS_WKS_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_WKS_DATA,BitMask) + (ByteCount)) #define DNS_WINS_RECORD_LENGTH(IpCount) (FIELD_OFFSET(DNS_WINS_DATA,WinsServers) + ((IpCount) *sizeof(IP4_ADDRESS))) +#define DNS_KEY_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_KEY_DATA,Key) + (ByteCount)) +#define DNS_SIG_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_SIG_DATA,Signature) + (ByteCount)) +#define DNS_NSEC_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_NSEC_DATA,TypeBitMaps) + (ByteCount)) +#define DNS_DS_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_DS_DATA,Digest) + (ByteCount)) +#define DNS_OPT_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_OPT_DATA,Data) + (ByteCount)) +#define DNS_DHCID_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_DHCID_DATA,DHCID) + (ByteCount)) +#define DNS_NSEC3_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_NSEC3_DATA,chData) + (ByteCount)) +#define DNS_NSEC3PARAM_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_NSEC3PARAM_DATA,pbSalt) + (ByteCount)) +#define DNS_TLSA_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_TLSA_DATA,bCertificateAssociationData) + (ByteCount)) +#define DNS_UNKNOWN_RECORD_LENGTH(ByteCount) (FIELD_OFFSET(DNS_UNKNOWN_DATA,bData) + (ByteCount)) typedef struct _DnsRecordFlags { DWORD Section : 2; @@ -661,7 +817,7 @@ extern "C" { union { DNS_A_DATA A; DNS_SOA_DATAW SOA,Soa; - DNS_PTR_DATAW PTR,Ptr,NS,Ns,CNAME,Cname,MB,Mb,MD,Md,MF,Mf,MG,Mg,MR,Mr; + DNS_PTR_DATAW PTR,Ptr,NS,Ns,CNAME,Cname,DNAME,Dname,MB,Mb,MD,Md,MF,Mf,MG,Mg,MR,Mr; DNS_MINFO_DATAW MINFO,Minfo,RP,Rp; DNS_MX_DATAW MX,Mx,AFSDB,Afsdb,RT,Rt; DNS_TXT_DATAW HINFO,Hinfo,ISDN,Isdn,TXT,Txt,X25; @@ -673,13 +829,42 @@ extern "C" { DNS_ATMA_DATA ATMA,Atma; DNS_NXT_DATAW NXT,Nxt; DNS_SRV_DATAW SRV,Srv; + DNS_NAPTR_DATAW NAPTR,Naptr; + DNS_OPT_DATA OPT,Opt; + DNS_DS_DATA DS,Ds; + DNS_RRSIG_DATAW RRSIG,Rrsig; + DNS_NSEC_DATAW NSEC,Nsec; + DNS_DNSKEY_DATA DNSKEY,Dnskey; DNS_TKEY_DATAW TKEY,Tkey; DNS_TSIG_DATAW TSIG,Tsig; DNS_WINS_DATA WINS,Wins; DNS_WINSR_DATAW WINSR,WinsR,NBSTAT,Nbstat; + DNS_DHCID_DATA DHCID; + DNS_NSEC3_DATA NSEC3,Nsec3; + DNS_NSEC3PARAM_DATA NSEC3PARAM,Nsec3Param; + DNS_TLSA_DATA TLSA,Tlsa; + DNS_UNKNOWN_DATA UNKNOWN,Unknown; + PBYTE pDataPtr; } Data; } DNS_RECORDW,*PDNS_RECORDW; + typedef struct _DnsRecordOptW { + struct _DnsRecordW *pNext; + PWSTR pName; + WORD wType; + WORD wDataLength; + union { + DWORD DW; + DNS_RECORD_FLAGS S; + } Flags; + DNS_HEADER_EXT ExtHeader; + WORD wPayloadSize; + WORD wReserved; + union { + DNS_OPT_DATA OPT,Opt; + } Data; + } DNS_RECORD_OPTW, *PDNS_RECORD_OPTW; + typedef struct _DnsRecordA { struct _DnsRecordA *pNext; PSTR pName; @@ -694,7 +879,7 @@ extern "C" { union { DNS_A_DATA A; DNS_SOA_DATAA SOA,Soa; - DNS_PTR_DATAA PTR,Ptr,NS,Ns,CNAME,Cname,MB,Mb,MD,Md,MF,Mf,MG,Mg,MR,Mr; + DNS_PTR_DATAA PTR,Ptr,NS,Ns,CNAME,Cname,DNAME,Dname,MB,Mb,MD,Md,MF,Mf,MG,Mg,MR,Mr; DNS_MINFO_DATAA MINFO,Minfo,RP,Rp; DNS_MX_DATAA MX,Mx,AFSDB,Afsdb,RT,Rt; DNS_TXT_DATAA HINFO,Hinfo,ISDN,Isdn,TXT,Txt,X25; @@ -706,17 +891,48 @@ extern "C" { DNS_ATMA_DATA ATMA,Atma; DNS_NXT_DATAA NXT,Nxt; DNS_SRV_DATAA SRV,Srv; + DNS_NAPTR_DATAA NAPTR,Naptr; + DNS_OPT_DATA OPT,Opt; + DNS_DS_DATA DS,Ds; + DNS_RRSIG_DATAA RRSIG,Rrsig; + DNS_NSEC_DATAA NSEC,Nsec; + DNS_DNSKEY_DATA DNSKEY,Dnskey; DNS_TKEY_DATAA TKEY,Tkey; DNS_TSIG_DATAA TSIG,Tsig; DNS_WINS_DATA WINS,Wins; DNS_WINSR_DATAA WINSR,WinsR,NBSTAT,Nbstat; + DNS_DHCID_DATA DHCID; + DNS_NSEC3_DATA NSEC3,Nsec3; + DNS_NSEC3PARAM_DATA NSEC3PARAM,Nsec3Param; + DNS_TLSA_DATA TLSA,Tlsa; + DNS_UNKNOWN_DATA UNKNOWN,Unknown; + PBYTE pDataPtr; } Data; } DNS_RECORDA,*PDNS_RECORDA; + typedef struct _DnsRecordOptA { + struct _DnsRecordA *pNext; + PSTR pName; + WORD wType; + WORD wDataLength; + union { + DWORD DW; + DNS_RECORD_FLAGS S; + } Flags; + DNS_HEADER_EXT ExtHeader; + WORD wPayloadSize; + WORD wReserved; + union { + DNS_OPT_DATA OPT, Opt; + } Data; + } DNS_RECORD_OPTA, *PDNS_RECORD_OPTA; + #ifdef UNICODE typedef DNS_RECORDW DNS_RECORD, *PDNS_RECORD; + typedef DNS_RECORD_OPTW DNS_RECORD_OPT, *PDNS_RECORD_OPT; #else typedef DNS_RECORDA DNS_RECORD, *PDNS_RECORD; + typedef DNS_RECORD_OPTA DNS_RECORD_OPT, *PDNS_RECORD_OPT; #endif #define DNS_RECORD_FIXED_SIZE FIELD_OFFSET(DNS_RECORD,Data) @@ -731,6 +947,21 @@ extern "C" { #define DNS_RRSET_ADD(rrset,pnewRR) { PDNS_RRSET _prrset = &(rrset); PDNS_RECORD _prrnew = (pnewRR); _prrset->pLastRR->pNext = _prrnew; _prrset->pLastRR = _prrnew; } #define DNS_RRSET_TERMINATE(rrset) { PDNS_RRSET _prrset = &(rrset); _prrset->pLastRR->pNext = NULL; } + typedef VOID (WINAPI *DNS_PROXY_COMPLETION_ROUTINE)(void *completionContext,DNS_STATUS status); + + typedef enum DNS_PROXY_INFORMATION_TYPE { + DNS_PROXY_INFORMATION_DIRECT, + DNS_PROXY_INFORMATION_DEFAULT_SETTINGS, + DNS_PROXY_INFORMATION_PROXY_NAME, + DNS_PROXY_INFORMATION_DOES_NOT_EXIST + } DNS_PROXY_INFORMATION_TYPE; + + typedef struct DNS_PROXY_INFORMATION { + ULONG version; + DNS_PROXY_INFORMATION_TYPE proxyInformationType; + PWSTR proxyName; + } DNS_PROXY_INFORMATION; + typedef enum _DNS_CHARSET { DnsCharSetUnknown,DnsCharSetUnicode,DnsCharSetUtf8,DnsCharSetAnsi } DNS_CHARSET; @@ -779,8 +1010,14 @@ extern "C" { #define DNS_QUERY_NO_MULTICAST 0x00000800 #define DNS_QUERY_TREAT_AS_FQDN 0x00001000 #define DNS_QUERY_APPEND_MULTILABEL 0x00800000 +#define DNS_QUERY_ADDRCONFIG 0x00002000 +#define DNS_QUERY_DUAL_ADDR 0x00004000 #define DNS_QUERY_DONT_RESET_TTL_VALUES 0x00100000 -#define DNS_QUERY_RESERVED 0xff000000 +#define DNS_QUERY_DISABLE_IDN_ENCODING 0x00200000 +#define DNS_QUERY_APPEND_MULTILABEL 0x00800000 +#define DNS_QUERY_DNSSEC_OK 0x01000000 +#define DNS_QUERY_DNSSEC_CHECKING_DISABLED 0x02000000 +#define DNS_QUERY_RESERVED 0xf0000000 #define DNS_QUERY_CACHE_ONLY DNS_QUERY_NO_WIRE_QUERY DNS_STATUS WINAPI DnsQuery_A(PCSTR pszName,WORD wType,DWORD Options,PIP4_ARRAY aipServers,PDNS_RECORD *ppQueryResults,PVOID *pReserved); @@ -789,6 +1026,24 @@ extern "C" { #define DnsQuery __MINGW_NAME_UAW(DnsQuery) +#if !defined (USE_PRIVATE_DNS_ADDR) || defined (MIDL_PASS) || defined (__WIDL__) +#define DNS_QUERY_REQUEST_VERSION1 0x1 +#define DNS_QUERY_REQUEST_VERSION2 0x2 +#endif + +#define DNS_QUERY_RESULTS_VERSION1 0x1 + + typedef struct _DNS_QUERY_RESULT { + ULONG Version; + DNS_STATUS QueryStatus; + ULONG64 QueryOptions; + PDNS_RECORD pQueryRecords; + PVOID Reserved; + } DNS_QUERY_RESULT, *PDNS_QUERY_RESULT; + + typedef VOID WINAPI DNS_QUERY_COMPLETION_ROUTINE(PVOID pQueryContext,PDNS_QUERY_RESULT pQueryResults); + typedef DNS_QUERY_COMPLETION_ROUTINE *PDNS_QUERY_COMPLETION_ROUTINE; + #define DNS_UPDATE_SECURITY_USE_DEFAULT 0x00000000 #define DNS_UPDATE_SECURITY_OFF 0x00000010 #define DNS_UPDATE_SECURITY_ON 0x00000020 @@ -818,12 +1073,33 @@ extern "C" { DNS_STATUS WINAPI DnsReplaceRecordSetUTF8(PDNS_RECORDA pNewSet,DWORD Options,HANDLE hContext,PIP4_ARRAY pServerList,PVOID pReserved); typedef enum _DNS_NAME_FORMAT { - DnsNameDomain,DnsNameDomainLabel,DnsNameHostnameFull,DnsNameHostnameLabel,DnsNameWildcard,DnsNameSrvRecord + DnsNameDomain, + DnsNameDomainLabel, + DnsNameHostnameFull, + DnsNameHostnameLabel, + DnsNameWildcard, + DnsNameSrvRecord, + DnsNameValidateTld } DNS_NAME_FORMAT; DNS_STATUS DnsValidateName_UTF8(LPCSTR pszName,DNS_NAME_FORMAT Format); DNS_STATUS DnsValidateName_W(LPCWSTR pwszName,DNS_NAME_FORMAT Format); DNS_STATUS DnsValidateName_A(LPCSTR pszName,DNS_NAME_FORMAT Format); + +#define DNS_VALSVR_ERROR_INVALID_ADDR 0x01 +#define DNS_VALSVR_ERROR_INVALID_NAME 0x02 +#define DNS_VALSVR_ERROR_UNREACHABLE 0x03 +#define DNS_VALSVR_ERROR_NO_RESPONSE 0x04 +#define DNS_VALSVR_ERROR_NO_AUTH 0x05 +#define DNS_VALSVR_ERROR_REFUSED 0x06 + +#define DNS_VALSVR_ERROR_NO_TCP 0x10 +#define DNS_VALSVR_ERROR_UNKNOWN 0xFF + +#ifdef _WS2DEF_ + DNS_STATUS DnsValidateServerStatus(PSOCKADDR server,PCWSTR queryName,PDWORD serverStatus); +#endif + WINBOOL WINAPI DnsNameCompare_A(LPSTR pName1,LPSTR pName2); WINBOOL WINAPI DnsNameCompare_W(LPWSTR pName1,LPWSTR pName2); @@ -837,6 +1113,234 @@ extern "C" { DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W(PDNS_MESSAGE_BUFFER pDnsBuffer,WORD wMessageLength,PDNS_RECORD *ppRecord); DNS_STATUS WINAPI DnsExtractRecordsFromMessage_UTF8(PDNS_MESSAGE_BUFFER pDnsBuffer,WORD wMessageLength,PDNS_RECORDA *ppRecord); + DWORD WINAPI DnsGetProxyInformation(PCWSTR hostName,DNS_PROXY_INFORMATION *proxyInformation,DNS_PROXY_INFORMATION *defaultProxyInformation,DNS_PROXY_COMPLETION_ROUTINE completionRoutine,void *completionContext); + VOID WINAPI DnsFreeProxyName(PWSTR proxyName); + +#define DNS_CONNECTION_NAME_MAX_LENGTH 64 +#define DNS_CONNECTION_PROXY_INFO_CURRENT_VERSION 1 +#define DNS_CONNECTION_PROXY_INFO_SERVER_MAX_LENGTH 256 +#define DNS_CONNECTION_PROXY_INFO_FRIENDLY_NAME_MAX_LENGTH 64 +#define DNS_CONNECTION_PROXY_INFO_USERNAME_MAX_LENGTH 128 +#define DNS_CONNECTION_PROXY_INFO_PASSWORD_MAX_LENGTH 128 +#define DNS_CONNECTION_PROXY_INFO_EXCEPTION_MAX_LENGTH 1024 +#define DNS_CONNECTION_PROXY_INFO_EXTRA_INFO_MAX_LENGTH 1024 + + typedef enum _DNS_CONNECTION_PROXY_TYPE { + DNS_CONNECTION_PROXY_TYPE_NULL = 0, + DNS_CONNECTION_PROXY_TYPE_HTTP = 1, + DNS_CONNECTION_PROXY_TYPE_WAP = 2, + DNS_CONNECTION_PROXY_TYPE_SOCKS4 = 4, + DNS_CONNECTION_PROXY_TYPE_SOCKS5 = 5 + } DNS_CONNECTION_PROXY_TYPE; + + typedef enum _DNS_CONNECTION_PROXY_INFO_SWITCH { + DNS_CONNECTION_PROXY_INFO_SWITCH_CONFIG = 0, + DNS_CONNECTION_PROXY_INFO_SWITCH_SCRIPT, + DNS_CONNECTION_PROXY_INFO_SWITCH_WPAD + } DNS_CONNECTION_PROXY_INFO_SWITCH; + +#define DNS_CONNECTION_PROXY_INFO_FLAG_DISABLED 0x1 +#define DNS_CONNECTION_PROXY_INFO_FLAG_BYPASSLOCAL 0x2 + + struct _DNS_CONNECTION_PROXY_INFO_CONFIG { + WCHAR *pwszServer; + WCHAR *pwszUsername; + WCHAR *pwszPassword; + WCHAR *pwszException; + WCHAR *pwszExtraInfo; + WORD Port; + }; + + struct _DNS_CONNECTION_PROXY_INFO_SCRIPT { + WCHAR *pwszScript; + WCHAR *pwszUsername; + WCHAR *pwszPassword; + }; + + typedef struct _DNS_CONNECTION_PROXY_INFO { + DWORD Version; + WCHAR *pwszFriendlyName; + DWORD Flags; + DNS_CONNECTION_PROXY_INFO_SWITCH Switch; + __C89_NAMELESS union { + struct _DNS_CONNECTION_PROXY_INFO_CONFIG Config; + struct _DNS_CONNECTION_PROXY_INFO_SCRIPT Script; + }; + } DNS_CONNECTION_PROXY_INFO, *PDNS_CONNECTION_PROXY_INFO; + + typedef struct _DNS_CONNECTION_PROXY_INFO_EX { + DNS_CONNECTION_PROXY_INFO ProxyInfo; + DWORD dwInterfaceIndex; + WCHAR *pwszConnectionName; + WINBOOL fDirectConfiguration; + HANDLE hConnection; + } DNS_CONNECTION_PROXY_INFO_EX, *PDNS_CONNECTION_PROXY_INFO_EX; + + typedef struct _DNS_CONNECTION_PROXY_ELEMENT { + DNS_CONNECTION_PROXY_TYPE Type; + DNS_CONNECTION_PROXY_INFO Info; + } DNS_CONNECTION_PROXY_ELEMENT; + + typedef struct _DNS_CONNECTION_PROXY_LIST { + DWORD cProxies; + DNS_CONNECTION_PROXY_ELEMENT *pProxies; + } DNS_CONNECTION_PROXY_LIST; + + typedef struct _DNS_CONNECTION_NAME { + WCHAR wszName[DNS_CONNECTION_NAME_MAX_LENGTH + 1]; + } DNS_CONNECTION_NAME; + + typedef struct _DNS_CONNECTION_NAME_LIST { + DWORD cNames; + DNS_CONNECTION_NAME *pNames; + } DNS_CONNECTION_NAME_LIST; + + DWORD DnsConnectionGetProxyInfoForHostUrl(PCWSTR pwszHostUrl,BYTE *pSelectionContext,DWORD dwSelectionContextLength,DWORD dwExplicitInterfaceIndex,DNS_CONNECTION_PROXY_INFO_EX *pProxyInfoEx); + VOID DnsConnectionFreeProxyInfoEx(DNS_CONNECTION_PROXY_INFO_EX *pProxyInfoEx); + DWORD DnsConnectionGetProxyInfo(PCWSTR pwszConnectionName,DNS_CONNECTION_PROXY_TYPE Type,DNS_CONNECTION_PROXY_INFO *pProxyInfo); + VOID DnsConnectionFreeProxyInfo(DNS_CONNECTION_PROXY_INFO *pProxyInfo); + DWORD DnsConnectionSetProxyInfo(PCWSTR pwszConnectionName,DNS_CONNECTION_PROXY_TYPE Type,const DNS_CONNECTION_PROXY_INFO *pProxyInfo); + DWORD DnsConnectionDeleteProxyInfo(PCWSTR pwszConnectionName,DNS_CONNECTION_PROXY_TYPE Type); + DWORD DnsConnectionGetProxyList(PCWSTR pwszConnectionName,DNS_CONNECTION_PROXY_LIST *pProxyList); + VOID DnsConnectionFreeProxyList(DNS_CONNECTION_PROXY_LIST *pProxyList); + DWORD DnsConnectionGetNameList(DNS_CONNECTION_NAME_LIST *pNameList); + VOID DnsConnectionFreeNameList(DNS_CONNECTION_NAME_LIST *pNameList); + + typedef struct _DNS_CONNECTION_IFINDEX_ENTRY { + PCWSTR pwszConnectionName; + DWORD dwIfIndex; + } DNS_CONNECTION_IFINDEX_ENTRY; + + typedef struct _DNS_CONNECTION_IFINDEX_LIST { + DNS_CONNECTION_IFINDEX_ENTRY *pConnectionIfIndexEntries; + DWORD nEntries; + } DNS_CONNECTION_IFINDEX_LIST; + + DWORD DnsConnectionUpdateIfIndexTable(DNS_CONNECTION_IFINDEX_LIST *pConnectionIfIndexEntries); + +#define DNS_CONNECTION_POLICY_ENTRY_ONDEMAND 0x00000001 + + typedef struct _DNS_CONNECTION_POLICY_ENTRY { + PCWSTR pwszHost; + PCWSTR pwszAppId; + DWORD cbAppSid; + PBYTE pbAppSid; + DWORD nConnections; + PCWSTR *ppwszConnections; + DWORD dwPolicyEntryFlags; + } DNS_CONNECTION_POLICY_ENTRY, *PDNS_CONNECTION_POLICY_ENTRY; + + typedef struct _DNS_CONNECTION_POLICY_ENTRY_LIST { + DNS_CONNECTION_POLICY_ENTRY *pPolicyEntries; + DWORD nEntries; + } DNS_CONNECTION_POLICY_ENTRY_LIST; + + typedef enum { + TAG_DNS_CONNECTION_POLICY_TAG_DEFAULT = 0, + TAG_DNS_CONNECTION_POLICY_TAG_CONNECTION_MANAGER, + TAG_DNS_CONNECTION_POLICY_TAG_WWWPT + } DNS_CONNECTION_POLICY_TAG; + + DWORD DnsConnectionSetPolicyEntries(DNS_CONNECTION_POLICY_TAG PolicyEntryTag,DNS_CONNECTION_POLICY_ENTRY_LIST *pPolicyEntryList); + DWORD DnsConnectionDeletePolicyEntries(DNS_CONNECTION_POLICY_TAG PolicyEntryTag); + + typedef struct _DNS_SERVICE_INSTANCE { + LPWSTR pszInstanceName; + LPWSTR pszHostName; + IP4_ADDRESS *ip4Address; + IP6_ADDRESS *ip6Address; + WORD wPort; + WORD wPriority; + WORD wWeight; + DWORD dwPropertyCount; + PWSTR *keys; + PWSTR *values; + DWORD dwInterfaceIndex; + } DNS_SERVICE_INSTANCE, *PDNS_SERVICE_INSTANCE; + + PDNS_SERVICE_INSTANCE WINAPI DnsServiceConstructInstance(PCWSTR pServiceName,PCWSTR pHostName,PIP4_ADDRESS pIp4,PIP6_ADDRESS pIp6,WORD wPort,WORD wPriority,WORD wWeight,DWORD dwPropertiesCount,PCWSTR *keys,PCWSTR *values); + PDNS_SERVICE_INSTANCE WINAPI DnsServiceCopyInstance(PDNS_SERVICE_INSTANCE pOrig); + VOID WINAPI DnsServiceFreeInstance(PDNS_SERVICE_INSTANCE pInstance); + + typedef struct _DNS_SERVICE_CANCEL { + PVOID reserved; + } DNS_SERVICE_CANCEL, *PDNS_SERVICE_CANCEL; + + typedef VOID WINAPI DNS_SERVICE_BROWSE_CALLBACK(DWORD Status,PVOID pQueryContext,PDNS_RECORD pDnsRecord); + typedef DNS_SERVICE_BROWSE_CALLBACK *PDNS_SERVICE_BROWSE_CALLBACK; + + typedef struct _DNS_SERVICE_BROWSE_REQUEST { + ULONG Version; + ULONG InterfaceIndex; + PCWSTR QueryName; + __C89_NAMELESS union { + PDNS_SERVICE_BROWSE_CALLBACK pBrowseCallback; + DNS_QUERY_COMPLETION_ROUTINE *pBrowseCallbackV2; + }; + PVOID pQueryContext; + } DNS_SERVICE_BROWSE_REQUEST, *PDNS_SERVICE_BROWSE_REQUEST; + + DNS_STATUS WINAPI DnsServiceBrowse(PDNS_SERVICE_BROWSE_REQUEST pRequest,PDNS_SERVICE_CANCEL pCancel); + DNS_STATUS WINAPI DnsServiceBrowseCancel(PDNS_SERVICE_CANCEL pCancelHandle); + + typedef VOID WINAPI DNS_SERVICE_RESOLVE_COMPLETE(DWORD Status,PVOID pQueryContext,PDNS_SERVICE_INSTANCE pInstance); + typedef DNS_SERVICE_RESOLVE_COMPLETE *PDNS_SERVICE_RESOLVE_COMPLETE; + + typedef struct _DNS_SERVICE_RESOLVE_REQUEST{ + ULONG Version; + ULONG InterfaceIndex; + PWSTR QueryName; + PDNS_SERVICE_RESOLVE_COMPLETE pResolveCompletionCallback; + PVOID pQueryContext; + } DNS_SERVICE_RESOLVE_REQUEST, *PDNS_SERVICE_RESOLVE_REQUEST; + + DNS_STATUS WINAPI DnsServiceResolve(PDNS_SERVICE_RESOLVE_REQUEST pRequest,PDNS_SERVICE_CANCEL pCancel); + DNS_STATUS WINAPI DnsServiceResolveCancel(PDNS_SERVICE_CANCEL pCancelHandle); + + typedef VOID WINAPI DNS_SERVICE_REGISTER_COMPLETE(DWORD Status,PVOID pQueryContext,PDNS_SERVICE_INSTANCE pInstance); + typedef DNS_SERVICE_REGISTER_COMPLETE *PDNS_SERVICE_REGISTER_COMPLETE; + + typedef struct _DNS_SERVICE_REGISTER_REQUEST{ + ULONG Version; + ULONG InterfaceIndex; + PDNS_SERVICE_INSTANCE pServiceInstance; + PDNS_SERVICE_REGISTER_COMPLETE pRegisterCompletionCallback; + PVOID pQueryContext; + HANDLE hCredentials; + WINBOOL unicastEnabled; + } DNS_SERVICE_REGISTER_REQUEST, *PDNS_SERVICE_REGISTER_REQUEST; + + DWORD WINAPI DnsServiceRegister(PDNS_SERVICE_REGISTER_REQUEST pRequest,PDNS_SERVICE_CANCEL pCancel); + DWORD WINAPI DnsServiceDeRegister(PDNS_SERVICE_REGISTER_REQUEST pRequest,PDNS_SERVICE_CANCEL pCancel); + DWORD WINAPI DnsServiceRegisterCancel(PDNS_SERVICE_CANCEL pCancelHandle); + + typedef struct _MDNS_QUERY_HANDLE { + WCHAR nameBuf[DNS_MAX_NAME_BUFFER_LENGTH]; + WORD wType; + PVOID pSubscription; + PVOID pWnfCallbackParams; + ULONG stateNameData[2]; + } MDNS_QUERY_HANDLE, *PMDNS_QUERY_HANDLE; + + typedef VOID WINAPI MDNS_QUERY_CALLBACK(PVOID pQueryContext,PMDNS_QUERY_HANDLE pQueryHandle,PDNS_QUERY_RESULT pQueryResults); + typedef MDNS_QUERY_CALLBACK *PMDNS_QUERY_CALLBACK; + + typedef struct _MDNS_QUERY_REQUEST { + ULONG Version; + ULONG ulRefCount; + PCWSTR Query; + WORD QueryType; + ULONG64 QueryOptions; + ULONG InterfaceIndex; + PMDNS_QUERY_CALLBACK pQueryCallback; + PVOID pQueryContext; + WINBOOL fAnswerReceived; + ULONG ulResendCount; + } MDNS_QUERY_REQUEST, *PMDNS_QUERY_REQUEST; + + DNS_STATUS WINAPI DnsStartMulticastQuery(PMDNS_QUERY_REQUEST pQueryRequest,PMDNS_QUERY_HANDLE pHandle); + DNS_STATUS WINAPI DnsStopMulticastQuery(PMDNS_QUERY_HANDLE pHandle); + #ifdef __cplusplus } #endif -- 2.34.1
_______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public