LOTS more socket work. It can connect. It looks like it can read/write, but I'm not...

diff --git a/ITInetSocket.h b/ITInetSocket.h
index aaf55b9..1b5af64 100755 (executable)
--- a/ITInetSocket.h
+++ b/ITInetSocket.h
@@ -65,12 +65,12 @@ typedef enum {
  */
 @protocol ITInetSocketDelegate
 /*!
- * @method dataRecieved:
+ * @method dataReceived:
  * @abstract Alerts the delegate of data.
  * @discussion The delegate should check [sender readPipe] to get the data.
  * @param sender The socket that the messages came from.
  */
-- (void) dataRecieved:(in ITInetSocket *)sender;
+- (void) dataReceived:(in ITInetSocket *)sender;
 /*!
  * @method errorOccured:during:onSocket:
  * @abstract Alerts the delegate of an error condition.
@@ -103,8 +103,8 @@ typedef enum {
     int sockfd;
     int port;
     unsigned short bufs;
-    int dieflag;
-    int actionflag;
+    volatile int dieflag;
+    volatile int actionflag;
     id <ITInetSocketDelegate,NSObject> delegate;
     struct addrinfo *ai, *ai_cur;
     ITByteStream *readPipe, *writePipe;

diff --git a/ITInetSocket.m b/ITInetSocket.m
index 7d3989b..0719779 100755 (executable)
--- 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
@@ -118,10 +119,15 @@
 
 -(void)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
@@ -148,32 +154,27 @@
 -(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
@@ -186,19 +187,26 @@
           const char *portNam = [namedPort cString], *hostCStr = [host cString];
 
           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_addr->sa_family,SOCK_STREAM,IPPROTO_TCP);
+    [self spinoffReadLoop];
 }
 
 -(void)spinoffReadLoop
@@ -217,22 +225,39 @@
     NSProxy *dp = [dcon rootProxy];
     char *buf = malloc(bufs);
     unsigned long readLen = 0;
-
+    signed int err;
+    NSLog(@"EYE MAEK CONNECT");
+    err = connect(sockfd,ai_cur->ai_addr,ai_cur->ai_addrlen);
+    if (err == -1)
+          {
+          perror("CAwh");
+          [(id)dp errorOccured:ITInetCouldNotConnect during:ITInetSocketConnecting onSocket:self];
+          goto dieaction;
+          }
+    [(id)dp finishedConnecting:self];
 lstart:
-    do
+
+          while (!actionflag && ![writePipe availableDataLength])
           {
-                 NSData *d = [NSData alloc];
+                 NSData *d;
                  readLen = recv(sockfd,buf,bufs,0);
-                 [d initWithBytesNoCopy:buf length:readLen];
-                 [readPipe writeData:d];
-                 [d release];
-                 [dp dataRecieved:self];
+                 if (readLen) {
+                        d = [NSData alloc];
+                        [d initWithBytesNoCopy:buf length:readLen];
+                        [readPipe writeData:d];
+                        [d release];
+                        [(id)dp dataReceived:self];
+                 }
           }
-    while (!actionflag);
+
     actionflag = 0;
+
     if (dieflag)
           {
+dieaction:
+          perror("Awh");
           free(buf);
+          shutdown(sockfd,2);
           [dcon release];
           [ap release];
           dieflag = 0;
@@ -244,5 +269,6 @@ lstart:
           write(sockfd,[d bytes],[d length]);
           goto lstart;
           }
+    goto dieaction;
 }
 @end
\ No newline at end of file

diff --git a/ShowcaseController.h b/ShowcaseController.h
index 2e18b74..8b4aef8 100755 (executable)
--- a/ShowcaseController.h
+++ b/ShowcaseController.h
@@ -7,9 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <ITFoundation/ITFoundation.h>
+#import <ITFoundation/ITInetSocket.h>
 
-@interface ShowcaseController : NSObject <ITInetServerSocketOwner> {
+@interface ShowcaseController : NSObject <ITInetSocketDelegate> {
 
 }
 

diff --git a/ShowcaseController.m b/ShowcaseController.m
index 722756f..c1eef3c 100755 (executable)
--- a/ShowcaseController.m
+++ b/ShowcaseController.m
@@ -7,22 +7,29 @@
 //
 
 #import "ShowcaseController.h"
+#import "ITInetSocket.h"
 
 
 @implementation ShowcaseController
 - (void)awakeFromNib
 {
-    /*
-    ITInetServerSocket *sock = [[ITInetServerSocket alloc] initWithDelegate:self];
+    
+    ITInetSocket *sock = [[ITInetSocket alloc] initWithDelegate:self];
     NSLog(@"rawr?");
-    [sock setPort:4776];
-    [sock setServiceName:@"Test Rendezvous Service"];
-    [sock setServiceType:@"ittest" useForPort:NO];
-    [sock start];
-       */
+    [sock connectToHost:@"66.111.58.80" onPort:4336];
 }
 
-- (void)newClientJoined:(ITInetSocket*)client
+- (void) finishedConnecting:(in ITInetSocket *)sender {
+    NSLog(@"Done connectin'");
+    NSData *d = [NSData dataWithBytesNoCopy:"M00f!" length:5];
+    [sender->writePipe writeData:d];
+}
+- (void) errorOccured:(ITInetSocketError)err during:(ITInetSocketState)state onSocket:(in ITInetSocket*)sender {NSLog(@"wtf");[sender retryConnection];}
+- (void) dataReceived:(in ITInetSocket *)sender
 {
+    ITByteStream *p = sender->readPipe;
+    NSData *d = [p readAllData];
+    NSLog(@"%@",d);
 }
+
 @end