ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-04-06 13:45:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

connect_remote() is now always non-blocking

Browse Source
This commit is contained in:
Matt Johnston 2015-02-14 09:56:11 +08:00
parent 2c35f1c8fd
commit 9abcc7b909
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli-main.c
View File

@ -72,8 +72,7 @@ int main(int argc, char ** argv) {
} else
#endif
{
int sock = connect_remote(cli_opts.remotehost, cli_opts.remoteport,
1, &error);
int sock = connect_remote(cli_opts.remotehost, cli_opts.remoteport, &error);
sock_in = sock_out = sock;
}

2
cli-tcpfwd.c
View File

@ -254,7 +254,7 @@ static int newtcpforwarded(struct Channel * channel) {
}
snprintf(portstring, sizeof(portstring), "%d", fwd->connectport);
sock = connect_remote(fwd->connectaddr, portstring, 1, NULL);
sock = connect_remote(fwd->connectaddr, portstring, NULL);
if (sock < 0) {
TRACE(("leave newtcpdirect: sock failed"))
err = SSH_OPEN_CONNECT_FAILED;

13
dbutil.c
View File

@ -435,8 +435,7 @@ static void set_piggyback_ack(int sock) {
* wasn't null, it will be a newly malloced error message */
/* TODO: maxfd */
int connect_remote(const char* remotehost, const char* remoteport,
int nonblocking, char ** errstring) {
int connect_remote(const char* remotehost, const char* remoteport, char ** errstring) {
struct addrinfo *res0 = NULL, *res = NULL, hints;
int sock;
@ -475,16 +474,14 @@ int connect_remote(const char* remotehost, const char* remoteport,
continue;
}
if (nonblocking) {
setnonblocking(sock);
setnonblocking(sock);
#if defined(__linux__) && defined(TCP_DEFER_ACCEPT)
set_piggyback_ack(sock);
set_piggyback_ack(sock);
#endif
}
if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) {
if (errno == EINPROGRESS && nonblocking) {
if (errno == EINPROGRESS) {
TRACE(("Connect in progress"))
break;
} else {
@ -498,7 +495,7 @@ int connect_remote(const char* remotehost, const char* remoteport,
break; /* Success */
}
if (sock < 0 && !(errno == EINPROGRESS && nonblocking)) {
if (sock < 0 && !(errno == EINPROGRESS)) {
/* Failed */
if (errstring != NULL && *errstring == NULL) {
int len;

3
dbutil.h
View File

@ -83,8 +83,7 @@ void run_shell_command(const char* cmd, unsigned int maxfd, char* usershell);
#ifdef ENABLE_CONNECT_UNIX
int connect_unix(const char* addr);
#endif
int connect_remote(const char* remotehost, const char* remoteport,
int nonblocking, char ** errstring);
int connect_remote(const char* remotehost, const char* remoteport, char ** errstring);
int buf_readfile(buffer* buf, const char* filename);
int buf_getline(buffer * line, FILE * authfile);

2
svr-tcpfwd.c
View File

@ -270,7 +270,7 @@ static int newtcpdirect(struct Channel * channel) {
}
snprintf(portstring, sizeof(portstring), "%d", destport);
sock = connect_remote(desthost, portstring, 1, NULL);
sock = connect_remote(desthost, portstring, NULL);
if (sock < 0) {
err = SSH_OPEN_CONNECT_FAILED;
TRACE(("leave newtcpdirect: sock failed"))