mDNSResponder-522.90.2.tar.gz

diff --git a/Makefile b/Makefile
index 7d7846081f8efccf55cbca022278caf562617516..4ebf3a5f34808db29df03548a62543c0be7d829d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 
 include $(MAKEFILEPATH)/pb_makefiles/platform.make
 
-MVERS = "mDNSResponder-522.1.11"
+MVERS = "mDNSResponder-522.90.2"
 
 DDNSWRITECONFIG = "$(DSTROOT)/Library/Application Support/Bonjour/ddnswriteconfig"
 VER = 

diff --git a/mDNSCore/DNSCommon.c b/mDNSCore/DNSCommon.c
index c8fcc8987b4bc04e1f62b610d248e16e59e97837..947607cfaba174e3326e5c4cf497b3ccfc90c8c1 100644 (file)
--- a/mDNSCore/DNSCommon.c
+++ b/mDNSCore/DNSCommon.c
@@ -429,8 +429,8 @@ mDNSexport char *GetRRDisplayString_rdb(const ResourceRecord *const rr, const RD
                 }
                 break;
             case kDNSOpt_Trace:
-                length += mDNS_snprintf(buffer+length, RemSpc, " Platform %d",     opt->u.tracer.platf);
-                length += mDNS_snprintf(buffer+length, RemSpc, " mDNSVers %d",     opt->u.tracer.mDNSv);
+                length += mDNS_snprintf(buffer+length, RemSpc, " Platform %d",    opt->u.tracer.platf);
+                length += mDNS_snprintf(buffer+length, RemSpc, " mDNSVers %d",    opt->u.tracer.mDNSv);
                 break;
             default:
                 length += mDNS_snprintf(buffer+length, RemSpc, " Unknown %d",  opt->opt);
@@ -2342,7 +2342,7 @@ mDNSexport mDNSu8 *putRData(const DNSMessage *const msg, mDNSu8 *ptr, const mDNS
                 break;
             case kDNSOpt_Trace:
                 *ptr++ = opt->u.tracer.platf;
-                ptr    = putVal16(ptr, opt->u.tracer.mDNSv);
+                ptr    = putVal32(ptr, opt->u.tracer.mDNSv);
                 break;
             }
         }
@@ -3197,8 +3197,8 @@ mDNSexport mDNSBool SetRData(const DNSMessage *const msg, const mDNSu8 *ptr, con
             case kDNSOpt_Trace:
                 if (opt->optlen == DNSOpt_TraceData_Space - 4)
                 {
-                    opt->u.tracer.platf  = ptr[0];
-                    opt->u.tracer.mDNSv  = (mDNSu16)((mDNSu16)ptr[1] <<  8 | ptr[2]);
+                    opt->u.tracer.platf   = ptr[0];
+                    opt->u.tracer.mDNSv   = (mDNSu32) ((mDNSu32)ptr[1] << 24 | (mDNSu32)ptr[2] << 16 | (mDNSu32)ptr[3] << 8 | ptr[4]);
                     opt++;
                 }
                 break;

diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c
index 54fa735978b8bae66b806b944e8f199182a3d71b..ccd068075becbbff7f635949f94a41b28301150a 100755 (executable)
--- a/mDNSCore/mDNS.c
+++ b/mDNSCore/mDNS.c
@@ -2250,8 +2250,9 @@ mDNSlocal void SendNDP(mDNS *const m, const mDNSu8 op, const mDNSu8 flags, const
 
 mDNSlocal void SetupTracerOpt(const mDNS *const m, rdataOPT *const Trace)
 {
-    Trace->u.tracer.platf   = m->mDNS_plat;
-    Trace->u.tracer.mDNSv   = _DNS_SD_H/1000; 
+    mDNSu32 DNS_VERS = _DNS_SD_H;
+    Trace->u.tracer.platf    = m->mDNS_plat;
+    Trace->u.tracer.mDNSv    = DNS_VERS;
 
     Trace->opt              = kDNSOpt_Trace;
     Trace->optlen           = DNSOpt_TraceData_Space - 4;

diff --git a/mDNSCore/mDNSEmbeddedAPI.h b/mDNSCore/mDNSEmbeddedAPI.h
index b041f0711c6460e369f046536a9533e03ce9ecd6..8a72dc163c5f3fc7a5a514fa02923d3593060dda 100755 (executable)
--- a/mDNSCore/mDNSEmbeddedAPI.h
+++ b/mDNSCore/mDNSEmbeddedAPI.h
@@ -934,8 +934,8 @@ typedef struct
 
 typedef struct
 {
-    mDNSu8    platf;       // Running platform (see enum Platform_t)
-    mDNSu16   mDNSv;       // mDNSResponder Version (defined in dns_sd.h)
+    mDNSu8    platf;      // Running platform (see enum Platform_t)
+    mDNSu32   mDNSv;      // mDNSResponder Version (DNS_SD_H defined in dns_sd.h)
 } TracerOptData;
 
 // Note: rdataOPT format may be repeated an arbitrary number of times in a single resource record
@@ -951,7 +951,7 @@ typedef packedstruct
 // LLQ   rdata    18  bytes (opt 2, len 2, vers 2, op 2, err 2, id 8, lease 4)
 // Lease rdata     8  bytes (opt 2, len 2, lease 4)
 // Owner rdata 12-24  bytes (opt 2, len 2, owner 8-20)
-// Trace rdata     7  bytes (opt 2, len 2, platf 1, mDNSv 2)
+// Trace rdata     9  bytes (opt 2, len 2, platf 1, mDNSv 4)
 
 
 #define DNSOpt_Header_Space                 11
@@ -961,7 +961,7 @@ typedef packedstruct
 #define DNSOpt_OwnerData_ID_Wake_Space     (4 + 2 + 6 + 6)
 #define DNSOpt_OwnerData_ID_Wake_PW4_Space (4 + 2 + 6 + 6 + 4)
 #define DNSOpt_OwnerData_ID_Wake_PW6_Space (4 + 2 + 6 + 6 + 6)
-#define DNSOpt_TraceData_Space             (4 + 1 + 2)
+#define DNSOpt_TraceData_Space             (4 + 1 + 4)
 
 #define ValidOwnerLength(X) (   (X) == DNSOpt_OwnerData_ID_Space          - 4 || \
                                 (X) == DNSOpt_OwnerData_ID_Wake_Space     - 4 || \

diff --git a/mDNSMacOSX/mDNSMacOSX.c b/mDNSMacOSX/mDNSMacOSX.c
index 3c42ad3bd9b2aedb55c671a1d9193e047511d1e7..ed130e9fec0a29596247783fa5607037f291654e 100644 (file)
--- a/mDNSMacOSX/mDNSMacOSX.c
+++ b/mDNSMacOSX/mDNSMacOSX.c
@@ -240,9 +240,10 @@ mDNSlocal void PrintHex(mDNSu8 *data, mDNSu16 len);
 typedef struct D2DRecordListElem
 {
     struct D2DRecordListElem *next;
-    AuthRecord               ar;
     D2DServiceInstance       instanceHandle;
     D2DTransportType         transportType;
+    AuthRecord               ar;    // must be last in the structure to accomodate extra space
+                                    // allocated for large records.
 } D2DRecordListElem;
 
 static D2DRecordListElem *D2DRecords = NULL; // List of records returned with D2DServiceFound events

diff --git a/mDNSShared/dns_sd.h b/mDNSShared/dns_sd.h
index bc42582734110983472662f744a19ca08cbc4fc6..6bbb98a01ecf43769ca0a572ac722f471f7649b9 100644 (file)
--- a/mDNSShared/dns_sd.h
+++ b/mDNSShared/dns_sd.h
@@ -77,7 +77,7 @@
  */
 
 #ifndef _DNS_SD_H
-#define _DNS_SD_H 5220111
+#define _DNS_SD_H 5229002
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/mDNSShared/uds_daemon.c b/mDNSShared/uds_daemon.c
index e9b3a2793c7844e3f38a99273d98c6c4b06f5d48..53677bdfabae4a88db5df9a33ebf1f352ee671d7 100644 (file)
--- a/mDNSShared/uds_daemon.c
+++ b/mDNSShared/uds_daemon.c
@@ -4958,7 +4958,7 @@ mDNSexport int udsserver_init(dnssd_sock_t skts[], mDNSu32 count)
     int ret;
     mDNSu32 i = 0;
 
-    LogInfo("udsserver_init: %d %d", _DNS_SD_H/10000, mDNSStorage.mDNS_plat);
+    LogInfo("udsserver_init: %d %d", _DNS_SD_H, mDNSStorage.mDNS_plat);
 
     // If a particular platform wants to opt out of having a PID file, define PID_FILE to be ""
     if (PID_FILE[0])