cuong/GCDWebServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for NAT port mapping

Browse Source
This commit is contained in:
Pierre-Olivier Latour
2015-09-16 11:16:41 -07:00
parent 3c33e9f056
commit e70a3338a5
3 changed files with 134 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
GCDWebServer/Core/GCDWebServer.m
View File

@ -38,6 +38,7 @@
#endif
#endif
#import <netinet/in.h>
#import <dns_sd.h>
#import "GCDWebServerPrivate.h"
@ -50,6 +51,7 @@
NSString* const GCDWebServerOption_Port = @"Port";
NSString* const GCDWebServerOption_BonjourName = @"BonjourName";
NSString* const GCDWebServerOption_BonjourType = @"BonjourType";
NSString* const GCDWebServerOption_RequestNATPortMapping = @"RequestNATPortMapping";
NSString* const GCDWebServerOption_BindToLocalhost = @"BindToLocalhost";
NSString* const GCDWebServerOption_MaxPendingConnections = @"MaxPendingConnections";
NSString* const GCDWebServerOption_ServerName = @"ServerName";
@ -171,6 +173,11 @@ static void _ExecuteMainThreadRunLoopSources() {
dispatch_source_t _source6;
CFNetServiceRef _registrationService;
CFNetServiceRef _resolutionService;
DNSServiceRef _dnsService;
CFSocketRef _dnsSocket;
CFRunLoopSourceRef _dnsSource;
NSString* _dnsAddress;
NSUInteger _dnsPort;
BOOL _bindToLocalhost;
#if TARGET_OS_IPHONE
BOOL _suspendInBackground;
@ -383,7 +390,7 @@ static void _NetServiceResolveCallBack(CFNetServiceRef service, CFStreamError* e
}
} else {
GCDWebServer* server = (__bridge GCDWebServer*)info;
GWS_LOG_INFO(@"%@ now reachable at %@", [server class], server.bonjourServerURL);
GWS_LOG_INFO(@"%@ now locally reachable at %@", [server class], server.bonjourServerURL);
if ([server.delegate respondsToSelector:@selector(webServerDidCompleteBonjourRegistration:)]) {
[server.delegate webServerDidCompleteBonjourRegistration:server];
}
@ -391,6 +398,41 @@ static void _NetServiceResolveCallBack(CFNetServiceRef service, CFStreamError* e
}
}
static void _DNSServiceCallBack(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode, uint32_t externalAddress, DNSServiceProtocol protocol, uint16_t internalPort, uint16_t externalPort, uint32_t ttl, void* context) {
GWS_DCHECK([NSThread isMainThread]);
@autoreleasepool {
GCDWebServer* server = (__bridge GCDWebServer*)context;
if ((errorCode == kDNSServiceErr_NoError) || (errorCode == kDNSServiceErr_DoubleNAT)) {
struct sockaddr_in addr4;
bzero(&addr4, sizeof(addr4));
addr4.sin_len = sizeof(addr4);
addr4.sin_family = AF_INET;
addr4.sin_addr.s_addr = externalAddress; // Already in network byte order
server->_dnsAddress = GCDWebServerStringFromSockAddr((const struct sockaddr*)&addr4, NO);
server->_dnsPort = ntohs(externalPort);
GWS_LOG_INFO(@"%@ now publicly reachable at %@", [server class], server.publicServerURL);
} else {
GWS_LOG_ERROR(@"DNS service error %i", errorCode);
server->_dnsAddress = nil;
server->_dnsPort = 0;
}
if ([server.delegate respondsToSelector:@selector(webServerDidUpdateNATPortMapping:)]) {
[server.delegate webServerDidUpdateNATPortMapping:server];
}
}
}
static void _SocketCallBack(CFSocketRef s, CFSocketCallBackType type, CFDataRef address, const void* data, void* info) {
GWS_DCHECK([NSThread isMainThread]);
@autoreleasepool {
GCDWebServer* server = (__bridge GCDWebServer*)info;
DNSServiceErrorType status = DNSServiceProcessResult(server->_dnsService);
if (status != kDNSServiceErr_NoError) {
GWS_LOG_ERROR(@"DNS service error %i", status);
}
}
}
static inline id _GetOption(NSDictionary* options, NSString* key, id defaultValue) {
id value = [options objectForKey:key];
return value ? value : defaultValue;
@ -580,6 +622,29 @@ static inline NSString* _EncodeBase64(NSString* string) {
}
}
if ([_GetOption(_options, GCDWebServerOption_RequestNATPortMapping, @NO) boolValue]) {
DNSServiceErrorType status = DNSServiceNATPortMappingCreate(&_dnsService, 0, 0, kDNSServiceProtocol_TCP, htons(port), htons(port), 0, _DNSServiceCallBack, (__bridge void*)self);
if (status == kDNSServiceErr_NoError) {
CFSocketContext context = {0, (__bridge void*)self, NULL, NULL, NULL};
_dnsSocket = CFSocketCreateWithNative(kCFAllocatorDefault, DNSServiceRefSockFD(_dnsService), kCFSocketReadCallBack, _SocketCallBack, &context);
if (_dnsSocket) {
CFSocketSetSocketFlags(_dnsSocket, CFSocketGetSocketFlags(_dnsSocket) & ~kCFSocketCloseOnInvalidate);
_dnsSource = CFSocketCreateRunLoopSource(kCFAllocatorDefault, _dnsSocket, 0);
if (_dnsSource) {
CFRunLoopAddSource(CFRunLoopGetMain(), _dnsSource, kCFRunLoopCommonModes);
} else {
GWS_LOG_ERROR(@"Failed creating CFRunLoopSource");
GWS_DNOT_REACHED();
}
} else {
GWS_LOG_ERROR(@"Failed creating CFSocket");
GWS_DNOT_REACHED();
}
} else {
GWS_LOG_ERROR(@"Failed creating NAT port mapping (%i)", status);
}
}
dispatch_resume(_source4);
dispatch_resume(_source6);
GWS_LOG_INFO(@"%@ started on port %i and reachable at %@", [self class], (int)_port, self.serverURL);
@ -595,6 +660,22 @@ static inline NSString* _EncodeBase64(NSString* string) {
- (void)_stop {
GWS_DCHECK(_source4 != NULL);
if (_dnsService) {
_dnsAddress = nil;
_dnsPort = 0;
if (_dnsSource) {
CFRunLoopSourceInvalidate(_dnsSource);
CFRelease(_dnsSource);
_dnsSource = NULL;
}
if (_dnsSocket) {
CFRelease(_dnsSocket);
_dnsSocket = NULL;
}
DNSServiceRefDeallocate(_dnsService);
_dnsService = NULL;
}
if (_registrationService) {
if (_resolutionService) {
CFNetServiceUnscheduleFromRunLoop(_resolutionService, CFRunLoopGetMain(), kCFRunLoopCommonModes);
@ -746,6 +827,17 @@ static inline NSString* _EncodeBase64(NSString* string) {
return nil;
}
- (NSURL*)publicServerURL {
if (_source4 && _dnsService && _dnsAddress && _dnsPort) {
if (_dnsPort != 80) {
return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@:%i/", _dnsAddress, (int)_dnsPort]];
} else {
return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/", _dnsAddress]];
}
}
return nil;
}
- (BOOL)start {
return [self startWithPort:kDefaultPort bonjourName:@""];
}