From fc50ce3d9d7221d156aa0e4e8fc2ffad2e52599f Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Fri, 5 Jul 2002 19:56:15 +0000 Subject: Reduce or localize dependencies on address families. * kdc_util.h (ADDRTYPE2FAMILY): New macro. * do_as_req.c (process_as_req): Use inet_ntop instead of inet_ntoa. * do_tgs_req.c (process_tgs_req): Ditto. * dispatch.c (dispatch): Fix inet_ntop code, and use it always. * kerberos_v4.c (process_v4): Check address family before copying out an IPv4 address. Log if not IPv4, but continue. * network.c (set_sa_port): New function. (setup_port): Use it. Combine IPv4 and IPv6 paths; IPv6 still disabled for now. Modify supplied sockaddr instead of making a copy. (process_packet): SADDR is now sockaddr_storage. Use socket-utils macros instead of casting. Enable the IPv6 code. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14602 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kdc/dispatch.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/kdc/dispatch.c') diff --git a/src/kdc/dispatch.c b/src/kdc/dispatch.c index db5e72314..896229010 100644 --- a/src/kdc/dispatch.c +++ b/src/kdc/dispatch.c @@ -57,17 +57,8 @@ dispatch(pkt, from, response) const char *name = 0; char buf[46]; -#ifdef HAVE_INET_NTOP - name = inet_ntop (from->address->addrtype, from->address->contents, - buf, sizeof (buf)); -#else - if (from->address->addrtype == ADDRTYPE_INET) { - struct sockaddr_in *mysin - = (struct sockaddr_in *)from->address->contents; - strcpy (buf, inet_ntoa (mysin->sin_addr)); - name = buf; - } -#endif + name = inet_ntop (ADDRTYPE2FAMILY (from->address->addrtype), + from->address->contents, buf, sizeof (buf)); if (name == 0) name = "[unknown address type]"; krb5_klog_syslog(LOG_INFO, -- cgit