From: Ralph Eastwood Date: Thu, 5 Oct 2023 08:02:19 +0000 (+0000) Subject: napatech: update docs to remove hba reference X-Git-Tag: suricata-8.0.0-beta1~2088 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9865164e75decf58a3ab1da2ff3a161e639dd8b6;p=thirdparty%2Fsuricata.git napatech: update docs to remove hba reference --- diff --git a/doc/userguide/capture-hardware/napatech.rst b/doc/userguide/capture-hardware/napatech.rst index e382de4294..22acd9abfc 100644 --- a/doc/userguide/capture-hardware/napatech.rst +++ b/doc/userguide/capture-hardware/napatech.rst @@ -391,14 +391,6 @@ that is being processed, the following counters will be output in stats.log: This is useful for fine-grain debugging to determine if a specific CPU core or thread is falling behind resulting in dropped packets. -If hba is enabled the following counter will also be provided: - -- napa.hba_drop: the number of packets dropped because the host buffer allowance high-water mark was reached. - -In addition to counters host buffer utilization is tracked and logged. This is also useful for -debugging. Log messages are output for both Host and On-Board buffers when reach 25, 50, 75 -percent of utilization. Corresponding messages are output when utilization decreases. - Debugging: For debugging configurations it is useful to see what traffic is flowing as well as what streams are @@ -419,15 +411,6 @@ Napatech configuration options: These are the Napatech options available in the Suricata configuration file:: napatech: - # The Host Buffer Allowance for all streams - # (-1 = OFF, 1 - 100 = percentage of the host buffer that can be held back) - # This may be enabled when sharing streams with another application. - # Otherwise, it should be turned off. - # - # Note: hba will be deprecated in Suricata 7 - # - #hba: -1 - # When use_all_streams is set to "yes" the initialization code will query # the Napatech service for all configured streams and listen on all of them. # When set to "no" the streams config array will be used. @@ -516,12 +499,6 @@ These are the Napatech options available in the Suricata configuration file:: # hashmode: hash5tuplesorted -*Note: hba is useful only when a stream is shared with another application. When hba is enabled packets will be dropped -(i.e. not delivered to Suricata) when the host-buffer utilization reaches the high-water mark indicated by the hba value. -This insures that, should Suricata get behind in its packet processing, the other application will still receive all -of the packets. If this is enabled without another application sharing the stream it will result in sub-optimal packet -buffering.* - Make sure that there are enough host-buffers declared in ``ntservice.ini`` to accommodate the number of cores/streams being used. diff --git a/src/source-napatech.c b/src/source-napatech.c index 572fa748ec..071d9ae684 100644 --- a/src/source-napatech.c +++ b/src/source-napatech.c @@ -797,7 +797,7 @@ TmEcode NapatechPacketLoop(ThreadVars *tv, void *data, void *slot) char error_buffer[100]; uint64_t pkt_ts; NtNetBuf_t packet_buffer; - NapatechThreadVars *ntv = (NapatechThreadVars *) data; + NapatechThreadVars *ntv = (NapatechThreadVars *)data; int numa_node = -1; int set_cpu_affinity = 0; int closer = 0; @@ -877,8 +877,8 @@ TmEcode NapatechPacketLoop(ThreadVars *tv, void *data, void *slot) SCLogDebug("Opening NAPATECH Stream: %u for processing", ntv->stream_id); - if ((status = NT_NetRxOpen(&(ntv->rx_stream), "SuricataStream", - NT_NET_INTERFACE_PACKET, ntv->stream_id, -1)) != NT_SUCCESS) { + if ((status = NT_NetRxOpen(&(ntv->rx_stream), "SuricataStream", NT_NET_INTERFACE_PACKET, + ntv->stream_id, -1)) != NT_SUCCESS) { NAPATECH_ERROR(status); SCFree(ntv);