=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/packet.h,v retrieving revision 1.15.2.4 retrieving revision 1.16 diff -u -r1.15.2.4 -r1.16 --- src/usr.bin/ssh/packet.h 2001/03/21 18:52:55 1.15.2.4 +++ src/usr.bin/ssh/packet.h 2000/06/20 01:39:43 1.16 @@ -1,17 +1,19 @@ /* + * + * packet.h + * * Author: Tatu Ylonen + * * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved + * + * Created: Sat Mar 18 02:02:14 1995 ylo + * * Interface for the packet protocol functions. * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: packet.h,v 1.15.2.4 2001/03/21 18:52:55 jason Exp $"); */ +/* RCSID("$OpenBSD: packet.h,v 1.16 2000/06/20 01:39:43 markus Exp $"); */ #ifndef PACKET_H #define PACKET_H @@ -46,17 +48,17 @@ * encrypted independently of each other. Cipher types are defined in ssh.h. */ void -packet_set_encryption_key(const u_char *key, u_int keylen, +packet_set_encryption_key(const unsigned char *key, unsigned int keylen, int cipher_type); /* * Sets remote side protocol flags for the current connection. This can be * called at any time. */ -void packet_set_protocol_flags(u_int flags); +void packet_set_protocol_flags(unsigned int flags); /* Returns the remote protocol flags set earlier by the above function. */ -u_int packet_get_protocol_flags(void); +unsigned int packet_get_protocol_flags(void); /* Enables compression in both directions starting from the next packet. */ void packet_start_compression(int level); @@ -65,7 +67,7 @@ * Informs that the current session is interactive. Sets IP flags for * optimal performance in interactive use. */ -void packet_set_interactive(int interactive); +void packet_set_interactive(int interactive, int keepalives); /* Returns true if the current connection is interactive. */ int packet_is_interactive(void); @@ -77,16 +79,16 @@ void packet_put_char(int ch); /* Appends an integer to the packet data. */ -void packet_put_int(u_int value); +void packet_put_int(unsigned int value); /* Appends an arbitrary precision integer to packet data. */ void packet_put_bignum(BIGNUM * value); void packet_put_bignum2(BIGNUM * value); /* Appends a string to packet data. */ -void packet_put_string(const char *buf, u_int len); +void packet_put_string(const char *buf, unsigned int len); void packet_put_cstring(const char *str); -void packet_put_raw(const char *buf, u_int len); +void packet_put_raw(const char *buf, unsigned int len); /* * Finalizes and sends the packet. If the encryption key has been set, @@ -117,13 +119,13 @@ * Buffers the given amount of input characters. This is intended to be used * together with packet_read_poll. */ -void packet_process_incoming(const char *buf, u_int len); +void packet_process_incoming(const char *buf, unsigned int len); /* Returns a character (0-255) from the packet data. */ -u_int packet_get_char(void); +unsigned int packet_get_char(void); /* Returns an integer from the packet data. */ -u_int packet_get_int(void); +unsigned int packet_get_int(void); /* * Returns an arbitrary precision integer from the packet data. The integer @@ -139,7 +141,7 @@ * no longer needed. The length_ptr argument may be NULL, or point to an * integer into which the length of the string is stored. */ -char *packet_get_string(u_int *length_ptr); +char *packet_get_string(unsigned int *length_ptr); /* * Logs the error in syslog using LOG_INFO, constructs and sends a disconnect @@ -213,11 +215,5 @@ /* returns remaining payload bytes */ int packet_remaining(void); - -/* append an ignore message */ -void packet_send_ignore(int nbytes); - -/* add an ignore message and make sure size (current+ignore) = n*sumlen */ -void packet_inject_ignore(int sumlen); #endif /* PACKET_H */