Commit 10f16aeb authored by Niels Möller's avatar Niels Möller
Browse files

General cleanup. Use types uint32_t and friends instead of

UINT32. Include files in the order config.h, C headers, system
headers, lsh headers. Deleted RCS id stings. Affects most files.

Rev: src/abstract_compress.c:1.5
Rev: src/abstract_compress.h:1.6
Rev: src/abstract_crypto.c:1.23
Rev: src/abstract_crypto.h:1.42
Rev: src/abstract_io.c:1.4
Rev: src/abstract_io.h:1.35
Rev: src/adns.c:1.4
Rev: src/algorithms.c:1.34
Rev: src/algorithms.h:1.10
Rev: src/alist.c:1.22
Rev: src/alist.h:1.18
Rev: src/atoms.c:1.13
Rev: src/atoms.h:1.8
Rev: src/bignum.c:1.23
Rev: src/bignum.h:1.21
Rev: src/channel.c:1.115
Rev: src/channel.h:1.73
Rev: src/channel_commands.c:1.27
Rev: src/channel_commands.h:1.21
Rev: src/channel_forward.c:1.12
Rev: src/channel_forward.h:1.6
Rev: src/charset.c:1.9
Rev: src/charset.h:1.5
Rev: src/client.c:1.147
Rev: src/client.h:1.52
Rev: src/client_escape.c:1.7
Rev: src/client_keyexchange.c:1.61
Rev: src/client_keyexchange.h:1.18
Rev: src/client_pty.c:1.24
Rev: src/client_session.c:1.20
Rev: src/client_userauth.c:1.53
Rev: src/client_x11.c:1.22
Rev: src/combinators.c:1.18
Rev: src/command.c:1.49
Rev: src/command.h:1.62
Rev: src/compress.c:1.9
Rev: src/compress.h:1.4
Rev: src/connection.c:1.74
Rev: src/connection.h:1.67
Rev: src/connection_commands.c:1.42
Rev: src/connection_commands.h:1.19
Rev: src/crypto.c:1.34
Rev: src/crypto.h:1.32
Rev: src/daemon.c:1.10
Rev: src/daemon.h:1.4
Rev: src/debug.c:1.37
Rev: src/debug.h:1.17
Rev: src/dh_exchange.c:1.15
Rev: src/dsa.c:1.38
Rev: src/dsa_keygen.c:1.25
Rev: src/encrypt.c:1.25
Rev: src/encrypt.h:1.11
Rev: src/exception.c:1.18
Rev: src/exception.h:1.28
Rev: src/format.c:1.52
Rev: src/format.h:1.40
Rev: src/gateway.c:1.8
Rev: src/gateway.h:1.2
Rev: src/gateway_channel.c:1.15
Rev: src/gateway_channel.h:1.6
Rev: src/gateway_commands.c:1.19
Rev: src/gateway_commands.h:1.5
Rev: src/gc.c:1.31
Rev: src/gc.h:1.12
Rev: src/handshake.c:1.16
Rev: src/handshake.h:1.6
Rev: src/interact.c:1.6
Rev: src/interact.h:1.10
Rev: src/io.c:1.182
Rev: src/io.h:1.99
Rev: src/io_commands.c:1.60
Rev: src/io_commands.h:1.30
Rev: src/jpoll.h:1.4
Rev: src/keyexchange.c:1.89
Rev: src/keyexchange.h:1.57
Rev: src/list.c:1.9
Rev: src/list.h:1.10
Rev: src/lookup_verifier.c:1.3
Rev: src/lookup_verifier.h:1.8
Rev: src/lsh-decode-key.c:1.20
Rev: src/lsh-execuv.c:1.5
Rev: src/lsh-export-key.c:1.17
Rev: src/lsh-keygen.c:1.16
Rev: src/lsh-krb-checkpw.c:1.3
Rev: src/lsh-make-seed.c:1.11
Rev: src/lsh-pam-checkpw.c:1.6
Rev: src/lsh-writekey.c:1.30
Rev: src/lsh.c:1.178
Rev: src/lsh.h:1.28
Rev: src/lsh_argp.h:1.2
Rev: src/lsh_proxy.c:1.35
Rev: src/lsh_types.h:1.45
Rev: src/lshd.c:1.149
Rev: src/lshg.c:1.19
Rev: src/memxor.c:1.2
Rev: src/memxor.h:1.2
Rev: src/pad.c:1.26
Rev: src/pad.h:1.12
Rev: src/parse.c:1.37
Rev: src/parse.h:1.27
Rev: src/parse_config.c:1.4
Rev: src/parse_config.h:1.3
Rev: src/parse_macros.h:1.4
Rev: src/pkcs5.c:1.7
Rev: src/proxy.c:1.16
Rev: src/proxy.h:1.7
Rev: src/proxy_agentforward.c:1.5
Rev: src/proxy_agentforward.h:1.2
Rev: src/proxy_session.c:1.10
Rev: src/proxy_session.h:1.5
Rev: src/proxy_tcpforward.c:1.7
Rev: src/proxy_tcpforward.h:1.2
Rev: src/proxy_userauth.c:1.13
Rev: src/proxy_userauth.h:1.3
Rev: src/proxy_x11forward.c:1.6
Rev: src/proxy_x11forward.h:1.2
Rev: src/publickey_crypto.c:1.45
Rev: src/publickey_crypto.h:1.48
Rev: src/queue.c:1.11
Rev: src/queue.h:1.13
Rev: src/randomness.c:1.28
Rev: src/randomness.h:1.16
Rev: src/read_data.c:1.36
Rev: src/read_data.h:1.16
Rev: src/read_file.c:1.5
Rev: src/read_file.h:1.2
Rev: src/read_line.c:1.31
Rev: src/read_line.h:1.17
Rev: src/read_packet.c:1.53
Rev: src/read_packet.h:1.11
Rev: src/reaper.c:1.25
Rev: src/reaper.h:1.12
Rev: src/resource.c:1.26
Rev: src/resource.h:1.15
Rev: src/rsa.c:1.27
Rev: src/rsa_keygen.c:1.15
Rev: src/server.c:1.72
Rev: src/server.h:1.21
Rev: src/server_authorization.c:1.20
Rev: src/server_authorization.h:1.6
Rev: src/server_keyexchange.c:1.54
Rev: src/server_keyexchange.h:1.12
Rev: src/server_password.c:1.34
Rev: src/server_pty.c:1.25
Rev: src/server_pty.h:1.14
Rev: src/server_publickey.c:1.23
Rev: src/server_session.c:1.99
Rev: src/server_session.h:1.20
Rev: src/server_userauth.c:1.38
Rev: src/server_userauth.h:1.21
Rev: src/server_x11.c:1.17
Rev: src/server_x11.h:1.7
Rev: src/sexp.c:1.47
Rev: src/sexp.h:1.39
Rev: src/spki.c:1.48
Rev: src/spki.h:1.29
Rev: src/srp-gen.c:1.17
Rev: src/srp.h:1.7
Rev: src/srp_exchange.c:1.18
Rev: src/ssh1_fallback.c:1.14
Rev: src/ssh1_fallback.h:1.6
Rev: src/string_buffer.c:1.10
Rev: src/string_buffer.h:1.5
Rev: src/suspend.c:1.3
Rev: src/suspend.h:1.3
Rev: src/tcpforward.c:1.65
Rev: src/tcpforward.h:1.19
Rev: src/tcpforward_commands.c:1.44
Rev: src/tcpforward_commands.h:1.7
Rev: src/translate_signal.c:1.5
Rev: src/translate_signal.h:1.3
Rev: src/tty.c:1.17
Rev: src/tty.h:1.13
Rev: src/unix_interact.c:1.17
Rev: src/unix_process.c:1.12
Rev: src/unix_random.c:1.13
Rev: src/unix_user.c:1.58
Rev: src/unpad.c:1.21
Rev: src/unpad.h:1.12
Rev: src/userauth.h:1.37
Rev: src/version.h:1.9
Rev: src/werror.c:1.68
Rev: src/werror.h:1.32
Rev: src/write_buffer.c:1.27
Rev: src/write_buffer.h:1.24
Rev: src/xalloc.c:1.32
Rev: src/xalloc.h:1.28
Rev: src/xauth.c:1.10
Rev: src/xauth.h:1.3
Rev: src/zlib.c:1.35
parent 63dbf8da
......@@ -2,7 +2,6 @@
*
* interface to compression algorithms...
*
* $Id$
*/
/* lsh, an implementation of the ssh protocol
......
/* abstract_compress.h
*
* interface to compression algorithms...
* Interface to compression algorithms...
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......
/* abstract_crypto.c
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......@@ -21,6 +21,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#if HAVE_CONFIG_H
# include "config.h"
#endif
#include <assert.h>
#include <string.h>
#include "abstract_crypto.h"
#include "crypto.h"
......@@ -28,9 +35,6 @@
#include "werror.h"
#include "xalloc.h"
#include <assert.h>
#include <string.h>
#define GABA_DEFINE
#include "abstract_crypto.h.x"
#undef GABA_DEFINE
......@@ -111,8 +115,8 @@ crypt_string_pad(struct crypto_instance *c,
int free)
{
struct lsh_string *s;
UINT8 *p;
UINT32 pad = c->block_size - (in->length % c->block_size);
uint8_t *p;
uint32_t pad = c->block_size - (in->length % c->block_size);
assert(pad);
......@@ -130,7 +134,7 @@ crypt_string_unpad(struct crypto_instance *c,
int free)
{
struct lsh_string *out;
UINT32 pad;
uint32_t pad;
assert(in->length);
......
......@@ -2,7 +2,7 @@
*
* Interface to block cryptos and hash functions
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......@@ -41,11 +41,11 @@ struct sexp_iterator;
(class
(name crypto_instance)
(vars
(block_size . UINT32)
(block_size . uint32_t)
; Length must be a multiple of the block size.
; NOTE: src == dst is allowed, but no other overlaps.
(crypt method void
"UINT32 length" "const UINT8 *src" "UINT8 *dst")))
"uint32_t length" "const uint8_t *src" "uint8_t *dst")))
*/
#define CRYPT(instance, length, src, dst) \
......@@ -58,11 +58,11 @@ struct sexp_iterator;
(class
(name crypto_algorithm)
(vars
(block_size . UINT32)
(key_size . UINT32)
(iv_size . UINT32)
(block_size . uint32_t)
(key_size . uint32_t)
(iv_size . uint32_t)
(make_crypt method (object crypto_instance)
"int mode" "const UINT8 *key" "const UINT8 *iv")))
"int mode" "const uint8_t *key" "const uint8_t *iv")))
*/
#define MAKE_CRYPT(crypto, mode, key, iv) \
......@@ -95,11 +95,11 @@ struct sexp_iterator;
/* FIXME: Maybe change these back to macros? */
void
hash_update(struct hash_instance *self,
UINT32 length, const UINT8 *data);
uint32_t length, const uint8_t *data);
void
hash_digest(struct hash_instance *self,
UINT8 *result);
uint8_t *result);
struct hash_instance *
hash_copy(struct hash_instance *self);
......@@ -118,10 +118,10 @@ make_hash(const struct hash_algorithm *self);
(class
(name mac_instance)
(vars
(mac_size . UINT32)
(mac_size . uint32_t)
(update method void
"UINT32 length" "const UINT8 *data")
(digest method void "UINT8 *result")))
"uint32_t length" "const uint8_t *data")
(digest method void "uint8_t *result")))
*/
#define MAC_UPDATE(instance, length, data) \
......@@ -134,11 +134,11 @@ make_hash(const struct hash_algorithm *self);
(class
(name mac_algorithm)
(vars
(mac_size . UINT32)
(mac_size . uint32_t)
; Recommended key size
(key_size . UINT32)
(key_size . uint32_t)
(make_mac method (object mac_instance)
"UINT32 length" "const UINT8 *key")))
"uint32_t length" "const uint8_t *key")))
*/
#define MAKE_MAC(m, l, key) ((m)->make_mac((m), (l), (key)))
......@@ -150,8 +150,8 @@ make_hash(const struct hash_algorithm *self);
(vars
(verify method int
"int algorithm"
"UINT32 length" "const UINT8 *data"
"UINT32 signature_length" "const UINT8 *signature_data")
"uint32_t length" "const uint8_t *data"
"uint32_t signature_length" "const uint8_t *signature_data")
(public_key method (string))
......@@ -172,7 +172,7 @@ make_hash(const struct hash_algorithm *self);
(vars
; Returns a non-spki signature
(sign method (string)
"int algorithm" "UINT32 length" "const UINT8 *data")
"int algorithm" "uint32_t length" "const uint8_t *data")
(get_verifier method (object verifier))))
*/
......
......@@ -2,7 +2,7 @@
*
* This is the layer separating protocol processing from actual io.
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......
......@@ -2,7 +2,7 @@
*
* This is the layer separating protocol processing from actual io.
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......@@ -64,7 +64,7 @@
; make sure that handler is not called again. '
; Available is 0 iff we have got EOF.
UINT32 "UINT32 available" "UINT8 *data")))
uint32_t "uint32_t available" "uint8_t *data")))
"struct exception_handler *e")))
*/
......
......@@ -2,7 +2,6 @@
*
* interface to Ian Jackson's asynchronous resolver.
*
* $Id$
*/
/* lsh, an implementation of the ssh protocol
......@@ -50,7 +49,7 @@ do_adns_free(adns_state s);
; a dns name.
(host string)
; The port number here is always in host byte order
(port . UINT32)
(port . uint32_t)
; Raw address
(socket space "struct sockaddr")))
*/
......
......@@ -2,7 +2,7 @@
*
* Translate algorithm identifiers (or names) to algorithm objects.
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......
......@@ -2,7 +2,7 @@
*
* Translate algorithm identifiers (or names) to algorithm objects.
*
* $Id$ */
*/
#ifndef LSH_ALGORITHMS_H_INCLUDED
#define LSH_ALGORITHMS_H_INCLUDED
......
......@@ -2,7 +2,7 @@
*
* Associations are implemented as linear tables.
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......
......@@ -2,7 +2,7 @@
*
* Associate atoms with objects (or functions) .
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......@@ -26,10 +26,10 @@
#ifndef LSH_ALIST_H_INCLUDED
#define LSH_ALIST_H_INCLUDED
#include "lsh.h"
#include <stdarg.h>
#include "lsh.h"
/* Forward declaration */
struct alist;
......
/* atoms.c
*
*
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......@@ -23,14 +21,19 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "atoms.h"
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h>
#include "atoms.h"
struct atom_rassoc
{
const UINT8 *name;
UINT32 length;
const uint8_t *name;
uint32_t length;
};
const struct atom_assoc *
......@@ -42,14 +45,14 @@ struct atom_rassoc atom_table[] =
#include "atoms_table.c"
;
UINT32 get_atom_length(int atom)
uint32_t get_atom_length(int atom)
{ return atom_table[atom].length; }
const UINT8 *get_atom_name(int atom)
const uint8_t *get_atom_name(int atom)
{ return atom_table[atom].name; }
int
lookup_atom(UINT32 length, const UINT8 *name)
lookup_atom(uint32_t length, const uint8_t *name)
{
/* NOTE: The automatically generated code uses const char *, and
* some compilers signal a fatal error on char * / unsigned char *
......
/* atoms.h
*
*
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......@@ -26,14 +24,16 @@
#ifndef LSH_ATOMS_H_INCLUDED
#define LSH_ATOMS_H_INCLUDED
#include "lsh_types.h"
/* FIXME: Need this be a separate file? */
#include <inttypes.h>
#include "atoms_defines.h"
/* Atoms are represented as plain (small) ints. Zero is used for all
* atoms we don't know about. */
UINT32 get_atom_length(int atom);
const UINT8 *get_atom_name(int atom);
int lookup_atom(UINT32 length, const UINT8 *name);
uint32_t get_atom_length(int atom);
const uint8_t *get_atom_name(int atom);
int lookup_atom(uint32_t length, const uint8_t *name);
#endif /* LSH_ATOMS_H_INCLUDED */
/* bignum.c
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......@@ -37,7 +37,7 @@ static void
bignum_random_size(mpz_t x, struct randomness *random, unsigned bits)
{
unsigned length = (bits + 7) / 8;
UINT8 *data = alloca(length);
uint8_t *data = alloca(length);
RANDOM(random, length, data);
......
......@@ -2,7 +2,7 @@
*
* Interface and conversion functions for GMP.
*
* $Id$ */
*/
/* lsh, an implementation of the ssh protocol
*
......
/* channel.c
*
* $Id$
*/
/* lsh, an implementation of the ssh protocol
......@@ -22,6 +21,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <assert.h>
#include <string.h>
#include "channel.h"
#include "format.h"
......@@ -31,9 +37,6 @@
#include "werror.h"
#include "xalloc.h"
#include <assert.h>
#include <string.h>
#define GABA_DEFINE
#include "channel.h.x"
#undef GABA_DEFINE
......@@ -41,7 +44,7 @@
#include "channel.c.x"
struct exception *
make_channel_open_exception(UINT32 error_code, const char *msg)
make_channel_open_exception(uint32_t error_code, const char *msg)
{
NEW(channel_open_exception, self);
......@@ -103,11 +106,11 @@ check_rec_max_packet(struct ssh_channel *channel)
struct lsh_string *
format_open_confirmation(struct ssh_channel *channel,
UINT32 channel_number,
uint32_t channel_number,
const char *format, ...)
{
va_list args;
UINT32 l1, l2;
uint32_t l1, l2;
struct lsh_string *packet;
#define CONFIRM_FORMAT "%c%i%i%i%i"
......@@ -141,7 +144,7 @@ format_open_confirmation(struct ssh_channel *channel,
}
struct lsh_string *
format_open_failure(UINT32 channel, UINT32 reason,
format_open_failure(uint32_t channel, uint32_t reason,
const char *msg, const char *language)
{
return ssh_format("%c%i%i%z%z", SSH_MSG_CHANNEL_OPEN_FAILURE,
......@@ -149,20 +152,20 @@ format_open_failure(UINT32 channel, UINT32 reason,
}
struct lsh_string *
format_channel_success(UINT32 channel)
format_channel_success(uint32_t channel)
{
return ssh_format("%c%i", SSH_MSG_CHANNEL_SUCCESS, channel);
}
struct lsh_string *
format_channel_failure(UINT32 channel)
format_channel_failure(uint32_t channel)
{
return ssh_format("%c%i", SSH_MSG_CHANNEL_FAILURE, channel);
}
struct lsh_string *
prepare_window_adjust(struct ssh_channel *channel,
UINT32 add)
uint32_t add)
{
channel->rec_window_size += add;
......@@ -180,7 +183,7 @@ prepare_window_adjust(struct ssh_channel *channel,
; Non-zero if the channel has already been deallocated.
(dead . int)
; Local channel number
(channel_number . UINT32)))
(channel_number . uint32_t)))
*/
static void
......@@ -248,7 +251,7 @@ do_exc_finish_channel_handler(struct exception_handler *s,
static struct exception_handler *
make_exc_finish_channel_handler(struct ssh_connection *connection,
UINT32 channel_number,
uint32_t channel_number,
struct exception_handler *e,
const char *context)
{
......@@ -310,7 +313,7 @@ make_channel_table(void)
int
alloc_channel(struct channel_table *table)
{
UINT32 i;
uint32_t i;
for(i = table->next_channel; i < table->used_channels; i++)
{
......@@ -328,9 +331,9 @@ alloc_channel(struct channel_table *table)
if (i == table->allocated_channels)
{
UINT32 new_size = table->allocated_channels * 2;
uint32_t new_size = table->allocated_channels * 2;
struct ssh_channel **new_channels;
UINT8 *new_in_use;
uint8_t *new_in_use;
new_channels = lsh_space_alloc(sizeof(struct ssh_channel *)
* new_size);
......@@ -379,7 +382,7 @@ dealloc_channel(struct channel_table *table, int i)
void
use_channel(struct ssh_connection *connection,
UINT32 local_channel_number)
uint32_t local_channel_number)
{
struct channel_table *table = connection->table;
struct ssh_channel *channel = table->channels[local_channel_number];
......@@ -393,7 +396,7 @@ use_channel(struct ssh_connection *connection,
}
void
register_channel(UINT32 local_channel_number,
register_channel(uint32_t local_channel_number,
struct ssh_channel *channel,
int take_into_use)
{
......@@ -423,7 +426,7 @@ register_channel(UINT32 local_channel_number,
}
struct ssh_channel *
lookup_channel(struct channel_table *table, UINT32 i)
lookup_channel(struct channel_table *table, uint32_t i)
{
return ( (i < table->used_channels)
&& (table->in_use[i] == CHANNEL_IN_USE))
......@@ -431,7 +434,7 @@ lookup_channel(struct channel_table *table, UINT32 i)
}
struct ssh_channel *
lookup_channel_reserved(struct channel_table *table, UINT32 i)
lookup_channel_reserved(struct channel_table *table, uint32_t i)
{
return ( (i < table->used_channels)
&& (table->in_use[i] == CHANNEL_RESERVED))
......@@ -449,7 +452,7 @@ lookup_channel_reserved(struct channel_table *table, UINT32 i)
* half or one third of the maximum window size), we send a
* window_adjust message to sync them. */
static void
adjust_rec_window(struct flow_controlled *f, UINT32 written)
adjust_rec_window(struct flow_controlled *f, uint32_t written)
{
CAST_SUBTYPE(ssh_channel, channel, f);
......@@ -463,7 +466,7 @@ adjust_rec_window(struct flow_controlled *f, UINT32 written)
void
channel_start_receive(struct ssh_channel *channel,
UINT32 initial_window_size)
uint32_t initial_window_size)
{
if (channel->rec_window_size < initial_window_size)
C_WRITE(channel->connection,
......@@ -813,7 +816,7 @@ make_channel_request_exception_handler(struct ssh_channel *channel,
static int
parse_channel_request(struct simple_buffer *buffer,
UINT32 *channel_number,
uint32_t *channel_number,
struct channel_request_info *info)
{
unsigned msg_number;
......@@ -837,7 +840,7 @@ DEFINE_PACKET_HANDLER(static, channel_request_handler,
{
struct simple_buffer buffer;
struct channel_request_info info;
UINT32 channel_number;
uint32_t channel_number;
simple_buffer_init(&buffer, packet->length, packet->data);
......@@ -915,10 +918,10 @@ DEFINE_PACKET_HANDLER(static, channel_request_handler,
(super command_continuation)
(vars
(connection object ssh_connection)
(local_channel_number . UINT32)
(remote_channel_number . UINT32)
(send_window_size . UINT32)
(send_max_packet . UINT32)))
(local_channel_number . uint32_t)
(remote_channel_number . uint32_t)
(send_window_size . uint32_t)
(send_max_packet . uint32_t)))
*/
static void
......@@ -952,10 +955,10 @@ do_channel_open_continue(struct command_continuation *c,
static struct command_continuation *
make_channel_open_continuation(struct ssh_connection *connection,
UINT32 local_channel_number,
UINT32 remote_channel_number,
UINT32 send_window_size,
UINT32 send_max_packet)
uint32_t local_channel_number,
uint32_t remote_channel_number,
uint32_t send_window_size,
uint32_t send_max_packet)
{
NEW(channel_open_continuation, self);
......@@ -975,8 +978,8 @@ make_channel_open_continuation(struct ssh_connection *connection,
(super exception_handler)
(vars
(connection object ssh_connection)
(local_channel_number . UINT32)
(remote_channel_number . UINT32)))
(local_channel_number . uint32_t)
(remote_channel_number . uint32_t)))
*/
static void
......@@ -1009,8 +1012,8 @@ do_exc_channel_open_handler(struct exception_handler *s,
static struct exception_handler *
make_exc_channel_open_handler(struct ssh_connection *connection,
UINT32 local_channel_number,
UINT32 remote_channel_number,
uint32_t local_channel_number,
uint32_t remote_channel_number,
struct exception_handler *parent,
const char *context)
{
......@@ -1136,8 +1139,8 @@ DEFINE_PACKET_HANDLER(static, window_adjust_handler,
{
struct simple_buffer buffer;
unsigned msg_number;
UINT32 channel_number;
UINT32 size;
uint32_t channel_number;
uint32_t size;
simple_buffer_init(&buffer, packet->length, packet->data);
......@@ -1179,7 +1182,7 @@ DEFINE_PACKET_HANDLER(static, channel_data_handler,
{
struct simple_buffer buffer;
unsigned msg_number;
UINT32 channel_number;
uint32_t channel_number;
struct lsh_string *data;
simple_buffer_init(&buffer, packet->length, packet->data);
......@@ -1248,8 +1251,8 @@ DEFINE_PACKET_HANDLER(static, channel_extended_data_handler,
{
struct simple_buffer buffer;
unsigned msg_number;
UINT32 channel_number;
UINT32 type;
uint32_t channel_number;
uint32_t type;
struct lsh_string *data;
simple_buffer_init(&buffer, packet->length, packet->data);
......@@ -1330,7 +1333,7 @@ DEFINE_PACKET_HANDLER(static, channel_eof_handler,
{
struct simple_buffer buffer;
unsigned msg_number;
UINT32 channel_number;
uint32_t channel_number;
simple_buffer_init(&buffer, packet->length, packet->data);
......@@ -1391,7 +1394,7 @@ DEFINE_PACKET_HANDLER(static, channel_close_handler,
{