Navigation

← Previous Changeset
Next Changeset →

Changeset 3509

Timestamp:

01/18/06 18:52:54 (3 years ago)

Author:

morris

Message:

Use WISocket, kill WCSocket

Files:

WiredClient/trunk/English.lproj/ServerInfo.nib/classes.nib (modified) (1 diff)
WiredClient/trunk/English.lproj/ServerInfo.nib/info.nib (modified) (1 diff)
WiredClient/trunk/English.lproj/ServerInfo.nib/keyedobjects.nib (modified) (previous)
WiredClient/trunk/English.lproj/ServerInfo.nib/objects.nib (modified) (previous)
WiredClient/trunk/WCConnection.h (modified) (1 diff)
WiredClient/trunk/WCConnection.m (modified) (1 diff)
WiredClient/trunk/WCError.m (modified) (9 diffs)
WiredClient/trunk/WCLink.h (modified) (3 diffs)
WiredClient/trunk/WCLink.m (modified) (12 diffs)
WiredClient/trunk/WCMain.m (modified) (1 diff)
WiredClient/trunk/WCServerConnection.m (modified) (1 diff)
WiredClient/trunk/WCServerInfo.h (modified) (1 diff)
WiredClient/trunk/WCServerInfo.m (modified) (3 diffs)
WiredClient/trunk/WCSocket.h (deleted)
WiredClient/trunk/WCSocket.m (deleted)
WiredClient/trunk/WCTrackerConnection.m (modified) (1 diff)
WiredClient/trunk/WCTrackers.m (modified) (1 diff)
WiredClient/trunk/WCTransfers.m (modified) (14 diffs)
WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj (modified) (10 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

WiredClient/trunk/English.lproj/ServerInfo.nib/classes.nib

r3406	r3509
25	25	"_sizeTextField" = NSTextField;
26	26	"_sizeTitleTextField" = NSTextField;
	27	"_sslProtocolTextField" = NSTextField;
	28	"_sslProtocolTitleTextField" = NSTextField;
27	29	"_uptimeTextField" = NSTextField;
28	30	"_uptimeTitleTextField" = NSTextField;

WiredClient/trunk/English.lproj/ServerInfo.nib/info.nib

r3406	r3509
12	12	</array>
13	13	<key>IBSystem Version</key>
14		<string>8~~F46~~</string>
	14	<string>8G32</string>
15	15	</dict>
16	16	</plist>

WiredClient/trunk/WCConnection.h

r3503 r3509

47 47
48 48 - (WIURL *)URL;
49 - (W~~CSSL~~Socket *)socket;
49 - (WISocket *)socket;
50 50 - (BOOL)isConnected;
51 51 - (double)protocol;

WiredClient/trunk/WCConnection.m

r3413	r3509
492	492
493	493	if(_type == WCConnectionTypeServer)
494		[NSThread detachNewThreadSelector:@selector(serverThread:) toTarget:self withObject:NULL];
	494	[WIThread detachNewThreadSelector:@selector(serverThread:) toTarget:self withObject:NULL];
495	495	else if(_type == WCConnectionTypeTracker)
496		[NSThread detachNewThreadSelector:@selector(trackerThread:) toTarget:self withObject:NULL];
	496	[WIThread detachNewThreadSelector:@selector(trackerThread:) toTarget:self withObject:NULL];
497	497
498	498	}

WiredClient/trunk/WCError.m

r3503	r3509
69	69	- (void)connectionHasAttached:(NSNotification *)notification {
70	70	[_lock lock];
71		[_connections setObject:[notification object] forKey:[[NSThread currentThread] threadIdentifier]];
	71	[_connections setObject:[notification object] forKey:[[WIThread currentThread] threadIdentifier]];
72	72	[_lock unlock];
73	73	}
…	…
77	77	- (void)connectionShouldTerminate:(NSNotification *)notificiation {
78	78	[_lock lock];
79		[_connections removeObjectForKey:[[NSThread currentThread] threadIdentifier]];
	79	[_connections removeObjectForKey:[[WIThread currentThread] threadIdentifier]];
80	80	[_lock unlock];
81	81	}
…	…
87	87	- (void)setError:(WCErrorType)error {
88	88	[_lock lock];
89		[_errors setObject:[NSNumber numberWithInt:error] forKey:[[NSThread currentThread] threadIdentifier]];
	89	[_errors setObject:[NSNumber numberWithInt:error] forKey:[[WIThread currentThread] threadIdentifier]];
90	90	[_lock unlock];
91	91	}
…	…
97	97
98	98	[_lock lock];
99		error = [[_errors objectForKey:[[NSThread currentThread] threadIdentifier]] intValue];
	99	error = [[_errors objectForKey:[[WIThread currentThread] threadIdentifier]] intValue];
100	100	[_lock unlock];
101	101
…	…
107	107	- (void)setArgument:(NSString *)argument {
108	108	[_lock lock];
109		[_arguments setObject:argument forKey:[[NSThread currentThread] threadIdentifier]];
	109	[_arguments setObject:argument forKey:[[WIThread currentThread] threadIdentifier]];
110	110	[_lock unlock];
111	111	}
…	…
117	117
118	118	[_lock lock];
119		argument = [_arguments objectForKey:[[NSThread currentThread] threadIdentifier]];
	119	argument = [_arguments objectForKey:[[WIThread currentThread] threadIdentifier]];
120	120	[_lock unlock];
121	121
…	…
127	127	- (void)setMessage:(NSString *)message {
128	128	[_lock lock];
129		[_messages setObject:message forKey:[[NSThread currentThread] threadIdentifier]];
	129	[_messages setObject:message forKey:[[WIThread currentThread] threadIdentifier]];
130	130	[_lock unlock];
131	131	}
…	…
137	137
138	138	[_lock lock];
139		message = [_messages objectForKey:[[NSThread currentThread] threadIdentifier]];
	139	message = [_messages objectForKey:[[WIThread currentThread] threadIdentifier]];
140	140	[_lock unlock];
141	141
…	…
578	578	if([self error] != WCApplicationErrorServerDisconnected) {
579	579	[_lock lock];
580		connection = [_connections objectForKey:[[NSThread currentThread] threadIdentifier]];
	580	connection = [_connections objectForKey:[[WIThread currentThread] threadIdentifier]];
581	581	[_lock unlock];
582	582

WiredClient/trunk/WCLink.h

r3413	r3509
29	29	@protocol WCConnection;
30	30
31		~~@class WCSSLSocket;~~
32
33	31	@interface WCLink : WIObject {
34		W~~CSSL~~Socket *_socket;
	32	WISocket *_socket;
35	33	WIURL *_url;
36	34
…	…
43	41	BOOL _delegateLinkReceivedMessage;
44	42
45		BOOL _connected;
	43	BOOL _connected, _closing;
46	44	}
47	45
…	…
53	51
54	52	- (WIURL *)URL;
55		- (W~~CSSL~~Socket *)socket;
	53	- (WISocket *)socket;
56	54	- (BOOL)isConnected;
57	55

WiredClient/trunk/WCLink.m

r3503	r3509
29	29	#import "WCConnection.h"
30	30	#import "WCLink.h"
31		~~#import "WCSocket.h"~~
32	31
33	32	@interface WCLink(Private)
34	33
35		- (void)_parseMessage:(NS~~Data *)data~~;
	34	- (void)_parseMessage:(NSString *)string;
36	35
37	36	@end
…	…
40	39	@implementation WCLink(Private)
41	40
42		- (void)_parseMessage:(NS~~Data *)data~~ {
	41	- (void)_parseMessage:(NSString *)string {
43	42	NSArray *arguments;
44		~~NSString string, argument;~~
45	43	unsigned int message;
46	44
47		if(_delegateLinkReceivedMessage) {
48		string = [NSString stringWithData:data encoding:NSUTF8StringEncoding];
49
50		if(!string)
51		return;
52
53		message = [[string substringToIndex:WCMessageLength] unsignedIntValue];
54		argument = [string substringFromIndex:WCMessageLength + 1];
55		arguments = [argument componentsSeparatedByString:WCFieldSeparator];
56
57		[_delegate link:self receivedMessage:message arguments:arguments];
58		}
	45	message = [[string substringToIndex:WCMessageLength] unsignedIntValue];
	46	arguments = [[string substringFromIndex:WCMessageLength + 1] componentsSeparatedByString:WCFieldSeparator];
	47
	48	[_delegate link:self receivedMessage:message arguments:arguments];
59	49	}
60	50
…	…
113	103
114	104
115		- (W~~CSSL~~Socket *)socket {
	105	- (WISocket *)socket {
116	106	return _socket;
117	107	}
…	…
128	118
129	119	- (void)connect {
130		[NSThread detachNewThreadSelector:@selector(linkThread:) toTarget:self withObject:NULL];
	120	[WIThread detachNewThreadSelector:@selector(linkThread:) toTarget:self withObject:NULL];
131	121	}
132	122
…	…
134	124
135	125	- (void)disconnect {
	126	_closing = YES;
	127
136	128	[_socket close];
137	129	}
…	…
171	163
172	164	[_socket writeString:[string stringByAppendingString:WCMessageSeparator]
173		encoding:NSUTF8StringEncoding];
	165	encoding:NSUTF8StringEncoding
	166	timeout:0.0];
174	167
175	168	if(_delegateLinkSentCommand)
…	…
182	175
183	176	- (void)linkThread:(id)arg {
184		NSAutoreleasePool pool, loopPool;
185		NSData *data;
	177	NSAutoreleasePool pool, loopPool = NULL;
	178	NSString *string;
	179	NSArray *arguments;
	180	WISocketContext *context;
	181	WIAddress *address;
	182	unsigned int message, i = 0;
186	183	BOOL reading = YES;
187	184
…	…
189	186	[_delegate retain];
190	187
191		// --- create socket
192		_socket = [[WCSSLSocket alloc] initWithHost:[_url host] port:[_url port] type:WCSocketTypeTCP];
	188	context = [WISocketContext socketContextForClient];
	189	[context setSSLCiphers:[WCSettings objectForKey:WCSSLControlCiphers]];
	190
	191	address = [WIAddress addressWithString:[_url host]];
	192	[address setPort:[_url port]];
	193
	194	_socket = [[WISocket alloc] initWithAddress:address type:WISocketTCP];
193	195
194	196	if(!_socket) {
…	…
199	201	}
200	202
201		[_socket setCipher:[WCSettings objectForKey:WCSSLControlCiphers]];
202		[_socket setUsesLocks:YES];
203		[[_socket descriptor] setUsesNagle:NO];
204
205		// --- connect to the host
206		if(![_socket connectWithTimeout:30.0]) {
	203	[_socket setInteractive:YES];
	204
	205	if(![_socket connectWithContext:context timeout:10.0]) {
207	206	[_socket close];
208	207
…	…
218	217	[_delegate linkConnected:self];
219	218
220		~~// --- start reading from server~~
221	219	while(reading) {
222		loopPool = [[NSAutoreleasePool alloc] init];
223		data = [_socket readDataUpToCharacter:WCMessageSeparatorChar];
224
225		if(!data \|\| [data length] == 0) {
	220	if(!loopPool)
	221	loopPool = [[NSAutoreleasePool alloc] init];
	222
	223	string = [_socket readStringUpToString:WCMessageSeparator encoding:NSUTF8StringEncoding timeout:0.0];
	224
	225	if(!string \|\| [string length] == 0) {
226	226	reading = NO;
227	227
…	…
229	229	}
230	230
231		[self _parseMessage:data];
232
233		[loopPool release];
	231	message = [[string substringToIndex:WCMessageLength] unsignedIntValue];
	232	arguments = [[string substringFromIndex:WCMessageLength + 1] componentsSeparatedByString:WCFieldSeparator];
	233
	234	if(_delegateLinkReceivedMessage)
	235	[_delegate link:self receivedMessage:message arguments:arguments];
	236
	237	if(++i % 10 == 0) {
	238	[loopPool release];
	239
	240	loopPool = NULL;
	241	}
234	242	}
235	243
236	244	_connected = NO;
237	245
238		if([_socket isOpen]) {
239		// --- pre-mature disconnect from server
	246	if(!_closing) {
240	247	if(_delegateLinkClosed)
241	248	[_delegate linkClosed:self];
…	…
243	250	[_socket close];
244	251	} else {
245		~~// --- user terminated the connection~~
246	252	if(_delegateLinkTerminated)
247	253	[_delegate linkTerminated:self];

WiredClient/trunk/WCMain.m

r3503	r3509
484	484	[[self window] makeFirstResponder:_addressTextField];
485	485
486		if(url) {
487		}
	486	if([url hostpair])
	487	[_addressTextField setStringValue:[url hostpair]];
	488
	489	if([url user])
	490	[_loginTextField setStringValue:[url user]];
	491
	492	if([url password])
	493	[_passwordTextField setStringValue:[url password]];
488	494
489	495	[self showWindow:self];

WiredClient/trunk/WCServerConnection.m

r3503 r3509

582 582
583 583
584 - (W~~CSSL~~Socket *)socket {
584 - (WISocket *)socket {
585 585 return [_link socket];
586 586 }

WiredClient/trunk/WCServerInfo.h

r3413	r3509
45	45	IBOutlet NSTextField *_protocolTitleTextField;
46	46	IBOutlet NSTextField *_protocolTextField;
	47	IBOutlet NSTextField *_sslProtocolTitleTextField;
	48	IBOutlet NSTextField *_sslProtocolTextField;
47	49	IBOutlet NSTextField *_cipherTitleTextField;
48	50	IBOutlet NSTextField *_cipherTextField;

WiredClient/trunk/WCServerInfo.m

r3413	r3509
42	42
43	43	- (void)_updateServerInfo {
	44	WISocket *socket;
44	45	WCServer *server;
45	46	NSRect rect;
46	47
	48	socket = [[self connection] socket];
47	49	server = [[self connection] server];
48	50
…	…
57	59	[_versionTextField setStringValue:[[server serverVersion] wiredVersion]];
58	60	[_protocolTextField setStringValue:[NSSWF:@"%.1f", [server protocol]]];
59		[_certificateTextField setStringValue:[[[self connection] socket] certificate]];
60		[_cipherTextField setStringValue:[[[self connection] socket] cipher]];
	61	[_sslProtocolTextField setStringValue:[socket cipherVersion]];
	62	[_certificateTextField setStringValue:[NSSWF:@"%@/%u bits, %@", [socket certificateName], [socket certificateBits], [socket certificateHostname]]];
	63	[_cipherTextField setStringValue:[NSSWF:@"%@/%u bits", [socket cipherName], [socket cipherBits]]];
61	64	[_filesTextField setIntValue:[server files]];
62	65	[_sizeTextField setStringValue:
…	…
69	72	[self _resizeTextField:_certificateTextField withTextField:_certificateTitleTextField];
70	73	[self _resizeTextField:_cipherTextField withTextField:_cipherTitleTextField];
	74	[self _resizeTextField:_sslProtocolTextField withTextField:_sslProtocolTitleTextField];
71	75	[self _resizeTextField:_protocolTextField withTextField:_protocolTitleTextField];
72	76	[self _resizeTextField:_versionTextField withTextField:_versionTitleTextField];

WiredClient/trunk/WCTrackerConnection.m

r3503 r3509

295 295
296 296
297 - (W~~CSSL~~Socket *)socket {
297 - (WISocket *)socket {
298 298 return [_link socket];
299 299 }

WiredClient/trunk/WCTrackers.m

r3505	r3509
424	424
425	425	- (IBAction)open:(id)sender {
426		NSEnumerator *enumerator;
427		NSData *data;
428		WCSocketAddress *address;
429		WCTracker *item;
430		WIURL *url = NULL;
431
432		// --- get tracker
	426	WIAddress *address;
	427	WIURL *url;
	428	WCTracker *item;
	429
433	430	item = [self selectedItem];
434	431
435	432	if([item netService]) {
436		// --- get addresses
437		enumerator = [[[item netService] addresses] objectEnumerator];
438
439		while((data = [enumerator nextObject])) {
440		// --- get adress
441		address = [WCSocketAddress addressWithSockaddr:(struct sockaddr *) [data bytes]];
442
443		if(address) {
444		// --- set new URL
445		url = [WIURL URLWithScheme:@"wired" host:[address host] port:[address port]];
446
447		break;
448		}
449		}
450		}
451
452		// --- connect
	433	address = [WIAddress addressWithNetService:[item netService]];
	434
	435	url = [WIURL URLWithScheme:@"wired" host:[address string] port:[address port]];
	436	} else {
	437	url = [item URL];
	438	}
	439
453	440	if([[url scheme] isEqualToString:@"wired"]) {
454	441	[[WCMain main] showConnectWindowWithURL:url];

WiredClient/trunk/WCTransfers.m

r3503	r3509
36	36	#import "WCServer.h"
37	37	#import "WCServerInfo.h"
38		~~#import "WCSocket.h"~~
39	38	#import "WCStats.h"
40	39	#import "WCTransfer.h"
…	…
248	247	// --- fork a thread
249	248	if([transfer type] == WCTransferTypeDownload)
250		[NSThread detachNewThreadSelector:@selector(downloadThread:) toTarget:self withObject:transfer];
	249	[WIThread detachNewThreadSelector:@selector(downloadThread:) toTarget:self withObject:transfer];
251	250	else
252		[NSThread detachNewThreadSelector:@selector(uploadThread:) toTarget:self withObject:transfer];
	251	[WIThread detachNewThreadSelector:@selector(uploadThread:) toTarget:self withObject:transfer];
253	252
254	253	// --- trigger event
…	…
952	951	NSProgressIndicator *progressIndicator;
953	952	NSString *path;
954		WCSSLSocket *socket = NULL;
	953	// WCSSLSocket *socket = NULL;
955	954	WCTransfer *transfer;
956	955	WCFile *file;
…	…
987	986
988	987	// --- create a socket
989		socket = [[WCSSLSocket alloc] initWithHost:[[transfer URL] host] port:[[transfer URL] port] type:WCSocketTypeTCP];
	988	/* socket = [[WCSSLSocket alloc] initWithHost:[[transfer URL] host] port:[[transfer URL] port] type:WCSocketTypeTCP];
990	989
991	990	if(!socket) {
…	…
1012	1011	WCTransferCommand,
1013	1012	[transfer hash],
1014		WCMessageSeparator]];
	1013	WCMessageSeparator]];*/
1015	1014
1016	1015	// --- get current time
…	…
1024	1023	// --- we're now transferring
1025	1024	[transfer setState:WCTransferStateRunning];
1026		[transfer setSecure:[socket isSecure]];
	1025	// [transfer setSecure:[socket isSecure]];
1027	1026
1028	1027	// --- reload table
…	…
1139	1138	close(fd);
1140	1139
1141		[socket close];
	1140	// [socket close];
1142	1141
1143	1142	// --- did this file finish?
…	…
1204	1203	[self performSelectorOnMainThread:@selector(validate)];
1205	1204
1206		[socket release];
	1205	// [socket release];
1207	1206	[pool release];
1208	1207	}
…	…
1214	1213	NSString *path;
1215	1214	NSDictionary *dictionary;
1216		WCSSLSocket *socket = NULL;
	1215	// WCSSLSocket *socket = NULL;
1217	1216	WCTransfer *transfer;
1218	1217	WCFile *file;
…	…
1247	1246
1248	1247	// --- create a socket
1249		socket = [[WCSSLSocket alloc] initWithHost:[[transfer URL] host] port:[[transfer URL] port] type:WCSocketTypeTCP];
	1248	/* socket = [[WCSSLSocket alloc] initWithHost:[[transfer URL] host] port:[[transfer URL] port] type:WCSocketTypeTCP];
1250	1249
1251	1250	if(!socket) {
…	…
1272	1271	WCTransferCommand,
1273	1272	[transfer hash],
1274		WCMessageSeparator]];
	1273	WCMessageSeparator]];*/
1275	1274
1276	1275	// --- get current time
…	…
1284	1283	// --- we're now transferring
1285	1284	[transfer setState:WCTransferStateRunning];
1286		[transfer setSecure:[socket isSecure]];
	1285	// [transfer setSecure:[socket isSecure]];
1287	1286
1288	1287	// --- reload table
…	…
1386	1385	close(fd);
1387	1386
1388		[socket close];
	1387	// [socket close];
1389	1388
1390	1389	// --- update stats
…	…
1466	1465	[self performSelectorOnMainThread:@selector(validate)];
1467	1466
1468		[socket release];
	1467	// [socket release];
1469	1468	[pool release];
1470	1469	}

WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj

r3503	r3509
83	83	/* Begin PBXBuildFile section */
84	84	771E6D510755F506000F9195 /* WCConversation.m in Sources / = {isa = PBXBuildFile; fileRef = 771E6D4F0755F506000F9195 / WCConversation.m */; };
	85	77724B3F097D39EE0003B608 /* WiredAdditions.framework in Frameworks / = {isa = PBXBuildFile; fileRef = A5E8BAFA08748EFD0010F2A4 / WiredAdditions.framework */; };
85	86	777E657B0740F34700A8DE0B /* WCBrowserCell.m in Sources / = {isa = PBXBuildFile; fileRef = 777E65790740F34700A8DE0B / WCBrowserCell.m */; };
86	87	777E663D07412EF300A8DE0B /* Columns.tiff in Resources / = {isa = PBXBuildFile; fileRef = 777E663C07412EF300A8DE0B / Columns.tiff */; };
…	…
180	181	A5DC7FAB057AB0A600736BBF /* WCUser.m in Sources / = {isa = PBXBuildFile; fileRef = A5DC7F9D057AB0A600736BBF / WCUser.m */; };
181	182	A5DC7FAD057AB0A600736BBF /* WCTransfer.m in Sources / = {isa = PBXBuildFile; fileRef = A5DC7F9F057AB0A600736BBF / WCTransfer.m */; };
182		~~A5DC7FB9057AB0D000736BBF /* WCSocket.m in Sources / = {isa = PBXBuildFile; fileRef = A5DC7FB1057AB0D000736BBF / WCSocket.m */; };~~
183	183	A5DC7FBA057AB0D000736BBF /* WCConnection.m in Sources / = {isa = PBXBuildFile; fileRef = A5DC7FB2057AB0D000736BBF / WCConnection.m */; };
184	184	A5DC7FBC057AB0D000736BBF /* WCError.m in Sources / = {isa = PBXBuildFile; fileRef = A5DC7FB4057AB0D000736BBF / WCError.m */; };
…	…
231	231	A5E4A6DB0791A3DC00FA127F /* DropBox12.tiff in Resources / = {isa = PBXBuildFile; fileRef = A5E4A6DA0791A3DC00FA127F / DropBox12.tiff */; };
232	232	A5E4A6E20791A3E400FA127F /* Uploads12.tiff in Resources / = {isa = PBXBuildFile; fileRef = A5E4A6E10791A3E400FA127F / Uploads12.tiff */; };
233		~~A5E8BCC10874940E0010F2A4 /* WiredAdditions.framework in Frameworks / = {isa = PBXBuildFile; fileRef = A5E8BAFA08748EFD0010F2A4 / WiredAdditions.framework */; };~~
234	233	A5E8BCC2087494120010F2A4 /* WiredAdditions.framework in Copy Files (Frameworks) / = {isa = PBXBuildFile; fileRef = A5E8BAFA08748EFD0010F2A4 / WiredAdditions.framework */; };
235	234	A5E8BCD0087494DB0010F2A4 /* ReleaseNotes.rtf in Resources / = {isa = PBXBuildFile; fileRef = A5E8BCCE087494DB0010F2A4 / ReleaseNotes.rtf */; };
…	…
480	479	A5DC7F9E057AB0A600736BBF /* WCTransfer.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = WCTransfer.h; sourceTree = "<group>"; };
481	480	A5DC7F9F057AB0A600736BBF /* WCTransfer.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WCTransfer.m; sourceTree = "<group>"; };
482		~~A5DC7FB1057AB0D000736BBF /* WCSocket.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WCSocket.m; sourceTree = "<group>"; };~~
483	481	A5DC7FB2057AB0D000736BBF /* WCConnection.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WCConnection.m; sourceTree = "<group>"; };
484	482	A5DC7FB3057AB0D000736BBF /* WCError.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = WCError.h; sourceTree = "<group>"; };
485	483	A5DC7FB4057AB0D000736BBF /* WCError.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WCError.m; sourceTree = "<group>"; };
486	484	A5DC7FB6057AB0D000736BBF /* WCConnection.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = WCConnection.h; sourceTree = "<group>"; };
487		~~A5DC7FB7057AB0D000736BBF /* WCSocket.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = WCSocket.h; sourceTree = "<group>"; };~~
488	485	A5DC7FC2057AB0F200736BBF /* WCStats.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = WCStats.h; sourceTree = "<group>"; };
489	486	A5DC7FC3057AB0F200736BBF /* WCStats.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WCStats.m; sourceTree = "<group>"; };
…	…
553	550	A5D4F28006D75DA4002A33D0 /* ExceptionHandling.framework in Frameworks */,
554	551	A5A3400707216D8900A16E9A /* Security.framework in Frameworks */,
555		~~A5E8BCC10874940E0010F2A4~~ /* WiredAdditions.framework in Frameworks */,
	552	77724B3F097D39EE0003B608 /* WiredAdditions.framework in Frameworks */,
556	553	);
557	554	runOnlyForDeploymentPostprocessing = 0;
…	…
1020	1017	A57D216B07C95094002C306E /* WCServerConnection.m */,
1021	1018	A57D216A07C95094002C306E /* WCServerConnection.h */,
1022		~~A5DC7FB1057AB0D000736BBF /* WCSocket.m */,~~
1023		~~A5DC7FB7057AB0D000736BBF /* WCSocket.h */,~~
1024	1019	A57D20F007C92736002C306E /* WCTrackerConnection.m */,
1025	1020	A57D20EF07C92736002C306E /* WCTrackerConnection.h */,
…	…
1379	1374	A5DC7EE1057AAF2900736BBF /* WCPublicChat.m in Sources */,
1380	1375	A5DC7EE3057AAF2900736BBF /* WCSearch.m in Sources */,
1381		~~A5DC7FB9057AB0D000736BBF /* WCSocket.m in Sources */,~~
1382	1376	A52B301C05E6F0A300C651A4 /* WCServerInfo.m in Sources */,
1383	1377	A5DC7FA7057AB0A600736BBF /* WCServer.m in Sources */,
…	…
1608	1602	GCC_PRECOMPILE_PREFIX_HEADER = YES;
1609	1603	GCC_PREFIX_HEADER = prefix.pch;
	1604	HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/WiredAdditions.framework/Headers\"";
1610	1605	INFOPLIST_FILE = Info.plist;
1611	1606	INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-DDEBUG";
…	…
1625	1620	GCC_PRECOMPILE_PREFIX_HEADER = YES;
1626	1621	GCC_PREFIX_HEADER = prefix.pch;
	1622	HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/WiredAdditions.framework/Headers\"";
1627	1623	INFOPLIST_FILE = Info.plist;
1628	1624	INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-DTEST";
…	…
1642	1638	GCC_PRECOMPILE_PREFIX_HEADER = YES;
1643	1639	GCC_PREFIX_HEADER = prefix.pch;
	1640	HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/WiredAdditions.framework/Headers\"";
1644	1641	INFOPLIST_FILE = Info.plist;
1645	1642	INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-DRELEASE";

r3503	r3509
582	582
583	583
584		- (W~~CSSL~~Socket *)socket {
	584	- (WISocket *)socket {
585	585	return [_link socket];
586	586	}

r3503	r3509
295	295
296	296
297		- (W~~CSSL~~Socket *)socket {
	297	- (WISocket *)socket {
298	298	return [_link socket];
299	299	}

Navigation

Changeset 3509

Legend:

Download in other formats: