summaryrefslogtreecommitdiffstats
path: root/sysdep/unix
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>2000-04-28 00:35:08 +0200
committerMartin Mares <mj@ucw.cz>2000-04-28 00:35:08 +0200
commitf75e3bbc01f2b711d1a2479eddd9ea35f8cfff47 (patch)
tree8063cd5dab1f0441a8cf49de52a6c6fb52b806bc /sysdep/unix
parent54896cbdba42a2ccd83c7f23c8ba14bed37a8b73 (diff)
downloadbird-f75e3bbc01f2b711d1a2479eddd9ea35f8cfff47.tar
bird-f75e3bbc01f2b711d1a2479eddd9ea35f8cfff47.zip
Fixed a couple of nasty CLI bugs which were triggered on long or multi-part
outputs. It took a whole evening to hunt them down, but now the CLI seems to work fine. Now I run three BGP connections with several thousand routes!
Diffstat (limited to 'sysdep/unix')
-rw-r--r--sysdep/unix/io.c2
-rw-r--r--sysdep/unix/main.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 35af2df..895f537 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -870,7 +870,7 @@ sk_write(sock *s)
case SK_DELETED:
return;
default:
- while (s->ttx != s->tbuf && sk_maybe_write(s) > 0)
+ while (s->ttx != s->tpos && sk_maybe_write(s) > 0)
s->tx_hook(s);
}
}
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 621d85c..06d1d1d 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -179,9 +179,10 @@ cli_write(cli *c)
struct cli_out *o = c->tx_pos;
c->tx_pos = o->next;
s->tbuf = o->outpos;
- return sk_send(s, o->wpos - o->outpos);
+ if (sk_send(s, o->wpos - o->outpos) > 0)
+ ev_schedule(c->event);
}
- return 1;
+ return !c->tx_pos;
}
int