diff --git a/DDWRT_MonitorAppDelegate.m b/DDWRT_MonitorAppDelegate.m index 236ff24..6dd0c23 100644 --- a/DDWRT_MonitorAppDelegate.m +++ b/DDWRT_MonitorAppDelegate.m @@ -370,14 +370,14 @@ - (void) updateThroughput:(NSTimer *)timer { - NSLog(@"Status %@ wan port: %@", ([wrt_client getWrtReachable] ? @"Up" : @"Down"), [wrt_client getWanPort]); + //NSLog(@"Status %@ wan port: %@", ([wrt_client getWrtReachable] ? @"Up" : @"Down"), [wrt_client getWanPort]); [wrt_client getStatusUpdate:[NSString stringWithFormat:@"fetchif.cgi?%@", [wrt_client getWanPort]] delegate:self callback:@selector(throughputCallback:)]; } - (void) throughputCallback:(NSData *)data { NSString *stringData = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding]; - NSLog(stringData); + NSString *key = [NSString stringWithFormat:@"%@:", [wrt_client getWanPort]]; stringData = [stringData substringFromIndex:([stringData rangeOfString:key].location + [key length])]; diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index f67811a..8e1961c 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -539,7 +539,7 @@ NSPanel - + 256 YES @@ -558,7 +558,6 @@ 268 {{129, 55}, {125, 17}} - YES @@ -586,7 +585,6 @@ 268 {{15, 56}, {62, 14}} - YES @@ -620,7 +618,6 @@ 268 {{79, 56}, {45, 14}} - 1 YES @@ -640,7 +637,6 @@ 268 {{82, 125}, {171, 16}} - YES @@ -677,7 +673,6 @@ 268 {{15, 125}, {62, 14}} - YES @@ -695,7 +690,6 @@ 268 {{15, 105}, {62, 14}} - YES @@ -713,7 +707,6 @@ 268 {{82, 103}, {126, 18}} - YES 1 @@ -827,7 +820,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{82, 82}, {39, 16}} - YES @@ -847,7 +839,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 82}, {62, 14}} - YES @@ -865,7 +856,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 32}, {74, 18}} - YES @@ -894,7 +884,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 12}, {76, 18}} - YES @@ -916,13 +905,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {272, 152}} - {{17, 41}, {274, 168}} - {0, 0} @@ -947,7 +934,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483380 {{156, 195}, {135, 17}} - YES @@ -968,8 +954,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 289 {{213, 20}, {75, 17}} - - YES -2080244224 @@ -990,7 +974,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{130, 20}, {75, 17}} - YES @@ -1013,7 +996,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 20}, {16, 16}} - 2 20746 @@ -1021,8 +1003,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{7, 11}, {308, 232}} - - {{0, 0}, {2048, 1130}} @@ -1038,7 +1018,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 8219 2 {{823, 723}, {555, 275}} - -461897728 + 1685585920 Bandwidth Viewer NSPanel @@ -2662,7 +2642,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 833 + 840 diff --git a/WRTStatusClient.m b/WRTStatusClient.m index 6ea5acb..6b738a4 100644 --- a/WRTStatusClient.m +++ b/WRTStatusClient.m @@ -52,7 +52,7 @@ uri]; - NSLog(@"Building request form %@", urlAddress); + //NSLog(@"Building request form %@", urlAddress); NSURL *url = [NSURL URLWithString:urlAddress]; @@ -270,14 +270,14 @@ - (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace { - NSLog(@"1.0.1"); + //NSLog(@"1.0.1"); return NO; // FIXME this need to return YES if an entry doesn't already exist in the keychain and the user will need to be prompted for credentials } - (BOOL)connectionShouldUseCredentialStorage:(NSURLConnection *)connection { - NSLog(@"1.0.2"); + //NSLog(@"1.0.2"); return YES; }