napatech: remove, to make room for plugin

Issue: 7166
pull/11948/head
Jeff Lucovsky 8 months ago committed by Victor Julien
parent 58556b7f8b
commit 330c408930

@ -410,7 +410,6 @@ noinst_HEADERS = \
runmode-erf-dag.h \
runmode-erf-file.h \
runmode-ipfw.h \
runmode-napatech.h \
runmode-netmap.h \
runmode-nflog.h \
runmode-nfq.h \
@ -428,7 +427,6 @@ noinst_HEADERS = \
source-erf-dag.h \
source-erf-file.h \
source-ipfw.h \
source-napatech.h \
source-netmap.h \
source-nflog.h \
source-nfq.h \
@ -539,7 +537,6 @@ noinst_HEADERS = \
util-mpm-ac-ks.h \
util-mpm.h \
util-mpm-hs.h \
util-napatech.h \
util-optimize.h \
util-pages.h \
util-path.h \
@ -982,7 +979,6 @@ libsuricata_c_a_SOURCES = \
runmode-erf-dag.c \
runmode-erf-file.c \
runmode-ipfw.c \
runmode-napatech.c \
runmode-netmap.c \
runmode-nflog.c \
runmode-nfq.c \
@ -999,7 +995,6 @@ libsuricata_c_a_SOURCES = \
source-erf-dag.c \
source-erf-file.c \
source-ipfw.c \
source-napatech.c \
source-netmap.c \
source-nflog.c \
source-nfq.c \
@ -1095,7 +1090,6 @@ libsuricata_c_a_SOURCES = \
util-mpm-ac-ks-small.c \
util-mpm.c \
util-mpm-hs.c \
util-napatech.c \
util-pages.c \
util-path.c \
util-pidfile.c \

@ -38,10 +38,6 @@
#include "app-layer-protos.h"
#endif
#ifdef HAVE_NAPATECH
#include "util-napatech.h"
#endif /* HAVE_NAPATECH */
typedef enum {
CHECKSUM_VALIDATION_DISABLE,
CHECKSUM_VALIDATION_ENABLE,
@ -549,9 +545,6 @@ typedef struct Packet_
#ifdef HAVE_DPDK
DPDKPacketVars dpdk_v;
#endif
#ifdef HAVE_NAPATECH
NapatechPacketVars ntpv;
#endif
#ifdef HAVE_AF_XDP
AFXDPPacketVars afxdp_v;
#endif

@ -1,269 +0,0 @@
/* Copyright (C) 2012-2017 Open Information Security Foundation
*
* You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \author nPulse Technologies, LLC.
* \author Matt Keeler <mk@npulsetech.com>
*/
#include "suricata-common.h"
#include "tm-threads.h"
#include "conf.h"
#include "runmodes.h"
#include "output.h"
#include "util-debug.h"
#include "util-time.h"
#include "util-cpu.h"
#include "util-byte.h"
#include "util-affinity.h"
#include "util-runmodes.h"
#include "util-device.h"
#include "util-napatech.h"
#include "runmode-napatech.h"
#include "source-napatech.h" // need NapatechStreamDevConf structure
static const char *default_mode = "workers";
#ifdef HAVE_NAPATECH
#define NT_RUNMODE_AUTOFP 1
#define NT_RUNMODE_WORKERS 2
#define MAX_STREAMS 256
static uint16_t num_configured_streams = 0;
static uint16_t first_stream = 0xffff;
static uint16_t last_stream = 0xffff;
static int auto_config = 0;
static int use_hw_bypass = 0;
uint16_t NapatechGetNumConfiguredStreams(void)
{
return num_configured_streams;
}
uint16_t NapatechGetNumFirstStream(void)
{
return first_stream;
}
uint16_t NapatechGetNumLastStream(void)
{
return last_stream;
}
bool NapatechIsAutoConfigEnabled(void)
{
return (auto_config != 0);
}
bool NapatechUseHWBypass(void)
{
return (use_hw_bypass != 0);
}
#endif
const char *RunModeNapatechGetDefaultMode(void)
{
return default_mode;
}
void RunModeNapatechRegister(void)
{
#ifdef HAVE_NAPATECH
RunModeRegisterNewRunMode(RUNMODE_NAPATECH, "workers",
"Workers Napatech mode, each thread does all"
" tasks from acquisition to logging",
RunModeNapatechWorkers, NULL);
return;
#endif
}
#ifdef HAVE_NAPATECH
static int NapatechRegisterDeviceStreams(void)
{
/* Display the configuration mode */
int use_all_streams;
if (ConfGetBool("napatech.use-all-streams", &use_all_streams) == 0) {
SCLogInfo("Could not find napatech.use-all-streams in config file. Defaulting to \"no\".");
use_all_streams = 0;
}
if (ConfGetBool("napatech.auto-config", &auto_config) == 0) {
SCLogInfo("napatech.auto-config not found in config file. Defaulting to disabled.");
}
if (ConfGetBool("napatech.hardware-bypass", &use_hw_bypass) == 0) {
SCLogInfo("napatech.hardware-bypass not found in config file. Defaulting to disabled.");
}
/* use_all_streams uses existing streams created prior to starting Suricata. auto_config
* automatically creates streams. Therefore, these two options are mutually exclusive.
*/
if (use_all_streams && auto_config) {
FatalError("napatech.auto-config cannot be used in configuration file at the same time as "
"napatech.use-all-streams.");
}
/* to use hardware_bypass we need to configure the streams to be consistent.
* with the rest of the configuration. Therefore auto_config is not a valid
* option.
*/
if (use_hw_bypass && auto_config == 0) {
FatalError("napatech auto-config must be enabled when using napatech.use_hw_bypass.");
}
/* Get the stream ID's either from the conf or by querying Napatech */
NapatechStreamConfig stream_config[MAX_STREAMS];
uint16_t stream_cnt = NapatechGetStreamConfig(stream_config);
num_configured_streams = stream_cnt;
SCLogDebug("Configuring %d Napatech Streams...", stream_cnt);
for (uint16_t inst = 0; inst < stream_cnt; ++inst) {
char *plive_dev_buf = SCCalloc(1, 9);
if (unlikely(plive_dev_buf == NULL)) {
FatalError("Failed to allocate memory for NAPATECH stream counter.");
}
snprintf(plive_dev_buf, 9, "nt%d", stream_config[inst].stream_id);
if (auto_config) {
if (stream_config[inst].is_active) {
SCLogError("Registering Napatech device: %s - active stream found.", plive_dev_buf);
SCLogError(
"run /opt/napatech3/bin/ntpl -e \"delete=all\" to delete existing stream");
FatalError("or disable auto-config in the conf file before running.");
}
} else {
SCLogInfo("Registering Napatech device: %s - active stream%sfound.",
plive_dev_buf, stream_config[inst].is_active ? " " : " NOT ");
}
LiveRegisterDevice(plive_dev_buf);
if (first_stream == 0xffff) {
first_stream = stream_config[inst].stream_id;
}
last_stream = stream_config[inst].stream_id;
}
/* Napatech stats come from a separate thread. This will suppress
* the counters when suricata exits.
*/
LiveDeviceHasNoStats();
return 0;
}
static void *NapatechConfigParser(const char *device)
{
/* Expect device to be of the form nt%d where %d is the stream id to use */
int dev_len = strlen(device);
if (dev_len < 3 || dev_len > 5) {
SCLogError("Could not parse config for device: %s - invalid length", device);
return NULL;
}
struct NapatechStreamDevConf *conf = SCCalloc(1, sizeof (struct NapatechStreamDevConf));
if (unlikely(conf == NULL)) {
SCLogError("Failed to allocate memory for NAPATECH device name.");
return NULL;
}
/* device+2 is a pointer to the beginning of the stream id after the constant nt portion */
if (StringParseUint16(&conf->stream_id, 10, 0, device + 2) < 0) {
SCLogError("Invalid value for stream_id: %s", device + 2);
SCFree(conf);
return NULL;
}
return (void *) conf;
}
static int NapatechGetThreadsCount(void *conf __attribute__((unused)))
{
/* No matter which live device it is there is no reason to ever use more than 1 thread
2 or more thread would cause packet duplication */
return 1;
}
static int NapatechInit(int runmode)
{
int status;
TimeModeSetLive();
/* Initialize the API and check version compatibility */
if ((status = NT_Init(NTAPI_VERSION)) != NT_SUCCESS) {
NAPATECH_ERROR(status);
exit(EXIT_FAILURE);
}
status = NapatechRegisterDeviceStreams();
if (status < 0 || num_configured_streams <= 0) {
FatalError("Unable to find existing Napatech Streams");
}
struct NapatechStreamDevConf *conf =
SCCalloc(1, sizeof (struct NapatechStreamDevConf));
if (unlikely(conf == NULL)) {
FatalError("Failed to allocate memory for NAPATECH device.");
}
if (use_hw_bypass) {
#ifdef NAPATECH_ENABLE_BYPASS
if (NapatechVerifyBypassSupport()) {
SCLogInfo("Napatech Hardware Bypass is supported and enabled.");
} else {
FatalError("Napatech Hardware Bypass requested in conf but is not supported by the "
"hardware.");
}
#else
FatalError(
"Napatech Hardware Bypass requested in conf but is not enabled by the software.");
#endif
} else {
SCLogInfo("Hardware Bypass is disabled in the conf file.");
}
/* Start a thread to process the statistics */
NapatechStartStats();
switch (runmode) {
case NT_RUNMODE_WORKERS:
status = RunModeSetLiveCaptureWorkers(NapatechConfigParser, NapatechGetThreadsCount,
"NapatechStream", "NapatechDecode", thread_name_workers, NULL);
break;
default:
status = -1;
}
if (status != 0) {
FatalError("Runmode start failed");
}
return 0;
}
int RunModeNapatechWorkers(void)
{
return NapatechInit(NT_RUNMODE_WORKERS);
}
#endif

@ -1,42 +0,0 @@
/* Copyright (C) 2012-2017 Open Information Security Foundation
*
* You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \autor nPulse Technologies, LLC.
* \author Matt Keeler <mk@npulsetech.com>
*/
#ifndef SURICATA_RUNMODE_NAPATECH_H
#define SURICATA_RUNMODE_NAPATECH_H
#ifdef HAVE_NAPATECH
#include <nt.h>
#endif /* HAVE_NAPATECH */
int RunModeNapatechWorkers(void);
void RunModeNapatechRegister(void);
const char *RunModeNapatechGetDefaultMode(void);
uint16_t NapatechGetNumConfiguredStreams(void);
uint16_t NapatechGetNumFirstStream(void);
uint16_t NapatechGetNumLastStream(void);
bool NapatechIsAutoConfigEnabled(void);
bool NapatechUseHWBypass(void);
#endif /* SURICATA_RUNMODE_NAPATECH_H */

@ -35,7 +35,6 @@
#include "runmode-erf-dag.h"
#include "runmode-erf-file.h"
#include "runmode-ipfw.h"
#include "runmode-napatech.h"
#include "runmode-netmap.h"
#include "runmode-nflog.h"
#include "runmode-nfq.h"
@ -133,8 +132,6 @@ static const char *RunModeTranslateModeToName(int runmode)
return "ERF_FILE";
case RUNMODE_DAG:
return "ERF_DAG";
case RUNMODE_NAPATECH:
return "NAPATECH";
case RUNMODE_UNITTEST:
return "UNITTEST";
case RUNMODE_AFP_DEV:
@ -226,7 +223,6 @@ void RunModeRegisterRunModes(void)
RunModeIpsIPFWRegister();
RunModeErfFileRegister();
RunModeErfDagRegister();
RunModeNapatechRegister();
RunModeIdsAFPRegister();
RunModeIdsAFXDPRegister();
RunModeIdsNetmapRegister();
@ -321,9 +317,6 @@ static const char *RunModeGetConfOrDefault(int capture_mode, const char *capture
case RUNMODE_DAG:
custom_mode = RunModeErfDagGetDefaultMode();
break;
case RUNMODE_NAPATECH:
custom_mode = RunModeNapatechGetDefaultMode();
break;
case RUNMODE_AFP_DEV:
custom_mode = RunModeAFPGetDefaultMode();
break;

@ -38,7 +38,6 @@ enum RunModes {
RUNMODE_NETMAP,
RUNMODE_DPDK,
RUNMODE_UNITTEST,
RUNMODE_NAPATECH,
RUNMODE_UNIX_SOCKET,
RUNMODE_WINDIVERT,
RUNMODE_PLUGIN,

File diff suppressed because it is too large Load Diff

@ -1,43 +0,0 @@
/* Copyright (C) 2012-2017 Open Information Security Foundation
*
* You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \author nPulse Technologies, LLC.
* \author Matt Keeler <mk@npulsetech.com>
*/
#ifndef SURICATA_SOURCE_NAPATECH_H
#define SURICATA_SOURCE_NAPATECH_H
void TmModuleNapatechStreamRegister(void);
TmEcode NapatechStreamThreadDeinit(ThreadVars *tv, void *data);
void TmModuleNapatechDecodeRegister(void);
#ifdef HAVE_NAPATECH
#include <nt.h>
struct NapatechStreamDevConf
{
uint16_t stream_id;
};
int NapatechSetPortmap(int port, int peer);
int NapatechGetAdapter(uint8_t port);
#endif /* HAVE_NAPATECH */
#endif /* SURICATA_SOURCE_NAPATECH_H */

@ -95,7 +95,6 @@
#include "source-pcap-file-helper.h"
#include "source-erf-file.h"
#include "source-erf-dag.h"
#include "source-napatech.h"
#include "source-af-packet.h"
#include "source-af-xdp.h"
#include "source-netmap.h"
@ -664,9 +663,6 @@ static void PrintUsage(const char *progname)
#ifdef HAVE_DAG
printf("\t--dag <dagX:Y> : process ERF records from DAG interface X, stream Y\n");
#endif
#ifdef HAVE_NAPATECH
printf("\t--napatech : run Napatech Streams using the API\n");
#endif
#ifdef BUILD_UNIX_SOCKET
printf("\t--unix-socket[=<file>] : use unix socket to control suricata work\n");
#endif
@ -927,9 +923,6 @@ void RegisterAllModules(void)
/* dag live */
TmModuleReceiveErfDagRegister();
TmModuleDecodeErfDagRegister();
/* napatech */
TmModuleNapatechStreamRegister();
TmModuleNapatechDecodeRegister();
/* flow worker */
TmModuleFlowWorkerRegister();
@ -1386,7 +1379,6 @@ TmEcode SCParseCommandLine(int argc, char **argv)
{"group", required_argument, 0, 0},
{"erf-in", required_argument, 0, 0},
{"dag", required_argument, 0, 0},
{"napatech", 0, 0, 0},
{"build-info", 0, &build_info, 1},
{"data-dir", required_argument, 0, 0},
#ifdef WINDIVERT
@ -1653,14 +1645,6 @@ TmEcode SCParseCommandLine(int argc, char **argv)
" to receive packets using --dag.");
return TM_ECODE_FAILED;
#endif /* HAVE_DAG */
} else if (strcmp((long_opts[option_index]).name, "napatech") == 0) {
#ifdef HAVE_NAPATECH
suri->run_mode = RUNMODE_NAPATECH;
#else
SCLogError("libntapi and a Napatech adapter are required"
" to capture packets using --napatech.");
return TM_ECODE_FAILED;
#endif /* HAVE_NAPATECH */
} else if (strcmp((long_opts[option_index]).name, "pcap-buffer-size") == 0) {
#ifdef HAVE_PCAP_SET_BUFF
if (ConfSetFinal("pcap.buffer-size", optarg) != 1) {

@ -191,9 +191,7 @@ const char * TmModuleTmmIdToString(TmmId id)
CASE_CODE (TMM_RECEIVEERFFILE);
CASE_CODE (TMM_DECODEERFFILE);
CASE_CODE (TMM_RECEIVEERFDAG);
CASE_CODE (TMM_DECODEERFDAG);
CASE_CODE (TMM_RECEIVENAPATECH);
CASE_CODE (TMM_DECODENAPATECH);
CASE_CODE(TMM_DECODEERFDAG);
CASE_CODE (TMM_RECEIVEAFP);
CASE_CODE(TMM_RECEIVEAFXDP);
CASE_CODE (TMM_ALERTPCAPINFO);

@ -58,8 +58,6 @@ typedef enum {
TMM_RECEIVENETMAP,
TMM_DECODENETMAP,
TMM_ALERTPCAPINFO,
TMM_RECEIVENAPATECH,
TMM_DECODENAPATECH,
TMM_STATSLOGGER,
TMM_RECEIVENFLOG,
TMM_DECODENFLOG,

File diff suppressed because it is too large Load Diff

@ -1,121 +0,0 @@
/* Copyright (C) 2017 Open Information Security Foundation
*
* You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \author Phil Young <py@napatech.com>
*
*/
#ifndef SURICATA_UTIL_NAPATECH_H
#define SURICATA_UTIL_NAPATECH_H
#ifdef HAVE_NAPATECH
#include <nt.h>
typedef struct NapatechPacketVars_
{
uint64_t stream_id;
NtNetBuf_t nt_packet_buf;
NtNetStreamRx_t rx_stream;
NtFlowStream_t flow_stream;
ThreadVars *tv;
#ifdef NAPATECH_ENABLE_BYPASS
NtDyn3Descr_t *dyn3;
int bypass;
#endif
} NapatechPacketVars;
typedef struct NapatechStreamConfig_
{
uint8_t stream_id;
bool is_active;
bool initialized;
} NapatechStreamConfig;
typedef struct NapatechCurrentStats_
{
uint64_t current_packets;
uint64_t current_bytes;
uint64_t current_drop_packets;
uint64_t current_drop_bytes;
} NapatechCurrentStats;
#define MAX_HOSTBUFFER 4
#define MAX_STREAMS 256
#define MAX_PORTS 80
#define MAX_ADAPTERS 8
#define HB_HIGHWATER 2048 //1982
extern void NapatechStartStats(void);
#define NAPATECH_ERROR(status) \
{ \
char errorBuffer[1024]; \
NT_ExplainError((status), errorBuffer, sizeof(errorBuffer) - 1); \
SCLogError("Napatech Error: %s", errorBuffer); \
}
#define NAPATECH_NTPL_ERROR(ntpl_cmd, ntpl_info, status) \
{ \
char errorBuffer[1024]; \
NT_ExplainError(status, errorBuffer, sizeof(errorBuffer) - 1); \
SCLogError(" NTPL failed: %s", errorBuffer); \
SCLogError(" cmd: %s", ntpl_cmd); \
if (strncmp(ntpl_info.u.errorData.errBuffer[0], "", 256) != 0) \
SCLogError(" %s", ntpl_info.u.errorData.errBuffer[0]); \
if (strncmp(ntpl_info.u.errorData.errBuffer[1], "", 256) != 0) \
SCLogError(" %s", ntpl_info.u.errorData.errBuffer[1]); \
if (strncmp(ntpl_info.u.errorData.errBuffer[2], "", 256) != 0) \
SCLogError(" %s", ntpl_info.u.errorData.errBuffer[2]); \
}
// #define ENABLE_NT_DEBUG
#ifdef ENABLE_NT_DEBUG
void NapatechPrintIP(uint32_t address);
#define NAPATECH_DEBUG(...) printf(__VA_ARGS__)
#define NAPATECH_PRINTIP(a) NapatechPrintIP(uint32_t address)
#else
#define NAPATECH_DEBUG(...)
#define NAPATECH_PRINTIP(a)
#endif
NapatechCurrentStats NapatechGetCurrentStats(uint16_t id);
int NapatechGetStreamConfig(NapatechStreamConfig stream_config[]);
bool NapatechSetupNuma(uint32_t stream, uint32_t numa);
uint32_t NapatechSetupTraffic(uint32_t first_stream, uint32_t last_stream);
uint32_t NapatechDeleteFilters(void);
#ifdef NAPATECH_ENABLE_BYPASS
/* */
#define NAPATECH_KEYTYPE_IPV4 3
#define NAPATECH_KEYTYPE_IPV4_SPAN 4
#define NAPATECH_KEYTYPE_IPV6 5
#define NAPATECH_KEYTYPE_IPV6_SPAN 6
#define NAPATECH_FLOWTYPE_DROP 7
#define NAPATECH_FLOWTYPE_PASS 8
int NapatechVerifyBypassSupport(void);
int NapatechGetNumAdapters(void);
int NapatechIsBypassSupported(void);
#endif /* NAPATECH_ENABLE_BYPASS */
#endif /* HAVE_NAPATECH */
#endif /* SURICATA_UTIL_NAPATECH_H */
Loading…
Cancel
Save