mDNSResponder-108.6.tar.gz

diff --git a/Makefile b/Makefile
index b23c0a884a3f4921d9c54106b54f62803b0ba7ad..1239e658f1cc0516262549b6a9475bf133caace8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 
 include /Developer/Makefiles/pb_makefiles/platform.make
 
 
 include /Developer/Makefiles/pb_makefiles/platform.make
 

-MVERS = "mDNSResponder-108.5"
+MVERS = "mDNSResponder-108.6"

 
 install:
        cd "$(SRCROOT)/mDNSMacOSX"; xcodebuild install     OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) DSTROOT=$(DSTROOT) MVERS=$(MVERS)
 
 install:
        cd "$(SRCROOT)/mDNSMacOSX"; xcodebuild install     OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) DSTROOT=$(DSTROOT) MVERS=$(MVERS)

diff --git a/mDNSMacOSX/mDNSMacOSX.c b/mDNSMacOSX/mDNSMacOSX.c
index 5b9ab354a04cf3b88f60b50a6831a158665ed6ae..c1bd30fb9f1281d96992a2bf9014e83b4dc80f25 100644 (file)
--- a/mDNSMacOSX/mDNSMacOSX.c
+++ b/mDNSMacOSX/mDNSMacOSX.c
@@ -24,6 +24,9 @@
     Change History (most recent first):
 
 $Log: mDNSMacOSX.c,v $
     Change History (most recent first):
 
 $Log: mDNSMacOSX.c,v $

+Revision 1.318.2.3  2007/07/18 20:35:42  cheshire
+Bracket LegacyNATInit/LegacyNATDestroy calls with "#ifdef _LEGACY_NAT_TRAVERSAL_"
+

 Revision 1.318.2.2  2006/12/14 21:38:51  cheshire
 Fix problem exposed by previous changes: kSecAccountItemAttr is not necessarily nul-terminated
 
 Revision 1.318.2.2  2006/12/14 21:38:51  cheshire
 Fix problem exposed by previous changes: kSecAccountItemAttr is not necessarily nul-terminated
 


@@ -2997,7 +3000,9 @@ mDNSlocal void SetSCPrefsBrowseDomainsFromCFArray(mDNS *m, CFArrayRef browseDoma
 
 mDNSlocal void DynDNSConfigChanged(mDNS *const m)
        {
 
 mDNSlocal void DynDNSConfigChanged(mDNS *const m)
        {

+#ifdef _LEGACY_NAT_TRAVERSAL_

        static mDNSBool LegacyNATInitialized = mDNSfalse;
        static mDNSBool LegacyNATInitialized = mDNSfalse;

+#endif _LEGACY_NAT_TRAVERSAL_

        uDNS_GlobalInfo *u = &m->uDNS_info;
        CFDictionaryRef dict;
        CFStringRef     key;
        uDNS_GlobalInfo *u = &m->uDNS_info;
        CFDictionaryRef dict;
        CFStringRef     key;


@@ -3150,6 +3155,7 @@ mDNSlocal void DynDNSConfigChanged(mDNS *const m)
                                memcmp(v6.ip.v6.b, u->AdvertisedV6.ip.v6.b, 16)             ||
                                r.ip.v4.NotAnInteger != u->Router.ip.v4.NotAnInteger)
                                {
                                memcmp(v6.ip.v6.b, u->AdvertisedV6.ip.v6.b, 16)             ||
                                r.ip.v4.NotAnInteger != u->Router.ip.v4.NotAnInteger)
                                {

+#ifdef _LEGACY_NAT_TRAVERSAL_

                                if (LegacyNATInitialized) { LegacyNATDestroy(); LegacyNATInitialized = mDNSfalse; }
                                if (r.ip.v4.NotAnInteger && IsPrivateV4Addr(&v4))
                                        {
                                if (LegacyNATInitialized) { LegacyNATDestroy(); LegacyNATInitialized = mDNSfalse; }
                                if (r.ip.v4.NotAnInteger && IsPrivateV4Addr(&v4))
                                        {


@@ -3157,6 +3163,7 @@ mDNSlocal void DynDNSConfigChanged(mDNS *const m)
                                        if (err)  LogMsg("ERROR: LegacyNATInit");
                                        else LegacyNATInitialized = mDNStrue;
                                        }                                       
                                        if (err)  LogMsg("ERROR: LegacyNATInit");
                                        else LegacyNATInitialized = mDNStrue;
                                        }                                       

+#endif _LEGACY_NAT_TRAVERSAL_

                                mDNS_SetPrimaryInterfaceInfo(m, &v4, v6.ip.v6.b[0] ? &v6 : NULL, r.ip.v4.NotAnInteger ? &r : NULL);
                                }
                        }
                                mDNS_SetPrimaryInterfaceInfo(m, &v4, v6.ip.v6.b[0] ? &v6 : NULL, r.ip.v4.NotAnInteger ? &r : NULL);
                                }
                        }

diff --git a/mDNSMacOSX/mDNSResponder.pbproj/project.pbxproj b/mDNSMacOSX/mDNSResponder.pbproj/project.pbxproj
index 1df317300a3d28bc6e33c8fb7fd7ab8d98bb2832..648166b5f47d62167b2074b479e8d3dcdaddbbdd 100644 (file)
--- a/mDNSMacOSX/mDNSResponder.pbproj/project.pbxproj
+++ b/mDNSMacOSX/mDNSResponder.pbproj/project.pbxproj
@@ -26,7 +26,7 @@
                                LIBRARY_SEARCH_PATHS = "\"${OBJROOT}/mDNSResponder.build\"";
                                MACOSX_DEPLOYMENT_TARGET = 10.2;
                                OPTIMIZATION_CFLAGS = "-O0";
                                LIBRARY_SEARCH_PATHS = "\"${OBJROOT}/mDNSResponder.build\"";
                                MACOSX_DEPLOYMENT_TARGET = 10.2;
                                OPTIMIZATION_CFLAGS = "-O0";

-                               OTHER_CFLAGS = "-no-cpp-precomp -mdynamic-no-pic -D__MACOSX__ -DmDNSResponderVersion=${MVERS} -D_LEGACY_NAT_TRAVERSAL_ -DMDNS_DEBUGMSGS=1";
+                               OTHER_CFLAGS = "-no-cpp-precomp -mdynamic-no-pic -D__MACOSX__ -DmDNSResponderVersion=${MVERS} -DMDNS_DEBUGMSGS=1";

                                OTHER_LDFLAGS = "-ldnsinfo";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = mDNSResponder.debug;
                                OTHER_LDFLAGS = "-ldnsinfo";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = mDNSResponder.debug;


@@ -75,7 +75,6 @@
                                F5E11B5E04A28126019798ED,
                                FFCB6D75075D595E00B8AF62,
                                00AD62B0032D799A0CCA2C71,
                                F5E11B5E04A28126019798ED,
                                FFCB6D75075D595E00B8AF62,
                                00AD62B0032D799A0CCA2C71,

-                               7FC8F9D606D14E66007E879D,

                                00AD62B1032D799A0CCA2C71,
                        );
                        isa = PBXSourcesBuildPhase;
                                00AD62B1032D799A0CCA2C71,
                        );
                        isa = PBXSourcesBuildPhase;


@@ -272,7 +271,6 @@
                };
                08FB7795FE84155DC02AAC07 = {
                        children = (
                };
                08FB7795FE84155DC02AAC07 = {
                        children = (

-                               7FC8F9D406D14E66007E879D,

                                7F461DB5062DBF2900672BF3,
                                F525E72804AA167501F1CF4D,
                                F5E11B5A04A28126019798ED,
                                7F461DB5062DBF2900672BF3,
                                F525E72804AA167501F1CF4D,
                                F5E11B5A04A28126019798ED,


@@ -333,7 +331,7 @@
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "\"${OBJROOT}/mDNSResponder.build\"";
                                MACOSX_DEPLOYMENT_TARGET = 10.2;
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "\"${OBJROOT}/mDNSResponder.build\"";
                                MACOSX_DEPLOYMENT_TARGET = 10.2;

-                               OTHER_CFLAGS = "-no-cpp-precomp -mdynamic-no-pic -D__MACOSX__ -DmDNSResponderVersion=${MVERS} -D_LEGACY_NAT_TRAVERSAL_";
+                               OTHER_CFLAGS = "-no-cpp-precomp -mdynamic-no-pic -D__MACOSX__ -DmDNSResponderVersion=${MVERS}";

                                OTHER_LDFLAGS = "-ldnsinfo";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = mDNSResponder;
                                OTHER_LDFLAGS = "-ldnsinfo";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = mDNSResponder;


@@ -374,7 +372,6 @@
                                F5E11B5C04A28126019798ED,
                                FFCB6D74075D539900B8AF62,
                                6575FBED022EAF7200000109,
                                F5E11B5C04A28126019798ED,
                                FFCB6D74075D539900B8AF62,
                                6575FBED022EAF7200000109,

-                               7FC8F9D506D14E66007E879D,

                                6575FBEE022EAF7200000109,
                        );
                        isa = PBXSourcesBuildPhase;
                                6575FBEE022EAF7200000109,
                        );
                        isa = PBXSourcesBuildPhase;


@@ -766,24 +763,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               7FC8F9D406D14E66007E879D = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       path = LegacyNATTraversal.c;
-                       refType = 2;
-               };
-               7FC8F9D506D14E66007E879D = {
-                       fileRef = 7FC8F9D406D14E66007E879D;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
-               7FC8F9D606D14E66007E879D = {
-                       fileRef = 7FC8F9D406D14E66007E879D;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

 //7F0
 //7F1
 //7F2
 //7F0
 //7F1
 //7F2