Deleted Added
full compact
channels.c (256281) channels.c (258343)
1/* $OpenBSD: channels.c,v 1.324 2013/07/12 00:19:58 djm Exp $ */
2/* $FreeBSD: stable/10/crypto/openssh/channels.c 255767 2013-09-21 21:36:09Z des $ */
1/* $OpenBSD: channels.c,v 1.327 2013/11/08 00:39:15 djm Exp $ */
2/* $FreeBSD: stable/10/crypto/openssh/channels.c 258343 2013-11-19 11:47:30Z des $ */
3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
5 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
6 * All rights reserved
7 * This file contains functions for generic socket connection forwarding.
8 * There is also code for initiating connection forwarding for X11 connections,
9 * arbitrary tcp/ip connections, and the authentication agent connection.
10 *

--- 695 unchanged lines hidden (view full) ---

706 channel_confirm_abandon_cb *abandon_cb, void *ctx)
707{
708 struct channel_confirm *cc;
709 Channel *c;
710
711 if ((c = channel_lookup(id)) == NULL)
712 fatal("channel_register_expect: %d: bad id", id);
713
3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
5 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
6 * All rights reserved
7 * This file contains functions for generic socket connection forwarding.
8 * There is also code for initiating connection forwarding for X11 connections,
9 * arbitrary tcp/ip connections, and the authentication agent connection.
10 *

--- 695 unchanged lines hidden (view full) ---

706 channel_confirm_abandon_cb *abandon_cb, void *ctx)
707{
708 struct channel_confirm *cc;
709 Channel *c;
710
711 if ((c = channel_lookup(id)) == NULL)
712 fatal("channel_register_expect: %d: bad id", id);
713
714 cc = xmalloc(sizeof(*cc));
714 cc = xcalloc(1, sizeof(*cc));
715 cc->cb = cb;
716 cc->abandon_cb = abandon_cb;
717 cc->ctx = ctx;
718 TAILQ_INSERT_TAIL(&c->status_confirms, cc, entry);
719}
720
721void
722channel_register_open_confirm(int id, channel_open_fn *fn, void *ctx)

--- 3159 unchanged lines hidden ---
715 cc->cb = cb;
716 cc->abandon_cb = abandon_cb;
717 cc->ctx = ctx;
718 TAILQ_INSERT_TAIL(&c->status_confirms, cc, entry);
719}
720
721void
722channel_register_open_confirm(int id, channel_open_fn *fn, void *ctx)

--- 3159 unchanged lines hidden ---