Permalink
Browse files

[Server] Move SocketHandler -> ServerSocketHandler

  • Loading branch information...
1 parent 690900e commit a084f52604d4d0305843aa9d24688ab745df2d26 @sebastian committed May 18, 2012
View
BIN SignpostDemo.xcworkspace/xcuserdata/spe24.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
View
12 SignpostDemoServer/SignpostDemoServer.xcodeproj/project.pbxproj
@@ -46,7 +46,7 @@
0CFAFFE715654AC9008CEE28 /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFAFFDE15654AC9008CEE28 /* DispatchQueueLogFormatter.m */; };
0CFAFFE815654AC9008CEE28 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0CFAFFDF15654AC9008CEE28 /* README.txt */; };
0CFAFFEC15654AFC008CEE28 /* MetricHTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFAFFEB15654AFC008CEE28 /* MetricHTTPServer.m */; };
- 0CFAFFFB15667DF6008CEE28 /* SocketHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFAFFFA15667DF6008CEE28 /* SocketHandler.m */; };
+ 0CFAFFFB15667DF6008CEE28 /* ServerSocketHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFAFFFA15667DF6008CEE28 /* ServerSocketHandler.m */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -128,8 +128,8 @@
0CFAFFDF15654AC9008CEE28 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
0CFAFFEA15654AFC008CEE28 /* MetricHTTPServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MetricHTTPServer.h; sourceTree = "<group>"; };
0CFAFFEB15654AFC008CEE28 /* MetricHTTPServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MetricHTTPServer.m; sourceTree = "<group>"; };
- 0CFAFFF915667DF6008CEE28 /* SocketHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketHandler.h; sourceTree = "<group>"; };
- 0CFAFFFA15667DF6008CEE28 /* SocketHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SocketHandler.m; sourceTree = "<group>"; };
+ 0CFAFFF915667DF6008CEE28 /* ServerSocketHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; path = ServerSocketHandler.h; sourceTree = "<group>"; };
+ 0CFAFFFA15667DF6008CEE28 /* ServerSocketHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServerSocketHandler.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -206,8 +206,8 @@
0C3E39851557E6F200BA33C3 /* SignpostDemoServerAppDelegate.h */,
0C3E39861557E6F200BA33C3 /* SignpostDemoServerAppDelegate.m */,
0C3E394E1557E6AD00BA33C3 /* Supporting Files */,
- 0CFAFFF915667DF6008CEE28 /* SocketHandler.h */,
- 0CFAFFFA15667DF6008CEE28 /* SocketHandler.m */,
+ 0CFAFFF915667DF6008CEE28 /* ServerSocketHandler.h */,
+ 0CFAFFFA15667DF6008CEE28 /* ServerSocketHandler.m */,
);
path = SignpostDemoServer;
sourceTree = "<group>";
@@ -457,7 +457,7 @@
0CFAFFE615654AC9008CEE28 /* ContextFilterLogFormatter.m in Sources */,
0CFAFFE715654AC9008CEE28 /* DispatchQueueLogFormatter.m in Sources */,
0CFAFFEC15654AFC008CEE28 /* MetricHTTPServer.m in Sources */,
- 0CFAFFFB15667DF6008CEE28 /* SocketHandler.m in Sources */,
+ 0CFAFFFB15667DF6008CEE28 /* ServerSocketHandler.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
2 ...Server/SignpostDemoServer/SocketHandler.h → .../SignpostDemoServer/ServerSocketHandler.h
@@ -17,7 +17,7 @@ typedef void(^LogHandler)(NSString *);
// The block is called with jitterSeenLocally, jitterSeenByClient
typedef void(^JitterUpdatesCallback)(double, double);
-@interface SocketHandler : NSObject {
+@interface ServerSocketHandler : NSObject {
// TCP measurement server socket
dispatch_queue_t socketQueue;
GCDAsyncSocket *listenSocket;
View
6 ...Server/SignpostDemoServer/SocketHandler.m → .../SignpostDemoServer/ServerSocketHandler.m
@@ -6,13 +6,13 @@
// Copyright (c) 2012 Kle.io. All rights reserved.
//
-#import "SocketHandler.h"
+#import "ServerSocketHandler.h"
#import "GCDAsyncSocket.h"
#import "GCDAsyncUdpSocket.h"
#import "SharedCode.h"
#import "ClientData.h"
-@implementation SocketHandler
+@implementation ServerSocketHandler
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
#pragma mark - Setup
@@ -439,4 +439,4 @@ - (void)udpSocket:(GCDAsyncUdpSocket *)sock didReceiveData:(NSData *)data
[commFunc addJitterMeasurement:timeDiff forHost:host];
}
-@end
+@end
View
4 SignpostDemoServer/SignpostDemoServer/SignpostDemoServerAppDelegate.h
@@ -9,10 +9,10 @@
#import <Cocoa/Cocoa.h>
#import "MetricHTTPServer.h"
-@class SocketHandler;
+@class ServerSocketHandler;
@interface SignpostDemoServerAppDelegate : NSObject <NSApplicationDelegate, MetricHTTPServerDelegate> {
- SocketHandler *socketHandler;
+ ServerSocketHandler *socketHandler;
}
@property (assign) IBOutlet NSWindow *window;
View
4 SignpostDemoServer/SignpostDemoServer/SignpostDemoServerAppDelegate.m
@@ -8,7 +8,7 @@
#import "SignpostDemoServerAppDelegate.h"
#import "MetricHTTPServer.h"
-#import "SocketHandler.h"
+#import "ServerSocketHandler.h"
#import "ClientData.h"
#import "SharedCode.h"
@@ -28,7 +28,7 @@ @implementation SignpostDemoServerAppDelegate
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
- socketHandler = [[SocketHandler alloc] initWithLogHandlerMessage:^(NSString *msg) {
+ socketHandler = [[ServerSocketHandler alloc] initWithLogHandlerMessage:^(NSString *msg) {
dispatch_async(dispatch_get_main_queue(), ^{
@autoreleasepool {
[self logMessage:msg];

0 comments on commit a084f52

Please sign in to comment.