diff options
| author | Ondrej Filip <feela@network.cz> | 2005-02-14 23:15:04 +0000 |
|---|---|---|
| committer | Ondrej Filip <feela@network.cz> | 2005-02-14 23:15:04 +0000 |
| commit | c025b85273178bc7c129bf54e420a91c775a9340 (patch) | |
| tree | b1b6f22928ed13ba1c5f509bc7578b2a3776f044 | |
| parent | 2eef9e887ad82976476ea81aa3a25d97c3956b87 (diff) | |
Real write is only in sk_maybe_write. Previous change partially reverted.
Thank you MJ.
| -rw-r--r-- | sysdep/unix/io.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index d34ff2fd..7dcca21a 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -75,13 +75,6 @@ tracked_fopen(pool *p, char *name, char *mode) return f; } -void -c_err_hook(struct birdsock *s, int err) -{ - s->ttx = s->tpos; /* empty tx buffer */ - s->err_hook(s, err); -} - /** * DOC: Timers * @@ -687,7 +680,7 @@ sk_passive_connected(sock *s, struct sockaddr *sa, int al, int type) else if (errno != EINTR && errno != EAGAIN) { log(L_ERR "accept: %m"); - c_err_hook(s, errno); + s->err_hook(s, errno); } return 0; } @@ -905,7 +898,8 @@ sk_maybe_write(sock *s) { if (errno != EINTR && errno != EAGAIN) { - c_err_hook(s, errno); + s->ttx = s->tpos; /* empty tx buffer */ + s->err_hook(s, errno); return -1; } return 0; @@ -930,7 +924,8 @@ sk_maybe_write(sock *s) { if (errno != EINTR && errno != EAGAIN) { - c_err_hook(s, errno); + s->ttx = s->tpos; /* empty tx buffer */ + s->err_hook(s, errno); return -1; } return 0; @@ -1008,10 +1003,10 @@ sk_read(sock *s) if (c < 0) { if (errno != EINTR && errno != EAGAIN) - c_err_hook(s, errno); + s->err_hook(s, errno); } else if (!c) - c_err_hook(s, 0); + s->err_hook(s, 0); else { s->rpos += c; @@ -1036,7 +1031,7 @@ sk_read(sock *s) if (e < 0) { if (errno != EINTR && errno != EAGAIN) - c_err_hook(s, errno); + s->err_hook(s, errno); return 0; } s->rpos = s->rbuf + e; @@ -1059,7 +1054,7 @@ sk_write(sock *s) if (connect(s->fd, (struct sockaddr *) &sa, sizeof(sa)) >= 0 || errno == EISCONN) sk_tcp_connected(s); else if (errno != EINTR && errno != EAGAIN && errno != EINPROGRESS) - c_err_hook(s, errno); + s->err_hook(s, errno); return 0; } default: |