PuTTy: Diff

Differences From Artifact [c546cd1227]:

File ssh.c — part of check-in [127cf34c50] at 2013-07-21 05:12:58 on branch trunk — If the SSH server sends us CHANNEL_CLOSE for a channel on which we're sitting on a pile of buffered data waiting for WINDOW_ADJUSTs, we should throw away that buffered data, because the CHANNEL_CLOSE tells us that we won't be receiving those WINDOW_ADJUSTs, and if we hang on to the data and keep trying then it'll prevent ssh_channel_try_eof from sending the CHANNEL_EOF which is a prerequisite of sending our own CHANNEL_CLOSE. (user: simon size: 315041)

To Artifact [bf95874977]:

File ssh.c — part of check-in [9388e0e1ae] at 2013-07-27 13:35:48 on branch trunk — Add an assortment of missing consts I've just noticed. (user: simon size: 315124)

︙
456 457 458 459 460 461 462 ~~463~~ 464 465 466 467 ~~468 469 470~~ 471 472 473 474 475 476 477	456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477	- + - - - + + +	typedef struct ssh_tag Ssh; struct Packet; static struct Packet ssh1_pkt_init(int pkt_type); static struct Packet ssh2_pkt_init(int pkt_type); static void ssh_pkt_ensure(struct Packet , int length); ~~static void ssh_pkt_adddata(struct Packet , void data, int len);~~ static void ssh_pkt_adddata(struct Packet , const void data, int len); static void ssh_pkt_addbyte(struct Packet , unsigned char value); static void ssh2_pkt_addbool(struct Packet , unsigned char value); static void ssh_pkt_adduint32(struct Packet , unsigned long value); static void ssh_pkt_addstring_start(struct Packet ); ~~static void ssh_pkt_addstring_str(struct Packet , char data); static void ssh_pkt_addstring_data(struct Packet , char data, int len); static void ssh_pkt_addstring(struct Packet , char data);~~ static void ssh_pkt_addstring_str(struct Packet , const char data); static void ssh_pkt_addstring_data(struct Packet , const char data, int len); static void ssh_pkt_addstring(struct Packet , const char data); static unsigned char ssh2_mpint_fmt(Bignum b, int len); static void ssh1_pkt_addmp(struct Packet , Bignum b); static void ssh2_pkt_addmp(struct Packet , Bignum b); static int ssh2_pkt_construct(Ssh, struct Packet ); static void ssh2_pkt_send(Ssh, struct Packet ); static void ssh2_pkt_send_noqueue(Ssh, struct Packet ); static int do_ssh1_login(Ssh ssh, unsigned char in, int inlen,
︙
1825 1826 1827 1828 1829 1830 1831 ~~1832~~ 1833 1834 1835 1836 1837 1838 1839	1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839	- +	unsigned char body = pkt->body; int offset = body ? body - pkt->data : 0; pkt->maxlen = length + 256; pkt->data = sresize(pkt->data, pkt->maxlen + APIEXTRA, unsigned char); if (body) pkt->body = pkt->data + offset; } } ~~static void ssh_pkt_adddata(struct Packet pkt, void data, int len)~~ static void ssh_pkt_adddata(struct Packet pkt, const void *data, int len) { if (pkt->logmode != PKTLOG_EMIT) { pkt->nblanks++; pkt->blanks = sresize(pkt->blanks, pkt->nblanks, struct logblank_t); assert(pkt->body); pkt->blanks[pkt->nblanks-1].offset = pkt->length - (pkt->body - pkt->data);
︙
1859 1860 1861 1862 1863 1864 1865 ~~1866~~ 1867 1868 1869 1870 ~~1871~~ 1872 1873 1874 1875 ~~1876~~ 1877 1878 1879 1880 1881 1882 1883	1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884	- + - + + - +	ssh_pkt_adddata(pkt, x, 4); } static void ssh_pkt_addstring_start(struct Packet pkt) { ssh_pkt_adduint32(pkt, 0); pkt->savedpos = pkt->length; } ~~static void ssh_pkt_addstring_str(struct Packet pkt, char data)~~ static void ssh_pkt_addstring_str(struct Packet pkt, const char data) { ssh_pkt_adddata(pkt, data, strlen(data)); PUT_32BIT(pkt->data + pkt->savedpos - 4, pkt->length - pkt->savedpos); } ~~static void ssh_pkt_addstring_data(struct Packet pkt, char data, ~~int len)~~~~ static void ssh_pkt_addstring_data(struct Packet pkt, const char data, int len) { ssh_pkt_adddata(pkt, data, len); PUT_32BIT(pkt->data + pkt->savedpos - 4, pkt->length - pkt->savedpos); } ~~static void ssh_pkt_addstring(struct Packet pkt, char data)~~ static void ssh_pkt_addstring(struct Packet pkt, const char data) { ssh_pkt_addstring_start(pkt); ssh_pkt_addstring_str(pkt, data); } static void ssh1_pkt_addmp(struct Packet pkt, Bignum b) { int len = ssh1_bignum_length(b);
︙