Commit 903a04d2 authored by 's avatar
Browse files

napatechflib build/install support


git-svn-id: file:///home/svn/mapi/trunk@1483 8d5bb341-7cf1-0310-8cf6-ba355fef3186
parent ede6f34f
...@@ -309,7 +309,7 @@ AS_HELP_STRING([--enable-napatech], [Enable support for NAPATECH cards]), ...@@ -309,7 +309,7 @@ AS_HELP_STRING([--enable-napatech], [Enable support for NAPATECH cards]),
*) AC_MSG_ERROR(bad value ${enableval} for --enable-napatech) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-napatech) ;;
esac], [napatech=false]) esac], [napatech=false])
AM_CONDITIONAL(DRIVER_NAPATECH, test x$napatech = xtrue) AM_CONDITIONAL(DRIVER_NAPATECH, test x$napatech = xtrue)
# AM_CONDITIONAL(BINARY_DAGFLIB, test x$dag = xtrue) AM_CONDITIONAL(BINARY_NAPATECHFLIB, test x$napatech = xtrue)
# AM_CONDITIONAL(PRECLASSIFICATION, test x$dag = xtrue) # AM_CONDITIONAL(PRECLASSIFICATION, test x$dag = xtrue)
if test x$napatech = xtrue; then if test x$napatech = xtrue; then
MAPI_CONF_NAPATECH_ENTRY=$srcdir/config/mapi.conf.napatech.entry MAPI_CONF_NAPATECH_ENTRY=$srcdir/config/mapi.conf.napatech.entry
......
...@@ -16,6 +16,9 @@ if BINARY_DAGFLIB ...@@ -16,6 +16,9 @@ if BINARY_DAGFLIB
BUILD_dagflib = dagflib BUILD_dagflib = dagflib
BUILD_bpfcompiler = bpfcompiler BUILD_bpfcompiler = bpfcompiler
endif endif
if BINARY_NAPATECHFLIB
BUILD_napatechflib = napatechflib
endif
if BINARY_EXTRAFLIB if BINARY_EXTRAFLIB
BUILD_extraflib = extraflib BUILD_extraflib = extraflib
endif endif
...@@ -27,6 +30,7 @@ $(BUILD_rulerflib) \ ...@@ -27,6 +30,7 @@ $(BUILD_rulerflib) \
$(BUILD_ipfixflib) \ $(BUILD_ipfixflib) \
$(BUILD_anonflib) \ $(BUILD_anonflib) \
$(BUILD_dagflib) \ $(BUILD_dagflib) \
$(BUILD_napatechflib) \
$(BUILD_extraflib) $(BUILD_extraflib)
#DIST_SUBDIRS = #DIST_SUBDIRS =
......
...@@ -34,9 +34,9 @@ static int interface_instance(mapidflib_function_instance_t *instance, ...@@ -34,9 +34,9 @@ static int interface_instance(mapidflib_function_instance_t *instance,
return MFUNCT_INVALID_ARGUMENT; return MFUNCT_INVALID_ARGUMENT;
/* refuse: the same function was already applied to this flow */ /* refuse: the same function was already applied to this flow */
fhlp_filtering_funct_is_in_list_but_INTERFACE(instance->hwinfo->gflist, fd, &interface_f); /*fhlp_filtering_funct_is_in_list_but_INTERFACE(instance->hwinfo->gflist, fd, &interface_f);
if (interface_f == INTERFACE_FUNCT_EXISTS) if (interface_f == INTERFACE_FUNCT_EXISTS)
return MFUNCT_COULD_NOT_APPLY_FUNCT; return MFUNCT_COULD_NOT_APPLY_FUNCT;*/
return 0; return 0;
} }
...@@ -68,7 +68,12 @@ static int interface_process(mapidflib_function_instance_t *instance, ...@@ -68,7 +68,12 @@ static int interface_process(mapidflib_function_instance_t *instance,
MAPI_UNUSED unsigned char* link_pkt, MAPI_UNUSED unsigned char* link_pkt,
MAPI_UNUSED mapid_pkthdr_t* pkt_head) MAPI_UNUSED mapid_pkthdr_t* pkt_head)
{ {
interface_instance_t *internal_data_ptr;
internal_data_ptr = (interface_instance_t *) (instance->internal_data);
return 1; return 1;
//return 0; //return 0;
} }
...@@ -86,7 +91,7 @@ static mapidflib_function_def_t finfo={ ...@@ -86,7 +91,7 @@ static mapidflib_function_def_t finfo={
"INTERFACE", //name "INTERFACE", //name
"Filters packets from specific interfaces on an adapter", //descr "Filters packets from specific interfaces on an adapter", //descr
"i", //argdescr "i", //argdescr
MAPI_DEVICE_DAG, //devtype MAPI_DEVICE_NAPATECH, //devtype
MAPIRES_NONE, //Method for returning results MAPIRES_NONE, //Method for returning results
0, //shm size 0, //shm size
0, //modifies_pkts 0, //modifies_pkts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment