mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
- make socks-patch portable
This commit is contained in:
parent
56eeb6e4e9
commit
4da2b13204
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=72133
@ -1,27 +1,29 @@
|
|||||||
--- src/socket.cpp.orig Tue Jul 23 12:22:13 2002
|
--- src/socket.cpp.orig Tue Jul 23 07:22:13 2002
|
||||||
+++ src/socket.cpp Thu Aug 8 03:07:32 2002
|
+++ src/socket.cpp Mon Dec 16 19:21:03 2002
|
||||||
@@ -13,6 +13,7 @@
|
@@ -13,6 +13,9 @@
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
+#ifdef __FreeBSD__
|
||||||
+#include <osreldate.h>
|
+#include <osreldate.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
#ifdef HAVE_INET_ATON
|
#ifdef HAVE_INET_ATON
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
@@ -304,6 +305,8 @@
|
@@ -304,6 +307,8 @@
|
||||||
// Setup the local structure
|
// Setup the local structure
|
||||||
#ifdef USE_SOCKS5
|
#ifdef USE_SOCKS5
|
||||||
int sizeofSockaddr = sizeof(struct sockaddr_in);
|
int sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
+#elif __FreeBSD_version < 400013
|
+#elif defined(__FreeBSD__) && __FreeBSD_version < 400013
|
||||||
+ int sizeofSockaddr = sizeof(struct sockaddr_in);
|
+ int sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
#else
|
#else
|
||||||
socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
|
socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
#endif
|
#endif
|
||||||
@@ -416,7 +419,11 @@
|
@@ -416,7 +421,11 @@
|
||||||
m_sRemoteAddr.sin_family = AF_INET;
|
m_sRemoteAddr.sin_family = AF_INET;
|
||||||
|
|
||||||
// if connect fails then call CloseConnection to clean up before returning
|
// if connect fails then call CloseConnection to clean up before returning
|
||||||
+#if __FreeBSD_version < 400013
|
+#if defined(__FreeBSD__) && __FreeBSD_version < 400013
|
||||||
+ int sizeofSockaddr = sizeof(struct sockaddr);
|
+ int sizeofSockaddr = sizeof(struct sockaddr);
|
||||||
+#else
|
+#else
|
||||||
socklen_t sizeofSockaddr = sizeof(struct sockaddr);
|
socklen_t sizeofSockaddr = sizeof(struct sockaddr);
|
||||||
@ -29,12 +31,12 @@
|
|||||||
if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
|
if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
|
||||||
{
|
{
|
||||||
// errno has been set
|
// errno has been set
|
||||||
@@ -691,6 +698,8 @@
|
@@ -691,6 +700,8 @@
|
||||||
void TCPSocket::RecvConnection(TCPSocket &newSocket)
|
void TCPSocket::RecvConnection(TCPSocket &newSocket)
|
||||||
{
|
{
|
||||||
#ifdef USE_SOCKS5
|
#ifdef USE_SOCKS5
|
||||||
+ int sizeofSockaddr = sizeof(struct sockaddr_in);
|
+ int sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
+#elif __FreeBSD_version < 400013
|
+#elif defined(__FreeBSD__) && __FreeBSD_version < 400013
|
||||||
int sizeofSockaddr = sizeof(struct sockaddr_in);
|
int sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
#else
|
#else
|
||||||
socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
|
socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
|
@ -1,27 +1,29 @@
|
|||||||
--- src/socket.cpp.orig Tue Jul 23 12:22:13 2002
|
--- src/socket.cpp.orig Tue Jul 23 07:22:13 2002
|
||||||
+++ src/socket.cpp Thu Aug 8 03:07:32 2002
|
+++ src/socket.cpp Mon Dec 16 19:21:03 2002
|
||||||
@@ -13,6 +13,7 @@
|
@@ -13,6 +13,9 @@
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
+#ifdef __FreeBSD__
|
||||||
+#include <osreldate.h>
|
+#include <osreldate.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
#ifdef HAVE_INET_ATON
|
#ifdef HAVE_INET_ATON
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
@@ -304,6 +305,8 @@
|
@@ -304,6 +307,8 @@
|
||||||
// Setup the local structure
|
// Setup the local structure
|
||||||
#ifdef USE_SOCKS5
|
#ifdef USE_SOCKS5
|
||||||
int sizeofSockaddr = sizeof(struct sockaddr_in);
|
int sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
+#elif __FreeBSD_version < 400013
|
+#elif defined(__FreeBSD__) && __FreeBSD_version < 400013
|
||||||
+ int sizeofSockaddr = sizeof(struct sockaddr_in);
|
+ int sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
#else
|
#else
|
||||||
socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
|
socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
#endif
|
#endif
|
||||||
@@ -416,7 +419,11 @@
|
@@ -416,7 +421,11 @@
|
||||||
m_sRemoteAddr.sin_family = AF_INET;
|
m_sRemoteAddr.sin_family = AF_INET;
|
||||||
|
|
||||||
// if connect fails then call CloseConnection to clean up before returning
|
// if connect fails then call CloseConnection to clean up before returning
|
||||||
+#if __FreeBSD_version < 400013
|
+#if defined(__FreeBSD__) && __FreeBSD_version < 400013
|
||||||
+ int sizeofSockaddr = sizeof(struct sockaddr);
|
+ int sizeofSockaddr = sizeof(struct sockaddr);
|
||||||
+#else
|
+#else
|
||||||
socklen_t sizeofSockaddr = sizeof(struct sockaddr);
|
socklen_t sizeofSockaddr = sizeof(struct sockaddr);
|
||||||
@ -29,12 +31,12 @@
|
|||||||
if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
|
if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
|
||||||
{
|
{
|
||||||
// errno has been set
|
// errno has been set
|
||||||
@@ -691,6 +698,8 @@
|
@@ -691,6 +700,8 @@
|
||||||
void TCPSocket::RecvConnection(TCPSocket &newSocket)
|
void TCPSocket::RecvConnection(TCPSocket &newSocket)
|
||||||
{
|
{
|
||||||
#ifdef USE_SOCKS5
|
#ifdef USE_SOCKS5
|
||||||
+ int sizeofSockaddr = sizeof(struct sockaddr_in);
|
+ int sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
+#elif __FreeBSD_version < 400013
|
+#elif defined(__FreeBSD__) && __FreeBSD_version < 400013
|
||||||
int sizeofSockaddr = sizeof(struct sockaddr_in);
|
int sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
#else
|
#else
|
||||||
socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
|
socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
|
||||||
|
Loading…
Reference in New Issue
Block a user