mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

- Handle EISCONN

Browse Source 
PR:		ports/196115
Submitted by:	Anthony Cornehl <accornehl@fastmail.fm>
This commit is contained in:
Bryan Drewery 2014-12-19 02:17:30 +00:00
parent e21d3ab409
commit 46bdb81107
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=374938
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/tsocks/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= tsocks
PORTVERSION= 1.8.b5
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= net security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.8%20beta%205 \
http://ftp1.sourceforge.net/tsocks/ \
@ -45,5 +45,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/*.example ${STAGEDIR}${EXAMPLESDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}/README
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
.include <bsd.port.mk>

19
net/tsocks/files/patch-tsocks.c Normal file
View File

@ -0,0 +1,19 @@
--- tsocks.c.orig 2014-12-19 02:01:24 UTC
+++ tsocks.c
@@ -852,7 +852,7 @@ static int connect_server(struct connreq
sizeof(conn->serveraddr));
show_msg(MSGDEBUG, "Connect returned %d, errno is %d\n", rc, errno);
- if (rc) {
+ if (rc && errno != EISCONN) {
if (errno != EINPROGRESS) {
show_msg(MSGERR, "Error %d attempting to connect to SOCKS "
"server (%s)\n", errno, strerror(errno));
@@ -862,6 +862,7 @@ static int connect_server(struct connreq
conn->state = CONNECTING;
}
} else {
+ rc = 0;
show_msg(MSGDEBUG, "Socket %d connected to SOCKS server\n", conn->sockid);
conn->state = CONNECTED;
}