diff -r 92581f26073e -r 59689fbdcf77 MYNetwork.xcodeproj/project.pbxproj
--- a/MYNetwork.xcodeproj/project.pbxproj	Fri Apr 24 10:10:32 2009 -0700
+++ b/MYNetwork.xcodeproj/project.pbxproj	Tue Apr 28 10:36:28 2009 -0700
@@ -33,6 +33,12 @@
 		2780F20C0FA194BD00C0FB83 /* MYDNSService.h in Headers */ = {isa = PBXBuildFile; fileRef = 2780F20A0FA194BD00C0FB83 /* MYDNSService.h */; };
 		2780F20D0FA194BD00C0FB83 /* MYDNSService.m in Sources */ = {isa = PBXBuildFile; fileRef = 2780F20B0FA194BD00C0FB83 /* MYDNSService.m */; };
 		2780F20E0FA194BD00C0FB83 /* MYDNSService.m in Sources */ = {isa = PBXBuildFile; fileRef = 2780F20B0FA194BD00C0FB83 /* MYDNSService.m */; };
+		2780F4380FA28F4400C0FB83 /* MYBonjourQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 2780F4360FA28F4400C0FB83 /* MYBonjourQuery.h */; };
+		2780F4390FA28F4400C0FB83 /* MYBonjourQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = 2780F4370FA28F4400C0FB83 /* MYBonjourQuery.m */; };
+		2780F43A0FA28F4400C0FB83 /* MYBonjourQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = 2780F4370FA28F4400C0FB83 /* MYBonjourQuery.m */; };
+		2780F4A10FA2C59000C0FB83 /* MYAddressLookup.h in Headers */ = {isa = PBXBuildFile; fileRef = 2780F49F0FA2C59000C0FB83 /* MYAddressLookup.h */; };
+		2780F4A20FA2C59000C0FB83 /* MYAddressLookup.m in Sources */ = {isa = PBXBuildFile; fileRef = 2780F4A00FA2C59000C0FB83 /* MYAddressLookup.m */; };
+		2780F4A30FA2C59000C0FB83 /* MYAddressLookup.m in Sources */ = {isa = PBXBuildFile; fileRef = 2780F4A00FA2C59000C0FB83 /* MYAddressLookup.m */; };
 		278C1A3D0F9F687800954AE1 /* PortMapperTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 278C1A340F9F687800954AE1 /* PortMapperTest.m */; };
 		278C1A3E0F9F687800954AE1 /* MYPortMapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 278C1A360F9F687800954AE1 /* MYPortMapper.m */; };
 		278C1BA60F9F92EA00954AE1 /* MYBonjourBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 278C1B9F0F9F92EA00954AE1 /* MYBonjourBrowser.m */; };
@@ -172,8 +178,12 @@
 		277904280DE91C7900C6D295 /* BLIP Echo Client-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "BLIP Echo Client-Info.plist"; sourceTree = "<group>"; };
 		2779048A0DE9204300C6D295 /* BLIPEchoClient.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BLIPEchoClient.xib; sourceTree = "<group>"; };
 		2779052D0DE9E5BC00C6D295 /* BLIPEchoServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = BLIPEchoServer; sourceTree = BUILT_PRODUCTS_DIR; };
-		2780F20A0FA194BD00C0FB83 /* MYDNSService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MYDNSService.h; sourceTree = "<group>"; };
-		2780F20B0FA194BD00C0FB83 /* MYDNSService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MYDNSService.m; sourceTree = "<group>"; };
+		2780F20A0FA194BD00C0FB83 /* MYDNSService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MYDNSService.h; path = PortMapper/MYDNSService.h; sourceTree = "<group>"; };
+		2780F20B0FA194BD00C0FB83 /* MYDNSService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MYDNSService.m; path = PortMapper/MYDNSService.m; sourceTree = "<group>"; };
+		2780F4360FA28F4400C0FB83 /* MYBonjourQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MYBonjourQuery.h; sourceTree = "<group>"; };
+		2780F4370FA28F4400C0FB83 /* MYBonjourQuery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MYBonjourQuery.m; sourceTree = "<group>"; };
+		2780F49F0FA2C59000C0FB83 /* MYAddressLookup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MYAddressLookup.h; sourceTree = "<group>"; };
+		2780F4A00FA2C59000C0FB83 /* MYAddressLookup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MYAddressLookup.m; sourceTree = "<group>"; };
 		278C1A340F9F687800954AE1 /* PortMapperTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PortMapperTest.m; sourceTree = "<group>"; };
 		278C1A350F9F687800954AE1 /* MYPortMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MYPortMapper.h; sourceTree = "<group>"; };
 		278C1A360F9F687800954AE1 /* MYPortMapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MYPortMapper.m; sourceTree = "<group>"; };
@@ -283,12 +293,11 @@
 			isa = PBXGroup;
 			children = (
 				279DDCCB0F9E381500D75D91 /* MYNetwork.h */,
-				270461010DE49030003D9D3F /* IPAddress.h */,
-				270461020DE49030003D9D3F /* IPAddress.m */,
+				2780F5710FA2E38100C0FB83 /* Addressing */,
+				278C1A320F9F687800954AE1 /* PortMapper */,
+				278C1B9D0F9F92D600954AE1 /* Bonjour */,
 				270461070DE49030003D9D3F /* TCP */,
-				278C1A320F9F687800954AE1 /* PortMapper */,
 				270460F10DE49030003D9D3F /* BLIP */,
-				278C1B9D0F9F92D600954AE1 /* Bonjour */,
 			);
 			name = MYNetwork;
 			sourceTree = "<group>";
@@ -356,8 +365,7 @@
 				27E0DBEC0DF3450F00E7F648 /* GoogleToolboxSubset */,
 			);
 			name = MYUtilities;
-			path = ../MYUtilities;
-			sourceTree = "<group>";
+			sourceTree = MYUtilities;
 		};
 		277903E70DE8F05F00C6D295 /* Demo */ = {
 			isa = PBXGroup;
@@ -374,11 +382,20 @@
 			path = BLIP/Demo;
 			sourceTree = "<group>";
 		};
+		2780F5710FA2E38100C0FB83 /* Addressing */ = {
+			isa = PBXGroup;
+			children = (
+				270461010DE49030003D9D3F /* IPAddress.h */,
+				270461020DE49030003D9D3F /* IPAddress.m */,
+				2780F20A0FA194BD00C0FB83 /* MYDNSService.h */,
+				2780F20B0FA194BD00C0FB83 /* MYDNSService.m */,
+			);
+			name = Addressing;
+			sourceTree = "<group>";
+		};
 		278C1A320F9F687800954AE1 /* PortMapper */ = {
 			isa = PBXGroup;
 			children = (
-				2780F20A0FA194BD00C0FB83 /* MYDNSService.h */,
-				2780F20B0FA194BD00C0FB83 /* MYDNSService.m */,
 				278C1A350F9F687800954AE1 /* MYPortMapper.h */,
 				278C1A360F9F687800954AE1 /* MYPortMapper.m */,
 				278C1A340F9F687800954AE1 /* PortMapperTest.m */,
@@ -393,6 +410,10 @@
 				278C1B9F0F9F92EA00954AE1 /* MYBonjourBrowser.m */,
 				278C1BA00F9F92EA00954AE1 /* MYBonjourService.h */,
 				278C1BA10F9F92EA00954AE1 /* MYBonjourService.m */,
+				2780F4360FA28F4400C0FB83 /* MYBonjourQuery.h */,
+				2780F4370FA28F4400C0FB83 /* MYBonjourQuery.m */,
+				2780F49F0FA2C59000C0FB83 /* MYAddressLookup.h */,
+				2780F4A00FA2C59000C0FB83 /* MYAddressLookup.m */,
 			);
 			path = Bonjour;
 			sourceTree = "<group>";
@@ -415,6 +436,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				2780F20C0FA194BD00C0FB83 /* MYDNSService.h in Headers */,
+				2780F4380FA28F4400C0FB83 /* MYBonjourQuery.h in Headers */,
+				2780F4A10FA2C59000C0FB83 /* MYAddressLookup.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -570,6 +593,8 @@
 				279E8FB70F9FDD2600608D8D /* MYBonjourService.m in Sources */,
 				279E8FB80F9FDD2600608D8D /* ConcurrentOperation.m in Sources */,
 				2780F20D0FA194BD00C0FB83 /* MYDNSService.m in Sources */,
+				2780F4390FA28F4400C0FB83 /* MYBonjourQuery.m in Sources */,
+				2780F4A20FA2C59000C0FB83 /* MYAddressLookup.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -604,6 +629,8 @@
 				278C1BA70F9F92EA00954AE1 /* MYBonjourService.m in Sources */,
 				278C1BB90F9F975700954AE1 /* ConcurrentOperation.m in Sources */,
 				2780F20E0FA194BD00C0FB83 /* MYDNSService.m in Sources */,
+				2780F43A0FA28F4400C0FB83 /* MYBonjourQuery.m in Sources */,
+				2780F4A30FA2C59000C0FB83 /* MYAddressLookup.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};