gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add some error checking for socks support

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25922 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2008-01-10 14:17:05 +00:00
parent bb7865a248
commit f5ae48acd7
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Source/GSSocketStream.m
View file

@ -592,7 +592,7 @@ static NSString * const GSSOCKSAckConn = @"GSSOCKSAckConn";
@implementation GSSOCKS
+ (void) tryInput: (GSSocketInputStream*)i output: (GSSocketOutputStream*)o
{
NSDictionary *conf;
NSDictionary *conf;
conf = [i propertyForKey: NSStreamSOCKSProxyConfigurationKey];
if (conf == nil)
@ -610,7 +610,44 @@ static NSString * const GSSOCKSAckConn = @"GSSOCKSAckConn";
if (conf != nil)
{
GSSOCKS *h;
GSSOCKS *h;
struct sockaddr *sa = [i _address];
NSString *v;
BOOL i6 = NO;
v = [conf objectForKey: NSStreamSOCKSProxyVersionKey];
if ([v isEqualToString: NSStreamSOCKSProxyVersion4] == YES)
{
v = NSStreamSOCKSProxyVersion4;
}
else
{
v = NSStreamSOCKSProxyVersion5;
}
#if defined(AF_INET6)
if (sa->sa_family == AF_INET6)
{
i6 = YES;
}
else
#endif
if (sa->sa_family != AF_INET)
{
GSOnceMLog(@"SOCKS not supported for socket type %d", sa->sa_family);
return;
}
if (v == NSStreamSOCKSProxyVersion5)
{
GSOnceMLog(@"SOCKS 5 not supported yet");
return;
}
else if (i6 == YES)
{
GSOnceMLog(@"INET6 not supported with SOCKS 4");
return;
}
h = [[GSSOCKS alloc] initWithInput: i output: o];
[i _setHandler: h];