search for: s4_req

...found++; + if (found == need) + break; } if (i > 1024) { /* the peer is probably sending garbage */ @@ -1056,7 +1066,7 @@ channel_decode_socks4(Channel *c, fd_set return -1; } } - if (!found) + if (found < need) return 0; buffer_get(&c->input, (char *)&s4_req.version, 1); buffer_get(&c->input, (char *)&s4_req.command, 1); @@ -1066,19 +1076,33 @@ channel_decode_socks4(Channel *c, fd_set p = buffer_ptr(&c->input); len = strlen(p); debug2("channel %d: decode socks4: user %s/%d", c->self, p, len); + len++; /* trail...

...case SSH_CHANNEL_DYNAMIC: + case SSH_CHANNEL_RDYNAMIC: case SSH_CHANNEL_OPEN: case SSH_CHANNEL_X11_OPEN: case SSH_CHANNEL_INPUT_DRAINING: @@ -1033,14 +1038,23 @@ channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset) u_int16_t dest_port; struct in_addr dest_addr; } s4_req, s4_rsp; + Buffer *input, *output; + + if (c->type == SSH_CHANNEL_RDYNAMIC) { + input = &c->output; + output = &c->input; + } else { + input = &c->input; + output = &c->output; + } debug2("channel %d: decode socks4", c->self); - have = buffer_le...

...+++ openssh-3.1p1-1-socks4a/channels.c Fri May 10 16:52:12 2002 @@ -908,11 +908,34 @@ channel_decode_socks4(Channel *c, fd_set strlcpy(username, p, sizeof(username)); buffer_consume(&c->input, len); buffer_consume(&c->input, 1); /* trailing '\0' */ - host = inet_ntoa(s4_req.dest_addr); - strlcpy(c->path, host, sizeof(c->path)); c->host_port = ntohs(s4_req.dest_port); + + /* check for socks4a vs socks4 */ + if (0 == (s4_req.dest_addr.s_addr & htonl(IN_CLASSC_NET))) { + /* + * is client using socks4a? if the first three octets of the IP + * are zer...

OpenSSH 3.0 has just been released. It will be available from the mirrors listed at http://www.openssh.com/ shortly. OpenSSH is a 100% complete SSH protocol version 1.3, 1.5 and 2.0 implementation and includes sftp client and server support. This release contains many portability bug-fixes (listed in the ChangeLog) as well as several new features (listed below). We would like to thank the