Small fixes

This commit is contained in:
Pierre-Olivier Latour
2013-04-01 14:21:58 -07:00
parent bcd9654330
commit 20507e9e85

View File

@ -202,16 +202,15 @@ static void _SocketCallBack(CFSocketRef socket, CFSocketCallBackType type, CFDat
if (CFSocketSetAddress(_socket, (CFDataRef)[NSData dataWithBytes:&addr4 length:sizeof(addr4)]) == kCFSocketSuccess) { if (CFSocketSetAddress(_socket, (CFDataRef)[NSData dataWithBytes:&addr4 length:sizeof(addr4)]) == kCFSocketSuccess) {
CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, _socket, 0); CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, _socket, 0);
CFRunLoopAddSource([runloop getCFRunLoop], source, kCFRunLoopCommonModes); CFRunLoopAddSource([runloop getCFRunLoop], source, kCFRunLoopCommonModes);
if (port == 0) { if (port == 0) { // Determine the actual port we are listening on
// determine the actual port we are listening on
CFDataRef addressData = CFSocketCopyAddress(_socket); CFDataRef addressData = CFSocketCopyAddress(_socket);
struct sockaddr_in* sockaddr = (struct sockaddr_in*)CFDataGetBytePtr(addressData); struct sockaddr_in* sockaddr = (struct sockaddr_in*)CFDataGetBytePtr(addressData);
DCHECK(sockaddr);
_port = ntohs(sockaddr->sin_port); _port = ntohs(sockaddr->sin_port);
CFRelease(addressData); CFRelease(addressData);
} else { } else {
_port = port; _port = port;
} }
CFRelease(source); CFRelease(source);
if (name) { if (name) {