[BACK]Return to canohost.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/canohost.c between version 1.64 and 1.65

version 1.64, 2009/02/12 03:00:56 version 1.65, 2009/05/27 06:31:25
Line 32 
Line 32 
 #include "misc.h"  #include "misc.h"
   
 static void check_ip_options(int, char *);  static void check_ip_options(int, char *);
   static char *canonical_host_ip = NULL;
   static int cached_port = -1;
   
 /*  /*
  * Return the canonical name of the host at the other end of the socket. The   * Return the canonical name of the host at the other end of the socket. The
Line 262 
Line 264 
         return get_socket_address(sock, 0, NI_NAMEREQD);          return get_socket_address(sock, 0, NI_NAMEREQD);
 }  }
   
   void
   clear_cached_addr(void)
   {
           if (canonical_host_ip != NULL) {
                   xfree(canonical_host_ip);
                   canonical_host_ip = NULL;
           }
           cached_port = -1;
   }
   
 /*  /*
  * Returns the IP-address of the remote host as a string.  The returned   * Returns the IP-address of the remote host as a string.  The returned
  * string must not be freed.   * string must not be freed.
Line 270 
Line 282 
 const char *  const char *
 get_remote_ipaddr(void)  get_remote_ipaddr(void)
 {  {
         static char *canonical_host_ip = NULL;  
   
         /* Check whether we have cached the ipaddr. */          /* Check whether we have cached the ipaddr. */
         if (canonical_host_ip == NULL) {          if (canonical_host_ip == NULL) {
                 if (packet_connection_is_on_socket()) {                  if (packet_connection_is_on_socket()) {
Line 355 
Line 365 
 int  int
 get_remote_port(void)  get_remote_port(void)
 {  {
         static int port = -1;  
   
         /* Cache to avoid getpeername() on a dead connection */          /* Cache to avoid getpeername() on a dead connection */
         if (port == -1)          if (cached_port == -1)
                 port = get_port(0);                  cached_port = get_port(0);
   
         return port;          return cached_port;
 }  }
   
 int  int

Legend:
Removed from v.1.64  
changed lines
  Added in v.1.65