From 3d6fdc55d06aba5a8a73c7d77792963a941ad58a Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Sat, 21 Dec 2013 16:16:56 +0000 Subject: New functions: str_to_ip6(), str_to_ip() This way we can avoid including lot of system header files in some dissectors and it might fix bug #9581 svn path=/trunk/; revision=54330 --- epan/dissectors/packet-tacacs.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'epan/dissectors/packet-tacacs.c') diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 3b4abf6b2b..fed9e4fc26 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -36,27 +36,6 @@ #include "config.h" -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -# include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif - -#ifdef HAVE_WINSOCK2_H -#include /* needed to define AF_ values on Windows */ -#endif - -#ifdef NEED_INET_V6DEFS_H -# include "wsutil/inet_v6defs.h" -#endif - #include #include @@ -827,8 +806,8 @@ mkipv4_address( address **addr, const char *str_addr ) *addr=(address *)g_malloc( sizeof(address) ); addr_data=(char *)g_malloc( 4 ); - ret = inet_pton( AF_INET, str_addr, addr_data ); - if (ret==1) + ret = str_to_ip(str_addr, addr_data); + if (ret) SET_ADDRESS(*addr, AT_IPv4, 4, addr_data); else SET_ADDRESS(*addr, AT_STRINGZ, (int)strlen(ADDR_INVLD)+1, ADDR_INVLD); -- cgit v1.2.3