implemented mdns host discovery

Limelight/Computer.h

@@ -0,0 +1,18 @@
+//
+//  Computer.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/14/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface Computer : NSObject
+@property NSString* displayName;
+@property NSString* hostName;
+@property BOOL paired;
+
+- (id) initWithHost:(NSNetService*)host;
+
+@end

Limelight/Computer.m

@@ -0,0 +1,22 @@
+//
+//  Computer.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/14/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "Computer.h"
+
+@implementation Computer
+
+- (id) initWithHost:(NSNetService *)host {
+    self = [super init];
+    
+    self.hostName = [host hostName];
+    self.displayName = [host name];
+    
+    return self;
+}
+
+@end

Limelight/MDNSManager.h

@@ -0,0 +1,28 @@
+//
+//  MDNSManager.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/14/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol MDNSCallback <NSObject>
+
+- (void) updateHosts:(NSArray*)hosts;
+
+@end
+
+@interface MDNSManager : NSObject <NSNetServiceBrowserDelegate, NSNetServiceDelegate>
+
+@property id<MDNSCallback> callback;
+
+- (id) initWithCallback:(id<MDNSCallback>) callback;
+- (void) searchForHosts;
+- (NSArray*) getFoundHosts;
+
+@end
+
+
+

Limelight/MDNSManager.m

@@ -0,0 +1,74 @@
+//
+//  MDNSManager.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/14/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "MDNSManager.h"
+#import "Computer.h"
+
+@implementation MDNSManager : NSObject
+NSNetServiceBrowser* mDNSBrowser;
+NSMutableArray* domains;
+NSMutableArray* services;
+
+static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
+
+- (id) initWithCallback:(id<MDNSCallback>)callback {
+    self = [super init];
+    
+    self.callback = callback;
+    
+    mDNSBrowser = [[NSNetServiceBrowser alloc] init];
+    [mDNSBrowser setDelegate:self];
+    
+    domains = [[NSMutableArray alloc] init];
+    services = [[NSMutableArray alloc] init];
+    
+    return self;
+}
+
+- (void) searchForHosts {
+    NSLog(@"Searching for hosts...");
+    [mDNSBrowser searchForServicesOfType:NV_SERVICE_TYPE inDomain:@""];
+}
+
+- (NSArray*) getFoundHosts {
+    NSMutableArray* hosts = [[NSMutableArray alloc] init];
+    for (NSNetService* service in services) {
+        if (service.hostName != nil) {
+            [hosts addObject:[[Computer alloc] initWithHost:service]];
+        }
+    }
+    return [[NSArray alloc] initWithArray:hosts];
+}
+
+- (void)netServiceDidResolveAddress:(NSNetService *)service {
+    NSLog(@"Resolved address: %@ -> %@", service, service.hostName);
+    [self.callback updateHosts:[self getFoundHosts]];
+}
+
+- (void)netService:(NSNetService *)sender didNotResolve:(NSDictionary *)errorDict {
+    NSLog(@"Did not resolve address for: %@\n%@", sender, [errorDict description]);
+}
+
+- (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didFindService:(NSNetService *)aNetService moreComing:(BOOL)moreComing {
+    NSLog(@"Found service: %@", aNetService);
+    [aNetService setDelegate:self];
+    [aNetService resolveWithTimeout:5];
+    [services addObject:aNetService];
+}
+
+- (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didRemoveService:(NSNetService *)aNetService moreComing:(BOOL)moreComing {
+    NSLog(@"Removing service: %@", aNetService);
+    [services removeObject:aNetService];
+}
+
+- (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didNotSearch:(NSDictionary *)errorDict {
+    NSLog(@"Did not perform search");
+    NSLog(@"%@", [errorDict description]);
+}
+
+@end

Limelight/MainFrameViewController.h

@@ -7,13 +7,16 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "MDNSManager.h"
 
-@interface MainFrameViewController : UIViewController <UIPickerViewDataSource,UIPickerViewDelegate>
+@interface MainFrameViewController : UIViewController <UIPickerViewDataSource, UIPickerViewDelegate, MDNSCallback>
+@property (strong, nonatomic) IBOutlet UIPickerView *HostPicker;
 - (IBAction)StreamButton:(UIButton *)sender;
 - (IBAction)PairButton:(UIButton *)sender;
-@property (strong, nonatomic) IBOutlet UITextField *HostField;
+
 @property (strong, nonatomic) IBOutlet UIPickerView *StreamConfigs;
 @property (strong, nonatomic) NSArray* streamConfigVals;
+@property (strong, nonatomic) NSArray* hostPickerVals;
 
 + (const char*)getHostAddr;
 - (void) segueIntoStream;

Limelight/MainFrameViewController.m

@@ -9,13 +9,11 @@
 #import "MainFrameViewController.h"
 #import "VideoDepacketizer.h"
 #import "ConnectionHandler.h"
-
-@interface MainFrameViewController ()
-
-@end
+#import "Computer.h"
 
 @implementation MainFrameViewController
-static NSString* hostAddr;
+NSString* hostAddr;
+MDNSManager* mDNSManager;
 
 + (const char*)getHostAddr
 {
@@ -25,14 +23,12 @@ static NSString* hostAddr;
 - (void)PairButton:(UIButton *)sender
 {
     NSLog(@"Pair Button Pressed!");
-    hostAddr = self.HostField.text;
     [ConnectionHandler pairWithHost:hostAddr];
 }
 
 - (void)StreamButton:(UIButton *)sender
 {
     NSLog(@"Stream Button Pressed!");
-    hostAddr = self.HostField.text;
     [ConnectionHandler streamWithHost:hostAddr viewController:self];
 }
 
@@ -42,11 +38,24 @@ static NSString* hostAddr;
 
 - (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
 {
-    return [self.streamConfigVals objectAtIndex:row];
+    if (pickerView == self.StreamConfigs) {
+        return [self.streamConfigVals objectAtIndex:row];
+    } else if (pickerView == self.HostPicker) {
+        return ((Computer*)([self.hostPickerVals objectAtIndex:row])).displayName;
+    } else {
+        return nil;
+    }
 }
 
 - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
 {
+    //self.hostPickerVals = [mDNSManager getFoundHosts];
+    
+    //[self.HostPicker reloadAllComponents];
+    if (pickerView == self.HostPicker) {
+        hostAddr = ((Computer*)([self.hostPickerVals objectAtIndex:[self.HostPicker selectedRowInComponent:0]])).hostName;
+    }
+    
     //TODO: figure out how to save this info!!
 }
 
@@ -59,14 +68,29 @@ static NSString* hostAddr;
 // returns the # of rows in each component..
 - (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
 {
-    return 4;
+    if (pickerView == self.StreamConfigs) {
+        return self.streamConfigVals.count;
+    } else if (pickerView == self.HostPicker) {
+        return self.hostPickerVals.count;
+    } else {
+        return 0;
+    }
 }
 
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-	// Do any additional setup after loading the view.
-    self.streamConfigVals = [[NSArray alloc] initWithObjects:@"1280x720 (30Hz)",@"1280x720 (60Hz)",@"1920x1080 (30Hz)",@"1920x1080 (60Hz)",nil];
+
+    self.streamConfigVals = [[NSArray alloc] initWithObjects:@"1280x720 (30Hz)", @"1280x720 (60Hz)", @"1920x1080 (30Hz)", @"1920x1080 (60Hz)",nil];
+    self.hostPickerVals = [[NSArray alloc] init];
+    
+    mDNSManager = [[MDNSManager alloc] initWithCallback:self];
+    [mDNSManager searchForHosts];
+}
+
+- (void)updateHosts:(NSArray *)hosts {
+    self.hostPickerVals = hosts;
+    [self.HostPicker reloadAllComponents];
 }
 
 - (void)didReceiveMemoryWarning