feedc0de/QtZeroConf
1
0
Fork 0
forked from jbagg/QtZeroConf
Code Pull Requests Activity

Update Bonjour sdk from 333 to 878.200.35

Browse Source
This commit is contained in:
Jonathan Bagg
2020-03-28 14:51:08 -04:00
parent 8625824b8b
commit ec8b3812e8
7 changed files with 5472 additions and 4690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

445
bonjour-sdk/CommonServices.h
View File

File diff suppressed because it is too large Load Diff

424
bonjour-sdk/DebugServices.h
View File

File diff suppressed because it is too large Load Diff

850
bonjour-sdk/dns_sd.h
View File

File diff suppressed because it is too large Load Diff

156
bonjour-sdk/dnssd_clientlib.c
View File

@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4 -*-
*
* Copyright (c) 2004, Apple Computer, Inc. All rights reserved.
* Copyright (c) 2004-2018 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
* 3. Neither the name of Apple Inc. ("Apple") nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
@ -31,10 +31,6 @@
#include "dns_sd.h"
#if MDNS_BUILDINGSHAREDLIBRARY || MDNS_BUILDINGSTUBLIBRARY
#pragma export on
#endif
#if defined(_WIN32)
// disable warning "conversion from <data> to uint16_t"
#pragma warning(disable:4244)
@ -43,10 +39,10 @@
#endif
/*********************************************************************************************
*
* Supporting Functions
*
*********************************************************************************************/
*
* Supporting Functions
*
*********************************************************************************************/
#define mDNSIsDigit(X) ((X) >= '0' && (X) <= '9')
@ -54,7 +50,7 @@
// (DNSServiceConstructFullName depends this returning 1 for true, rather than any non-zero value meaning true)
static int DomainEndsInDot(const char *dom)
{
{
while (dom[0] && dom[1])
{
if (dom[0] == '\\') // advance past escaped byte sequence
@ -66,16 +62,16 @@ static int DomainEndsInDot(const char *dom)
else dom++; // else goto next character
}
return (dom[0] == '.');
}
}
static uint8_t *InternalTXTRecordSearch
(
(
uint16_t txtLen,
const void *txtRecord,
const char *key,
unsigned long *keylen
)
{
)
{
uint8_t *p = (uint8_t*)txtRecord;
uint8_t *e = p + txtLen;
*keylen = (unsigned long) strlen(key);
@ -87,26 +83,26 @@ static uint8_t *InternalTXTRecordSearch
if (*keylen == x[0] || x[1+*keylen] == '=') return(x);
}
return(NULL);
}
}
/*********************************************************************************************
*
* General Utility Functions
*
*********************************************************************************************/
*
* General Utility Functions
*
*********************************************************************************************/
// Note: Need to make sure we don't write more than kDNSServiceMaxDomainName (1009) bytes to fullName
// In earlier builds this constant was defined to be 1005, so to avoid buffer overruns on clients
// compiled with that constant we'll actually limit the output to 1005 bytes.
DNSServiceErrorType DNSSD_API DNSServiceConstructFullName
(
(
char *const fullName,
const char *const service, // May be NULL
const char *const regtype,
const char *const domain
)
{
)
{
const size_t len = !regtype ? 0 : strlen(regtype) - DomainEndsInDot(regtype);
char *fn = fullName;
char *const lim = fullName + 1005;
@ -143,11 +139,11 @@ DNSServiceErrorType DNSSD_API DNSServiceConstructFullName
*fn++ = '.';
}
while (*r) if (fn+1 >= lim) goto fail; else *fn++ = *r++;
if (!DomainEndsInDot(regtype)) { if (fn+1 >= lim) goto fail; else *fn++ = '.'; }
while (*r) if (fn+1 >= lim) goto fail;else *fn++ = *r++;
if (!DomainEndsInDot(regtype)) { if (fn+1 >= lim) goto fail;else *fn++ = '.';}
while (*d) if (fn+1 >= lim) goto fail; else *fn++ = *d++;
if (!DomainEndsInDot(domain)) { if (fn+1 >= lim) goto fail; else *fn++ = '.'; }
while (*d) if (fn+1 >= lim) goto fail;else *fn++ = *d++;
if (!DomainEndsInDot(domain)) { if (fn+1 >= lim) goto fail;else *fn++ = '.';}
*fn = '\0';
return kDNSServiceErr_NoError;
@ -155,57 +151,57 @@ DNSServiceErrorType DNSSD_API DNSServiceConstructFullName
fail:
*fn = '\0';
return kDNSServiceErr_BadParam;
}
}
/*********************************************************************************************
*
* TXT Record Construction Functions
*
*********************************************************************************************/
*
* TXT Record Construction Functions
*
*********************************************************************************************/
typedef struct _TXTRecordRefRealType
{
{
uint8_t *buffer; // Pointer to data
uint16_t buflen; // Length of buffer
uint16_t datalen; // Length currently in use
uint16_t malloced; // Non-zero if buffer was allocated via malloc()
} TXTRecordRefRealType;
} TXTRecordRefRealType;
#define txtRec ((TXTRecordRefRealType*)txtRecord)
// The opaque storage defined in the public dns_sd.h header is 16 bytes;
// make sure we don't exceed that.
struct CompileTimeAssertionCheck_dnssd_clientlib
{
{
char assert0[(sizeof(TXTRecordRefRealType) <= 16) ? 1 : -1];
};
};
void DNSSD_API TXTRecordCreate
(
(
TXTRecordRef *txtRecord,
uint16_t bufferLen,
void *buffer
)
{
)
{
txtRec->buffer = buffer;
txtRec->buflen = buffer ? bufferLen : (uint16_t)0;
txtRec->datalen = 0;
txtRec->malloced = 0;
}
}
void DNSSD_API TXTRecordDeallocate(TXTRecordRef *txtRecord)
{
{
if (txtRec->malloced) free(txtRec->buffer);
}
}
DNSServiceErrorType DNSSD_API TXTRecordSetValue
(
(
TXTRecordRef *txtRecord,
const char *key,
uint8_t valueSize,
const void *value
)
{
)
{
uint8_t *start, *p;
const char *k;
unsigned long keysize, keyvalsize;
@ -241,14 +237,14 @@ DNSServiceErrorType DNSSD_API TXTRecordSetValue
*start = (uint8_t)(p - start - 1);
txtRec->datalen += p - start;
return(kDNSServiceErr_NoError);
}
}
DNSServiceErrorType DNSSD_API TXTRecordRemoveValue
(
(
TXTRecordRef *txtRecord,
const char *key
)
{
)
{
unsigned long keylen, itemlen, remainder;
uint8_t *item = InternalTXTRecordSearch(txtRec->datalen, txtRec->buffer, key, &keylen);
if (!item) return(kDNSServiceErr_NoSuchKey);
@ -258,58 +254,58 @@ DNSServiceErrorType DNSSD_API TXTRecordRemoveValue
memmove(item, item + itemlen, remainder);
txtRec->datalen -= itemlen;
return(kDNSServiceErr_NoError);
}
}
uint16_t DNSSD_API TXTRecordGetLength (const TXTRecordRef *txtRecord) { return(txtRec->datalen); }
const void * DNSSD_API TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) { return(txtRec->buffer); }
/*********************************************************************************************
*
* TXT Record Parsing Functions
*
*********************************************************************************************/
*
* TXT Record Parsing Functions
*
*********************************************************************************************/
int DNSSD_API TXTRecordContainsKey
(
(
uint16_t txtLen,
const void *txtRecord,
const char *key
)
{
)
{
unsigned long keylen;
return (InternalTXTRecordSearch(txtLen, txtRecord, key, &keylen) ? 1 : 0);
}
}
const void * DNSSD_API TXTRecordGetValuePtr
(
(
uint16_t txtLen,
const void *txtRecord,
const char *key,
uint8_t *valueLen
)
{
)
{
unsigned long keylen;
uint8_t *item = InternalTXTRecordSearch(txtLen, txtRecord, key, &keylen);
if (!item || item[0] <= keylen) return(NULL); // If key not found, or found with no value, return NULL
*valueLen = (uint8_t)(item[0] - (keylen + 1));
return (item + 1 + keylen + 1);
}
}
uint16_t DNSSD_API TXTRecordGetCount
(
(
uint16_t txtLen,
const void *txtRecord
)
{
)
{
uint16_t count = 0;
uint8_t *p = (uint8_t*)txtRecord;
uint8_t *e = p + txtLen;
while (p<e) { p += 1 + p[0]; count++; }
return((p>e) ? (uint16_t)0 : count);
}
}
DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex
(
(
uint16_t txtLen,
const void *txtRecord,
uint16_t itemIndex,
@ -317,8 +313,8 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex
char *key,
uint8_t *valueLen,
const void **value
)
{
)
{
uint16_t count = 0;
uint8_t *p = (uint8_t*)txtRecord;
uint8_t *e = p + txtLen;
@ -345,22 +341,30 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex
return(kDNSServiceErr_NoError);
}
return(kDNSServiceErr_Invalid);
}
}
/*********************************************************************************************
*
* SCCS-compatible version string
*
*********************************************************************************************/
*
* SCCS-compatible version string
*
*********************************************************************************************/
// For convenience when using the "strings" command, this is the last thing in the file
// Note: The C preprocessor stringify operator ('#') makes a string from its argument, without macro expansion
// e.g. If "version" is #define'd to be "4", then STRINGIFY_AWE(version) will return the string "version", not "4"
// To expand "version" to its value before making the string, use STRINGIFY(version) instead
#define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) #s
#define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) # s
#define STRINGIFY(s) STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s)
// The "used" variable attribute prevents a non-exported variable from being stripped, even if its visibility is hidden,
// e.g., when compiling with -fvisibility=hidden.
#if defined(__GNUC__)
#define DNSSD_USED __attribute__((used))
#else
#define DNSSD_USED
#endif
// NOT static -- otherwise the compiler may optimize it out
// The "@(#) " pattern is a special prefix the "what" command looks for
const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
const char VersionString_SCCS_libdnssd[] DNSSD_USED = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";

982
bonjour-sdk/dnssd_clientstub.c
View File

File diff suppressed because it is too large Load Diff

44
bonjour-sdk/dnssd_ipc.c
View File

@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4 -*-
*
* Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved.
* Copyright (c) 2003-2011 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
* 3. Neither the name of Apple Inc. ("Apple") nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
@ -31,7 +31,7 @@
#if defined(_WIN32)
char *win32_strerror(int inErrorCode)
{
{
static char buffer[1024];
DWORD n;
memset(buffer, 0, sizeof(buffer));
@ -50,21 +50,21 @@ char *win32_strerror(int inErrorCode)
buffer[--n] = '\0';
}
return buffer;
}
}
#endif
void put_uint32(const uint32_t l, char **ptr)
{
{
(*ptr)[0] = (char)((l >> 24) & 0xFF);
(*ptr)[1] = (char)((l >> 16) & 0xFF);
(*ptr)[2] = (char)((l >> 8) & 0xFF);
(*ptr)[3] = (char)((l ) & 0xFF);
*ptr += sizeof(uint32_t);
}
}
uint32_t get_uint32(const char **ptr, const char *end)
{
{
if (!*ptr || *ptr + sizeof(uint32_t) > end)
{
*ptr = NULL;
@ -76,17 +76,17 @@ uint32_t get_uint32(const char **ptr, const char *end)
*ptr += sizeof(uint32_t);
return((uint32_t) ((uint32_t)p[0] << 24 | (uint32_t)p[1] << 16 | (uint32_t)p[2] << 8 | p[3]));
}
}
}
void put_uint16(uint16_t s, char **ptr)
{
{
(*ptr)[0] = (char)((s >> 8) & 0xFF);
(*ptr)[1] = (char)((s ) & 0xFF);
*ptr += sizeof(uint16_t);
}
}
uint16_t get_uint16(const char **ptr, const char *end)
{
{
if (!*ptr || *ptr + sizeof(uint16_t) > end)
{
*ptr = NULL;
@ -98,18 +98,18 @@ uint16_t get_uint16(const char **ptr, const char *end)
*ptr += sizeof(uint16_t);
return((uint16_t) ((uint16_t)p[0] << 8 | p[1]));
}
}
}
int put_string(const char *str, char **ptr)
{
{
if (!str) str = "";
strcpy(*ptr, str);
*ptr += strlen(str) + 1;
return 0;
}
}
int get_string(const char **ptr, const char *const end, char *buffer, int buflen)
{
{
if (!*ptr)
{
*buffer = 0;
@ -128,16 +128,16 @@ int get_string(const char **ptr, const char *const end, char *buffer, int buflen
*ptr = NULL; // clear pointer,
return(-1); // and return failure indication
}
}
}
void put_rdata(const int rdlen, const unsigned char *rdata, char **ptr)
{
{
memcpy(*ptr, rdata, rdlen);
*ptr += rdlen;
}
}
const char *get_rdata(const char **ptr, const char *end, int rdlen)
{
{
if (!*ptr || *ptr + rdlen > end)
{
*ptr = NULL;
@ -149,13 +149,13 @@ const char *get_rdata(const char **ptr, const char *end, int rdlen)
*ptr += rdlen;
return rd;
}
}
}
void ConvertHeaderBytes(ipc_msg_hdr *hdr)
{
{
hdr->version = htonl(hdr->version);
hdr->datalen = htonl(hdr->datalen);
hdr->ipc_flags = htonl(hdr->ipc_flags);
hdr->op = htonl(hdr->op );
hdr->reg_index = htonl(hdr->reg_index);
}
}

37
bonjour-sdk/dnssd_ipc.h
View File

@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4 -*-
*
* Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved.
* Copyright (c) 2003-2015 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
* 3. Neither the name of Apple Inc. ("Apple") nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
@ -41,7 +41,6 @@
# define dnssd_EWOULDBLOCK WSAEWOULDBLOCK
# define dnssd_EINTR WSAEINTR
# define dnssd_ECONNRESET WSAECONNRESET
# define dnssd_sock_t SOCKET
# define dnssd_socklen_t int
# define dnssd_close(sock) closesocket(sock)
# define dnssd_errno WSAGetLastError()
@ -60,13 +59,13 @@ extern char *win32_strerror(int inErrorCode);
# include <sys/stat.h>
# include <sys/socket.h>
# include <netinet/in.h>
# include <arpa/inet.h>
# define dnssd_InvalidSocket -1
# define dnssd_SocketValid(s) ((s) >= 0)
# define dnssd_EWOULDBLOCK EWOULDBLOCK
# define dnssd_EINTR EINTR
# define dnssd_ECONNRESET ECONNRESET
# define dnssd_EPIPE EPIPE
# define dnssd_sock_t int
# define dnssd_socklen_t unsigned int
# define dnssd_close(sock) close(sock)
# define dnssd_errno errno
@ -84,9 +83,10 @@ extern char *win32_strerror(int inErrorCode);
# ifndef MDNS_UDS_SERVERPATH
# define MDNS_UDS_SERVERPATH "/var/run/mDNSResponder"
# endif
# define MDNS_UDS_SERVERPATH_ENVVAR "DNSSD_UDS_PATH"
# define LISTENQ 100
// longest legal control path length
# define MAX_CTLPATH 256
// longest legal control path length
# define MAX_CTLPATH (sizeof(((struct sockaddr_un*)0)->sun_path))
# define dnssd_sockaddr_t struct sockaddr_un
#endif
@ -116,7 +116,7 @@ extern char *win32_strerror(int inErrorCode);
#endif
typedef enum
{
{
request_op_none = 0, // No request yet received on this connection
connection_request = 1, // connected socket via DNSServiceConnect()
reg_record_request, // reg/remove record only valid for connected sockets
@ -134,12 +134,15 @@ typedef enum
port_mapping_request, // New in Leopard and B4W 2.0
addrinfo_request,
send_bpf, // New in SL
getpid_request,
release_request,
connection_delegate_request,
cancel_request = 63
} request_op_t;
} request_op_t;
typedef enum
{
{
enumeration_reply_op = 64,
reg_service_reply_op,
browse_reply_op,
@ -149,7 +152,7 @@ typedef enum
getproperty_reply_op, // New in B4W 1.0.4
port_mapping_reply_op, // New in Leopard and B4W 2.0
addrinfo_reply_op
} reply_op_t;
} reply_op_t;
#if defined(_WIN64)
# pragma pack(push,4)
@ -159,13 +162,13 @@ typedef enum
// to accomodate 64-bit clients communicating with 32-bit daemon.
// There's no reason for the daemon to ever be a 64-bit process, but its clients might be
typedef packedunion
{
{
void *context;
uint32_t u32[2];
} client_context_t;
} client_context_t;
typedef packedstruct
{
{
uint32_t version;
uint32_t datalen;
uint32_t ipc_flags;
@ -174,7 +177,7 @@ typedef packedstruct
uint32_t reg_index; // identifier for a record registered via DNSServiceRegisterRecord() on a
// socket connected by DNSServiceCreateConnection(). Must be unique in the scope of the connection, such that and
// index/socket pair uniquely identifies a record. (Used to select records for removal by DNSServiceRemoveRecord())
} ipc_msg_hdr;
} ipc_msg_hdr;
#if defined(_WIN64)
# pragma pack(pop)
@ -202,16 +205,16 @@ int get_string(const char **ptr, const char *const end, char *buffer, int buflen
void put_rdata(const int rdlen, const unsigned char *rdata, char **ptr);
const char *get_rdata(const char **ptr, const char *end, int rdlen); // return value is rdata pointed to by *ptr -
// rdata is not copied from buffer.
// rdata is not copied from buffer.
void ConvertHeaderBytes(ipc_msg_hdr *hdr);
struct CompileTimeAssertionChecks_dnssd_ipc
{
{
// Check that the compiler generated our on-the-wire packet format structure definitions
// properly packed, without adding padding bytes to align fields on 32-bit or 64-bit boundaries.
char assert0[(sizeof(client_context_t) == 8) ? 1 : -1];
char assert1[(sizeof(ipc_msg_hdr) == 28) ? 1 : -1];
};
};
#endif // DNSSD_IPC_H