[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.34 and 1.35

version 1.34, 2002/09/23 20:46:27 version 1.35, 2002/11/26 02:38:54
Line 38 
Line 38 
         /* Get IP address of client. */          /* Get IP address of client. */
         fromlen = sizeof(from);          fromlen = sizeof(from);
         memset(&from, 0, sizeof(from));          memset(&from, 0, sizeof(from));
         if (getpeername(socket, (struct sockaddr *) &from, &fromlen) < 0) {          if (getpeername(socket, (struct sockaddr *)&from, &fromlen) < 0) {
                 debug("getpeername failed: %.100s", strerror(errno));                  debug("getpeername failed: %.100s", strerror(errno));
                 fatal_cleanup();                  fatal_cleanup();
         }          }
Line 180 
Line 180 
 }  }
   
 /*  /*
  * Returns the remote IP-address of socket as a string.  The returned   * Returns the local/remote IP-address/hostname of socket as a string.
  * string must be freed.   * The returned string must be freed.
  */   */
 static char *  static char *
 get_socket_address(int socket, int remote, int flags)  get_socket_address(int socket, int remote, int flags)
Line 206 
Line 206 
         /* Get the address in ascii. */          /* Get the address in ascii. */
         if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),          if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),
             NULL, 0, flags) != 0) {              NULL, 0, flags) != 0) {
                 error("get_socket_ipaddr: getnameinfo %d failed", flags);                  error("get_socket_address: getnameinfo %d failed", flags);
                 return NULL;                  return NULL;
         }          }
         return xstrdup(ntop);          return xstrdup(ntop);
Line 292 
Line 292 
                         return 0;                          return 0;
                 }                  }
         } else {          } else {
                 if (getpeername(sock, (struct sockaddr *) & from, &fromlen) < 0) {                  if (getpeername(sock, (struct sockaddr *)&from, &fromlen) < 0) {
                         debug("getpeername failed: %.100s", strerror(errno));                          debug("getpeername failed: %.100s", strerror(errno));
                         fatal_cleanup();                          fatal_cleanup();
                 }                  }
Legend:
Removed from v.1.34  
changed lines
  Added in v.1.35