- itojun@cvs.openbsd.org 2001/06/26 06:32:58

     [atomicio.h authfd.h authfile.h auth.h auth-options.h bufaux.h
      buffer.h canohost.h channels.h cipher.h clientloop.h compat.h
      compress.h crc32.h deattack.h dh.h dispatch.h groupaccess.h
      hostfile.h kex.h key.h log.h mac.h match.h misc.h mpaux.h packet.h
      radix.h readconf.h readpass.h rsa.h]
     prototype pedant.  not very creative...
     - () -> (void)
     - no variable names

32 files changed, 278 insertions, 307 deletions

diff --git a/ChangeLog b/ChangeLog
index 492d00c5..19552da1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,15 @@
    - markus@cvs.openbsd.org 2001/06/26 05:50:11
      [auth2.c]
      new interface for secure_filename()
+   - itojun@cvs.openbsd.org 2001/06/26 06:32:58
+     [atomicio.h authfd.h authfile.h auth.h auth-options.h bufaux.h 
+      buffer.h canohost.h channels.h cipher.h clientloop.h compat.h 
+      compress.h crc32.h deattack.h dh.h dispatch.h groupaccess.h 
+      hostfile.h kex.h key.h log.h mac.h match.h misc.h mpaux.h packet.h 
+      radix.h readconf.h readpass.h rsa.h]
+     prototype pedant.  not very creative...
+     - () -> (void)
+     - no variable names
 
 20010629
  - (bal) Removed net_aton() since we don't use it any more
@@ -5865,4 +5874,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1355 2001/07/04 03:56:56 mouring Exp $
+$Id: ChangeLog,v 1.1356 2001/07/04 04:02:36 mouring Exp $
diff --git a/atomicio.h b/atomicio.h
index d878687d..e569d38c 100644
--- a/atomicio.h
+++ b/atomicio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atomicio.h,v 1.3 2001/03/02 18:54:30 deraadt Exp $	*/
+/*	$OpenBSD: atomicio.h,v 1.4 2001/06/26 06:32:46 itojun Exp $	*/
 
 /*
  * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
@@ -28,4 +28,4 @@
 /*
  * Ensure all of data on socket comes through. f==read || f==write
  */
-ssize_t	atomicio(ssize_t (*f)(), int fd, void *s, size_t n);
+ssize_t	atomicio(ssize_t (*)(), int, void *, size_t);
diff --git a/auth-options.h b/auth-options.h
index 8ee26949..db0e6e8f 100644
--- a/auth-options.h
+++ b/auth-options.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* $OpenBSD: auth-options.h,v 1.8 2001/01/21 19:05:42 markus Exp $ */
+/* $OpenBSD: auth-options.h,v 1.9 2001/06/26 06:32:47 itojun Exp $ */
 
 #ifndef AUTH_OPTIONS_H
 #define AUTH_OPTIONS_H
@@ -35,8 +35,7 @@ extern struct envstring *custom_environment;
  * side effect: sets key option flags
  */
 int
-auth_parse_options(struct passwd *pw, char *options, char *file,
-    u_long linenum);
+auth_parse_options(struct passwd *, char *, char *, u_long);
 
 /* reset options flags */
 void	auth_clear_options(void);
diff --git a/auth.h b/auth.h
index 415967c2..a2994411 100644
--- a/auth.h
+++ b/auth.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $OpenBSD: auth.h,v 1.19 2001/06/25 17:54:49 provos Exp $
+ * $OpenBSD: auth.h,v 1.20 2001/06/26 06:32:47 itojun Exp $
  */
 #ifndef AUTH_H
 #define AUTH_H
@@ -79,45 +79,44 @@ struct KbdintDevice
  * authentication succeeds.  If ignore_rhosts is non-zero, this will not
  * consider .rhosts and .shosts (/etc/hosts.equiv will still be used).
  */
-int     auth_rhosts(struct passwd * pw, const char *client_user);
+int     auth_rhosts(struct passwd *, const char *);
 
 /* extended interface similar to auth_rhosts() */
 int
-auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
-    const char *ipaddr);
+auth_rhosts2(struct passwd *, const char *, const char *, const char *);
 
 /*
  * Tries to authenticate the user using the .rhosts file and the host using
  * its host key.  Returns true if authentication succeeds.
  */
 int
-auth_rhosts_rsa(struct passwd * pw, const char *client_user, RSA* client_host_key);
+auth_rhosts_rsa(struct passwd *, const char *, RSA *);
 
 /*
  * Tries to authenticate the user using password.  Returns true if
  * authentication succeeds.
  */
-int     auth_password(Authctxt *authctxt, const char *password);
+int     auth_password(Authctxt *, const char *);
 
 /*
  * Performs the RSA authentication dialog with the client.  This returns 0 if
  * the client could not be authenticated, and 1 if authentication was
  * successful.  This may exit if there is a serious protocol violation.
  */
-int     auth_rsa(struct passwd * pw, BIGNUM * client_n);
+int     auth_rsa(struct passwd *, BIGNUM *);
 
 /*
  * Parses an RSA key (number of bits, e, n) from a string.  Moves the pointer
  * over the key.  Skips any whitespace at the beginning and at end.
  */
-int     auth_rsa_read_key(char **cpp, u_int *bitsp, BIGNUM * e, BIGNUM * n);
+int     auth_rsa_read_key(char **, u_int *, BIGNUM *, BIGNUM *);
 
 /*
  * Performs the RSA authentication challenge-response dialog with the client,
  * and returns true (non-zero) if the client gave the correct answer to our
  * challenge; returns zero if the client gives a wrong answer.
  */
-int     auth_rsa_challenge_dialog(RSA *pk);
+int     auth_rsa_challenge_dialog(RSA *);
 
 #ifdef KRB4
 #include <krb.h>
@@ -126,17 +125,17 @@ int     auth_rsa_challenge_dialog(RSA *pk);
  * if the client could not be authenticated, and 1 if authentication was
  * successful.  This may exit if there is a serious protocol violation.
  */
-int     auth_krb4(const char *server_user, KTEXT auth, char **client);
-int     krb4_init(uid_t uid);
-void    krb4_cleanup_proc(void *ignore);
-int	auth_krb4_password(struct passwd * pw, const char *password);
+int     auth_krb4(const char *, KTEXT, char **);
+int     krb4_init(uid_t);
+void    krb4_cleanup_proc(void *);
+int	auth_krb4_password(struct passwd *, const char *);
 
 #ifdef AFS
 #include <kafs.h>
 
 /* Accept passed Kerberos v4 ticket-granting ticket and AFS tokens. */
-int     auth_kerberos_tgt(struct passwd * pw, const char *string);
-int     auth_afs_token(struct passwd * pw, const char *token_string);
+int     auth_kerberos_tgt(struct passwd *, const char *);
+int     auth_afs_token(struct passwd *, const char *);
 #endif				/* AFS */
 
 #endif				/* KRB4 */
@@ -148,33 +147,32 @@ void	do_authentication(void);
 void	do_authentication2(void);
 
 Authctxt *authctxt_new(void);
-void	auth_log(Authctxt *authctxt, int authenticated, char *method, char *info);
-void	userauth_finish(Authctxt *authctxt, int authenticated, char *method);
-int	auth_root_allowed(char *method);
+void	auth_log(Authctxt *, int, char *, char *);
+void	userauth_finish(Authctxt *, int, char *);
+int	auth_root_allowed(char *);
 
-int	auth2_challenge(Authctxt *authctxt, char *devs);
+int	auth2_challenge(Authctxt *, char *);
 
-int	allowed_user(struct passwd * pw);
+int	allowed_user(struct passwd *);
 
-char	*get_challenge(Authctxt *authctxt);
-int	verify_response(Authctxt *authctxt, const char *response);
+char	*get_challenge(Authctxt *);
+int	verify_response(Authctxt *, const char *);
 
 struct passwd * auth_get_user(void);
 
 /* expand a filename - return buffer is allocated by xmalloc */
-char	*expand_filename(const char *template, struct passwd *pw);
-char	*authorized_keys_file(struct passwd *pw);
-char	*authorized_keys_file2(struct passwd *pw);
+char	*expand_filename(const char *, struct passwd *);
+char	*authorized_keys_file(struct passwd *);
+char	*authorized_keys_file2(struct passwd *);
 
 /* check a file and the path to it */
 int
-secure_filename(FILE *f, const char *file, struct passwd *pw,
-    char *err, size_t errlen);
+secure_filename(FILE *, const char *, struct passwd *, char *, size_t);
 
 /* helper for hostbased auth */
 HostStatus
-check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
-    const char *sysfile, const char *userfile);
+check_key_in_hostfiles(struct passwd *, Key *, const char *,
+    const char *, const char *);
 
 #define AUTH_FAIL_MAX 6
 #define AUTH_FAIL_LOG (AUTH_FAIL_MAX/2)
diff --git a/authfd.h b/authfd.h
index 04439fd0..4fe35aff 100644
--- a/authfd.h
+++ b/authfd.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: authfd.h,v 1.17 2001/06/26 04:59:59 markus Exp $"); */
+/* RCSID("$OpenBSD: authfd.h,v 1.18 2001/06/26 06:32:47 itojun Exp $"); */
 
 #ifndef AUTHFD_H
 #define AUTHFD_H
@@ -62,7 +62,7 @@ int     ssh_get_authentication_socket(void);
  * ssh_get_authentication_socket().  Depending on the way the descriptor was
  * obtained, this may close the descriptor.
  */
-void    ssh_close_authentication_socket(int authfd);
+void    ssh_close_authentication_socket(int);
 
 /*
  * Opens and connects a private socket for communication with the
@@ -76,19 +76,19 @@ AuthenticationConnection *ssh_get_authentication_connection(void);
  * Closes the connection to the authentication agent and frees any associated
  * memory.
  */
-void    ssh_close_authentication_connection(AuthenticationConnection *auth);
+void    ssh_close_authentication_connection(AuthenticationConnection *);
 
 /*
  * Returns the number authentication identity held by the agent.
  */
-int	ssh_get_num_identities(AuthenticationConnection *auth, int version);
+int	ssh_get_num_identities(AuthenticationConnection *, int);
 
 /*
  * Returns the first authentication identity held by the agent or NULL if
  * no identies are available. Caller must free comment and key.
  * Note that you cannot mix calls with different versions.
  */
-Key	*ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int version);
+Key	*ssh_get_first_identity(AuthenticationConnection *, char **, int);
 
 /*
  * Returns the next authentication identity for the agent.  Other functions
@@ -96,25 +96,20 @@ Key	*ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int
  * function.  This returns NULL if there are no more identities.  The caller
  * must free key and comment after a successful return.
  */
-Key	*ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version);
+Key	*ssh_get_next_identity(AuthenticationConnection *, char **, int);
 
 /*
  * Requests the agent to decrypt the given challenge.  Returns true if the
  * agent claims it was able to decrypt it.
  */
 int
-ssh_decrypt_challenge(AuthenticationConnection *auth,
-    Key *key, BIGNUM * challenge,
-    u_char session_id[16],
-    u_int response_type,
-    u_char response[16]);
+ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],
+    u_int, u_char[16]);
 
 /* Requests the agent to sign data using key */
 int
-ssh_agent_sign(AuthenticationConnection *auth,
-    Key *key,
-    u_char **sigp, int *lenp,
-    u_char *data, int datalen);
+ssh_agent_sign(AuthenticationConnection *, Key *, u_char **, int *,
+    u_char *, int);
 
 /*
  * Adds an identity to the authentication server.  This call is not meant to
@@ -122,23 +117,22 @@ ssh_agent_sign(AuthenticationConnection *auth,
  * successfully added.
  */
 int
-ssh_add_identity(AuthenticationConnection *auth, Key *key,
-    const char *comment);
+ssh_add_identity(AuthenticationConnection *, Key *, const char *);
 
 /*
  * Removes the identity from the authentication server.  This call is not
  * meant to be used by normal applications.  This returns true if the
  * identity was successfully added.
  */
-int     ssh_remove_identity(AuthenticationConnection *auth, Key *key);
+int     ssh_remove_identity(AuthenticationConnection *, Key *);
 
 /*
  * Removes all identities from the authentication agent.  This call is not
  * meant to be used by normal applications.  This returns true if the
  * operation was successful.
  */
-int	ssh_remove_all_identities(AuthenticationConnection *auth, int version);
+int	ssh_remove_all_identities(AuthenticationConnection *, int);
 
-int	ssh_update_card(AuthenticationConnection *auth, int add, int reader_id);
+int	ssh_update_card(AuthenticationConnection *, int, int);
 
 #endif				/* AUTHFD_H */
diff --git a/authfile.h b/authfile.h
index da90cd91..982645d5 100644
--- a/authfile.h
+++ b/authfile.h
@@ -10,27 +10,24 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* $OpenBSD: authfile.h,v 1.6 2001/03/26 08:07:08 markus Exp $ */
+/* $OpenBSD: authfile.h,v 1.7 2001/06/26 06:32:48 itojun Exp $ */
 
 #ifndef AUTHFILE_H
 #define AUTHFILE_H
 
 int
-key_save_private(Key *key, const char *filename, const char *passphrase,
-    const char *comment);
+key_save_private(Key *, const char *, const char *, const char *);
 
 Key *
-key_load_public(const char *filename, char **commentp);
+key_load_public(const char *, char **);
 
 Key *
-key_load_public_type(int type, const char *filename, char **commentp);
+key_load_public_type(int, const char *, char **);
 
 Key *
-key_load_private(const char *filename, const char *passphrase,
-    char **commentp);
+key_load_private(const char *, const char *, char **);
 
 Key *
-key_load_private_type(int type, const char *filename, const char *passphrase,
-    char **commentp);
+key_load_private_type(int, const char *, const char *, char **);
 
 #endif
diff --git a/bufaux.h b/bufaux.h
index c0182da1..765ee5e7 100644
--- a/bufaux.h
+++ b/bufaux.h
@@ -10,7 +10,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: bufaux.h,v 1.11 2001/01/21 19:05:45 markus Exp $"); */
+/* RCSID("$OpenBSD: bufaux.h,v 1.12 2001/06/26 06:32:48 itojun Exp $"); */
 
 #ifndef BUFAUX_H
 #define BUFAUX_H
@@ -22,30 +22,30 @@
  * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed
  * by (bits+7)/8 bytes of binary data, msb first.
  */
-void    buffer_put_bignum(Buffer * buffer, BIGNUM * value);
-void    buffer_put_bignum2(Buffer * buffer, BIGNUM * value);
+void    buffer_put_bignum(Buffer *, BIGNUM *);
+void    buffer_put_bignum2(Buffer *, BIGNUM *);
 
 /* Retrieves an BIGNUM from the buffer. */
-int     buffer_get_bignum(Buffer * buffer, BIGNUM * value);
-int	buffer_get_bignum2(Buffer *buffer, BIGNUM * value);
+int     buffer_get_bignum(Buffer *, BIGNUM *);
+int	buffer_get_bignum2(Buffer *, BIGNUM *);
 
 /* Returns an integer from the buffer (4 bytes, msb first). */
-u_int buffer_get_int(Buffer * buffer);
+u_int buffer_get_int(Buffer *);
 #ifdef HAVE_U_INT64_T
-u_int64_t buffer_get_int64(Buffer *buffer);
+u_int64_t buffer_get_int64(Buffer *);
 #endif
 
 /* Stores an integer in the buffer in 4 bytes, msb first. */
-void    buffer_put_int(Buffer * buffer, u_int value);
+void    buffer_put_int(Buffer *, u_int);
 #ifdef HAVE_U_INT64_T
-void	buffer_put_int64(Buffer *buffer, u_int64_t value);
+void	buffer_put_int64(Buffer *, u_int64_t);
 #endif
 
 /* Returns a character from the buffer (0 - 255). */
-int     buffer_get_char(Buffer * buffer);
+int     buffer_get_char(Buffer *);
 
 /* Stores a character in the buffer. */
-void    buffer_put_char(Buffer * buffer, int value);
+void    buffer_put_char(Buffer *, int);
 
 /*
  * Returns an arbitrary binary string from the buffer.  The string cannot be
@@ -55,10 +55,10 @@ void    buffer_put_char(Buffer * buffer, int value);
  * stored there.  A null character will be automatically appended to the
  * returned string, and is not counted in length.
  */
-char   *buffer_get_string(Buffer * buffer, u_int *length_ptr);
+char   *buffer_get_string(Buffer *, u_int *);
 
 /* Stores and arbitrary binary string in the buffer. */
-void    buffer_put_string(Buffer * buffer, const void *buf, u_int len);
-void	buffer_put_cstring(Buffer *buffer, const char *s);
+void    buffer_put_string(Buffer *, const void *, u_int);
+void	buffer_put_cstring(Buffer *, const char *);
 
 #endif				/* BUFAUX_H */
diff --git a/buffer.h b/buffer.h
index f3c509df..5e9fc278 100644
--- a/buffer.h
+++ b/buffer.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: buffer.h,v 1.7 2000/12/19 23:17:55 markus Exp $"); */
+/* RCSID("$OpenBSD: buffer.h,v 1.8 2001/06/26 06:32:48 itojun Exp $"); */
 
 #ifndef BUFFER_H
 #define BUFFER_H
@@ -23,44 +23,44 @@ typedef struct {
 	u_int end;	/* Offset of last byte containing data. */
 }       Buffer;
 /* Initializes the buffer structure. */
-void    buffer_init(Buffer * buffer);
+void    buffer_init(Buffer *);
 
 /* Frees any memory used for the buffer. */
-void    buffer_free(Buffer * buffer);
+void    buffer_free(Buffer *);
 
 /* Clears any data from the buffer, making it empty.  This does not actually
    zero the memory. */
-void    buffer_clear(Buffer * buffer);
+void    buffer_clear(Buffer *);
 
 /* Appends data to the buffer, expanding it if necessary. */
-void    buffer_append(Buffer * buffer, const char *data, u_int len);
+void    buffer_append(Buffer *, const char *, u_int);
 
 /*
  * Appends space to the buffer, expanding the buffer if necessary. This does
  * not actually copy the data into the buffer, but instead returns a pointer
  * to the allocated region.
  */
-void    buffer_append_space(Buffer * buffer, char **datap, u_int len);
+void    buffer_append_space(Buffer *, char **, u_int);
 
 /* Returns the number of bytes of data in the buffer. */
-u_int buffer_len(Buffer * buffer);
+u_int buffer_len(Buffer *);
 
 /* Gets data from the beginning of the buffer. */
-void    buffer_get(Buffer * buffer, char *buf, u_int len);
+void    buffer_get(Buffer *, char *, u_int);
 
 /* Consumes the given number of bytes from the beginning of the buffer. */
-void    buffer_consume(Buffer * buffer, u_int bytes);
+void    buffer_consume(Buffer *, u_int);
 
 /* Consumes the given number of bytes from the end of the buffer. */
-void    buffer_consume_end(Buffer * buffer, u_int bytes);
+void    buffer_consume_end(Buffer *, u_int);
 
 /* Returns a pointer to the first used byte in the buffer. */
-char   *buffer_ptr(Buffer * buffer);
+char   *buffer_ptr(Buffer *);
 
 /*
  * Dumps the contents of the buffer to stderr in hex.  This intended for
  * debugging purposes only.
  */
-void    buffer_dump(Buffer * buffer);
+void    buffer_dump(Buffer *);
 
 #endif				/* BUFFER_H */
diff --git a/canohost.h b/canohost.h
index 36fb345a..66e64d50 100644
--- a/canohost.h
+++ b/canohost.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: canohost.h,v 1.6 2001/04/12 19:15:24 markus Exp $	*/
+/*	$OpenBSD: canohost.h,v 1.7 2001/06/26 06:32:49 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -17,7 +17,7 @@
  * connection (as returned by packet_get_connection).  The host name is
  * cached, so it is efficient to call this several times.
  */
-const char *get_canonical_hostname(int reverse_mapping_check);
+const char *get_canonical_hostname(int);
 
 /*
  * Returns the IP-address of the remote host as a string.  The returned
@@ -25,13 +25,13 @@ const char *get_canonical_hostname(int reverse_mapping_check);
  */
 const char *get_remote_ipaddr(void);
 
-const char *get_remote_name_or_ip(u_int utmp_len, int reverse_mapping_check);
+const char *get_remote_name_or_ip(u_int, int);
 
 /* Returns the ipaddr/port number of the peer of the socket. */
-char *	get_peer_ipaddr(int socket);
-int     get_peer_port(int sock);
-char *	get_local_ipaddr(int socket);
-char *	get_local_name(int socket);
+char *	get_peer_ipaddr(int);
+int     get_peer_port(int);
+char *	get_local_ipaddr(int);
+char *	get_local_name(int);
 
 /* Returns the port number of the remote/local host. */
 int     get_remote_port(void);
diff --git a/channels.h b/channels.h
index 0ce8372b..3a114e07 100644
--- a/channels.h
+++ b/channels.h
@@ -32,7 +32,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: channels.h,v 1.40 2001/06/25 08:25:36 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.41 2001/06/26 06:32:49 itojun Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -65,8 +65,8 @@
 struct Channel;
 typedef struct Channel Channel;
 
-typedef void channel_callback_fn(int id, void *arg);
-typedef int channel_filter_fn(struct Channel *c, char *buf, int len);
+typedef void channel_callback_fn(int, void *);
+typedef int channel_filter_fn(struct Channel *, char *, int);
 
 struct Channel {
 	int     type;		/* channel type/state */
@@ -142,44 +142,39 @@ struct Channel {
 
 /* channel management */
 
-Channel	*channel_lookup(int id);
-Channel *
-channel_new(char *ctype, int type, int rfd, int wfd, int efd,
-    int window, int maxpack, int extusage, char *remote_name, int nonblock);
-void
-channel_set_fds(int id, int rfd, int wfd, int efd,
-    int extusage, int nonblock);
-void    channel_free(Channel *c);
+Channel	*channel_lookup(int);
+Channel *channel_new(char *, int, int, int, int, int, int, int, char *, int);
+void	channel_set_fds(int, int, int, int, int, int);
+void    channel_free(Channel *);
 void    channel_free_all(void);
 
-void	channel_send_open(int id);
-void	channel_request(int id, char *service, int wantconfirm);
-void	channel_request_start(int id, char *service, int wantconfirm);
-void	channel_register_callback(int id, int mtype, channel_callback_fn *fn, void *arg);
-void	channel_register_cleanup(int id, channel_callback_fn *fn);
-void	channel_register_filter(int id, channel_filter_fn *fn);
-void	channel_cancel_cleanup(int id);
+void	channel_send_open(int);
+void	channel_request(int, char *, int);
+void	channel_request_start(int, char *, int);
+void	channel_register_callback(int, int mtype, channel_callback_fn *, void *);
+void	channel_register_cleanup(int, channel_callback_fn *);
+void	channel_register_filter(int, channel_filter_fn *);
+void	channel_cancel_cleanup(int);
 
 /* protocol handler */
 
-void	channel_input_channel_request(int type, int plen, void *ctxt);
-void	channel_input_close(int type, int plen, void *ctxt);
-void	channel_input_close_confirmation(int type, int plen, void *ctxt);
-void	channel_input_data(int type, int plen, void *ctxt);
-void	channel_input_extended_data(int type, int plen, void *ctxt);
-void	channel_input_ieof(int type, int plen, void *ctxt);
-void	channel_input_oclose(int type, int plen, void *ctxt);
-void	channel_input_open_confirmation(int type, int plen, void *ctxt);
-void	channel_input_open_failure(int type, int plen, void *ctxt);
-void	channel_input_port_open(int type, int plen, void *ctxt);
-void	channel_input_window_adjust(int type, int plen, void *ctxt);
+void	channel_input_channel_request(int, int, void *);
+void	channel_input_close(int, int, void *);
+void	channel_input_close_confirmation(int, int, void *);
+void	channel_input_data(int, int, void *);
+void	channel_input_extended_data(int, int, void *);
+void	channel_input_ieof(int, int, void *);
+void	channel_input_oclose(int, int, void *);
+void	channel_input_open_confirmation(int, int, void *);
+void	channel_input_open_failure(int, int, void *);
+void	channel_input_port_open(int, int, void *);
+void	channel_input_window_adjust(int, int, void *);
 
 /* file descriptor handling (read/write) */
 
 void
-channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
-    int rekeying);
-void    channel_after_select(fd_set * readset, fd_set * writeset);
+channel_prepare_select(fd_set **, fd_set **, int *, int);
+void    channel_after_select(fd_set *, fd_set *);
 void    channel_output_poll(void);
 
 int     channel_not_very_much_buffered_data(void);
@@ -191,45 +186,41 @@ int	channel_find_open(void);
 
 /* channel_tcpfwd.c */
 int
-channel_request_local_forwarding(u_short listen_port,
-    const char *host_to_connect, u_short port_to_connect, int gateway_ports);
+channel_request_local_forwarding(u_short, const char *, u_short, int);
 int
-channel_request_forwarding(const char *listen_address, u_short listen_port,
-    const char *host_to_connect, u_short port_to_connect, int gateway_ports,
-    int remote_fwd);
+channel_request_forwarding(const char *, u_short, const char *, u_short, int,
+    int);
 void
-channel_request_remote_forwarding(u_short port, const char *host,
-    u_short remote_port);
+channel_request_remote_forwarding(u_short, const char *, u_short);
 void    channel_permit_all_opens(void);
-void	channel_add_permitted_opens(char *host, int port);
+void	channel_add_permitted_opens(char *, int);
 void	channel_clear_permitted_opens(void);
-void    channel_input_port_forward_request(int is_root, int gateway_ports);
-int	channel_connect_to(const char *host, u_short host_port);
-int	channel_connect_by_listen_adress(u_short listen_port);
+void    channel_input_port_forward_request(int, int);
+int	channel_connect_to(const char *, u_short);
+int	channel_connect_by_listen_adress(u_short);
 
 /* x11 forwarding */
 
 int	x11_connect_display(void);
-char   *x11_create_display(int screen);
-char   *x11_create_display_inet(int screen, int x11_display_offset);
-void    x11_input_open(int type, int plen, void *ctxt);
+char   *x11_create_display(int);
+char   *x11_create_display_inet(int, int);
+void    x11_input_open(int, int, void *);
 void    x11_request_forwarding(void);
 void
-x11_request_forwarding_with_spoofing(int client_session_id,
-    const char *proto, const char *data);
-void	deny_input_open(int type, int plen, void *ctxt);
+x11_request_forwarding_with_spoofing(int, const char *, const char *);
+void	deny_input_open(int, int, void *);
 
 /* agent forwarding */
 
 void    auth_request_forwarding(void);
 char   *auth_get_socket_name(void);
-void	auth_sock_cleanup_proc(void *pw);
-int     auth_input_request_forwarding(struct passwd * pw);
-void    auth_input_open_request(int type, int plen, void *ctxt);
+void	auth_sock_cleanup_proc(void *);
+int     auth_input_request_forwarding(struct passwd *);
+void    auth_input_open_request(int, int, void *);
 
 /* channel close */
 
-typedef void    chan_event_fn(Channel * c);
+typedef void    chan_event_fn(Channel *);
 
 /* for the input state */
 extern chan_event_fn	*chan_rcvd_oclose;
@@ -241,9 +232,9 @@ extern chan_event_fn	*chan_rcvd_ieof;
 extern chan_event_fn	*chan_write_failed;
 extern chan_event_fn	*chan_obuf_empty;
 
-int	chan_is_dead(Channel * c);
-void	chan_mark_dead(Channel * c);
-void    chan_init_iostates(Channel * c);
+int	chan_is_dead(Channel *);
+void	chan_mark_dead(Channel *);
+void    chan_init_iostates(Channel *);
 void	chan_init(void);
 
 #endif
diff --git a/cipher.h b/cipher.h
index 2ad4979c..16dd0623 100644
--- a/cipher.h
+++ b/cipher.h
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* RCSID("$OpenBSD: cipher.h,v 1.26 2001/05/28 22:51:11 markus Exp $"); */
+/* RCSID("$OpenBSD: cipher.h,v 1.27 2001/06/26 06:32:49 itojun Exp $"); */
 
 #ifndef CIPHER_H
 #define CIPHER_H
@@ -104,15 +104,16 @@ struct Cipher {
 	void	(*decrypt)(CipherContext *, u_char *, const u_char *, u_int);
 };
 
-u_int cipher_mask_ssh1(int client);
-Cipher *cipher_by_name(const char *name);
-Cipher *cipher_by_number(int id);
-int cipher_number(const char *name);
-char *cipher_name(int id);
-int ciphers_valid(const char *names);
-void cipher_init(CipherContext *, Cipher *, const u_char *, u_int, const u_char *, u_int);
-void cipher_encrypt(CipherContext *context, u_char *dest, const u_char *src, u_int len);
-void cipher_decrypt(CipherContext *context, u_char *dest, const u_char *src, u_int len);
-void cipher_set_key_string(CipherContext *context, Cipher *cipher, const char *passphrase);
+u_int cipher_mask_ssh1(int);
+Cipher *cipher_by_name(const char *);
+Cipher *cipher_by_number(int);
+int cipher_number(const char *);
+char *cipher_name(int);
+int ciphers_valid(const char *);
+void cipher_init(CipherContext *, Cipher *, const u_char *, u_int,
+    const u_char *, u_int);
+void cipher_encrypt(CipherContext *, u_char *, const u_char *, u_int);
+void cipher_decrypt(CipherContext *, u_char *, const u_char *, u_int);
+void cipher_set_key_string(CipherContext *, Cipher *, const char *);
 
 #endif				/* CIPHER_H */
diff --git a/clientloop.h b/clientloop.h
index ee40d87e..b7f48aa8 100644
--- a/clientloop.h
+++ b/clientloop.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clientloop.h,v 1.4 2001/02/06 22:43:02 markus Exp $	*/
+/*	$OpenBSD: clientloop.h,v 1.5 2001/06/26 06:32:50 itojun Exp $	*/
 
 /*