*/
#include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.81 2001/12/28 14:13:13 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.87 2002/01/24 21:13:23 stevesk Exp $");
#include "xmalloc.h"
#include "buffer.h"
#include "mac.h"
#include "log.h"
#include "canohost.h"
+#include "misc.h"
#ifdef PACKET_DEBUG
#define DBG(x) x
fatal("packet_set_connection: cannot load cipher 'none'");
connection_in = fd_in;
connection_out = fd_out;
- cipher_init(&send_context, none, (u_char *) "", 0, NULL, 0);
- cipher_init(&receive_context, none, (u_char *) "", 0, NULL, 0);
+ cipher_init(&send_context, none, "", 0, NULL, 0);
+ cipher_init(&receive_context, none, "", 0, NULL, 0);
newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL;
if (!initialized) {
initialized = 1;
buffer_consume(&outgoing_packet, 8 - padding);
/* Add check bytes. */
- checksum = ssh_crc32((u_char *) buffer_ptr(&outgoing_packet),
+ checksum = ssh_crc32(buffer_ptr(&outgoing_packet),
buffer_len(&outgoing_packet));
PUT_32BIT(buf, checksum);
buffer_append(&outgoing_packet, buf, 4);
}
block_size = enc ? enc->cipher->block_size : 8;
- ucp = (u_char *) buffer_ptr(&outgoing_packet);
+ ucp = buffer_ptr(&outgoing_packet);
type = ucp[5];
#ifdef PACKET_DEBUG
}
/* packet_length includes payload, padding and padding length field */
packet_length = buffer_len(&outgoing_packet) - 4;
- ucp = (u_char *)buffer_ptr(&outgoing_packet);
+ ucp = buffer_ptr(&outgoing_packet);
PUT_32BIT(ucp, packet_length);
ucp[4] = padlen;
DBG(debug("send: len %d (includes padlen %d)", packet_length+4, padlen));
/* compute MAC over seqnr and packet(length fields, payload, padding) */
if (mac && mac->enabled) {
macbuf = mac_compute(mac, seqnr,
- (u_char *) buffer_ptr(&outgoing_packet),
+ buffer_ptr(&outgoing_packet),
buffer_len(&outgoing_packet));
DBG(debug("done calc MAC out #%d", seqnr));
}
*/
int
-packet_read_seqnr(int *payload_len_ptr, u_int32_t *seqnr_p)
+packet_read_seqnr(u_int32_t *seqnr_p)
{
int type, len;
fd_set *setp;
/* Stay in the loop until we have received a complete packet. */
for (;;) {
/* Try to read a packet from the buffer. */
- type = packet_read_poll_seqnr(payload_len_ptr, seqnr_p);
+ type = packet_read_poll_seqnr(seqnr_p);
if (!compat20 && (
type == SSH_SMSG_SUCCESS
|| type == SSH_SMSG_FAILURE
}
int
-packet_read(int *payload_len_ptr)
+packet_read(void)
{
- return packet_read_seqnr(payload_len_ptr, NULL);
+ return packet_read_seqnr(NULL);
}
/*
*/
void
-packet_read_expect(int *payload_len_ptr, int expected_type)
+packet_read_expect(int expected_type)
{
int type;
- type = packet_read(payload_len_ptr);
+ type = packet_read();
if (type != expected_type)
packet_disconnect("Protocol error: expected packet type %d, got %d",
expected_type, type);
* SSH_MSG_DISCONNECT is handled specially here. Also,
* SSH_MSG_IGNORE messages are skipped by this function and are never returned
* to higher levels.
- *
- * The returned payload_len does include space consumed by:
- * Packet length
- * Padding
- * Packet type
- * Check bytes
*/
static int
-packet_read_poll1(int *payload_len_ptr)
+packet_read_poll1(void)
{
u_int len, padded_len;
u_char *ucp, type;
if (buffer_len(&input) < 4 + 8)
return SSH_MSG_NONE;
/* Get length of incoming packet. */
- ucp = (u_char *) buffer_ptr(&input);
+ ucp = buffer_ptr(&input);
len = GET_32BIT(ucp);
if (len < 1 + 2 + 2 || len > 256 * 1024)
packet_disconnect("Bad packet length %d.", len);
#endif
/* Compute packet checksum. */
- checksum = ssh_crc32((u_char *) buffer_ptr(&incoming_packet),
+ checksum = ssh_crc32(buffer_ptr(&incoming_packet),
buffer_len(&incoming_packet) - 4);
/* Skip padding. */
packet_disconnect("packet_read_poll1: len %d != buffer_len %d.",
len, buffer_len(&incoming_packet));
- ucp = (u_char *) buffer_ptr(&incoming_packet) + len - 4;
+ ucp = (u_char *)buffer_ptr(&incoming_packet) + len - 4;
stored_checksum = GET_32BIT(ucp);
if (checksum != stored_checksum)
packet_disconnect("Corrupted check bytes on input.");
buffer_len(&compression_buffer));
}
type = buffer_get_char(&incoming_packet);
- *payload_len_ptr = buffer_len(&incoming_packet);
return type;
}
static int
-packet_read_poll2(int *payload_len_ptr, u_int32_t *seqnr_p)
+packet_read_poll2(u_int32_t *seqnr_p)
{
static u_int32_t seqnr = 0;
static u_int packet_length = 0;
cp = buffer_append_space(&incoming_packet, block_size);
cipher_decrypt(&receive_context, cp, buffer_ptr(&input),
block_size);
- ucp = (u_char *) buffer_ptr(&incoming_packet);
+ ucp = buffer_ptr(&incoming_packet);
packet_length = GET_32BIT(ucp);
if (packet_length < 1 + 4 || packet_length > 256 * 1024) {
buffer_dump(&incoming_packet);
*/
if (mac && mac->enabled) {
macbuf = mac_compute(mac, seqnr,
- (u_char *) buffer_ptr(&incoming_packet),
+ buffer_ptr(&incoming_packet),
buffer_len(&incoming_packet));
if (memcmp(macbuf, buffer_ptr(&input), mac->mac_len) != 0)
packet_disconnect("Corrupted MAC on input.");
type = buffer_get_char(&incoming_packet);
if (type == SSH2_MSG_NEWKEYS)
set_newkeys(MODE_IN);
- *payload_len_ptr = buffer_len(&incoming_packet);
#ifdef PACKET_DEBUG
fprintf(stderr, "read/plain[%d]:\r\n", type);
buffer_dump(&incoming_packet);
}
int
-packet_read_poll_seqnr(int *payload_len_ptr, u_int32_t *seqnr_p)
+packet_read_poll_seqnr(u_int32_t *seqnr_p)
{
- int reason;
+ int reason, seqnr;
u_char type;
char *msg;
for (;;) {
if (compat20) {
- type = packet_read_poll2(payload_len_ptr, seqnr_p);
+ type = packet_read_poll2(seqnr_p);
if (type)
DBG(debug("received packet type %d", type));
switch (type) {
xfree(msg);
fatal_cleanup();
break;
+ case SSH2_MSG_UNIMPLEMENTED:
+ seqnr = packet_get_int();
+ debug("Received SSH2_MSG_UNIMPLEMENTED for %d", seqnr);
+ break;
default:
return type;
break;
}
} else {
- type = packet_read_poll1(payload_len_ptr);
+ type = packet_read_poll1();
switch (type) {
case SSH_MSG_IGNORE:
break;
}
int
-packet_read_poll(int *payload_len_ptr)
+packet_read_poll(void)
{
- return packet_read_poll_seqnr(payload_len_ptr, NULL);
+ return packet_read_poll_seqnr(NULL);
}
/*
int lowdelay = IPTOS_LOWDELAY;
int throughput = IPTOS_THROUGHPUT;
#endif
- int on = 1;
if (called)
return;
strerror(errno));
}
#endif
- if (setsockopt(connection_in, IPPROTO_TCP, TCP_NODELAY, (void *) &on,
- sizeof(on)) < 0)
- error("setsockopt TCP_NODELAY: %.100s", strerror(errno));
+ set_nodelay(connection_in);
} else if (packet_connection_is_ipv4()) {
/*
* Set IP options for a non-interactive connection. Use
andersk / openssh.git / blobdiff