X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/c1dc61cc189c0eb83fe8027c70949b9c4dcdbd24..52cc5b84bdd910fe315c8a77dd8a9a5b0f6d0502:/ITInetSocket.m?ds=sidebyside

diff --git a/ITInetSocket.m b/ITInetSocket.m
index 09f94f5..4e40628 100755
--- a/ITInetSocket.m
+++ b/ITInetSocket.m
@@ -7,14 +7,29 @@
 //
 
 #import "ITInetSocket.h"
+#import "ITServiceBrowserDelegate.h"
 #import <sys/socket.h>
 #import <arpa/inet.h>
 
+
 @interface ITInetSocket(Debugging)
 -(NSString*)dumpv6Addrinfo:(struct addrinfo *)_ai;
 @end
 
+@interface ITInetSocket(Private)
+-(void)doConnSetupWithHost:(NSString*)host namedPort:(NSString*)namedPort;
+@end
+
 @implementation ITInetSocket
++(void)startAutoconnectingToService:(NSString*)type delegate:(id)d
+{
+    NSNetServiceBrowser *browse = [[NSNetServiceBrowser alloc] init];
+    ITServiceBrowserDelegate *bd = [[ITServiceBrowserDelegate alloc] initWithDelegate:d];
+
+    [browse setDelegate:bd];
+    [browse searchForServicesOfType:[NSString stringWithFormat:@"._%@._tcp",type] inDomain:nil];
+}
+
 -(id)initWithFD:(int)fd delegate:(id)d
 {
     if (self = [super init])
@@ -23,12 +38,24 @@
 	   sockfd = fd;
 	   delegate = [d retain];
 	   port = 0;
-	   writeBuffer = nil;
+	   writePipe = [[ITByteStream alloc] init];
+	   readPipe = [[ITByteStream alloc] init];
 	   ai = nil;
+	   sarr = nil;
 	   }
     return self;
 }
 
+-(void) dealloc
+{
+    shutdown(sockfd,2);
+    [delegate release];
+    [writePipe release];
+    [readPipe release];
+    if (!sarr) freeaddrinfo(ai);
+    [sarr release];
+}
+
 -(id)initWithDelegate:(id)d
 {
     if (self = [super init])
@@ -37,8 +64,10 @@
 	   sockfd = -1;
 	   delegate = [d retain];
 	   port = 0;
-	   writeBuffer = nil;
+	   writePipe = [[ITByteStream alloc] init];
+	   readPipe = [[ITByteStream alloc] init];
 	   ai = nil;
+	   sarr = nil;
 	   }
     return self;
 }
@@ -47,24 +76,33 @@
 {
     if (state == ITInetSocketDisconnected)
 	   {
-	   struct addrinfo hints;
-	   int err;
-	   const char *portNam = [[[NSNumber numberWithShort:thePort] stringValue] cString], *hostCStr = [host cString];
-
-	   hints.ai_flags = 0;
-	   hints.ai_family = PF_INET6;
-	   hints.ai_socktype = SOCK_STREAM;
-	   hints.ai_protocol = IPPROTO_TCP;
-	   hints.ai_canonname = NULL;
-	   hints.ai_addr = NULL;
-	   hints.ai_next = NULL;
+	   NSString *nport = [[NSNumber numberWithShort:thePort] stringValue];
+	   [self doConnSetupWithHost:host namedPort:nport];
+	   }
+}
 
-	   err = getaddrinfo(hostCStr,portNam,&hints,&ai);
-	   if (err == EAI_NODATA) //it's a dotted-decimal IPv4 string, so we use v6compat stuff now
+-(void) connectToHost:(NSString*)host onNamedPort:(NSString*)_port
+{
+    if (state == ITInetSocketDisconnected)
 	   {
-		  err = getaddrinfo([[NSString stringWithFormat:@"ffff::%s",hostCStr] cString],portNam,&hints,&ai);
+	   [self doConnSetupWithHost:host namedPort:_port];
 	   }
-	   NSLog([self dumpv6Addrinfo:ai]);
+}
+
+-(void) connectWithSockaddrArray:(NSArray*)arr
+{
+    NSEnumerator *e = [arr objectEnumerator];
+    NSData *d;
+    struct addrinfo *a;
+    ai = malloc(sizeof(struct addrinfo));
+    a = ai;
+    while (d = [e nextObject])
+	   {
+	   struct sockaddr *s = (struct sockaddr*)[d bytes];
+	   a->ai_family = s->sa_family;
+	   a->ai_addr = s;
+	   a->ai_next = malloc(sizeof(struct addrinfo));
+	   a = a->ai_next;
 	   }
 }
 
@@ -90,7 +128,7 @@
     "\tFamily = %x\n"
     "\tPort = %d\n"
     "\tFlowinfo = %x\n"
-    "\tAddr = {%#lx,%#lx,%#lx,%#lx}\n"
+    "\tAddr = {%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx}\n"
     "\tScope = %x\n"
     "}\n"
     "Next = ";
@@ -100,10 +138,34 @@
     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_addr32[0],sa->sin6_addr.__u6_addr.__u6_addr32[1],sa->sin6_addr.__u6_addr.__u6_addr32[2],sa->sin6_addr.__u6_addr.__u6_addr32[3],sa->sin6_scope_id];
+		  [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
+
+@implementation ITInetSocket(Private)
+-(void)doConnSetupWithHost:(NSString*)host namedPort:(NSString*)namedPort
+{
+    struct addrinfo hints;
+	   int err;
+	   const char *portNam = [namedPort cString], *hostCStr = [host cString];
+
+	   hints.ai_flags = 0;
+	   hints.ai_family = PF_INET6;
+	   hints.ai_socktype = SOCK_STREAM;
+	   hints.ai_protocol = IPPROTO_TCP;
+	   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]);
+}
 @end
\ No newline at end of file