moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-04-09 17:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DiscoveryManager trying to start discovery again on all machines when any machine is discovered

Browse Source
This commit is contained in:
Cameron Gutman
2018-06-01 19:50:32 -07:00
parent cdb5f51ab8
commit 862b8632e3
3 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Limelight/Network/DiscoveryManager.m
View File

@@ -159,27 +159,24 @@
}
// Override from MDNSCallback
- (void)updateHosts:(NSArray *)hosts {
- (void)updateHost:(TemporaryHost*)host {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
// Discover the hosts before adding to eliminate duplicates
for (TemporaryHost* host in hosts) {
Log(LOG_I, @"Found host through MDNS: %@:", host.name);
// Since this is on a background thread, we do not need to use the opQueue
DiscoveryWorker* worker = (DiscoveryWorker*)[self createWorkerForHost:host];
[worker discoverHost];
if ([self addHostToDiscovery:host]) {
Log(LOG_D, @"Adding host to discovery: %@", host.name);
[self->_callback updateAllHosts:self->_hostQueue];
} else {
Log(LOG_D, @"Not adding host to discovery: %@", host.name);
}
Log(LOG_I, @"Found host through MDNS: %@:", host.name);
// Since this is on a background thread, we do not need to use the opQueue
DiscoveryWorker* worker = (DiscoveryWorker*)[self createWorkerForHost:host];
[worker discoverHost];
if ([self addHostToDiscovery:host]) {
Log(LOG_D, @"Adding host to discovery: %@", host.name);
[self->_callback updateAllHosts:self->_hostQueue];
} else {
Log(LOG_D, @"Not adding host to discovery: %@", host.name);
}
});
}
- (TemporaryHost*) getHostInDiscovery:(NSString*)uuidString {
for (int i = 0; i < _hostQueue.count; i++) {
TemporaryHost* discoveredHost = [_hostQueue objectAtIndex:i];
for (TemporaryHost* discoveredHost in _hostQueue) {
if (discoveredHost.uuid.length > 0 && [discoveredHost.uuid isEqualToString:uuidString]) {
return discoveredHost;
}

4
Limelight/Network/MDNSManager.h
View File

@@ -6,9 +6,11 @@
// Copyright (c) 2014 Moonlight Stream. All rights reserved.
//
#import "TemporaryHost.h"
@protocol MDNSCallback <NSObject>
- (void) updateHosts:(NSArray*)hosts;
- (void) updateHost:(TemporaryHost*)host;
@end

20
Limelight/Network/MDNSManager.m
View File

@@ -11,7 +11,6 @@
@implementation MDNSManager {
NSNetServiceBrowser* mDNSBrowser;
NSMutableArray* domains;
NSMutableArray* services;
BOOL scanActive;
}
@@ -28,7 +27,6 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
mDNSBrowser = [[NSNetServiceBrowser alloc] init];
[mDNSBrowser setDelegate:self];
domains = [[NSMutableArray alloc] init];
services = [[NSMutableArray alloc] init];
return self;
@@ -54,22 +52,12 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
[mDNSBrowser stop];
}
- (NSArray*) getFoundHosts {
NSMutableArray* hosts = [[NSMutableArray alloc] init];
for (NSNetService* service in services) {
if (service.hostName != nil) {
TemporaryHost* host = [[TemporaryHost alloc] init];
host.activeAddress = host.localAddress = service.hostName;
host.name = service.hostName;
[hosts addObject:host];
}
}
return hosts;
}
- (void)netServiceDidResolveAddress:(NSNetService *)service {
Log(LOG_D, @"Resolved address: %@ -> %@", service, service.hostName);
[self.callback updateHosts:[self getFoundHosts]];
TemporaryHost* host = [[TemporaryHost alloc] init];
host.activeAddress = host.localAddress = service.hostName;
host.name = service.hostName;
[self.callback updateHost:host];
}
- (void)netService:(NSNetService *)sender didNotResolve:(NSDictionary *)errorDict {