mirror of https://github.com/c-ares/c-ares.git
MacOS 10.8-10.11 won't compile with dnsinfo.h from configd-1109.140.1, back off to configd-963.50.8 which still works with newer MacOS verions Fixes Issue: #783 Fix By: Brad House (@bradh352)v1.29
Brad House
8 months ago
parent
e49916f101
commit
e13fdff82b
3 changed files with 143 additions and 7 deletions
@ -1,4 +1,12 @@ |
||||
The `dnsinfo.h` header was extracted from Apple's OpenSource repository: |
||||
[https://opensource.apple.com/source/configd/configd-1109.140.1/dnsinfo/dnsinfo.h](https://opensource.apple.com/source/configd/configd-1109.140.1/dnsinfo/dnsinfo.h) |
||||
[https://opensource.apple.com/source/configd/configd-963.50.8/dnsinfo/dnsinfo.h](https://opensource.apple.com/source/configd/configd-963.50.8/dnsinfo/dnsinfo.h) |
||||
|
||||
We did make one tweak to this file to put `(void)` as the parameter list for both `dns_configuration_notify_key()` |
||||
and `dns_configuration_copy()` to sidestep compiler warnings in this old header. |
||||
|
||||
NOTE: For legacy MacOS compatibility, we needed to import 963.50.8. We tried with the |
||||
latest (at this time) of 1109.140.1, and it caused issues with MacPorts still supporting |
||||
MacOS versions 10.8-10.11. There's really not any reason to not support these if it doesn't |
||||
take much effort if MacPorts still is. |
||||
|
||||
This is needed to call into `dns_configuration_copy()` and `dns_configuration_free()`. |
||||
|
||||
@ -0,0 +1,128 @@ |
||||
/* |
||||
* Copyright (c) 2004-2006, 2008, 2009, 2011-2013, 2015-2018 Apple Inc. All rights reserved. |
||||
* |
||||
* @APPLE_LICENSE_HEADER_START@ |
||||
* |
||||
* This file contains Original Code and/or Modifications of Original Code |
||||
* as defined in and that are subject to the Apple Public Source License |
||||
* Version 2.0 (the 'License'). You may not use this file except in |
||||
* compliance with the License. Please obtain a copy of the License at |
||||
* http://www.opensource.apple.com/apsl/ and read it before using this |
||||
* file. |
||||
* |
||||
* The Original Code and all software distributed under the License are |
||||
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER |
||||
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, |
||||
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, |
||||
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. |
||||
* Please see the License for the specific language governing rights and |
||||
* limitations under the License. |
||||
* |
||||
* @APPLE_LICENSE_HEADER_END@ |
||||
*/ |
||||
|
||||
#ifndef __DNSINFO_H__ |
||||
#define __DNSINFO_H__ |
||||
|
||||
/* |
||||
* These routines provide access to the systems DNS configuration |
||||
*/ |
||||
|
||||
#include <os/availability.h> |
||||
#include <sys/cdefs.h> |
||||
#include <stdint.h> |
||||
#include <sys/types.h> |
||||
#include <sys/socket.h> |
||||
#include <netinet/in.h> |
||||
|
||||
#define DNSINFO_VERSION 20170629 |
||||
|
||||
#define DEFAULT_SEARCH_ORDER 200000 /* search order for the "default" resolver domain name */ |
||||
|
||||
#define DNS_PTR(type, name) \ |
||||
union { \ |
||||
type name; \ |
||||
uint64_t _ ## name ## _p; \ |
||||
} |
||||
|
||||
#define DNS_VAR(type, name) \ |
||||
type name |
||||
|
||||
|
||||
#pragma pack(4) |
||||
typedef struct { |
||||
struct in_addr address; |
||||
struct in_addr mask; |
||||
} dns_sortaddr_t; |
||||
#pragma pack() |
||||
|
||||
|
||||
#pragma pack(4) |
||||
typedef struct { |
||||
DNS_PTR(char *, domain); /* domain */ |
||||
DNS_VAR(int32_t, n_nameserver); /* # nameserver */ |
||||
DNS_PTR(struct sockaddr **, nameserver); |
||||
DNS_VAR(uint16_t, port); /* port (in host byte order) */ |
||||
DNS_VAR(int32_t, n_search); /* # search */ |
||||
DNS_PTR(char **, search); |
||||
DNS_VAR(int32_t, n_sortaddr); /* # sortaddr */ |
||||
DNS_PTR(dns_sortaddr_t **, sortaddr); |
||||
DNS_PTR(char *, options); /* options */ |
||||
DNS_VAR(uint32_t, timeout); /* timeout */ |
||||
DNS_VAR(uint32_t, search_order); /* search_order */ |
||||
DNS_VAR(uint32_t, if_index); |
||||
DNS_VAR(uint32_t, flags); |
||||
DNS_VAR(uint32_t, reach_flags); /* SCNetworkReachabilityFlags */ |
||||
DNS_VAR(uint32_t, service_identifier); |
||||
DNS_PTR(char *, cid); /* configuration identifer */ |
||||
DNS_PTR(char *, if_name); /* if_index interface name */ |
||||
} dns_resolver_t; |
||||
#pragma pack() |
||||
|
||||
|
||||
#define DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS 0x0002 /* always requesting for A dns records in queries */ |
||||
#define DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS 0x0004 /* always requesting for AAAA dns records in queries */ |
||||
|
||||
#define DNS_RESOLVER_FLAGS_REQUEST_ALL_RECORDS \ |
||||
(DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS | DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS) |
||||
|
||||
#define DNS_RESOLVER_FLAGS_SCOPED 0x1000 /* configuration is for scoped questions */ |
||||
#define DNS_RESOLVER_FLAGS_SERVICE_SPECIFIC 0x2000 /* configuration is service-specific */ |
||||
#define DNS_RESOLVER_FLAGS_SUPPLEMENTAL 0x4000 /* supplemental match configuration */ |
||||
|
||||
|
||||
#pragma pack(4) |
||||
typedef struct { |
||||
DNS_VAR(int32_t, n_resolver); /* resolver configurations */ |
||||
DNS_PTR(dns_resolver_t **, resolver); |
||||
DNS_VAR(int32_t, n_scoped_resolver); /* "scoped" resolver configurations */ |
||||
DNS_PTR(dns_resolver_t **, scoped_resolver); |
||||
DNS_VAR(uint64_t, generation); |
||||
DNS_VAR(int32_t, n_service_specific_resolver); |
||||
DNS_PTR(dns_resolver_t **, service_specific_resolver); |
||||
DNS_VAR(uint32_t, version); |
||||
} dns_config_t; |
||||
#pragma pack() |
||||
|
||||
|
||||
__BEGIN_DECLS |
||||
|
||||
/* |
||||
* DNS configuration access APIs |
||||
*/ |
||||
const char * |
||||
dns_configuration_notify_key (void) API_AVAILABLE(macos(10.4), ios(2.0)); |
||||
|
||||
dns_config_t * |
||||
dns_configuration_copy (void) API_AVAILABLE(macos(10.4), ios(2.0)); |
||||
|
||||
void |
||||
dns_configuration_free (dns_config_t *config) API_AVAILABLE(macos(10.4), ios(2.0)); |
||||
|
||||
void |
||||
_dns_configuration_ack (dns_config_t *config, |
||||
const char *bundle_id) API_AVAILABLE(macos(10.8), ios(6.0)); |
||||
|
||||
__END_DECLS |
||||
|
||||
#endif /* __DNSINFO_H__ */ |
||||
Loading…
Reference in new issue