Merge branch 'master' of github.com:robbiehanson/CocoaAsyncSocket

robbiehanson · robbiehanson · commit 2680461dde76 · 2011-12-16T16:32:26.000-08:00
diff --git a/GCD/GCDAsyncSocket.h b/GCD/GCDAsyncSocket.h
@@ -271,7 +271,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 
 /**
  * Connects to the given address, specified as a sockaddr structure wrapped in a NSData object.
- * For example, a NSData object returned from NSNetservice's addresses method.
+ * For example, a NSData object returned from NSNetService's addresses method.
  * 
  * If you have an existing struct sockaddr you can convert it to a NSData object like so:
  * struct sockaddr sa  -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];
@@ -291,7 +291,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
  * Connects to the given address, using the specified interface and timeout.
  * 
  * The address is specified as a sockaddr structure wrapped in a NSData object.
- * For example, a NSData object returned from NSNetservice's addresses method.
+ * For example, a NSData object returned from NSNetService's addresses method.
  * 
  * If you have an existing struct sockaddr you can convert it to a NSData object like so:
  * struct sockaddr sa  -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -6888,16 +6888,17 @@ + (BOOL)getHost:(NSString **)hostPtr port:(uint16_t *)portPtr fromAddress:(NSDat
 {
 	if ([address length] >= sizeof(struct sockaddr))
 	{
-		const struct sockaddr *sockaddrX = (const struct sockaddr *)[address bytes];
+		const struct sockaddr *sockaddrX = [address bytes];
 		
 		if (sockaddrX->sa_family == AF_INET)
 		{
 			if ([address length] >= sizeof(struct sockaddr_in))
 			{
-				const struct sockaddr_in *sockaddr4 = (const struct sockaddr_in *)sockaddrX;
+				struct sockaddr_in sockaddr4;
+				memcpy(&sockaddr4, sockaddrX, sizeof(sockaddr4));
 				
-				if (hostPtr) *hostPtr = [self hostFromSockaddr4:sockaddr4];
-				if (portPtr) *portPtr = [self portFromSockaddr4:sockaddr4];
+				if (hostPtr) *hostPtr = [self hostFromSockaddr4:&sockaddr4];
+				if (portPtr) *portPtr = [self portFromSockaddr4:&sockaddr4];
 				
 				return YES;
 			}
@@ -6906,10 +6907,11 @@ + (BOOL)getHost:(NSString **)hostPtr port:(uint16_t *)portPtr fromAddress:(NSDat
 		{
 			if ([address length] >= sizeof(struct sockaddr_in6))
 			{
-				const struct sockaddr_in6 *sockaddr6 = (const struct sockaddr_in6 *)sockaddrX;
+				struct sockaddr_in6 sockaddr6;
+				memcpy(&sockaddr6, sockaddrX, sizeof(sockaddr6));
 				
-				if (hostPtr) *hostPtr = [self hostFromSockaddr6:sockaddr6];
-				if (portPtr) *portPtr = [self portFromSockaddr6:sockaddr6];
+				if (hostPtr) *hostPtr = [self hostFromSockaddr6:&sockaddr6];
+				if (portPtr) *portPtr = [self portFromSockaddr6:&sockaddr6];
 				
 				return YES;
 			}
diff --git a/RunLoop/AsyncSocket.h b/RunLoop/AsyncSocket.h
@@ -267,7 +267,7 @@ typedef enum AsyncSocketError AsyncSocketError;
 
 /**
  * Connects to the given address, specified as a sockaddr structure wrapped in a NSData object.
- * For example, a NSData object returned from NSNetservice's addresses method.
+ * For example, a NSData object returned from NSNetService's addresses method.
  * 
  * If you have an existing struct sockaddr you can convert it to a NSData object like so:
  * struct sockaddr sa  -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];
diff --git a/RunLoop/AsyncSocket.m b/RunLoop/AsyncSocket.m
@@ -1519,7 +1519,7 @@ - (BOOL)connectToAddress:(NSData *)remoteAddr error:(NSError **)errPtr
  * specifically in the onSocketWillConnect: method.
  * 
  * Note: The NSData parameter is expected to be a sockaddr structure. For example, an NSData object returned from
- * NSNetservice addresses method.
+ * NSNetService addresses method.
  * If you have an existing struct sockaddr you can convert it to an NSData object like so:
  * struct sockaddr sa  -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];
  * struct sockaddr *sa -> NSData *dsa = [NSData dataWithBytes:remoteAddr length:remoteAddr->sa_len];
@@ -4291,7 +4291,7 @@ static void MyCFSocketCallback (CFSocketRef sref, CFSocketCallBackType type, CFD
 	AsyncSocket *theSocket = [[(AsyncSocket *)pInfo retain] autorelease];
 	[theSocket doCFSocketCallback:type forSocket:sref withAddress:(NSData *)address withData:pData];
 	
-	[pool release];
+	[pool drain];
 }
 
 /**
@@ -4305,7 +4305,7 @@ static void MyCFReadStreamCallback (CFReadStreamRef stream, CFStreamEventType ty
 	AsyncSocket *theSocket = [[(AsyncSocket *)pInfo retain] autorelease];
 	[theSocket doCFReadStreamCallback:type forStream:stream];
 	
-	[pool release];
+	[pool drain];
 }
 
 /**
@@ -4319,7 +4319,7 @@ static void MyCFWriteStreamCallback (CFWriteStreamRef stream, CFStreamEventType
 	AsyncSocket *theSocket = [[(AsyncSocket *)pInfo retain] autorelease];
 	[theSocket doCFWriteStreamCallback:type forStream:stream];
 	
-	[pool release];
+	[pool drain];
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/RunLoop/AsyncUdpSocket.m b/RunLoop/AsyncUdpSocket.m
@@ -2337,7 +2337,7 @@ static void MyCFSocketCallback(CFSocketRef sref, CFSocketCallBackType type, CFDa
 	AsyncUdpSocket *theSocket = [[(AsyncUdpSocket *)pInfo retain] autorelease];
 	[theSocket doCFSocketCallback:type forSocket:sref withAddress:(NSData *)address withData:pData];
 	
-	[pool release];
+	[pool drain];
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;`
`271`	`271`
`272`	`272`	`/**`
`273`	`273`	`* Connects to the given address, specified as a sockaddr structure wrapped in a NSData object.`
`274`		`- * For example, a NSData object returned from NSNetservice's addresses method.`
	`274`	`+ * For example, a NSData object returned from NSNetService's addresses method.`
`275`	`275`	`*`
`276`	`276`	`* If you have an existing struct sockaddr you can convert it to a NSData object like so:`
`277`	`277`	`* struct sockaddr sa -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];`
`@@ -291,7 +291,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;`
`291`	`291`	`* Connects to the given address, using the specified interface and timeout.`
`292`	`292`	`*`
`293`	`293`	`* The address is specified as a sockaddr structure wrapped in a NSData object.`
`294`		`- * For example, a NSData object returned from NSNetservice's addresses method.`
	`294`	`+ * For example, a NSData object returned from NSNetService's addresses method.`
`295`	`295`	`*`
`296`	`296`	`* If you have an existing struct sockaddr you can convert it to a NSData object like so:`
`297`	`297`	`* struct sockaddr sa -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];`
Original file line number	Diff line number	Diff line change
`@@ -6888,16 +6888,17 @@ + (BOOL)getHost:(NSString *)hostPtr port:(uint16_t )portPtr fromAddress:(NSDat`
`6888`	`6888`	`{`
`6889`	`6889`	`if ([address length] >= sizeof(struct sockaddr))`
`6890`	`6890`	`{`
`6891`		`- const struct sockaddr sockaddrX = (const struct sockaddr )[address bytes];`
	`6891`	`+ const struct sockaddr *sockaddrX = [address bytes];`
`6892`	`6892`
`6893`	`6893`	`if (sockaddrX->sa_family == AF_INET)`
`6894`	`6894`	`{`
`6895`	`6895`	`if ([address length] >= sizeof(struct sockaddr_in))`
`6896`	`6896`	`{`
`6897`		`- const struct sockaddr_in sockaddr4 = (const struct sockaddr_in )sockaddrX;`
	`6897`	`+ struct sockaddr_in sockaddr4;`
	`6898`	`+ memcpy(&sockaddr4, sockaddrX, sizeof(sockaddr4));`
`6898`	`6899`
`6899`		`- if (hostPtr) *hostPtr = [self hostFromSockaddr4:sockaddr4];`
`6900`		`- if (portPtr) *portPtr = [self portFromSockaddr4:sockaddr4];`
	`6900`	`+ if (hostPtr) *hostPtr = [self hostFromSockaddr4:&sockaddr4];`
	`6901`	`+ if (portPtr) *portPtr = [self portFromSockaddr4:&sockaddr4];`
`6901`	`6902`
`6902`	`6903`	`return YES;`
`6903`	`6904`	`}`
`@@ -6906,10 +6907,11 @@ + (BOOL)getHost:(NSString *)hostPtr port:(uint16_t )portPtr fromAddress:(NSDat`
`6906`	`6907`	`{`
`6907`	`6908`	`if ([address length] >= sizeof(struct sockaddr_in6))`
`6908`	`6909`	`{`
`6909`		`- const struct sockaddr_in6 sockaddr6 = (const struct sockaddr_in6 )sockaddrX;`
	`6910`	`+ struct sockaddr_in6 sockaddr6;`
	`6911`	`+ memcpy(&sockaddr6, sockaddrX, sizeof(sockaddr6));`
`6910`	`6912`
`6911`		`- if (hostPtr) *hostPtr = [self hostFromSockaddr6:sockaddr6];`
`6912`		`- if (portPtr) *portPtr = [self portFromSockaddr6:sockaddr6];`
	`6913`	`+ if (hostPtr) *hostPtr = [self hostFromSockaddr6:&sockaddr6];`
	`6914`	`+ if (portPtr) *portPtr = [self portFromSockaddr6:&sockaddr6];`
`6913`	`6915`
`6914`	`6916`	`return YES;`
`6915`	`6917`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ typedef enum AsyncSocketError AsyncSocketError;`
`267`	`267`
`268`	`268`	`/**`
`269`	`269`	`* Connects to the given address, specified as a sockaddr structure wrapped in a NSData object.`
`270`		`- * For example, a NSData object returned from NSNetservice's addresses method.`
	`270`	`+ * For example, a NSData object returned from NSNetService's addresses method.`
`271`	`271`	`*`
`272`	`272`	`* If you have an existing struct sockaddr you can convert it to a NSData object like so:`
`273`	`273`	`* struct sockaddr sa -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];`
Original file line number	Diff line number	Diff line change
`@@ -2337,7 +2337,7 @@ static void MyCFSocketCallback(CFSocketRef sref, CFSocketCallBackType type, CFDa`
`2337`	`2337`	`AsyncUdpSocket theSocket = [[(AsyncUdpSocket )pInfo retain] autorelease];`
`2338`	`2338`	`[theSocket doCFSocketCallback:type forSocket:sref withAddress:(NSData *)address withData:pData];`
`2339`	`2339`
`2340`		`- [pool release];`
	`2340`	`+ [pool drain];`
`2341`	`2341`	`}`
`2342`	`2342`
`2343`	`2343`	`@end`