diff --git a/Source/win32/NSStreamWin32.m b/Source/win32/NSStreamWin32.m index 0c702860c..00882a13c 100644 --- a/Source/win32/NSStreamWin32.m +++ b/Source/win32/NSStreamWin32.m @@ -1072,98 +1072,6 @@ static void setNonblocking(SOCKET fd) return self; } -static id propertyForInet4Stream(int descriptor, NSString *key) -{ - struct sockaddr_in sin; - unsigned size = sizeof(sin); - id result = nil; - - if ([key isEqualToString: GSStreamLocalAddressKey]) - { - if (getsockname(descriptor, (struct sockaddr*)&sin, &size) != -1) - { - result = [NSString stringWithUTF8String: - (char*)inet_ntoa(sin.sin_addr)]; - } - } - else if ([key isEqualToString: GSStreamLocalPortKey]) - { - if (getsockname(descriptor, (struct sockaddr*)&sin, &size) != -1) - { - result = [NSString stringWithFormat: @"%d", - (int)GSSwapBigI16ToHost(sin.sin_port)]; - } - } - else if ([key isEqualToString: GSStreamRemoteAddressKey]) - { - if (getpeername(descriptor, (struct sockaddr*)&sin, &size) != -1) - { - result = [NSString stringWithUTF8String: - (char*)inet_ntoa(sin.sin_addr)]; - } - } - else if ([key isEqualToString: GSStreamRemotePortKey]) - { - if (getpeername(descriptor, (struct sockaddr*)&sin, &size) != -1) - { - result = [NSString stringWithFormat: @"%d", - (int)GSSwapBigI16ToHost(sin.sin_port)]; - } - } - return result; -} -#if defined(AF_INET6) -static id propertyForInet6Stream(int descriptor, NSString *key) -{ - struct sockaddr_in6 sin; - unsigned size = sizeof(sin); - id result = nil; - - if ([key isEqualToString: GSStreamLocalAddressKey]) - { - if (getsockname(descriptor, (struct sockaddr*)&sin, &size) != -1) - { - char buf[INET6_ADDRSTRLEN+1]; - - if (inet_ntop(AF_INET6, &(sin.sin6_addr), buf, INET6_ADDRSTRLEN) == 0) - { - buf[INET6_ADDRSTRLEN] = '\0'; - result = [NSString stringWithUTF8String: buf]; - } - } - } - else if ([key isEqualToString: GSStreamLocalPortKey]) - { - if (getsockname(descriptor, (struct sockaddr*)&sin, &size) != -1) - { - result = [NSString stringWithFormat: @"%d", - (int)GSSwapBigI16ToHost(sin.sin6_port)]; - } - } - else if ([key isEqualToString: GSStreamRemoteAddressKey]) - { - if (getpeername(descriptor, (struct sockaddr*)&sin, &size) != -1) - { - char buf[INET6_ADDRSTRLEN+1]; - - if (inet_ntop(AF_INET6, &(sin.sin6_addr), buf, INET6_ADDRSTRLEN) == 0) - { - buf[INET6_ADDRSTRLEN] = '\0'; - result = [NSString stringWithUTF8String: buf]; - } - } - } - else if ([key isEqualToString: GSStreamRemotePortKey]) - { - if (getpeername(descriptor, (struct sockaddr*)&sin, &size) != -1) - { - result = [NSString stringWithFormat: @"%d", - (int)GSSwapBigI16ToHost(sin.sin6_port)]; - } - } - return result; -} -#endif @end @implementation GSFileOutputStream