summaryrefslogtreecommitdiffstats
path: root/mDNSResponder/Clients/dns-sd.c
diff options
context:
space:
mode:
Diffstat (limited to 'mDNSResponder/Clients/dns-sd.c')
-rw-r--r--mDNSResponder/Clients/dns-sd.c107
1 files changed, 50 insertions, 57 deletions
diff --git a/mDNSResponder/Clients/dns-sd.c b/mDNSResponder/Clients/dns-sd.c
index 78c8f29f..5260b3f2 100644
--- a/mDNSResponder/Clients/dns-sd.c
+++ b/mDNSResponder/Clients/dns-sd.c
@@ -174,10 +174,6 @@ static const char kFilePathSep = '/';
#include "../mDNSShared/dnssd_clientstub.c"
#endif
-#if _DNS_SD_LIBDISPATCH
-#include <dispatch/private.h>
-#endif
-
//*************************************************************************************************************
// Globals
@@ -416,46 +412,36 @@ static unsigned int keytag(unsigned char *key, unsigned int keysize)
return ac & 0xFFFF;
}
-static void base64Encode(char *buffer, int buflen, void *rdata, unsigned int rdlen)
+// Base 64 encoding according to <https://tools.ietf.org/html/rfc4648#section-4>.
+#define kBase64EncodingTable "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+
+static void base64Encode(char *buffer, size_t buflen, void *rdata, size_t rdlen)
{
-#if _DNS_SD_LIBDISPATCH
- const void *result = NULL;
- size_t size;
- dispatch_data_t src_data = NULL, dest_data = NULL, null_str = NULL, data = NULL, map = NULL;
-
- src_data = dispatch_data_create(rdata, rdlen, dispatch_get_global_queue(0, 0), ^{});
- if (!src_data)
- goto done;
-
- dest_data = dispatch_data_create_with_transform(src_data, DISPATCH_DATA_FORMAT_TYPE_NONE, DISPATCH_DATA_FORMAT_TYPE_BASE64);
- if (!dest_data)
- goto done;
-
- null_str = dispatch_data_create("", 1, dispatch_get_global_queue(0, 0), ^{});
- if (!null_str)
- goto done;
-
- data = dispatch_data_create_concat(dest_data, null_str);
- if (!data)
- goto done;
-
- map = dispatch_data_create_map(data, &result, &size);
- if (!map)
- goto done;
-
- snprintf(buffer, buflen, " %s", (char *)result);
-
-done:
- if (src_data) dispatch_release(src_data);
- if (dest_data) dispatch_release(dest_data);
- if (data) dispatch_release(data);
- if (null_str) dispatch_release(null_str);
- if (map) dispatch_release(map);
- return;
-#else //_DNS_SD_LIBDISPATCH
- snprintf(buffer, buflen, " %s", ".");
- return;
-#endif //_DNS_SD_LIBDISPATCH
+ const uint8_t *src = (const uint8_t *)rdata;
+ const uint8_t *const end = &src[rdlen];
+ char *dst = buffer;
+ const char *lim;
+
+ if (buflen == 0) return;
+ lim = &buffer[buflen - 1];
+ while ((src < end) && (dst < lim))
+ {
+ uint32_t i;
+ const size_t rem = (size_t)(end - src);
+
+ // Form a 24-bit input group. If less than 24 bits remain, pad with zero bits.
+ if ( rem >= 3) i = (src[0] << 16) | (src[1] << 8) | src[2]; // 24 bits are equal to 4 6-bit groups.
+ else if (rem == 2) i = (src[0] << 16) | (src[1] << 8); // 16 bits are treated as 3 6-bit groups + 1 pad
+ else i = src[0] << 16; // 8 bits are treated as 2 6-bit groups + 2 pads
+
+ // Encode each 6-bit group.
+ *dst++ = kBase64EncodingTable[(i >> 18) & 0x3F];
+ if (dst < lim) *dst++ = kBase64EncodingTable[(i >> 12) & 0x3F];
+ if (dst < lim) *dst++ = (rem >= 2) ? kBase64EncodingTable[(i >> 6) & 0x3F] : '=';
+ if (dst < lim) *dst++ = (rem >= 3) ? kBase64EncodingTable[ i & 0x3F] : '=';
+ src += (rem > 3) ? 3 : rem;
+ }
+ *dst = '\0';
}
static DNSServiceProtocol GetProtocol(const char *s)
@@ -924,9 +910,9 @@ static int snprintd(char *p, int max, const unsigned char **rd)
return(p-buf);
}
-static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, char *p, unsigned const char *rd, uint16_t rdlen)
+static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, size_t rdb_size, unsigned const char *rd, uint16_t rdlen)
{
- int rdb_size = 1000;
+ char *p = rdb;
switch (rrtype)
{
case kDNSServiceType_DS:
@@ -945,7 +931,7 @@ static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, char *p, unsigned con
case kDNSServiceType_DNSKEY:
{
rdataDNSKey *rrkey = (rdataDNSKey *)rd;
- p += snprintf(p, rdb + rdb_size - p, "%d %d %d %u", swap16(rrkey->flags), rrkey->proto,
+ p += snprintf(p, rdb + rdb_size - p, "%d %d %d %u ", swap16(rrkey->flags), rrkey->proto,
rrkey->alg, (unsigned int)keytag((unsigned char *)rrkey, rdlen));
base64Encode(p, rdb + rdb_size - p, (unsigned char *)(rd + DNSKEY_FIXED_SIZE), rdlen - DNSKEY_FIXED_SIZE);
break;
@@ -1027,6 +1013,11 @@ static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, char *p, unsigned con
p += snprintd(p, rdb + rdb_size - p, &q);
len = p - k + 1;
+ if ((&rdb[rdb_size] - p) >= 2)
+ {
+ *p++ = ' ';
+ *p = '\0';
+ }
base64Encode(p, rdb + rdb_size - p, (unsigned char *)(rd + len + RRSIG_FIXED_SIZE), rdlen - (len + RRSIG_FIXED_SIZE));
break;
}
@@ -1058,7 +1049,7 @@ static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags,
if (operation == 'D')
printf("Timestamp A/R if %-30s%-6s%-7s%-18s Rdata\n", "Name", "Type", "Class", "DNSSECStatus");
else
- printf("Timestamp A/R Flags if %-30s%-6s%-7s Rdata\n", "Name", "Type", "Class");
+ printf("Timestamp A/R Flags if %-30s%-6s%-7s Rdata\n", "Name", "Type", "Class");
}
printtimestamp();
@@ -1115,7 +1106,7 @@ static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags,
case kDNSServiceType_DNSKEY:
case kDNSServiceType_NSEC:
case kDNSServiceType_RRSIG:
- ParseDNSSECRecords(rrtype, rdb, p, rd, rdlen);
+ ParseDNSSECRecords(rrtype, rdb, sizeof(rdb), rd, rdlen);
break;
default:
@@ -1143,7 +1134,7 @@ static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags,
if (operation == 'D')
printf("%s%3d %-30s%-6s%-7s%-18s %s", op, ifIndex, fullname, rr_type, rr_class, dnssec_status, rdb);
else
- printf("%s%6X%3d %-30s%-7s%-6s %s", op, flags, ifIndex, fullname, rr_type, rr_class, rdb);
+ printf("%s%9X%3d %-30s%-7s%-6s %s", op, flags, ifIndex, fullname, rr_type, rr_class, rdb);
if (unknowntype)
{
while (rd < end)
@@ -1208,7 +1199,7 @@ static void DNSSD_API addrinfo_reply(DNSServiceRef sdref, const DNSServiceFlags
if (operation == 'g')
printf("Timestamp A/R if %-25s %-44s %-18s\n", "Hostname", "Address", "DNSSECStatus");
else
- printf("Timestamp A/R Flags if %-38s %-44s %s\n", "Hostname", "Address", "TTL");
+ printf("Timestamp A/R Flags if %-38s %-44s %s\n", "Hostname", "Address", "TTL");
}
printtimestamp();
@@ -1248,7 +1239,7 @@ static void DNSSD_API addrinfo_reply(DNSServiceRef sdref, const DNSServiceFlags
if (operation == 'g')
printf("%s%3d %-25s %-44s %-18s", op, interfaceIndex, hostname, addr, dnssec_status);
else
- printf("%s%6X%3d %-38s %-44s %d", op, flags, interfaceIndex, hostname, addr, ttl);
+ printf("%s%9X%3d %-38s %-44s %d", op, flags, interfaceIndex, hostname, addr, ttl);
if (errorCode)
{
if (errorCode == kDNSServiceErr_NoSuchRecord)
@@ -1513,12 +1504,6 @@ static int API_string_limit_test()
return 0;
}
-// local prototypes for routines that don't have prototypes in dns_sd.h
-#if APPLE_OSX_mDNSResponder
-DNSServiceErrorType DNSSD_API DNSServiceSetDefaultDomainForUser(DNSServiceFlags flags, const char *domain);
-DNSServiceErrorType DNSSD_API DNSServiceCreateDelegateConnection(DNSServiceRef *sdRef, int32_t pid, uuid_t uuid);
-#endif
-
static int API_NULL_input_test()
{
printf("Running basic API input range tests with various pointer parameters set to NULL:\n");
@@ -1916,6 +1901,14 @@ int main(int argc, char **argv)
opinterface = kDNSServiceInterfaceIndexBLE;
}
+ if (argc > 1 && !strcasecmp(argv[1], "-allowexpired"))
+ {
+ argc--;
+ argv++;
+ flags |= kDNSServiceFlagsAllowExpiredAnswers;
+ printf("Setting kDNSServiceFlagsAllowExpiredAnswers\n");
+ }
+
if (argc > 1 && !strcasecmp(argv[1], "-includep2p"))
{
argc--;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 16:34:17 +0000