From owner-svn-src-projects@FreeBSD.ORG Thu Aug 12 15:12:20 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF5B910656A6; Thu, 12 Aug 2010 15:12:20 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9F9518FC25; Thu, 12 Aug 2010 15:12:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7CFCKiG015369; Thu, 12 Aug 2010 15:12:20 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7CFCKtq015367; Thu, 12 Aug 2010 15:12:20 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201008121512.o7CFCKtq015367@svn.freebsd.org> From: Attilio Rao Date: Thu, 12 Aug 2010 15:12:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211224 - projects/sv/usr.sbin/netdumpsrv X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Aug 2010 15:12:20 -0000 Author: attilio Date: Thu Aug 12 15:12:20 2010 New Revision: 211224 URL: http://svn.freebsd.org/changeset/base/211224 Log: Remove occurrences of addr2ascii. Just one is left on questionable code that might be stripped away in any case. Modified: projects/sv/usr.sbin/netdumpsrv/netdump_server.c Modified: projects/sv/usr.sbin/netdumpsrv/netdump_server.c ============================================================================== --- projects/sv/usr.sbin/netdumpsrv/netdump_server.c Thu Aug 12 15:05:41 2010 (r211223) +++ projects/sv/usr.sbin/netdumpsrv/netdump_server.c Thu Aug 12 15:12:20 2010 (r211224) @@ -503,8 +503,7 @@ int receive_message(int sock, struct soc return -1; } - snprintf(fromstr, fromstrlen, "%s:%hu", - addr2ascii(AF_INET, &from->sin_addr, sizeof(from->sin_addr), NULL), + snprintf(fromstr, fromstrlen, "%s:%hu", inet_aton(from->sin_addr), ntohs(from->sin_port)); if ((size_t)len < sizeof(struct netdump_msg_hdr)) @@ -756,9 +755,7 @@ int main(int argc, char **argv) fputs("Invalid bind IP specified\n", stderr); return 1; } - printf("Listening on IP %s\n", - addr2ascii(AF_INET, &bindip, - sizeof(bindip), NULL)); + printf("Listening on IP %s\n", inet_aton(bindip)); break; case 2: bindip.s_addr = INADDR_ANY;