summaryrefslogtreecommitdiff
path: root/nchan.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-06 11:47:28 +1100
committerDamien Miller <djm@mindrot.org>1999-12-06 11:47:28 +1100
commitaae6c614da614eb10ced16505f35410671c95d9d (patch)
tree441e578781d38e7de4c5f609a4f86695d937e640 /nchan.c
parentdc33fc3910552c82518503b581efc1a51192fa76 (diff)
- Merged OpenBSD CVS changes:
- [auth-krb4.c auth-passwd.c auth-skey.c ssh. move skey-auth from auth-passwd.c to auth-s - [auth-rsa.c] warn only about mismatch if key is _used_ warn about keysize-mismatch with log() not channels.c readconf.c readconf.h ssh.c ssh. ports are u_short - [hostfile.c] indent, shorter warning - [nchan.c] use error() for internal errors - [packet.c] set loglevel for SSH_MSG_DISCONNECT to log( serverloop.c indent - [ssh-add.1 ssh-add.c ssh.h] document , reasonable default - [ssh.1] CheckHostIP is not available for connects v - [sshconnect.c] typo easier to read client code for passwd and s turn of checkhostip for proxy connects, sin
Diffstat (limited to 'nchan.c')
-rw-r--r--nchan.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/nchan.c b/nchan.c
index 065b69ba..23d180c4 100644
--- a/nchan.c
+++ b/nchan.c
@@ -28,7 +28,7 @@
*/
#include "includes.h"
-RCSID("$Id: nchan.c,v 1.3 1999/11/25 00:54:59 damien Exp $");
+RCSID("$Id: nchan.c,v 1.4 1999/12/06 00:47:29 damien Exp $");
#include "ssh.h"
@@ -65,7 +65,7 @@ chan_rcvd_oclose(Channel *c)
chan_delele_if_full_closed(c);
break;
default:
- debug("protocol error: chan_rcvd_oclose %d for istate %d", c->self, c->istate);
+ error("protocol error: chan_rcvd_oclose %d for istate %d", c->self, c->istate);
break;
}
}
@@ -79,7 +79,7 @@ chan_read_failed(Channel *c)
c->istate = CHAN_INPUT_WAIT_DRAIN;
break;
default:
- debug("internal error: we do not read, but chan_read_failed %d for istate %d",
+ error("internal error: we do not read, but chan_read_failed %d for istate %d",
c->self, c->istate);
break;
}
@@ -88,7 +88,7 @@ void
chan_ibuf_empty(Channel *c)
{
if (buffer_len(&c->input)) {
- debug("internal error: chan_ibuf_empty %d for non empty buffer", c->self);
+ error("internal error: chan_ibuf_empty %d for non empty buffer", c->self);
return;
}
switch (c->istate) {
@@ -98,7 +98,7 @@ chan_ibuf_empty(Channel *c)
c->istate = CHAN_INPUT_WAIT_OCLOSE;
break;
default:
- debug("internal error: chan_ibuf_empty %d for istate %d", c->self, c->istate);
+ error("internal error: chan_ibuf_empty %d for istate %d", c->self, c->istate);
break;
}
}
@@ -118,7 +118,7 @@ chan_rcvd_ieof(Channel *c)
chan_delele_if_full_closed(c);
break;
default:
- debug("protocol error: chan_rcvd_ieof %d for ostate %d", c->self, c->ostate);
+ error("protocol error: chan_rcvd_ieof %d for ostate %d", c->self, c->ostate);
break;
}
}
@@ -138,7 +138,7 @@ chan_write_failed(Channel *c)
chan_delele_if_full_closed(c);
break;
default:
- debug("internal error: chan_write_failed %d for ostate %d", c->self, c->ostate);
+ error("internal error: chan_write_failed %d for ostate %d", c->self, c->ostate);
break;
}
}
@@ -157,7 +157,7 @@ chan_obuf_empty(Channel *c)
chan_delele_if_full_closed(c);
break;
default:
- debug("internal error: chan_obuf_empty %d for ostate %d", c->self, c->ostate);
+ error("internal error: chan_obuf_empty %d for ostate %d", c->self, c->ostate);
break;
}
}
@@ -176,7 +176,7 @@ chan_send_ieof(Channel *c)
packet_send();
break;
default:
- debug("internal error: channel %d: cannot send IEOF for istate %d", c->self, c->istate);
+ error("internal error: channel %d: cannot send IEOF for istate %d", c->self, c->istate);
break;
}
}
@@ -193,7 +193,7 @@ chan_send_oclose(Channel *c)
packet_send();
break;
default:
- debug("internal error: channel %d: cannot send OCLOSE for ostate %d", c->self, c->istate);
+ error("internal error: channel %d: cannot send OCLOSE for ostate %d", c->self, c->istate);
break;
}
}