#define logevent(s) { logevent(s); \
if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) \
- fprintf(stderr, "%s\n", s); }
+ { fprintf(stderr, "%s\n", s); fflush(stderr); } }
#define bombout(msg) ( ssh_state = SSH_STATE_CLOSED, \
(s ? sk_close(s), s = NULL : 0), \
}
static int alloc_channel_id(void) {
- const int CHANNEL_NUMBER_OFFSET = 256;
- int low, high, mid;
+ const unsigned CHANNEL_NUMBER_OFFSET = 256;
+ unsigned low, high, mid;
int tsize;
struct ssh_channel *c;
if (pktin.type == SSH1_MSG_DISCONNECT) {
/* log reason code in disconnect message */
char buf[256];
- int msglen = GET_32BIT(pktin.body);
- int nowlen;
+ unsigned msglen = GET_32BIT(pktin.body);
+ unsigned nowlen;
strcpy(buf, "Remote sent disconnect: ");
nowlen = strlen(buf);
if (msglen > sizeof(buf)-nowlen-1)
/* log reason code in disconnect message */
char buf[256];
int reason = GET_32BIT(pktin.data+6);
- int msglen = GET_32BIT(pktin.data+10);
- int nowlen;
+ unsigned msglen = GET_32BIT(pktin.data+10);
+ unsigned nowlen;
if (reason > 0 && reason < lenof(ssh2_disconnect_reasons)) {
sprintf(buf, "Received disconnect message (%s)",
ssh2_disconnect_reasons[reason]);
} else if (pktin.type == SSH1_SMSG_X11_OPEN) {
/* Remote side is trying to open a channel to talk to our
* X-Server. Give them back a local channel number. */
- struct ssh_channel *c, *d;
+ struct ssh_channel *c;
logevent("Received X11 connect request");
/* Refuse if X11 forwarding is disabled. */
} else if (pktin.type == SSH1_SMSG_AGENT_OPEN) {
/* Remote side is trying to open a channel to talk to our
* agent. Give them back a local channel number. */
- unsigned i;
struct ssh_channel *c;
/* Refuse if agent forwarding is disabled. */
method = 0;
- if (!method && can_pubkey && agent_exists && !tried_agent) {
+ if (!method && can_pubkey && agent_exists() && !tried_agent) {
/*
* Attempt public-key authentication using Pageant.
*/
ssh2_pkt_send();
sfree(c);
} else {
- struct ssh_channel *d;
- unsigned i;
-
c->localid = alloc_channel_id();
c->closes = 0;
c->v2.remwindow = ssh2_pkt_getuint32();