git.ithinksw.org
/
ITFoundation.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maybe
[ITFoundation.git]
/
ITInetSocket.m
diff --git
a/ITInetSocket.m
b/ITInetSocket.m
index
decfd43
..
b7441cb
100755
(executable)
--- a/
ITInetSocket.m
+++ b/
ITInetSocket.m
@@
-30,7
+30,7
@@
ITServiceBrowserDelegate *bd = [[ITServiceBrowserDelegate alloc] initWithDelegate:d];
[browse setDelegate:bd];
ITServiceBrowserDelegate *bd = [[ITServiceBrowserDelegate alloc] initWithDelegate:d];
[browse setDelegate:bd];
- [browse searchForServicesOfType:[NSString stringWithFormat:@"
._%@._tcp",type] inDomain:nil
];
+ [browse searchForServicesOfType:[NSString stringWithFormat:@"
_%@._tcp.",type] inDomain:@""
];
}
-(id)initWithFD:(int)fd delegate:(id <ITInetSocketDelegate,NSObject>)d
}
-(id)initWithFD:(int)fd delegate:(id <ITInetSocketDelegate,NSObject>)d
@@
-47,7
+47,9
@@
sarr = nil;
bufs = 512;
actionflag = dieflag = 0;
sarr = nil;
bufs = 512;
actionflag = dieflag = 0;
+ nc = 0;
}
}
+ [self spinoffReadLoop];
return self;
}
return self;
}
@@
-65,6
+67,7
@@
sarr = nil;
bufs = 512;
actionflag = dieflag = 0;
sarr = nil;
bufs = 512;
actionflag = dieflag = 0;
+ nc = 1;
}
return self;
}
}
return self;
}
@@
-103,18
+106,25
@@
{
NSEnumerator *e = [arr objectEnumerator];
NSData *d;
{
NSEnumerator *e = [arr objectEnumerator];
NSData *d;
- struct addrinfo *a;
+ struct addrinfo *a
,*oa
;
ai = malloc(sizeof(struct addrinfo));
ai = malloc(sizeof(struct addrinfo));
- a = ai;
+ ai_cur = ai;
+ oa = a = ai;
+ bzero(a,sizeof(struct addrinfo));
while (d = [e nextObject])
{
struct sockaddr *s = (struct sockaddr*)[d bytes];
while (d = [e nextObject])
{
struct sockaddr *s = (struct sockaddr*)[d bytes];
+ bzero(a,sizeof(struct addrinfo));
a->ai_family = s->sa_family;
a->ai_addr = s;
a->ai_next = malloc(sizeof(struct addrinfo));
a->ai_family = s->sa_family;
a->ai_addr = s;
a->ai_next = malloc(sizeof(struct addrinfo));
+ oa = a;
a = a->ai_next;
}
a = a->ai_next;
}
- ai_cur = ai;
+ free(a);
+ oa->ai_next = NULL;
+ NSLog(@"Sockaddr connecting....");
+ [self dumpv6Addrinfo:ai];
[self realDoConnection];
}
}
[self realDoConnection];
}
}
@@
-123,6
+133,7
@@
{
NSLog(@"Got a disconnect");
dieflag = 1;
{
NSLog(@"Got a disconnect");
dieflag = 1;
+ do {} while (dieflag == 1);
}
-(void)retryConnection
}
-(void)retryConnection
@@
-153,11
+164,10
@@
-(void)newDataAdded:(ITByteStream*)sender
{
-(void)newDataAdded:(ITByteStream*)sender
{
- NSLog(@"writePipe got something");
- actionflag = 1;
- do {} while (actionflag == 1);
- NSLog(@"thread saw actionFlag");
}
}
+
+-(ITByteStream*)readPipe {return readPipe;}
+-(ITByteStream*)writePipe {return writePipe;}
@end
@implementation ITInetSocket(Debugging)
@end
@implementation ITInetSocket(Debugging)
@@
-215,7
+225,7
@@
-(void)realDoConnection
{
-(void)realDoConnection
{
- sockfd = socket(ai_cur->ai_
addr->sa_
family,SOCK_STREAM,IPPROTO_TCP);
+ sockfd = socket(ai_cur->ai_family,SOCK_STREAM,IPPROTO_TCP);
[self spinoffReadLoop];
}
[self spinoffReadLoop];
}
@@
-234,22
+244,25
@@
NSConnection *dcon = [[NSConnection alloc] initWithReceivePort:[data objectAtIndex:0] sendPort:[data objectAtIndex:1]];
NSProxy *dp = [[dcon rootProxy] retain];
char *buf = malloc(bufs);
NSConnection *dcon = [[NSConnection alloc] initWithReceivePort:[data objectAtIndex:0] sendPort:[data objectAtIndex:1]];
NSProxy *dp = [[dcon rootProxy] retain];
char *buf = malloc(bufs);
- unsigned long readLen = 0;
+ unsigned long readLen = 0
,wpl = 0
;
signed int err;
signed int err;
- [readPipe setDelegate:dp];
+ [readPipe setDelegate:(id <ITInetSocketDelegate>)dp];
+ if (nc){
NSLog(@"Connecting");
err = connect(sockfd,ai_cur->ai_addr,ai_cur->ai_addrlen);
if (err == -1)
{
perror("CAwh");
NSLog(@"Connecting");
err = connect(sockfd,ai_cur->ai_addr,ai_cur->ai_addrlen);
if (err == -1)
{
perror("CAwh");
+ *((char*)NULL) = 12;
[(id)dp errorOccured:ITInetCouldNotConnect during:ITInetSocketConnecting onSocket:self];
goto dieaction;
}
[(id)dp errorOccured:ITInetCouldNotConnect during:ITInetSocketConnecting onSocket:self];
goto dieaction;
}
+ }
NSLog(@"Sending finishedConnecting");
[(id)dp finishedConnecting:self];
lstart:
state = ITInetSocketListening;
NSLog(@"Sending finishedConnecting");
[(id)dp finishedConnecting:self];
lstart:
state = ITInetSocketListening;
- while (!actionflag && !dieflag)
+ while (!actionflag && !dieflag
&& !(wpl = CFDataGetLength((CFDataRef)writePipe->data))
)
{
readLen = recv(sockfd,buf,bufs,0);
state = ITInetSocketReading;
{
readLen = recv(sockfd,buf,bufs,0);
state = ITInetSocketReading;
@@
-280,10
+293,13
@@
dieaction:
}
{
}
{
+ const char *d = CFDataGetBytePtr((CFDataRef)writePipe->data);
state = ITInetSocketWriting;
state = ITInetSocketWriting;
- NSLog(@"Emptying writePipe");
- NSData *d = [writePipe readAllData];
- write(sockfd,[d bytes],[d length]);
+ NSLog(@"Writing");
+ [writePipe lockStream];
+ wpl = send(sockfd,d,wpl,0);
+ [writePipe shortenData:wpl];
+ [writePipe unlockStream];
[ap release];
ap = [[NSAutoreleasePool alloc] init];
goto lstart;
[ap release];
ap = [[NSAutoreleasePool alloc] init];
goto lstart;