search for: channel_pr

...*auth_sock_name = NULL; static char *auth_sock_dir = NULL; +#endif /* AF_UNSPEC or AF_INET or AF_INET6 */ static int IPv4or6 = AF_UNSPEC; +#ifdef WITH_TCPFWD /* helper */ static void port_open_helper(Channel *c, char *rtype); +#endif /* -- channel core */ @@ -678,6 +683,7 @@ chan_fn *channel_pre[SSH_CHANNEL_MAX_TYPE]; chan_fn *channel_post[SSH_CHANNEL_MAX_TYPE]; +#ifdef WITH_TCPFWD static void channel_pre_listener(Channel *c, fd_set * readset, fd_set * writeset) { @@ -690,7 +696,9 @@ debug3("channel %d: waiting for connection", c->self); FD_SET(c->sock, writeset)...

...n_addr)); - buffer_append(&c->output, &dest_port, sizeof(dest_port)); + buffer_append(output, &s5_rsp, sizeof(s5_rsp)); + buffer_append(output, &dest_addr, sizeof(struct in_addr)); + buffer_append(output, &dest_port, sizeof(dest_port)); return 1; } @@ -1317,6 +1341,92 @@ channel_pre_dynamic(Channel *c, fd_set *readset, fd_set *writeset) } } +static void +channel_pre_rdynamic(Channel *c, fd_set *readset, fd_set *writeset) +{ + u_char *p; + u_int have; + int ret; + + if (c->sock >= 0) { + /* SOCKS session was established. */ + FD_SET(c->sock, writeset); + retur...

...if (c->type == SSH2_CHANNEL_PORT_LISTENER) + packet_put_cstring("forwarded-tcpip"); + else + packet_put_cstring("direct-tcpip"); packet_put_int(newch); packet_put_int(c->local_window_max); packet_put_int(c->local_maxpacket); @@ -820,10 +826,12 @@ channel_pre[SSH_CHANNEL_OPEN] = &channel_pre_open_20; channel_pre[SSH_CHANNEL_X11_OPEN] = &channel_pre_x11_open; channel_pre[SSH_CHANNEL_PORT_LISTENER] = &channel_pre_listener; + channel_pre[SSH2_CHANNEL_PORT_LISTENER] = &channel_pre_listener; channel_pre[SSH_CHANNEL_X11_LISTENER] =...

...if (c->type == SSH2_CHANNEL_PORT_LISTENER) + packet_put_cstring("forwarded-tcpip"); + else + packet_put_cstring("direct-tcpip"); packet_put_int(newch); packet_put_int(c->local_window_max); packet_put_int(c->local_maxpacket); @@ -786,10 +799,12 @@ channel_pre[SSH_CHANNEL_OPEN] = &channel_pre_open_20; channel_pre[SSH_CHANNEL_X11_OPEN] = &channel_pre_x11_open; channel_pre[SSH_CHANNEL_PORT_LISTENER] = &channel_pre_listener; + channel_pre[SSH2_CHANNEL_PORT_LISTENER] = &channel_pre_listener; channel_pre[SSH_CHANNEL_X11_LISTENER] =...

...igned-bugs at mindrot.org Reporter: m.schmidt at emtec.com Created attachment 3690 --> https://bugzilla.mindrot.org/attachment.cgi?id=3690&action=edit A few lines of code to fix the channels leak. Function channel_free_all(struct ssh *ssh) misses to free some of its elements: - channel_pre - channel_post - and the permitted_user and permitted_adm from local and remote perms This was found through a memory leaking tool (I'm building on Windows Visual Studio with memory leaks enabled). I would suggest to add something akin to the attached to the bottom of channel_free_all(struct...

...o channels in * select bitmasks. */ --- channels.c~ Wed Jun 13 15:18:05 2001 +++ channels.c Thu Jul 12 08:32:53 2001 @@ -1160,6 +1160,14 @@ } void +channel_zero_set(fd_set *setp, int maxfdp) +{ + u_int sz = howmany(maxfdp+1, NFDBITS) * sizeof(fd_mask); + + memset(setp, 0, sz); +} + +void channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp, int rekeying) { @@ -1178,8 +1186,8 @@ *writesetp = xmalloc(sz); *maxfdp = n; } - memset(*readsetp, 0, sz); - memset(*writesetp, 0, sz); + channel_zero_set(*readsetp, *maxfdp); + channel_zero_set(*writesetp, *maxfdp);...

Three patches attached. One implements a 'ControlPersist' option, which when used with 'ControlMaster auto' or 'ControlMaster 'yes' make makes the master background itself and stick around after its own primary session is completed. The second causes control clients to pass X11 display, auth proto and auth data over the control socket so that appropriate X11

...te_id, c->istate, buffer_len(&c->input), c->ostate, buffer_len(&c->output), - c->rfd, c->wfd, c->ctl_fd); + c->rfd, c->wfd, c->ctl_chan); buffer_append(&buffer, buf, strlen(buf)); continue; default: @@ -834,9 +839,6 @@ channel_pre_open(Channel *c, fd_set *rea FD_SET(c->efd, readset); } /* XXX: What about efd? races? */ - if (compat20 && c->ctl_fd != -1 && - c->istate == CHAN_INPUT_OPEN && c->ostate == CHAN_OUTPUT_OPEN) - FD_SET(c->ctl_fd, readset); } /* ARGSUSED */ @@...

https://bugzilla.mindrot.org/show_bug.cgi?id=2573 Bug ID: 2573 Summary: dead sessions cannot be closed with ~. Product: Portable OpenSSH Version: 3.7.1p2 Hardware: Other OS: Linux Status: NEW Severity: normal Priority: P5 Component: ssh Assignee: unassigned-bugs at mindrot.org