diff options
Diffstat (limited to 'canohost.c')
-rw-r--r-- | canohost.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/canohost.c b/canohost.c index 00c499ca0..a457d3c52 100644 --- a/canohost.c +++ b/canohost.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: canohost.c,v 1.32 2002/06/11 08:11:45 itojun Exp $"); | 15 | RCSID("$OpenBSD: canohost.c,v 1.34 2002/09/23 20:46:27 stevesk Exp $"); |
16 | 16 | ||
17 | #include "packet.h" | 17 | #include "packet.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -77,7 +77,9 @@ get_remote_hostname(int socket, int verify_reverse_mapping) | |||
77 | if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), | 77 | if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), |
78 | NULL, 0, NI_NAMEREQD) != 0) { | 78 | NULL, 0, NI_NAMEREQD) != 0) { |
79 | /* Host name not found. Use ip address. */ | 79 | /* Host name not found. Use ip address. */ |
80 | #if 0 | ||
80 | log("Could not reverse map address %.100s.", ntop); | 81 | log("Could not reverse map address %.100s.", ntop); |
82 | #endif | ||
81 | return xstrdup(ntop); | 83 | return xstrdup(ntop); |
82 | } | 84 | } |
83 | 85 | ||
@@ -216,18 +218,12 @@ get_socket_address(int socket, int remote, int flags) | |||
216 | 218 | ||
217 | if (remote) { | 219 | if (remote) { |
218 | if (getpeername(socket, (struct sockaddr *)&addr, &addrlen) | 220 | if (getpeername(socket, (struct sockaddr *)&addr, &addrlen) |
219 | < 0) { | 221 | < 0) |
220 | debug("get_socket_ipaddr: getpeername failed: %.100s", | ||
221 | strerror(errno)); | ||
222 | return NULL; | 222 | return NULL; |
223 | } | ||
224 | } else { | 223 | } else { |
225 | if (getsockname(socket, (struct sockaddr *)&addr, &addrlen) | 224 | if (getsockname(socket, (struct sockaddr *)&addr, &addrlen) |
226 | < 0) { | 225 | < 0) |
227 | debug("get_socket_ipaddr: getsockname failed: %.100s", | ||
228 | strerror(errno)); | ||
229 | return NULL; | 226 | return NULL; |
230 | } | ||
231 | } | 227 | } |
232 | /* Get the address in ascii. */ | 228 | /* Get the address in ascii. */ |
233 | if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop), | 229 | if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop), |
@@ -241,13 +237,21 @@ get_socket_address(int socket, int remote, int flags) | |||
241 | char * | 237 | char * |
242 | get_peer_ipaddr(int socket) | 238 | get_peer_ipaddr(int socket) |
243 | { | 239 | { |
244 | return get_socket_address(socket, 1, NI_NUMERICHOST); | 240 | char *p; |
241 | |||
242 | if ((p = get_socket_address(socket, 1, NI_NUMERICHOST)) != NULL) | ||
243 | return p; | ||
244 | return xstrdup("UNKNOWN"); | ||
245 | } | 245 | } |
246 | 246 | ||
247 | char * | 247 | char * |
248 | get_local_ipaddr(int socket) | 248 | get_local_ipaddr(int socket) |
249 | { | 249 | { |
250 | return get_socket_address(socket, 0, NI_NUMERICHOST); | 250 | char *p; |
251 | |||
252 | if ((p = get_socket_address(socket, 0, NI_NUMERICHOST)) != NULL) | ||
253 | return p; | ||
254 | return xstrdup("UNKNOWN"); | ||
251 | } | 255 | } |
252 | 256 | ||
253 | char * | 257 | char * |