other_mirrors/ iodine
1
0
Fork 0
mirror of https://github.com/yarrick/iodine.git synced 2024-06-02 07:09:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'window-size-zero' from Masaq-

This commit is contained in:
frekky 2017-06-24 20:03:16 +02:00
parent 2219dc370b 94251811da
commit 6ea754329f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client.c
View File

@ -1028,7 +1028,7 @@ tunnel_tun()
if (this.conn == CONN_DNS_NULL) {
/* Check if outgoing buffer can hold data */
if (window_buffer_available(this.outbuf) < (read / MAX_FRAGSIZE) + 1) {
if ((0 == this.windowsize_up && 0 != this.outbuf->numitems) || window_buffer_available(this.outbuf) < (read / MAX_FRAGSIZE) + 1) {
DEBUG(1, " Outgoing buffer full (%" L "u/%" L "u), not adding data!",
this.outbuf->numitems, this.outbuf->length);
return -1;
@ -1353,7 +1353,7 @@ client_tunnel()
FD_ZERO(&fds);
maxfd = 0;
if (this.conn != CONN_DNS_NULL || window_buffer_available(this.outbuf) > 1) {
if (this.conn != CONN_DNS_NULL || 0 == this.windowsize_up || window_buffer_available(this.outbuf) > 1) {
/* Fill up outgoing buffer with available data if it has enough space
* The windowing protocol manages data retransmits, timeouts etc. */
if (this.use_remote_forward) {
@ -2715,7 +2715,7 @@ client_handshake()
return -1;
/* init windowing protocol */
this.outbuf = window_buffer_init(64, this.windowsize_up, this.maxfragsize_up, WINDOW_SENDING);
this.outbuf = window_buffer_init(64, (0 == this.windowsize_up ? 1 : this.windowsize_up), this.maxfragsize_up, WINDOW_SENDING);
this.outbuf->timeout = ms_to_timeval(this.downstream_timeout_ms);
/* Incoming buffer max fragsize doesn't matter */
this.inbuf = window_buffer_init(64, this.windowsize_down, MAX_FRAGSIZE, WINDOW_RECVING);

2
src/iodine.c
View File

@ -683,7 +683,7 @@ main(int argc, char **argv)
}
int max_ws = MAX_SEQ_ID / 2;
if (this.windowsize_up < 1 || this.windowsize_down < 1 ||
if (this.windowsize_up < 0 || this.windowsize_down < 1 ||
this.windowsize_up > max_ws || this.windowsize_down > max_ws) {
warnx("Window sizes (-w or -W) must be between 0 and %d!", max_ws);
usage();