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

fixed host online state and simplified some code

Browse Source
This commit is contained in:
Diego Waxemberg
2015-02-01 18:33:36 -05:00
parent 879f304a79
commit 337e5e3d9d
3 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Limelight/Network/DiscoveryManager.m
+1
View File
@@ -48,6 +48,7 @@
DataManager* dataMan = [[DataManager alloc] init]; DataManager* dataMan = [[DataManager alloc] init];
host = [dataMan createHost]; host = [dataMan createHost];
host.address = hostAddress; host.address = hostAddress;
host.online = YES;
[serverInfoResponse populateHost:host]; [serverInfoResponse populateHost:host];
if (![self addHostToDiscovery:host]) { if (![self addHostToDiscovery:host]) {
[dataMan removeHost:host]; [dataMan removeHost:host];
Limelight/Network/DiscoveryWorker.m
-3
View File
@@ -77,9 +77,6 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
_host.online = receivedResponse; _host.online = receivedResponse;
if (receivedResponse) { if (receivedResponse) {
NSLog(@"Received response from: %@\n{\n\t address:%@ \n\t localAddress:%@ \n\t externalAddress:%@ \n\t uuid:%@ \n\t mac:%@ \n\t pairState:%d \n\t online:%d \n}", _host.name, _host.address, _host.localAddress, _host.externalAddress, _host.uuid, _host.mac, _host.pairState, _host.online); NSLog(@"Received response from: %@\n{\n\t address:%@ \n\t localAddress:%@ \n\t externalAddress:%@ \n\t uuid:%@ \n\t mac:%@ \n\t pairState:%d \n\t online:%d \n}", _host.name, _host.address, _host.localAddress, _host.externalAddress, _host.uuid, _host.mac, _host.pairState, _host.online);
} else {
// If the host is not online, we do not know the pairstate
_host.pairState = PairStateUnknown;
} }
} }
Limelight/Network/ServerInfoResponse.m
+10 -23
View File
@@ -25,30 +25,17 @@ static NSString* TAG_PAIR_STATUS = @"PairStatus";
} }
- (void) populateHost:(Host*)host { - (void) populateHost:(Host*)host {
NSString* hostname = [self getStringTag:TAG_HOSTNAME]; host.name = [self getStringTag:TAG_HOSTNAME];
NSString* externalIp = [self getStringTag:TAG_EXTERNAL_IP]; host.externalAddress = [self getStringTag:TAG_EXTERNAL_IP];
NSString* localIp = [self getStringTag:TAG_LOCAL_IP]; host.localAddress = [self getStringTag:TAG_LOCAL_IP];
NSString* uniqueId = [self getStringTag:TAG_UNIQUE_ID]; host.uuid = [self getStringTag:TAG_UNIQUE_ID];
NSString* macAddress = [self getStringTag:TAG_MAC_ADDRESS]; host.mac = [self getStringTag:TAG_MAC_ADDRESS];
NSString* pairStatus = [self getStringTag:TAG_PAIR_STATUS];
if (hostname) { NSInteger pairStatus;
host.name = hostname; if ([self getIntTag:TAG_PAIR_STATUS value:&pairStatus]) {
} host.pairState = pairStatus ? PairStatePaired : PairStateUnpaired;
if (externalIp) { } else {
host.externalAddress = externalIp; host.pairState = PairStateUnknown;
}
if (localIp) {
host.localAddress = localIp;
}
if (uniqueId) {
host.uuid = uniqueId;
}
if (macAddress) {
host.mac = macAddress;
}
if (pairStatus) {
host.pairState = [pairStatus isEqualToString:@"1"] ? PairStatePaired : PairStateUnpaired;
} }
} }