diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-21 16:16:56 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-21 16:16:56 +0000 |
| commit | 3d6fdc55d06aba5a8a73c7d77792963a941ad58a (patch) | |
| tree | 87c3615c3e63ce2fbf46709ffb1cb96f79c4b6a1 /epan/dissectors/packet-tacacs.c | |
| parent | aa4b08e2ca2785e22e8e49271b7513a28275bbe1 (diff) | |
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
Diffstat (limited to 'epan/dissectors/packet-tacacs.c')
| -rw-r--r-- | epan/dissectors/packet-tacacs.c | 25 |
1 files changed, 2 insertions, 23 deletions
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 <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif - -#ifdef HAVE_WINSOCK2_H -#include <winsock2.h> /* needed to define AF_ values on Windows */ -#endif - -#ifdef NEED_INET_V6DEFS_H -# include "wsutil/inet_v6defs.h" -#endif - #include <glib.h> #include <wsutil/md5.h> @@ -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); |