mirror of
https://github.com/OISF/suricata.git
synced 2026-10-11 22:09:53 +00:00
src: doc: remove more double-space typos
Found with git grep -E '[a-z] [a-z]'
This commit is contained in:
committed by
Victor Julien
parent
a1f088cc65
commit
dd6baccabd
@@ -538,7 +538,7 @@ We use ``/* foobar */`` style and try to avoid ``//`` style.
|
|||||||
File names
|
File names
|
||||||
**********
|
**********
|
||||||
|
|
||||||
File names are all lowercase and have a .c. .h or .rs (Rust) extension.
|
File names are all lowercase and have a .c .h or .rs (Rust) extension.
|
||||||
|
|
||||||
Most files have a _subsystem_ prefix, e.g. ``detect-dsize.c, util-ip.c``
|
Most files have a _subsystem_ prefix, e.g. ``detect-dsize.c, util-ip.c``
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ static __always_inline int ipv4_hash(struct __sk_buff *skb)
|
|||||||
//char fmt2[] = "Got hash %u\n";
|
//char fmt2[] = "Got hash %u\n";
|
||||||
//bpf_trace_printk(fmt2, sizeof(fmt2), src + dst);
|
//bpf_trace_printk(fmt2, sizeof(fmt2), src + dst);
|
||||||
#endif
|
#endif
|
||||||
return src + dst;
|
return src + dst;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline __u32 ipv6_addr_hash(struct __sk_buff *ctx, __u64 off)
|
static inline __u32 ipv6_addr_hash(struct __sk_buff *ctx, __u64 off)
|
||||||
|
|||||||
+4
-4
@@ -6509,7 +6509,7 @@
|
|||||||
},
|
},
|
||||||
"version0_malformed_sre_hdr": {
|
"version0_malformed_sre_hdr": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"description": "Number of packets of with version 0 and malformed SRE header for GRE"
|
"description": "Number of packets of with version 0 and malformed SRE header for GRE"
|
||||||
},
|
},
|
||||||
"version0_recur": {
|
"version0_recur": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
@@ -6529,7 +6529,7 @@
|
|||||||
},
|
},
|
||||||
"version1_malformed_sre_hdr": {
|
"version1_malformed_sre_hdr": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"description": "Number of packets with version 1 and malformed SRE header for GRE"
|
"description": "Number of packets with version 1 and malformed SRE header for GRE"
|
||||||
},
|
},
|
||||||
"version1_no_key": {
|
"version1_no_key": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
@@ -7096,11 +7096,11 @@
|
|||||||
},
|
},
|
||||||
"max_mac_addrs_dst": {
|
"max_mac_addrs_dst": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"description": "Maximum amount of destination MAC addresses seen per flow (only if ethernet header logging enabled)"
|
"description": "Maximum amount of destination MAC addresses seen per flow (only if ethernet header logging enabled)"
|
||||||
},
|
},
|
||||||
"max_mac_addrs_src": {
|
"max_mac_addrs_src": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"description": "Maximum amount of source MAC addresses seen per flow (only if ethernet header logging enabled)"
|
"description": "Maximum amount of source MAC addresses seen per flow (only if ethernet header logging enabled)"
|
||||||
},
|
},
|
||||||
"max_pkt_size": {
|
"max_pkt_size": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ static TmEcode NapatechStreamDeInit(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Register the Napatech receiver (reader) module.
|
* \brief Register the Napatech receiver (reader) module.
|
||||||
*/
|
*/
|
||||||
void TmModuleReceiveNapatechRegister(int slot)
|
void TmModuleReceiveNapatechRegister(int slot)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -862,7 +862,7 @@ int NapatechGetStreamConfig(NapatechStreamConfig stream_config[])
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if we get here it is an active stream */
|
/* if we get here it is an active stream */
|
||||||
stream_config[instance_cnt].stream_id = stream_id++;
|
stream_config[instance_cnt].stream_id = stream_id++;
|
||||||
stream_config[instance_cnt].is_active = true;
|
stream_config[instance_cnt].is_active = true;
|
||||||
instance_cnt++;
|
instance_cnt++;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# App layer event rules
|
# App layer event rules
|
||||||
#
|
#
|
||||||
# SID's fall in the 2260000+ range. See http://doc.emergingthreats.net/bin/view/Main/SidAllocation
|
# SID's fall in the 2260000+ range. See http://doc.emergingthreats.net/bin/view/Main/SidAllocation
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# HTTP event rules
|
# HTTP event rules
|
||||||
#
|
#
|
||||||
# SID's fall in the 2221000+ range. See http://doc.emergingthreats.net/bin/view/Main/SidAllocation
|
# SID's fall in the 2221000+ range. See http://doc.emergingthreats.net/bin/view/Main/SidAllocation
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# SMTP event rules
|
# SMTP event rules
|
||||||
#
|
#
|
||||||
# SID's fall in the 2220000+ range. See http://doc.emergingthreats.net/bin/view/Main/SidAllocation
|
# SID's fall in the 2220000+ range. See http://doc.emergingthreats.net/bin/view/Main/SidAllocation
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# TLS event rules
|
# TLS event rules
|
||||||
#
|
#
|
||||||
# SID's fall in the 2230000+ range. See http://doc.emergingthreats.net/bin/view/Main/SidAllocation
|
# SID's fall in the 2230000+ range. See http://doc.emergingthreats.net/bin/view/Main/SidAllocation
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -335,7 +335,7 @@ static DetectBytetestData *DetectBytetestParse(
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Subtract two since two values are conjoined */
|
/* Subtract two since two values are conjoined */
|
||||||
for (i = 0; i < (ret - 1); i++) {
|
for (i = 0; i < (ret - 1); i++) {
|
||||||
res = pcre2_substring_get_bynumber(match, i + 1, (PCRE2_UCHAR8 **)&str_ptr, &pcre2_len);
|
res = pcre2_substring_get_bynumber(match, i + 1, (PCRE2_UCHAR8 **)&str_ptr, &pcre2_len);
|
||||||
if (res < 0) {
|
if (res < 0) {
|
||||||
|
|||||||
@@ -351,7 +351,7 @@ static int DetectStreamEventSetup (DetectEngineCtx *de_ctx, Signature *s, const
|
|||||||
#ifdef UNITTESTS
|
#ifdef UNITTESTS
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \test EngineEventTestParse01 is a test for a valid decode-event value
|
* \test EngineEventTestParse01 is a test for a valid decode-event value
|
||||||
*/
|
*/
|
||||||
static int EngineEventTestParse01 (void)
|
static int EngineEventTestParse01 (void)
|
||||||
{
|
{
|
||||||
@@ -364,9 +364,8 @@ static int EngineEventTestParse01 (void)
|
|||||||
PASS;
|
PASS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \test EngineEventTestParse02 is a test for a valid upper + lower case decode-event value
|
* \test EngineEventTestParse02 is a test for a valid upper + lower case decode-event value
|
||||||
*/
|
*/
|
||||||
static int EngineEventTestParse02 (void)
|
static int EngineEventTestParse02 (void)
|
||||||
{
|
{
|
||||||
@@ -380,7 +379,7 @@ static int EngineEventTestParse02 (void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \test EngineEventTestParse03 is a test for a valid upper case decode-event value
|
* \test EngineEventTestParse03 is a test for a valid upper case decode-event value
|
||||||
*/
|
*/
|
||||||
static int EngineEventTestParse03 (void)
|
static int EngineEventTestParse03 (void)
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -92,7 +92,7 @@ static int DetectGidSetup (DetectEngineCtx *de_ctx, Signature *s, const char *ra
|
|||||||
|
|
||||||
#ifdef UNITTESTS
|
#ifdef UNITTESTS
|
||||||
/**
|
/**
|
||||||
* \test GidTestParse01 is a test for a valid gid value
|
* \test GidTestParse01 is a test for a valid gid value
|
||||||
*/
|
*/
|
||||||
static int GidTestParse01 (void)
|
static int GidTestParse01 (void)
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -255,7 +255,7 @@ void DetectIpOptsFree(DetectEngineCtx *de_ctx, void *de_ptr)
|
|||||||
|
|
||||||
#ifdef UNITTESTS
|
#ifdef UNITTESTS
|
||||||
/**
|
/**
|
||||||
* \test IpOptsTestParse01 is a test for a valid ipopts value
|
* \test IpOptsTestParse01 is a test for a valid ipopts value
|
||||||
*/
|
*/
|
||||||
static int IpOptsTestParse01 (void)
|
static int IpOptsTestParse01 (void)
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -1424,7 +1424,7 @@ typedef struct SigTableElmt_ {
|
|||||||
uint8_t flags, void *alstate, void *txv,
|
uint8_t flags, void *alstate, void *txv,
|
||||||
const Signature *, const SigMatchCtx *);
|
const Signature *, const SigMatchCtx *);
|
||||||
|
|
||||||
/** File match function pointer */
|
/** File match function pointer */
|
||||||
int (*FileMatch)(DetectEngineThreadCtx *,
|
int (*FileMatch)(DetectEngineThreadCtx *,
|
||||||
Flow *, /**< *LOCKED* flow */
|
Flow *, /**< *LOCKED* flow */
|
||||||
uint8_t flags, File *, const Signature *, const SigMatchCtx *);
|
uint8_t flags, File *, const Signature *, const SigMatchCtx *);
|
||||||
|
|||||||
@@ -2111,7 +2111,7 @@ error:
|
|||||||
TmEcode AFPSetBPFFilter(AFPThreadVars *ptv)
|
TmEcode AFPSetBPFFilter(AFPThreadVars *ptv)
|
||||||
{
|
{
|
||||||
struct bpf_program filter;
|
struct bpf_program filter;
|
||||||
struct sock_fprog fcode;
|
struct sock_fprog fcode;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
#ifdef HAVE_PACKET_EBPF
|
#ifdef HAVE_PACKET_EBPF
|
||||||
|
|||||||
+1
-1
@@ -2388,7 +2388,7 @@ static int StreamTcpPacketStateSynSent(
|
|||||||
StreamTcp3whsStoreSynApplyToSsn(ssn, &syn_pkt);
|
StreamTcp3whsStoreSynApplyToSsn(ssn, &syn_pkt);
|
||||||
}
|
}
|
||||||
} else if (tcph->th_flags & TH_ACK) {
|
} else if (tcph->th_flags & TH_ACK) {
|
||||||
/* Handle the asynchronous stream, when we receive a SYN packet
|
/* Handle the asynchronous stream, when we receive a SYN packet
|
||||||
and now instead of receiving a SYN/ACK we receive a ACK from the
|
and now instead of receiving a SYN/ACK we receive a ACK from the
|
||||||
same host, which sent the SYN, this suggests the ASYNC streams.*/
|
same host, which sent the SYN, this suggests the ASYNC streams.*/
|
||||||
if (!stream_config.async_oneside)
|
if (!stream_config.async_oneside)
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ static int DetectParseTest01 (void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \test DetectParseTestNoOpt is a regression test to make sure that we reject
|
* \test DetectParseTestNoOpt is a regression test to make sure that we reject
|
||||||
* any signature where a NOOPT rule option is given a value. This can hide rule
|
* any signature where a NOOPT rule option is given a value. This can hide rule
|
||||||
* errors which make other options disappear, eg: foo: bar: baz; where "foo" is
|
* errors which make other options disappear, eg: foo: bar: baz; where "foo" is
|
||||||
* the NOOPT option, we will end up with a signature which is missing "bar".
|
* the NOOPT option, we will end up with a signature which is missing "bar".
|
||||||
|
|||||||
+2
-2
@@ -837,7 +837,7 @@ static int EBPFForEachFlowV6Table(ThreadVars *th_v,
|
|||||||
bytes_cnt += BPF_PERCPU(values_array, i).bytes;
|
bytes_cnt += BPF_PERCPU(values_array, i).bytes;
|
||||||
}
|
}
|
||||||
/* Get the corresponding Flow in the Flow table to compare and update
|
/* Get the corresponding Flow in the Flow table to compare and update
|
||||||
* its counters and lastseen if needed */
|
* its counters and lastseen if needed */
|
||||||
FlowKey flow_key;
|
FlowKey flow_key;
|
||||||
if (tcfg->mode == AFP_MODE_XDP_BYPASS) {
|
if (tcfg->mode == AFP_MODE_XDP_BYPASS) {
|
||||||
flow_key.sp = ntohs(next_key.port16[0]);
|
flow_key.sp = ntohs(next_key.port16[0]);
|
||||||
@@ -992,7 +992,7 @@ void EBPFBuildCPUSet(SCConfNode *node, char *iface)
|
|||||||
* Setup peer interface in XDP system
|
* Setup peer interface in XDP system
|
||||||
*
|
*
|
||||||
* Ths function set up the peer interface in the XDP maps used by the
|
* Ths function set up the peer interface in the XDP maps used by the
|
||||||
* bypass filter. The first map tx_peer has type device map and is
|
* bypass filter. The first map tx_peer has type device map and is
|
||||||
* used to store the peer. The second map tx_peer_int is used by the
|
* used to store the peer. The second map tx_peer_int is used by the
|
||||||
* code to check if we have a peer defined for this interface.
|
* code to check if we have a peer defined for this interface.
|
||||||
*
|
*
|
||||||
|
|||||||
+1
-1
@@ -838,7 +838,7 @@ static int SCHSCacheRuleset(MpmConfig *mpm_conf)
|
|||||||
SCLogDebug("Caching the loaded ruleset to %s", mpm_conf->cache_dir_path);
|
SCLogDebug("Caching the loaded ruleset to %s", mpm_conf->cache_dir_path);
|
||||||
if (SCCreateDirectoryTree(mpm_conf->cache_dir_path, true) != 0) {
|
if (SCCreateDirectoryTree(mpm_conf->cache_dir_path, true) != 0) {
|
||||||
SCLogWarning("Failed to create Hyperscan cache folder, make sure "
|
SCLogWarning("Failed to create Hyperscan cache folder, make sure "
|
||||||
"the parent folder is writeable "
|
"the parent folder is writeable "
|
||||||
"or adjust sgh-mpm-caching-path setting (%s)",
|
"or adjust sgh-mpm-caching-path setting (%s)",
|
||||||
mpm_conf->cache_dir_path);
|
mpm_conf->cache_dir_path);
|
||||||
return -1;
|
return -1;
|
||||||
|
|||||||
+4
-2
@@ -297,7 +297,8 @@ void UtRunModeRegister(void)
|
|||||||
static int UtSelftestTrue(void)
|
static int UtSelftestTrue(void)
|
||||||
{
|
{
|
||||||
if (1)return 1;
|
if (1)return 1;
|
||||||
else return 0;
|
else
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \brief False test
|
/** \brief False test
|
||||||
@@ -308,7 +309,8 @@ static int UtSelftestTrue(void)
|
|||||||
static int UtSelftestFalse(void)
|
static int UtSelftestFalse(void)
|
||||||
{
|
{
|
||||||
if (0)return 0;
|
if (0)return 0;
|
||||||
else return 1;
|
else
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \brief Run self tests
|
/** \brief Run self tests
|
||||||
|
|||||||
Reference in New Issue
Block a user