now send the device name when pairing. also fixed null-terminating buffers that caused all kinds of problems

Limelight-iOS/ConnectionHandler.m

@@ -72,6 +72,16 @@ static MainFrameViewController* viewCont;
     return [idString substringFromIndex:24];
 }
 
++ (NSString*) getName
+{
+    NSString* name = [UIDevice currentDevice].name;
+    NSLog(@"Device Name: %@", name);
+    
+    //sanitize name
+    name = [name stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    return name;
+}
+
 - (id) initForStream:(NSString*)host
 {
     self = [super init];
@@ -129,8 +139,6 @@ static MainFrameViewController* viewCont;
             NSURLResponse* response = nil;
             NSData *response1 = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:NULL];
             
-            NSLog(@"url response: %@", response1);
-            
             
             [viewCont performSelector:@selector(segueIntoStream) onThread:[NSThread mainThread] withObject:nil waitUntilDone:NO];
             break;
@@ -161,7 +169,7 @@ static MainFrameViewController* viewCont;
             }
             
             // this will hang until it pairs successfully or unsuccessfully
-            NSData* pairResponse = [self httpRequest:[NSString stringWithFormat:@"pair?uniqueid=%@", [ConnectionHandler getId]]];
+            NSData* pairResponse = [self httpRequest:[NSString stringWithFormat:@"pair?uniqueid=%@&devicename=%@", [ConnectionHandler getId], [ConnectionHandler getName]]];
             
             void* buffer = [self getXMLBufferFromData:pairResponse];
             if (buffer == NULL) {
@@ -283,6 +291,7 @@ cleanup:
     
     NSMutableURLRequest* request = [[NSMutableURLRequest alloc] initWithURL:url];
     [request setHTTPMethod:@"GET"];
+    [request setTimeoutInterval:7];
     
     NSURLResponse* response = nil;
     NSError* error = nil;
@@ -291,7 +300,6 @@ cleanup:
     if (error != nil) {
         NSLog(@"An error occured making HTTP request: %@\n Caused by: %@", [error localizedDescription], [error localizedFailureReason]);
     }
-    
     return responseData;
 }
 
@@ -302,17 +310,19 @@ cleanup:
         NSLog(@"ERROR: No data to get XML from!");
         return NULL;
     }
-    void* buffer = malloc([data length]);
+    char* buffer = malloc([data length] + 1);
     if (buffer == NULL) {
         NSLog(@"ERROR: Unable to allocate XML buffer.");
         return NULL;
     }
     [data getBytes:buffer length:[data length]];
+    buffer[[data length]] = 0;
     
-    
+    NSLog(@"Buffer: %s", buffer);
     //#allthejank
-    void* newBuffer = (void*)[[[NSString stringWithUTF8String:buffer]stringByReplacingOccurrencesOfString:@"utf-16" withString:@"UTF-8" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [data length])] UTF8String];
+    void* newBuffer = (void*)[[[NSString stringWithUTF8String:buffer]stringByReplacingOccurrencesOfString:@"UTF-16" withString:@"UTF-8" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [data length])] UTF8String];
     
+    NSLog(@"New Buffer: %s", newBuffer);
     free(buffer);
     return newBuffer;
 }