PuTTy: Diff

Differences From Artifact [63d6340166]:

File x11fwd.c — part of check-in [39f0cd437b] at 2009-04-23 12:39:36 on branch trunk — When giving authorisation errors from the proxy code in x11fwd.c, name the proxy using the global 'appname' variable, instead of statically calling it PuTTY. (Knock-on effect is that PSCP and PSFTP have to declare that variable, though of course they shouldn't ever actually _use_ the X forwarding code. Probably I ought to replace it with a stub nox11fwd.c for those applications.) (user: simon size: 23413)

To Artifact [e6b822ef3d]:

File x11fwd.c — part of check-in [a2c0243430] at 2011-07-14 13:52:21 on branch trunk — Post-release destabilisation! Completely remove the struct type 'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. (user: simon size: 23386)

︙			︙
64 65 66 67 68 69 70 ~~71 72~~ 73 74 75 76 77 78 79	static void dummy_plug_sent(Plug p, int bufsize) { } static int dummy_plug_accepting(Plug p, OSSocket sock) { return 1; } static const struct plug_function_table dummy_plug = { dummy_plug_log, dummy_plug_closing, dummy_plug_receive, dummy_plug_sent, dummy_plug_accepting }; ~~struct X11Display x11_setup_display(char display, int authtype, ~~const Config cfg)~~~~ { struct X11Display disp = snew(struct X11Display); char localcopy; int i; if (!display \|\| !display) { localcopy = platform_get_x_display();	\| <	64 65 66 67 68 69 70 71 72 73 74 75 76 77 78	static void dummy_plug_sent(Plug p, int bufsize) { } static int dummy_plug_accepting(Plug p, OSSocket sock) { return 1; } static const struct plug_function_table dummy_plug = { dummy_plug_log, dummy_plug_closing, dummy_plug_receive, dummy_plug_sent, dummy_plug_accepting }; struct X11Display x11_setup_display(char display, int authtype, Conf conf) { struct X11Display disp = snew(struct X11Display); char localcopy; int i; if (!display \|\| !display) { localcopy = platform_get_x_display();
︙			︙
162 163 164 165 166 167 168 ~~169~~ 170 171 172 173 174 175 176	* Look up the display hostname, if we need to. / if (!disp->unixdomain) { const char err; disp->port = 6000 + disp->displaynum; disp->addr = name_lookup(disp->hostname, disp->port, ~~&disp->realhost, cfg, ADDRTYPE_UNSPEC);~~ if ((err = sk_addr_error(disp->addr)) != NULL) { sk_addr_free(disp->addr); sfree(disp->hostname); sfree(disp->unixsocketpath); return NULL; /* FIXME: report an error */ }	\|	161 162 163 164 165 166 167 168 169 170 171 172 173 174 175	* Look up the display hostname, if we need to. / if (!disp->unixdomain) { const char err; disp->port = 6000 + disp->displaynum; disp->addr = name_lookup(disp->hostname, disp->port, &disp->realhost, conf, ADDRTYPE_UNSPEC); if ((err = sk_addr_error(disp->addr)) != NULL) { sk_addr_free(disp->addr); sfree(disp->hostname); sfree(disp->unixsocketpath); return NULL; /* FIXME: report an error */ }
︙			︙
245 246 247 248 249 250 251 ~~252~~ 253 254 255 256 257 258 259	/* * Fetch the local authorisation details. / disp->localauthproto = X11_NO_AUTH; disp->localauthdata = NULL; disp->localauthdatalen = 0; ~~platform_get_x11_auth(disp, cfg);~~ return disp; } void x11_free_display(struct X11Display disp) { if (disp->xdmseen != NULL) {	\|	244 245 246 247 248 249 250 251 252 253 254 255 256 257 258	/* * Fetch the local authorisation details. / disp->localauthproto = X11_NO_AUTH; disp->localauthdata = NULL; disp->localauthdatalen = 0; platform_get_x11_auth(disp, conf); return disp; } void x11_free_display(struct X11Display disp) { if (disp->xdmseen != NULL) {
︙			︙
554 555 556 557 558 559 560 ~~561 562~~ 563 564 565 566 567 568 569	/* * Called to set up the raw connection. * * Returns an error message, or NULL on success. * also, fills the SocketsStructure / extern const char x11_init(Socket s, struct X11Display disp, void c, ~~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	\| <	553 554 555 556 557 558 559 560 561 562 563 564 565 566 567	/* * Called to set up the raw connection. * * Returns an error message, or NULL on success. * also, fills the SocketsStructure / extern const char x11_init(Socket s, struct X11Display disp, void c, const char peeraddr, int peerport, Conf *conf) { static const struct plug_function_table fn_table = { x11_log, x11_closing, x11_receive, x11_sent, NULL
︙			︙
582 583 584 585 586 587 588 ~~589~~ 590 591 592 593 594 595 596	pr->verified = 0; pr->data_read = 0; pr->throttled = pr->throttle_override = 0; pr->c = c; pr->s = s = new_connection(sk_addr_dup(disp->addr), disp->realhost, disp->port, ~~0, 1, 0, 0, (Plug) pr, cfg);~~ if ((err = sk_socket_error(s)) != NULL) { sfree(pr); return err; } /* * See if we can make sense of the peer address we were given.	\|	580 581 582 583 584 585 586 587 588 589 590 591 592 593 594	pr->verified = 0; pr->data_read = 0; pr->throttled = pr->throttle_override = 0; pr->c = c; pr->s = s = new_connection(sk_addr_dup(disp->addr), disp->realhost, disp->port, 0, 1, 0, 0, (Plug) pr, conf); if ((err = sk_socket_error(s)) != NULL) { sfree(pr); return err; } /* * See if we can make sense of the peer address we were given.
︙			︙