Libinfo-222.4.12.tar.gz

[apple/libinfo.git] / mdns.subproj / DNSServiceDiscovery.c

diff --git a/mdns.subproj/DNSServiceDiscovery.c b/mdns.subproj/DNSServiceDiscovery.c
index d3ef6a00630c97590a7757f4eb5fc93424a76feb..a31176909ccacce9323dc26df63d11155a12ff1d 100644 (file)
--- a/mdns.subproj/DNSServiceDiscovery.c
+++ b/mdns.subproj/DNSServiceDiscovery.c
@@ -2,24 +2,21 @@
  * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
  * @APPLE_LICENSE_HEADER_END@
  */
 
@@ -35,7 +32,7 @@
 
 #include <netinet/in.h>
 
-extern struct rpc_subsystem internal_DNSServiceDiscoveryReply_subsystem;
+extern struct mig_subsystem internal_DNSServiceDiscoveryReply_subsystem;
 
 extern boolean_t DNSServiceDiscoveryReply_server(
         mach_msg_header_t *InHeadP,
@@ -66,7 +63,7 @@ kern_return_t DNSServiceRegistrationCreate_rpc
     DNSCString name,
     DNSCString regtype,
     DNSCString domain,
-    int port,
+    IPPort port,
     DNSCString txtRecord
 );
 
@@ -273,7 +270,9 @@ dns_service_discovery_ref DNSServiceRegistrationCreate
     kern_return_t              result;
     dns_service_discovery_ref return_t;
     struct a_requests  *request;
-    
+    IPPort IpPort;
+       char *portptr = (char *)&port;
+       
     if (!serverPort) {
         return NULL;
     }
@@ -303,7 +302,15 @@ dns_service_discovery_ref DNSServiceRegistrationCreate
     request->context = context;
     request->callout.regCallback = callBack;
 
-    result = DNSServiceRegistrationCreate_rpc(serverPort, clientPort, (char *)name, (char *)regtype, (char *)domain, port, (char *)txtRecord);
+       // older versions of this code passed the port via mach IPC as an int.
+       // we continue to pass it as 4 bytes to maintain binary compatibility,
+       // but now ensure that the network byte order is preserved by using a struct
+       IpPort.bytes[0] = 0;
+       IpPort.bytes[1] = 0;
+       IpPort.bytes[2] = portptr[0];
+       IpPort.bytes[3] = portptr[1];
+
+    result = DNSServiceRegistrationCreate_rpc(serverPort, clientPort, (char *)name, (char *)regtype, (char *)domain, IpPort, (char *)txtRecord);
 
     if (result != KERN_SUCCESS) {
         printf("There was an error creating a resolve, %s\n", mach_error_string(result));