X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/d0e2a23f6909335baea90af08491a5160026757b..086eb4c9abbda3c5d5f74c07800ad5cb04a50505:/ITInetSocket.m diff --git a/ITInetSocket.m b/ITInetSocket.m index 7d3989b..b7441cb 100755 --- a/ITInetSocket.m +++ b/ITInetSocket.m @@ -18,6 +18,7 @@ @interface ITInetSocket(Private) -(void)doConnSetupWithHost:(NSString*)host namedPort:(NSString*)namedPort; +-(void)realDoConnection; -(void)spinoffReadLoop; -(void)socketReadLoop:(id)data; @end @@ -29,7 +30,7 @@ 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 )d @@ -40,13 +41,15 @@ sockfd = fd; delegate = [d retain]; port = 0; - writePipe = [[ITByteStream alloc] init]; - readPipe = [[ITByteStream alloc] init]; + writePipe = [[ITByteStream alloc] initWithDelegate:self]; + readPipe = [[ITByteStream alloc] initWithDelegate:d]; ai = nil; sarr = nil; bufs = 512; actionflag = dieflag = 0; + nc = 0; } + [self spinoffReadLoop]; return self; } @@ -58,12 +61,13 @@ sockfd = -1; delegate = [d retain]; port = 0; - writePipe = [[ITByteStream alloc] init]; - readPipe = [[ITByteStream alloc] init]; + writePipe = [[ITByteStream alloc] initWithDelegate:self]; + readPipe = [[ITByteStream alloc] initWithDelegate:d]; ai = nil; sarr = nil; bufs = 512; actionflag = dieflag = 0; + nc = 1; } return self; } @@ -102,26 +106,41 @@ { NSEnumerator *e = [arr objectEnumerator]; NSData *d; - struct addrinfo *a; + struct addrinfo *a,*oa; 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]; + bzero(a,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; } + free(a); + oa->ai_next = NULL; + NSLog(@"Sockaddr connecting...."); + [self dumpv6Addrinfo:ai]; + [self realDoConnection]; } } -(void)disconnect { + NSLog(@"Got a disconnect"); + dieflag = 1; + do {} while (dieflag == 1); } -(void)retryConnection { + ai_cur = ai_cur->ai_next?ai_cur->ai_next:ai_cur; + [self disconnect]; + [self realDoConnection]; } -(ITInetSocketState)state @@ -142,38 +161,40 @@ { bufs = _bufs; } + +-(void)newDataAdded:(ITByteStream*)sender +{ +} + +-(ITByteStream*)readPipe {return readPipe;} +-(ITByteStream*)writePipe {return writePipe;} @end @implementation ITInetSocket(Debugging) -(NSString*)dumpv6Addrinfo:(struct addrinfo *)_ai { const char *cfmt = - "\{\n" + "{\n" "Flags = %x\n" "Family = %x\n" "Socktype = %x\n" "Protocol = %x\n" "Canonname = %s\n" "Sockaddr = \n" - "{\n" + "\t{\n" "\tLength = %x\n" "\tFamily = %x\n" "\tPort = %d\n" "\tFlowinfo = %x\n" "\tAddr = {%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx}\n" "\tScope = %x\n" - "}\n" - "Next = "; + "\t}\n" + "Next = %@\n" + "}\n"; NSString *nsfmt = [NSString stringWithCString:cfmt]; - NSMutableString *buf = [[[NSMutableString alloc] init] autorelease]; + struct sockaddr_in6 *sa = (struct sockaddr_in6 *)_ai->ai_addr; + NSString *buf = [[NSMutableString alloc] initWithFormat:nsfmt,_ai->ai_flags,_ai->ai_family,_ai->ai_socktype,_ai->ai_protocol,_ai->ai_canonname?_ai->ai_canonname:"",sa->sin6_len,sa->sin6_family,sa->sin6_port,sa->sin6_flowinfo,sa->sin6_addr.__u6_addr.__u6_addr16[0],sa->sin6_addr.__u6_addr.__u6_addr16[1],sa->sin6_addr.__u6_addr.__u6_addr16[2],sa->sin6_addr.__u6_addr.__u6_addr16[3],sa->sin6_addr.__u6_addr.__u6_addr16[4],sa->sin6_addr.__u6_addr.__u6_addr16[5],sa->sin6_addr.__u6_addr.__u6_addr16[6],sa->sin6_addr.__u6_addr.__u6_addr16[7],sa->sin6_scope_id,_ai->ai_next?[self dumpv6Addrinfo:_ai->ai_next]:@"nil"]; - do - { - struct sockaddr_in6 *sa = (struct sockaddr_in6 *)_ai->ai_addr; - [buf appendFormat:nsfmt,_ai->ai_flags,_ai->ai_family,_ai->ai_socktype,_ai->ai_protocol,_ai->ai_canonname?_ai->ai_canonname:"",sa->sin6_len,sa->sin6_family,sa->sin6_port,sa->sin6_flowinfo,sa->sin6_addr.__u6_addr.__u6_addr16[0],sa->sin6_addr.__u6_addr.__u6_addr16[1],sa->sin6_addr.__u6_addr.__u6_addr16[2],sa->sin6_addr.__u6_addr.__u6_addr16[3],sa->sin6_addr.__u6_addr.__u6_addr16[4],sa->sin6_addr.__u6_addr.__u6_addr16[5],sa->sin6_addr.__u6_addr.__u6_addr16[6],sa->sin6_addr.__u6_addr.__u6_addr16[7],sa->sin6_scope_id]; - } - while (_ai = _ai->ai_next); - [buf appendString:@"nil\n}"]; return buf; } @end @@ -184,21 +205,28 @@ struct addrinfo hints; int err; const char *portNam = [namedPort cString], *hostCStr = [host cString]; - + state = ITInetSocketConnecting; hints.ai_flags = 0; - hints.ai_family = PF_INET6; + hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP; + hints.ai_addrlen = 0; hints.ai_canonname = NULL; hints.ai_addr = NULL; hints.ai_next = NULL; err = getaddrinfo(hostCStr,portNam,&hints,&ai); - if (err == EAI_NODATA) //it's a dotted-decimal IPv4 string, so we use v6compat stuff now - { - err = getaddrinfo([[NSString stringWithFormat:@"ffff::%s",hostCStr] cString],portNam,&hints,&ai); - } - NSLog([self dumpv6Addrinfo:ai]); + + NSLog(@"%s, h %@ p %@",gai_strerror(err),host,namedPort); + NSLog(ai?[self dumpv6Addrinfo:ai]:@""); + ai_cur = ai; + [self realDoConnection]; +} + +-(void)realDoConnection +{ + sockfd = socket(ai_cur->ai_family,SOCK_STREAM,IPPROTO_TCP); + [self spinoffReadLoop]; } -(void)spinoffReadLoop @@ -214,35 +242,68 @@ { NSAutoreleasePool *ap = [[NSAutoreleasePool alloc] init]; NSConnection *dcon = [[NSConnection alloc] initWithReceivePort:[data objectAtIndex:0] sendPort:[data objectAtIndex:1]]; - NSProxy *dp = [dcon rootProxy]; + NSProxy *dp = [[dcon rootProxy] retain]; char *buf = malloc(bufs); - unsigned long readLen = 0; - + unsigned long readLen = 0,wpl = 0; + signed int err; + [readPipe setDelegate:(id )dp]; + if (nc){ + 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; + } + } + NSLog(@"Sending finishedConnecting"); + [(id)dp finishedConnecting:self]; lstart: - do + state = ITInetSocketListening; + while (!actionflag && !dieflag && !(wpl = CFDataGetLength((CFDataRef)writePipe->data))) { - NSData *d = [NSData alloc]; readLen = recv(sockfd,buf,bufs,0); - [d initWithBytesNoCopy:buf length:readLen]; - [readPipe writeData:d]; - [d release]; - [dp dataRecieved:self]; + state = ITInetSocketReading; + if (readLen == -1) {[(id)dp errorOccured:ITInetConnectionDropped during:ITInetSocketReading onSocket:self];goto dieaction;} + if (readLen) { + NSLog(@"recv'd"); + NSLog(@"Doing writeData to readPipe"); + [readPipe writeBytes:buf len:readLen]; + [ap release]; + ap = [[NSAutoreleasePool alloc] init]; + } } - while (!actionflag); + state = ITInetSocketListening; actionflag = 0; + if (dieflag) { +dieaction: + state = ITInetSocketDisconnected; + perror("Awh"); free(buf); + shutdown(sockfd,2); [dcon release]; + [dp release]; [ap release]; dieflag = 0; return; } { - NSData *d = [writePipe readAllData]; - write(sockfd,[d bytes],[d length]); + const char *d = CFDataGetBytePtr((CFDataRef)writePipe->data); + state = ITInetSocketWriting; + NSLog(@"Writing"); + [writePipe lockStream]; + wpl = send(sockfd,d,wpl,0); + [writePipe shortenData:wpl]; + [writePipe unlockStream]; + [ap release]; + ap = [[NSAutoreleasePool alloc] init]; goto lstart; } + goto dieaction; } @end \ No newline at end of file