src/usr.bin/ssh/channels.c - diff

Return to channels.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.346, 2015/06/30 05:25:07

version 1.347, 2015/07/01 02:26:31

Line 155

static char *x11_saved_data = NULL;

static u_int x11_saved_data_len = 0;

/* Deadline after which all X11 connections are refused */

static u_int x11_refuse_time;

* Fake X11 authentication data. This is what the server will be sending us;

* we should replace any occurrences of this by the real data.

Line 902

Line 905

u_char *ucp;

u_int proto_len, data_len;

/* Is this being called after the refusal deadline? */

if (x11_refuse_time != 0 && (u_int)monotime() >= x11_refuse_time) {

verbose("Rejected X11 connection after ForwardX11Timeout "

"expired");

return -1;

}

/* Check if the fixed size part of the packet is in buffer. */

if (buffer_len(b) < 12)

return 0;

Line 1471

Line 1481

if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1)

error("setsockopt SO_REUSEADDR fd %d: %s", fd, strerror(errno));

}

void

channel_set_x11_refuse_time(u_int refuse_time)

{

x11_refuse_time = refuse_time;

}