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-6lowpan.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-6lowpan.c')
| -rw-r--r-- | epan/dissectors/packet-6lowpan.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 26383bd8db..8ff36ecff8 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -25,26 +25,6 @@ */ #include "config.h" -/* Need to get headers for AF_INET6 and inet_pton() */ -#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> -#endif -#ifdef NEED_INET_V6DEFS_H -# include "wsutil/inet_v6defs.h" -#endif - #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> @@ -2833,7 +2813,7 @@ prefs_6lowpan_apply(void) for (i = 0; i < LOWPAN_CONTEXT_MAX; i++) { if (!lowpan_context_prefs[i]) continue; - if (inet_pton(AF_INET6, lowpan_context_prefs[i], &prefix) <= 0) continue; + if (!str_to_ip6(lowpan_context_prefs[i], &prefix)) continue; /* Set the prefix */ lowpan_context_insert(i, IEEE802154_BCAST_PAN, 64, &prefix, 0); } /* for */ |