Differences From Artifact [12d8d53e3a]:

• File x11fwd.c — part of check-in [99d7fec46d] at 2004-12-30 10:45:11 on branch trunk — Integrate unfix.org's IPv6 patches up to level 10, with rather a lot of polishing to bring them to what I think should in principle be release quality. Unlike the unfix.org patches themselves, this checkin enables IPv6 by default; if you want to leave it out, you have to build with COMPAT=-DNO_IPV6. I have tested that this compiles on Visual C 7 (so the nightlies _should_ acquire IPv6 support without missing a beat), but since I don't have IPv6 set up myself I haven't actually tested that it _works_. It still seems to make correct IPv4 connections, but that's all I've been able to verify for myself. Further testing is needed. (user: simon size: 14675)

To Artifact [6fbf603504]:

• File x11fwd.c — part of check-in [d774282d73] at 2005-01-16 08:29:34 on branch trunk — Support for falling back through the list of addresses returned from a DNS lookup, whether they're IPv4, v6 or a mixture of both. (user: simon size: 14875)

173
174
175
176
177
178
179






180
181
182
183
184
185
186

	tim = time(NULL);
	if (abs(t - tim) > 20*60)      /* 20 minute clock skew should be OK */
	    return "XDM-AUTHORIZATION-1 time stamp was too far out";
    }
    /* implement other protocols here if ever required */
    return NULL;
}







static int x11_closing(Plug plug, const char *error_msg, int error_code,
		       int calling_back)
{
    struct X11Private *pr = (struct X11Private *) plug;

    /*

>
>
>
>
>
>

173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192

	tim = time(NULL);
	if (abs(t - tim) > 20*60)      /* 20 minute clock skew should be OK */
	    return "XDM-AUTHORIZATION-1 time stamp was too far out";
    }
    /* implement other protocols here if ever required */
    return NULL;
}

static void x11_log(Plug p, int type, SockAddr addr, int port,
		    const char *error_msg, int error_code)
{
    /* We have no interface to the logging module here, so we drop these. */
}

static int x11_closing(Plug plug, const char *error_msg, int error_code,
		       int calling_back)
{
    struct X11Private *pr = (struct X11Private *) plug;

    /*

255
256
257
258
259
260
261

262
263
264
265
266
267
268

 * Returns an error message, or NULL on success.
 * also, fills the SocketsStructure
 */
const char *x11_init(Socket * s, char *display, void *c, void *auth,
		     const char *peeraddr, int peerport, const Config *cfg)
{
    static const struct plug_function_table fn_table = {

	x11_closing,
	x11_receive,
	x11_sent,
	NULL
    };

    SockAddr addr;

>

261
262
263
264
265
266
267
268
269
270
271
272
273
274
275

 * Returns an error message, or NULL on success.
 * also, fills the SocketsStructure
 */
const char *x11_init(Socket * s, char *display, void *c, void *auth,
		     const char *peeraddr, int peerport, const Config *cfg)
{
    static const struct plug_function_table fn_table = {
	x11_log,
	x11_closing,
	x11_receive,
	x11_sent,
	NULL
    };

    SockAddr addr;