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

Return to channels.c CVS log

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

version 1.223, 2005/07/17 07:17:54

version 1.224, 2005/09/07 08:53:53

Line 2656

char strport[NI_MAXSERV];

int gaierr, n, num_socks = 0, socks[NUM_SOCKS];

if (chanids == NULL)

return -1;

for (display_number = x11_display_offset;

display_number < MAX_DISPLAYS;

display_number++) {

Line 2715

Line 2718

}

/* Allocate a channel for each socket. */

if (chanids != NULL)

*chanids = xmalloc(sizeof(**chanids) * (num_socks + 1));

for (n = 0; n < num_socks; n++) {

sock = socks[n];

nc = channel_new("x11 listener",

Line 2724

Line 2726

CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT,

0, "X11 inet listener", 1);

nc->single_connection = single_connection;

if (*chanids != NULL)

(*chanids)[n] = nc->self;

}

if (*chanids != NULL)

(*chanids)[n] = -1;

/* Return the display number for the DISPLAY environment variable. */

*display_numberp = display_number;