Preston_PLB
/
sngrep
forked from Mirrors/sngrep
1
0
Fork 0
Code Pull Requests Activity

Replace WITH_IPV6 for USE_IPV6 define

This commit is contained in:
Kaian 2015-09-23 10:59:19 +02:00
parent 4feda3df96
commit 3ac971b445
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -149,15 +149,15 @@ AS_IF([test "x$WITH_PCRE" == "xyes"], [
####
AC_ARG_ENABLE([ipv6],
AS_HELP_STRING([--enable-ipv6], [Enable IPv6 Support]),
[AC_SUBST(WITH_IPV6, $enableval)],
[AC_SUBST(WITH_IPV6, no)]
[AC_SUBST(USE_IPV6, $enableval)],
[AC_SUBST(USE_IPV6, no)]
)
AS_IF([test "x$WITH_IPV6" == "xyes"], [
AS_IF([test "x$USE_IPV6" == "xyes"], [
AC_CHECK_HEADER([netinet/ip6.h], [], [
AC_MSG_ERROR([ You dont seem to have ipv6 support (no ip6.h found).])
])
AC_DEFINE([WITH_IPV6],[],[Compile With IPv6 support])
AC_DEFINE([USE_IPV6],[],[Compile With IPv6 support])
], [])
@ -189,7 +189,7 @@ AC_MSG_NOTICE( ====================================================== )
AC_MSG_NOTICE( OpenSSL Support : ${WITH_OPENSSL} )
AC_MSG_NOTICE( Unicode Support : ${UNICODE} )
AC_MSG_NOTICE( Perl Expressions Support : ${WITH_PCRE} )
AC_MSG_NOTICE( IPv6 Support : ${WITH_IPV6} )
AC_MSG_NOTICE( IPv6 Support : ${USE_IPV6} )
AC_MSG_NOTICE( ====================================================== )
AC_MSG_NOTICE

10
src/capture_reasm.c
View File

@ -34,7 +34,7 @@
#include "util.h"
#include "capture.h"
#include "capture_reasm.h"
#ifdef WITH_IPV6
#ifdef USE_IPV6
#include <netinet/ip6.h>
#endif
@ -47,7 +47,7 @@ capture_packet_reasm_ip(capture_info_t *capinfo, const struct pcap_pkthdr *heade
{
// IP header data
struct ip *ip4;
#ifdef WITH_IPV6
#ifdef USE_IPV6
// IPv6 header data
struct ip6_hdr *ip6;
#endif
@ -80,7 +80,7 @@ capture_packet_reasm_ip(capture_info_t *capinfo, const struct pcap_pkthdr *heade
// Get IP header
ip4 = (struct ip *) (packet + capinfo->link_hl);
#ifdef WITH_IPV6
#ifdef USE_IPV6
// Get IPv6 header
ip6 = (struct ip6_hdr *) (packet + capinfo->link_hl);
#endif
@ -101,7 +101,7 @@ capture_packet_reasm_ip(capture_info_t *capinfo, const struct pcap_pkthdr *heade
inet_ntop(AF_INET, &ip4->ip_src, ip_src, sizeof(ip_src));
inet_ntop(AF_INET, &ip4->ip_dst, ip_dst, sizeof(ip_dst));
break;
#ifdef WITH_IPV6
#ifdef USE_IPV6
case 6:
ip_hl = sizeof(struct ip6_hdr);
ip_proto = ip6->ip6_nxt;
@ -123,7 +123,7 @@ capture_packet_reasm_ip(capture_info_t *capinfo, const struct pcap_pkthdr *heade
// Remove IP Header length from payload
*size = *caplen - capinfo->link_hl - ip_hl;
#ifdef WITH_IPV6
#ifdef USE_IPV6
if (ip_ver == 6)
*size -= ntohs(ip6->ip6_ctlun.ip6_un1.ip6_un1_plen);
#endif

2
src/main.c
View File

@ -89,7 +89,7 @@ version()
#ifdef WITH_PCRE
" * Compiled with Perl Compatible regular expressions support.\n"
#endif
#ifdef WITH_IPV6
#ifdef USE_IPV6
" * Compiled with IPv6 support.\n"
#endif
"\nWritten by Ivan Alonso [aka Kaian]\n",