Changeset 1c68a81
- Timestamp:
- 12/30/07 11:44:58 (13 years ago)
- Branches:
- 4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
- Children:
- 7641ce8
- Parents:
- 1066d75
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
config-win.h
r6ed6c4a r1c68a81 12 12 #define HAVE_LIBPCAP 1 13 13 #define HAVE_PCAP 1 14 #define HAVE_BPF 114 #define HAVE_BPF_FILTER 1 15 15 #define HAVE_PCAP_H 1 16 16 #define HAVE_PCAP_BPF_H 1 -
configure.in
rb282cf8 r1c68a81 4 4 # and in the README 5 5 6 AC_INIT([libtrace],[3.0. 3],[contact@wand.net.nz],[libtrace])6 AC_INIT([libtrace],[3.0.4],[contact@wand.net.nz],[libtrace]) 7 7 8 8 LIBTRACE_MAJOR=3 … … 148 148 ADD_LIBS="$ADD_LIBS -lpcap" 149 149 AC_DEFINE([HAVE_LIBPCAP],1,[compile with libpcap support]) 150 AC_DEFINE([HAVE_BPF_FILTER],1,[compile with bpf filter support]) 150 151 fi 151 152 … … 245 246 AC_CHECK_LIB(z, gzopen) 246 247 247 AM_CONDITIONAL([HAVE_BPF ], [test "$ac_cv_have_decl_BIOCSETIF" = yes ])248 AM_CONDITIONAL([HAVE_BPF_CAPTURE], [test "$ac_cv_have_decl_BIOCSETIF" = yes ]) 248 249 AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true]) 249 250 AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag_version" = 24]) … … 258 259 259 260 AM_CONDITIONAL(HAS_DOXYGEN, [test x"$libtrace_doxygen" = xtrue]) 260 261 261 262 262 AC_SUBST([ADD_LIBS]) … … 270 270 AC_SUBST([LIBTRACE_MINOR]) 271 271 AC_SUBST([DAG_VERSION_NUM]) 272 AC_SUBST([HAVE_BPF_CAPTURE]) 272 273 dnl and finally, output our Makefiles 273 274 AC_OUTPUT -
lib/Makefile.am
re53fbe1 r1c68a81 9 9 endif 10 10 11 if HAVE_BPF 11 if HAVE_BPF_CAPTURE 12 12 BPFFORMATS=format_bpf.c 13 13 else -
lib/trace.c
r50bbce8 r1c68a81 231 231 pcap_constructor(); 232 232 #endif 233 #if def HAVE_BIOCSETIF233 #if HAVE_DECL_BIOCSETIF 234 234 bpf_constructor(); 235 235 #endif … … 1008 1008 trace_create_filter_from_bytecode(void *bf_insns, unsigned int bf_len) 1009 1009 { 1010 #ifndef HAVE_BPF 1010 #ifndef HAVE_BPF_FILTER 1011 1011 fprintf(stderr, "This version of libtrace does not have BPF support\n"); 1012 1012 return NULL; … … 1035 1035 */ 1036 1036 DLLEXPORT libtrace_filter_t *trace_create_filter(const char *filterstring) { 1037 #ifdef HAVE_BPF 1037 #ifdef HAVE_BPF_FILTER 1038 1038 libtrace_filter_t *filter = (libtrace_filter_t*) 1039 1039 malloc(sizeof(libtrace_filter_t)); … … 1049 1049 DLLEXPORT void trace_destroy_filter(libtrace_filter_t *filter) 1050 1050 { 1051 #ifdef HAVE_BPF 1051 #ifdef HAVE_BPF_FILTER 1052 1052 free(filter->filterstring); 1053 1053 if (filter->flag) … … 1066 1066 int trace_bpf_compile(libtrace_filter_t *filter, 1067 1067 const libtrace_packet_t *packet ) { 1068 #ifdef HAVE_BPF 1068 #ifdef HAVE_BPF_FILTER 1069 1069 void *linkptr = 0; 1070 1070 libtrace_linktype_t linktype; … … 1120 1120 DLLEXPORT int trace_apply_filter(libtrace_filter_t *filter, 1121 1121 const libtrace_packet_t *packet) { 1122 #ifdef HAVE_BPF 1122 #ifdef HAVE_BPF_FILTER 1123 1123 void *linkptr = 0; 1124 1124 uint32_t clen = 0;
Note: See TracChangeset
for help on using the changeset viewer.