- (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]

[openssh.git] / canohost.h

diff --git a/canohost.h b/canohost.h
index da60b3af9f00cba61175b94fbe63ba98c9fcf88a..d9b41ffe5449c05112a0c6639d99cdfbab0e419e 100644 (file)
--- a/canohost.h
+++ b/canohost.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: canohost.h,v 1.4 2001/02/03 10:08:37 markus Exp $     */
+/* $OpenBSD: canohost.h,v 1.10 2009/02/12 03:00:56 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -12,23 +12,18 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/*
- * Return the canonical name of the host in the other side of the current
- * 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);
+const char     *get_remote_ipaddr(void);
+const char     *get_remote_name_or_ip(u_int, int);
 
-/*
- * Returns the IP-address of the remote host as a string.  The returned
- * string is cached and must not be freed.
- */
-const char *get_remote_ipaddr(void);
+char           *get_peer_ipaddr(int);
+int             get_peer_port(int);
+char           *get_local_ipaddr(int);
+char           *get_local_name(int);
+
+int             get_remote_port(void);
+int             get_local_port(void);
+int             get_sock_port(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);
 
-/* Returns the port number of the remote/local host. */
-int     get_remote_port(void);
-int    get_local_port(void);
+void            ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *);