- markus@cvs.openbsd.org 2001/11/07 22:53:21

[openssh.git] / canohost.c

diff --git a/canohost.c b/canohost.c
index 823545d4c33f3f57f223bc1a605e7ff6561b6c1b..6e6a04505e97c2244342baca4cd8a81aed33975c 100644 (file)
--- a/canohost.c
+++ b/canohost.c
@@ -12,21 +12,21 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.25 2001/04/12 19:15:24 markus Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.27 2001/06/23 15:12:17 itojun Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
 #include "log.h"
 #include "canohost.h"
 
-void   check_ip_options(int socket, char *ipaddr);
+static void check_ip_options(int, char *);
 
 /*
  * Return the canonical name of the host at the other end of the socket. The
  * caller should free the returned string with xfree.
  */
 
-char *
+static char *
 get_remote_hostname(int socket, int reverse_mapping_check)
 {
        struct sockaddr_storage from;
@@ -71,7 +71,7 @@ get_remote_hostname(int socket, int reverse_mapping_check)
             NULL, 0, NI_NUMERICHOST) != 0)
                fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
 
-       debug("Trying to reverse map address %.100s.", ntop);
+       debug3("Trying to reverse map address %.100s.", ntop);
        /* Map the IP address to a host name. */
        if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
             NULL, 0, NI_NAMEREQD) != 0) {
@@ -140,7 +140,7 @@ get_remote_hostname(int socket, int reverse_mapping_check)
  * exit here if we detect any IP options.
  */
 /* IPv4 only */
-void
+static void
 check_ip_options(int socket, char *ipaddr)
 {
        u_char options[200];
@@ -202,7 +202,7 @@ get_canonical_hostname(int reverse_mapping_check)
  * Returns the remote IP-address of socket as a string.  The returned
  * string must be freed.
  */
-char *
+static char *
 get_socket_address(int socket, int remote, int flags)
 {
        struct sockaddr_storage addr;
@@ -293,7 +293,7 @@ get_remote_name_or_ip(u_int utmp_len, int reverse_mapping_check)
 
 /* Returns the local/remote port for the socket. */
 
-int
+static int
 get_sock_port(int sock, int local)
 {
        struct sockaddr_storage from;
@@ -323,7 +323,7 @@ get_sock_port(int sock, int local)
 
 /* Returns remote/local port number for the current connection. */
 
-int
+static int
 get_port(int local)
 {
        /*