From 26bcc97515e6fd38b36d7cb39373b5bf8a63a5fc Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 28 Apr 2020 09:56:44 +0200 Subject: [PATCH] detect/keywords: dynamic version part of doc URL --- src/counters.c | 2 +- src/detect-app-layer-event.c | 2 +- src/detect-app-layer-protocol.c | 2 +- src/detect-base64-data.c | 2 +- src/detect-base64-decode.c | 2 +- src/detect-bsize.c | 2 +- src/detect-bypass.c | 2 +- src/detect-byte-extract.c | 2 +- src/detect-bytejump.c | 2 +- src/detect-bytetest.c | 2 +- src/detect-cipservice.c | 4 ++-- src/detect-classtype.c | 2 +- src/detect-content.c | 2 +- src/detect-datarep.c | 2 +- src/detect-dataset.c | 2 +- src/detect-depth.c | 4 ++-- src/detect-detection-filter.c | 2 +- src/detect-distance.c | 2 +- src/detect-dnp3.c | 8 ++++---- src/detect-dns-query.c | 2 +- src/detect-dsize.c | 2 +- src/detect-engine-register.c | 4 ++-- src/detect-fast-pattern.c | 2 +- src/detect-file-data.c | 2 +- src/detect-fileext.c | 2 +- src/detect-filemagic.c | 6 +++--- src/detect-filemd5.c | 2 +- src/detect-filename.c | 4 ++-- src/detect-filesha1.c | 2 +- src/detect-filesha256.c | 2 +- src/detect-filesize.c | 2 +- src/detect-filestore.c | 2 +- src/detect-flow.c | 2 +- src/detect-flowbits.c | 2 +- src/detect-flowint.c | 2 +- src/detect-fragbits.c | 2 +- src/detect-fragoffset.c | 2 +- src/detect-ftpbounce.c | 2 +- src/detect-ftpdata.c | 2 +- src/detect-geoip.c | 4 ++-- src/detect-gid.c | 2 +- src/detect-hostbits.c | 2 +- src/detect-http-client-body.c | 4 ++-- src/detect-http-cookie.c | 4 ++-- src/detect-http-header-names.c | 2 +- src/detect-http-header.c | 4 ++-- src/detect-http-headers-stub.h | 2 +- src/detect-http-host.c | 8 ++++---- src/detect-http-method.c | 4 ++-- src/detect-http-protocol.c | 2 +- src/detect-http-raw-header.c | 4 ++-- src/detect-http-request-line.c | 2 +- src/detect-http-response-line.c | 2 +- src/detect-http-server-body.c | 4 ++-- src/detect-http-start.c | 2 +- src/detect-http-stat-code.c | 4 ++-- src/detect-http-stat-msg.c | 4 ++-- src/detect-http-ua.c | 4 ++-- src/detect-http-uri.c | 8 ++++---- src/detect-icmp-id.c | 2 +- src/detect-icmp-seq.c | 2 +- src/detect-icmpv6-mtu.c | 2 +- src/detect-icmpv6hdr.c | 2 +- src/detect-icode.c | 2 +- src/detect-id.c | 2 +- src/detect-ipopts.c | 2 +- src/detect-ipproto.c | 2 +- src/detect-iprep.c | 2 +- src/detect-ipv4hdr.c | 2 +- src/detect-ipv6hdr.c | 2 +- src/detect-isdataat.c | 4 ++-- src/detect-itype.c | 2 +- src/detect-krb5-cname.c | 2 +- src/detect-krb5-errcode.c | 2 +- src/detect-krb5-msgtype.c | 2 +- src/detect-krb5-sname.c | 2 +- src/detect-lua.c | 4 ++-- src/detect-metadata.c | 2 +- src/detect-modbus.c | 2 +- src/detect-msg.c | 2 +- src/detect-nfs-procedure.c | 2 +- src/detect-nfs-version.c | 2 +- src/detect-noalert.c | 2 +- src/detect-nocase.c | 2 +- src/detect-offset.c | 2 +- src/detect-pcre.c | 2 +- src/detect-prefilter.c | 2 +- src/detect-priority.c | 2 +- src/detect-reference.c | 2 +- src/detect-replace.c | 2 +- src/detect-rev.c | 2 +- src/detect-rfb-name.c | 2 +- src/detect-rfb-secresult.c | 2 +- src/detect-rfb-sectype.c | 2 +- src/detect-rpc.c | 2 +- src/detect-sameip.c | 2 +- src/detect-sid.c | 2 +- src/detect-sip-method.c | 2 +- src/detect-sip-protocol.c | 2 +- src/detect-sip-request-line.c | 2 +- src/detect-sip-response-line.c | 2 +- src/detect-sip-stat-code.c | 2 +- src/detect-sip-stat-msg.c | 2 +- src/detect-sip-uri.c | 2 +- src/detect-snmp-community.c | 2 +- src/detect-snmp-pdu_type.c | 2 +- src/detect-snmp-version.c | 2 +- src/detect-ssh-proto-version.c | 2 +- src/detect-ssh-proto.c | 2 +- src/detect-ssh-software-version.c | 2 +- src/detect-ssh-software.c | 2 +- src/detect-ssl-state.c | 2 +- src/detect-ssl-version.c | 2 +- src/detect-stream_size.c | 2 +- src/detect-target.c | 2 +- src/detect-tcp-ack.c | 2 +- src/detect-tcp-flags.c | 2 +- src/detect-tcp-seq.c | 2 +- src/detect-tcp-window.c | 2 +- src/detect-tcphdr.c | 2 +- src/detect-tcpmss.c | 2 +- src/detect-template2.c | 2 +- src/detect-threshold.c | 2 +- src/detect-tls-cert-fingerprint.c | 2 +- src/detect-tls-cert-issuer.c | 2 +- src/detect-tls-cert-serial.c | 2 +- src/detect-tls-cert-subject.c | 2 +- src/detect-tls-cert-validity.c | 8 ++++---- src/detect-tls-certs.c | 2 +- src/detect-tls-ja3-hash.c | 2 +- src/detect-tls-ja3-string.c | 2 +- src/detect-tls-ja3s-hash.c | 2 +- src/detect-tls-ja3s-string.c | 2 +- src/detect-tls-sni.c | 2 +- src/detect-tls-version.c | 2 +- src/detect-tls.c | 8 ++++---- src/detect-tos.c | 2 +- src/detect-transform-compress-whitespace.c | 2 +- src/detect-transform-dotprefix.c | 2 +- src/detect-transform-md5.c | 2 +- src/detect-transform-sha1.c | 2 +- src/detect-transform-sha256.c | 2 +- src/detect-transform-strip-whitespace.c | 2 +- src/detect-ttl.c | 2 +- src/detect-udphdr.c | 2 +- src/detect-uricontent.c | 2 +- src/detect-urilen.c | 2 +- src/detect-within.c | 2 +- src/detect-xbits.c | 2 +- src/output-json-stats.c | 4 ++-- src/suricata.c | 9 +++++++++ src/suricata.h | 7 +------ 152 files changed, 194 insertions(+), 190 deletions(-) diff --git a/src/counters.c b/src/counters.c index e292b07db3..a9ff3c405b 100644 --- a/src/counters.c +++ b/src/counters.c @@ -247,7 +247,7 @@ static void StatsInitCtxPreOutput(void) if (gstats == NULL) { SCLogWarning(SC_ERR_STATS_LOG_GENERIC, "global stats config is missing. " "Stats enabled through legacy stats.log. " - "See %s%s/configuration/suricata-yaml.html#stats", DOC_URL, DOC_VERSION); + "See %s/configuration/suricata-yaml.html#stats", GetDocURL()); } const char *interval = ConfNodeLookupChildValue(stats, "interval"); diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c index f1a690d485..e6700f063e 100644 --- a/src/detect-app-layer-event.c +++ b/src/detect-app-layer-event.c @@ -67,7 +67,7 @@ void DetectAppLayerEventRegister(void) { sigmatch_table[DETECT_AL_APP_LAYER_EVENT].name = "app-layer-event"; sigmatch_table[DETECT_AL_APP_LAYER_EVENT].desc = "match on events generated by the App Layer Parsers and the protocol detection engine"; - sigmatch_table[DETECT_AL_APP_LAYER_EVENT].url = DOC_URL DOC_VERSION "/rules/app-layer.html#app-layer-event"; + sigmatch_table[DETECT_AL_APP_LAYER_EVENT].url = "/rules/app-layer.html#app-layer-event"; sigmatch_table[DETECT_AL_APP_LAYER_EVENT].Match = DetectAppLayerEventPktMatch; sigmatch_table[DETECT_AL_APP_LAYER_EVENT].Setup = DetectAppLayerEventSetupP1; diff --git a/src/detect-app-layer-protocol.c b/src/detect-app-layer-protocol.c index f03847243e..86b7f51b60 100644 --- a/src/detect-app-layer-protocol.c +++ b/src/detect-app-layer-protocol.c @@ -259,7 +259,7 @@ void DetectAppLayerProtocolRegister(void) { sigmatch_table[DETECT_AL_APP_LAYER_PROTOCOL].name = "app-layer-protocol"; sigmatch_table[DETECT_AL_APP_LAYER_PROTOCOL].desc = "match on the detected app-layer protocol"; - sigmatch_table[DETECT_AL_APP_LAYER_PROTOCOL].url = DOC_URL DOC_VERSION "/rules/app-layer.html#app-layer-protocol"; + sigmatch_table[DETECT_AL_APP_LAYER_PROTOCOL].url = "/rules/app-layer.html#app-layer-protocol"; sigmatch_table[DETECT_AL_APP_LAYER_PROTOCOL].Match = DetectAppLayerProtocolPacketMatch; sigmatch_table[DETECT_AL_APP_LAYER_PROTOCOL].Setup = diff --git a/src/detect-base64-data.c b/src/detect-base64-data.c index 3c130adbb1..e12d0d0652 100644 --- a/src/detect-base64-data.c +++ b/src/detect-base64-data.c @@ -33,7 +33,7 @@ void DetectBase64DataRegister(void) sigmatch_table[DETECT_BASE64_DATA].desc = "Content match base64 decoded data."; sigmatch_table[DETECT_BASE64_DATA].url = - DOC_URL DOC_VERSION "/rules/base64-keywords.html#base64-data"; + "/rules/base64-keywords.html#base64-data"; sigmatch_table[DETECT_BASE64_DATA].Setup = DetectBase64DataSetup; sigmatch_table[DETECT_BASE64_DATA].RegisterTests = DetectBase64DataRegisterTests; diff --git a/src/detect-base64-decode.c b/src/detect-base64-decode.c index 8581b118bd..480b755777 100644 --- a/src/detect-base64-decode.c +++ b/src/detect-base64-decode.c @@ -42,7 +42,7 @@ void DetectBase64DecodeRegister(void) sigmatch_table[DETECT_BASE64_DECODE].desc = "Decodes base64 encoded data."; sigmatch_table[DETECT_BASE64_DECODE].url = - DOC_URL DOC_VERSION "/rules/base64-keywords.html#base64-decode"; + "/rules/base64-keywords.html#base64-decode"; sigmatch_table[DETECT_BASE64_DECODE].Setup = DetectBase64DecodeSetup; sigmatch_table[DETECT_BASE64_DECODE].Free = DetectBase64DecodeFree; sigmatch_table[DETECT_BASE64_DECODE].RegisterTests = diff --git a/src/detect-bsize.c b/src/detect-bsize.c index 3abe883b02..d390851459 100644 --- a/src/detect-bsize.c +++ b/src/detect-bsize.c @@ -51,7 +51,7 @@ void DetectBsizeRegister(void) { sigmatch_table[DETECT_BSIZE].name = "bsize"; sigmatch_table[DETECT_BSIZE].desc = "match on the length of a buffer"; - sigmatch_table[DETECT_BSIZE].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#bsize"; + sigmatch_table[DETECT_BSIZE].url = "/rules/payload-keywords.html#bsize"; sigmatch_table[DETECT_BSIZE].Match = NULL; sigmatch_table[DETECT_BSIZE].Setup = DetectBsizeSetup; sigmatch_table[DETECT_BSIZE].Free = DetectBsizeFree; diff --git a/src/detect-bypass.c b/src/detect-bypass.c index 8a37b3ba70..5f38517f2c 100644 --- a/src/detect-bypass.c +++ b/src/detect-bypass.c @@ -62,7 +62,7 @@ void DetectBypassRegister(void) { sigmatch_table[DETECT_BYPASS].name = "bypass"; sigmatch_table[DETECT_BYPASS].desc = "call the bypass callback when the match of a sig is complete"; - sigmatch_table[DETECT_BYPASS].url = DOC_URL DOC_VERSION "/rules/bypass-keyword.html"; + sigmatch_table[DETECT_BYPASS].url = "/rules/bypass-keyword.html"; sigmatch_table[DETECT_BYPASS].Match = DetectBypassMatch; sigmatch_table[DETECT_BYPASS].Setup = DetectBypassSetup; sigmatch_table[DETECT_BYPASS].Free = NULL; diff --git a/src/detect-byte-extract.c b/src/detect-byte-extract.c index caef34f3cb..8305c226b5 100644 --- a/src/detect-byte-extract.c +++ b/src/detect-byte-extract.c @@ -99,7 +99,7 @@ void DetectByteExtractRegister(void) { sigmatch_table[DETECT_BYTE_EXTRACT].name = "byte_extract"; sigmatch_table[DETECT_BYTE_EXTRACT].desc = "extract at a particular and store it in "; - sigmatch_table[DETECT_BYTE_EXTRACT].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#byte-extract"; + sigmatch_table[DETECT_BYTE_EXTRACT].url = "/rules/payload-keywords.html#byte-extract"; sigmatch_table[DETECT_BYTE_EXTRACT].Match = NULL; sigmatch_table[DETECT_BYTE_EXTRACT].Setup = DetectByteExtractSetup; sigmatch_table[DETECT_BYTE_EXTRACT].Free = DetectByteExtractFree; diff --git a/src/detect-bytejump.c b/src/detect-bytejump.c index 64e7e8dac2..8a8b5e4b7d 100644 --- a/src/detect-bytejump.c +++ b/src/detect-bytejump.c @@ -70,7 +70,7 @@ void DetectBytejumpRegister (void) { sigmatch_table[DETECT_BYTEJUMP].name = "byte_jump"; sigmatch_table[DETECT_BYTEJUMP].desc = "allow the ability to select a from an and move the detection pointer to that position"; - sigmatch_table[DETECT_BYTEJUMP].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#byte-jump"; + sigmatch_table[DETECT_BYTEJUMP].url = "/rules/payload-keywords.html#byte-jump"; sigmatch_table[DETECT_BYTEJUMP].Match = DetectBytejumpMatch; sigmatch_table[DETECT_BYTEJUMP].Setup = DetectBytejumpSetup; sigmatch_table[DETECT_BYTEJUMP].Free = DetectBytejumpFree; diff --git a/src/detect-bytetest.c b/src/detect-bytetest.c index 0ca8ce6884..feb7f9b086 100644 --- a/src/detect-bytetest.c +++ b/src/detect-bytetest.c @@ -77,7 +77,7 @@ void DetectBytetestRegister (void) { sigmatch_table[DETECT_BYTETEST].name = "byte_test"; sigmatch_table[DETECT_BYTETEST].desc = "extract and perform an operation selected with against the value in at a particular "; - sigmatch_table[DETECT_BYTETEST].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#byte-test"; + sigmatch_table[DETECT_BYTETEST].url = "/rules/payload-keywords.html#byte-test"; sigmatch_table[DETECT_BYTETEST].Match = DetectBytetestMatch; sigmatch_table[DETECT_BYTETEST].Setup = DetectBytetestSetup; sigmatch_table[DETECT_BYTETEST].Free = DetectBytetestFree; diff --git a/src/detect-cipservice.c b/src/detect-cipservice.c index f719f969d6..712a7d8ae3 100644 --- a/src/detect-cipservice.c +++ b/src/detect-cipservice.c @@ -52,7 +52,7 @@ void DetectCipServiceRegister(void) SCEnter(); sigmatch_table[DETECT_CIPSERVICE].name = "cip_service"; //rule keyword sigmatch_table[DETECT_CIPSERVICE].desc = "match on CIP Service"; - sigmatch_table[DETECT_CIPSERVICE].url = DOC_URL DOC_VERSION "/rules/enip-keyword.html#enip-cip-keywords"; + sigmatch_table[DETECT_CIPSERVICE].url = "/rules/enip-keyword.html#enip-cip-keywords"; sigmatch_table[DETECT_CIPSERVICE].Match = NULL; sigmatch_table[DETECT_CIPSERVICE].Setup = DetectCipServiceSetup; sigmatch_table[DETECT_CIPSERVICE].Free = DetectCipServiceFree; @@ -307,7 +307,7 @@ void DetectEnipCommandRegister(void) sigmatch_table[DETECT_ENIPCOMMAND].name = "enip_command"; //rule keyword sigmatch_table[DETECT_ENIPCOMMAND].desc = "rules for detecting EtherNet/IP command"; - sigmatch_table[DETECT_ENIPCOMMAND].url = DOC_URL DOC_VERSION "/rules/enip-keyword.html#enip-cip-keywords"; + sigmatch_table[DETECT_ENIPCOMMAND].url = "/rules/enip-keyword.html#enip-cip-keywords"; sigmatch_table[DETECT_ENIPCOMMAND].Match = NULL; sigmatch_table[DETECT_ENIPCOMMAND].Setup = DetectEnipCommandSetup; sigmatch_table[DETECT_ENIPCOMMAND].Free = DetectEnipCommandFree; diff --git a/src/detect-classtype.c b/src/detect-classtype.c index 20a66623e9..24a2c9ad51 100644 --- a/src/detect-classtype.c +++ b/src/detect-classtype.c @@ -50,7 +50,7 @@ void DetectClasstypeRegister(void) { sigmatch_table[DETECT_CLASSTYPE].name = "classtype"; sigmatch_table[DETECT_CLASSTYPE].desc = "information about the classification of rules and alerts"; - sigmatch_table[DETECT_CLASSTYPE].url = DOC_URL DOC_VERSION "/rules/meta.html#classtype"; + sigmatch_table[DETECT_CLASSTYPE].url = "/rules/meta.html#classtype"; sigmatch_table[DETECT_CLASSTYPE].Setup = DetectClasstypeSetup; sigmatch_table[DETECT_CLASSTYPE].RegisterTests = DetectClasstypeRegisterTests; diff --git a/src/detect-content.c b/src/detect-content.c index ddba6569d1..7ab5ba6e12 100644 --- a/src/detect-content.c +++ b/src/detect-content.c @@ -56,7 +56,7 @@ void DetectContentRegister (void) { sigmatch_table[DETECT_CONTENT].name = "content"; sigmatch_table[DETECT_CONTENT].desc = "match on payload content"; - sigmatch_table[DETECT_CONTENT].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#content"; + sigmatch_table[DETECT_CONTENT].url = "/rules/payload-keywords.html#content"; sigmatch_table[DETECT_CONTENT].Match = NULL; sigmatch_table[DETECT_CONTENT].Setup = DetectContentSetup; sigmatch_table[DETECT_CONTENT].Free = DetectContentFree; diff --git a/src/detect-datarep.c b/src/detect-datarep.c index 6ee3ee2121..d4802e0cfb 100644 --- a/src/detect-datarep.c +++ b/src/detect-datarep.c @@ -51,7 +51,7 @@ void DetectDatarepRegister (void) { sigmatch_table[DETECT_DATAREP].name = "datarep"; sigmatch_table[DETECT_DATAREP].desc = "operate on datasets (experimental)"; - sigmatch_table[DETECT_DATAREP].url = DOC_URL DOC_VERSION "/rules/dataset-keywords.html#datarep"; + sigmatch_table[DETECT_DATAREP].url = "/rules/dataset-keywords.html#datarep"; sigmatch_table[DETECT_DATAREP].Setup = DetectDatarepSetup; sigmatch_table[DETECT_DATAREP].Free = DetectDatarepFree; diff --git a/src/detect-dataset.c b/src/detect-dataset.c index 3123a53124..ea0a1b0d19 100644 --- a/src/detect-dataset.c +++ b/src/detect-dataset.c @@ -50,7 +50,7 @@ void DetectDatasetRegister (void) { sigmatch_table[DETECT_DATASET].name = "dataset"; sigmatch_table[DETECT_DATASET].desc = "match sticky buffer against datasets (experimental)"; - sigmatch_table[DETECT_DATASET].url = DOC_URL DOC_VERSION "/rules/dataset-keywords.html#dataset"; + sigmatch_table[DETECT_DATASET].url = "/rules/dataset-keywords.html#dataset"; sigmatch_table[DETECT_DATASET].Setup = DetectDatasetSetup; sigmatch_table[DETECT_DATASET].Free = DetectDatasetFree; diff --git a/src/detect-depth.c b/src/detect-depth.c index 30eee56cff..9f30d31c5f 100644 --- a/src/detect-depth.c +++ b/src/detect-depth.c @@ -48,7 +48,7 @@ void DetectDepthRegister (void) { sigmatch_table[DETECT_DEPTH].name = "depth"; sigmatch_table[DETECT_DEPTH].desc = "designate how many bytes from the beginning of the payload will be checked"; - sigmatch_table[DETECT_DEPTH].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#depth"; + sigmatch_table[DETECT_DEPTH].url = "/rules/payload-keywords.html#depth"; sigmatch_table[DETECT_DEPTH].Match = NULL; sigmatch_table[DETECT_DEPTH].Setup = DetectDepthSetup; sigmatch_table[DETECT_DEPTH].Free = NULL; @@ -56,7 +56,7 @@ void DetectDepthRegister (void) sigmatch_table[DETECT_STARTS_WITH].name = "startswith"; sigmatch_table[DETECT_STARTS_WITH].desc = "pattern must be at the start of a buffer (same as 'depth:')"; - sigmatch_table[DETECT_STARTS_WITH].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#startswith"; + sigmatch_table[DETECT_STARTS_WITH].url = "/rules/payload-keywords.html#startswith"; sigmatch_table[DETECT_STARTS_WITH].Setup = DetectStartsWithSetup; sigmatch_table[DETECT_STARTS_WITH].flags |= SIGMATCH_NOOPT; } diff --git a/src/detect-detection-filter.c b/src/detect-detection-filter.c index 5ceb9e85a4..85c6439f6f 100644 --- a/src/detect-detection-filter.c +++ b/src/detect-detection-filter.c @@ -63,7 +63,7 @@ void DetectDetectionFilterRegister (void) { sigmatch_table[DETECT_DETECTION_FILTER].name = "detection_filter"; sigmatch_table[DETECT_DETECTION_FILTER].desc = "alert on every match after a threshold has been reached"; - sigmatch_table[DETECT_DETECTION_FILTER].url = DOC_URL DOC_VERSION "/rules/thresholding.html#detection-filter"; + sigmatch_table[DETECT_DETECTION_FILTER].url = "/rules/thresholding.html#detection-filter"; sigmatch_table[DETECT_DETECTION_FILTER].Match = DetectDetectionFilterMatch; sigmatch_table[DETECT_DETECTION_FILTER].Setup = DetectDetectionFilterSetup; sigmatch_table[DETECT_DETECTION_FILTER].Free = DetectDetectionFilterFree; diff --git a/src/detect-distance.c b/src/detect-distance.c index bc711c03fc..c1334b4b96 100644 --- a/src/detect-distance.c +++ b/src/detect-distance.c @@ -54,7 +54,7 @@ void DetectDistanceRegister(void) { sigmatch_table[DETECT_DISTANCE].name = "distance"; sigmatch_table[DETECT_DISTANCE].desc = "indicates a relation between this content keyword and the content preceding it"; - sigmatch_table[DETECT_DISTANCE].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#distance"; + sigmatch_table[DETECT_DISTANCE].url = "/rules/payload-keywords.html#distance"; sigmatch_table[DETECT_DISTANCE].Match = NULL; sigmatch_table[DETECT_DISTANCE].Setup = DetectDistanceSetup; sigmatch_table[DETECT_DISTANCE].Free = NULL; diff --git a/src/detect-dnp3.c b/src/detect-dnp3.c index f3f229dad1..4ec6b54884 100644 --- a/src/detect-dnp3.c +++ b/src/detect-dnp3.c @@ -493,7 +493,7 @@ static void DetectDNP3FuncRegister(void) sigmatch_table[DETECT_AL_DNP3FUNC].name = "dnp3_func"; sigmatch_table[DETECT_AL_DNP3FUNC].alias = "dnp3.func"; sigmatch_table[DETECT_AL_DNP3FUNC].desc = "match on the application function code found in DNP3 request and responses"; - sigmatch_table[DETECT_AL_DNP3FUNC].url = DOC_URL DOC_VERSION "/rules/dnp3-keywords.html#dnp3-func"; + sigmatch_table[DETECT_AL_DNP3FUNC].url = "/rules/dnp3-keywords.html#dnp3-func"; sigmatch_table[DETECT_AL_DNP3FUNC].Match = NULL; sigmatch_table[DETECT_AL_DNP3FUNC].AppLayerTxMatch = DetectDNP3FuncMatch; sigmatch_table[DETECT_AL_DNP3FUNC].Setup = DetectDNP3FuncSetup; @@ -511,7 +511,7 @@ static void DetectDNP3IndRegister(void) sigmatch_table[DETECT_AL_DNP3IND].name = "dnp3_ind"; sigmatch_table[DETECT_AL_DNP3IND].alias = "dnp3.ind"; sigmatch_table[DETECT_AL_DNP3IND].desc = "match on the DNP3 internal indicator flags in the response application header"; - sigmatch_table[DETECT_AL_DNP3IND].url = DOC_URL DOC_VERSION "/rules/dnp3-keywords.html#dnp3-ind"; + sigmatch_table[DETECT_AL_DNP3IND].url = "/rules/dnp3-keywords.html#dnp3-ind"; sigmatch_table[DETECT_AL_DNP3IND].Match = NULL; sigmatch_table[DETECT_AL_DNP3IND].AppLayerTxMatch = DetectDNP3IndMatch; sigmatch_table[DETECT_AL_DNP3IND].Setup = DetectDNP3IndSetup; @@ -529,7 +529,7 @@ static void DetectDNP3ObjRegister(void) sigmatch_table[DETECT_AL_DNP3OBJ].name = "dnp3_obj"; sigmatch_table[DETECT_AL_DNP3OBJ].alias = "dnp3.obj"; sigmatch_table[DETECT_AL_DNP3OBJ].desc = "match on the DNP3 application data objects"; - sigmatch_table[DETECT_AL_DNP3OBJ].url = DOC_URL DOC_VERSION "/rules/dnp3-keywords.html#dnp3-obj"; + sigmatch_table[DETECT_AL_DNP3OBJ].url = "/rules/dnp3-keywords.html#dnp3-obj"; sigmatch_table[DETECT_AL_DNP3OBJ].Match = NULL; sigmatch_table[DETECT_AL_DNP3OBJ].AppLayerTxMatch = DetectDNP3ObjMatch; sigmatch_table[DETECT_AL_DNP3OBJ].Setup = DetectDNP3ObjSetup; @@ -559,7 +559,7 @@ static void DetectDNP3DataRegister(void) sigmatch_table[DETECT_AL_DNP3DATA].name = "dnp3.data"; sigmatch_table[DETECT_AL_DNP3DATA].alias = "dnp3_data"; sigmatch_table[DETECT_AL_DNP3DATA].desc = "make the following content options to match on the re-assembled application buffer"; - sigmatch_table[DETECT_AL_DNP3DATA].url = DOC_URL DOC_VERSION "/rules/dnp3-keywords.html#dnp3-data"; + sigmatch_table[DETECT_AL_DNP3DATA].url = "/rules/dnp3-keywords.html#dnp3-data"; sigmatch_table[DETECT_AL_DNP3DATA].Setup = DetectDNP3DataSetup; sigmatch_table[DETECT_AL_DNP3DATA].RegisterTests = DetectDNP3DataRegisterTests; diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c index f5853d8228..86291ac4fc 100644 --- a/src/detect-dns-query.c +++ b/src/detect-dns-query.c @@ -208,7 +208,7 @@ void DetectDnsQueryRegister (void) sigmatch_table[DETECT_AL_DNS_QUERY].name = "dns.query"; sigmatch_table[DETECT_AL_DNS_QUERY].alias = "dns_query"; sigmatch_table[DETECT_AL_DNS_QUERY].desc = "sticky buffer to match DNS query-buffer"; - sigmatch_table[DETECT_AL_DNS_QUERY].url = DOC_URL DOC_VERSION "/rules/dns-keywords.html#dns-query"; + sigmatch_table[DETECT_AL_DNS_QUERY].url = "/rules/dns-keywords.html#dns-query"; sigmatch_table[DETECT_AL_DNS_QUERY].Setup = DetectDnsQuerySetup; sigmatch_table[DETECT_AL_DNS_QUERY].RegisterTests = DetectDnsQueryRegisterTests; sigmatch_table[DETECT_AL_DNS_QUERY].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-dsize.c b/src/detect-dsize.c index b0b125f5f1..69f0577bbc 100644 --- a/src/detect-dsize.c +++ b/src/detect-dsize.c @@ -65,7 +65,7 @@ void DetectDsizeRegister (void) { sigmatch_table[DETECT_DSIZE].name = "dsize"; sigmatch_table[DETECT_DSIZE].desc = "match on the size of the packet payload"; - sigmatch_table[DETECT_DSIZE].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#dsize"; + sigmatch_table[DETECT_DSIZE].url = "/rules/payload-keywords.html#dsize"; sigmatch_table[DETECT_DSIZE].Match = DetectDsizeMatch; sigmatch_table[DETECT_DSIZE].Setup = DetectDsizeSetup; sigmatch_table[DETECT_DSIZE].Free = DetectDsizeFree; diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c index 5830a8566c..f855353f07 100644 --- a/src/detect-engine-register.c +++ b/src/detect-engine-register.c @@ -315,7 +315,7 @@ static void SigMultilinePrint(int i, const char *prefix) printf("%sFeatures: ", prefix); PrintFeatureList(&sigmatch_table[i], ','); if (sigmatch_table[i].url) { - printf("\n%sDocumentation: %s", prefix, sigmatch_table[i].url); + printf("\n%sDocumentation: %s%s", prefix, GetDocURL(), sigmatch_table[i].url); } if (sigmatch_table[i].alternative) { printf("\n%sReplaced by: %s", prefix, sigmatch_table[sigmatch_table[i].alternative].name); @@ -363,7 +363,7 @@ void SigTableList(const char *keyword) PrintFeatureList(&sigmatch_table[i], ':'); printf(";"); if (sigmatch_table[i].url) { - printf("%s", sigmatch_table[i].url); + printf("%s%s", GetDocURL(), sigmatch_table[i].url); } printf(";"); printf("\n"); diff --git a/src/detect-fast-pattern.c b/src/detect-fast-pattern.c index da34a0653a..96286c0fec 100644 --- a/src/detect-fast-pattern.c +++ b/src/detect-fast-pattern.c @@ -165,7 +165,7 @@ void DetectFastPatternRegister(void) { sigmatch_table[DETECT_FAST_PATTERN].name = "fast_pattern"; sigmatch_table[DETECT_FAST_PATTERN].desc = "force using preceding content in the multi pattern matcher"; - sigmatch_table[DETECT_FAST_PATTERN].url = DOC_URL DOC_VERSION "/rules/prefilter-keywords.html#fast-pattern"; + sigmatch_table[DETECT_FAST_PATTERN].url = "/rules/prefilter-keywords.html#fast-pattern"; sigmatch_table[DETECT_FAST_PATTERN].Match = NULL; sigmatch_table[DETECT_FAST_PATTERN].Setup = DetectFastPatternSetup; sigmatch_table[DETECT_FAST_PATTERN].Free = NULL; diff --git a/src/detect-file-data.c b/src/detect-file-data.c index 2e8d685340..beb3974840 100644 --- a/src/detect-file-data.c +++ b/src/detect-file-data.c @@ -83,7 +83,7 @@ void DetectFiledataRegister(void) sigmatch_table[DETECT_FILE_DATA].name = "file.data"; sigmatch_table[DETECT_FILE_DATA].alias = "file_data"; sigmatch_table[DETECT_FILE_DATA].desc = "make content keywords match on file data"; - sigmatch_table[DETECT_FILE_DATA].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#file-data"; + sigmatch_table[DETECT_FILE_DATA].url = "/rules/http-keywords.html#file-data"; sigmatch_table[DETECT_FILE_DATA].Setup = DetectFiledataSetup; #ifdef UNITTESTS sigmatch_table[DETECT_FILE_DATA].RegisterTests = DetectFiledataRegisterTests; diff --git a/src/detect-fileext.c b/src/detect-fileext.c index fcc25d4de9..ae116ec47b 100644 --- a/src/detect-fileext.c +++ b/src/detect-fileext.c @@ -65,7 +65,7 @@ void DetectFileextRegister(void) { sigmatch_table[DETECT_FILEEXT].name = "fileext"; sigmatch_table[DETECT_FILEEXT].desc = "match on the extension of a file name"; - sigmatch_table[DETECT_FILEEXT].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#fileext"; + sigmatch_table[DETECT_FILEEXT].url = "/rules/file-keywords.html#fileext"; sigmatch_table[DETECT_FILEEXT].FileMatch = DetectFileextMatch; sigmatch_table[DETECT_FILEEXT].Setup = DetectFileextSetup; sigmatch_table[DETECT_FILEEXT].Free = DetectFileextFree; diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c index e03dcee3bf..529ae19cec 100644 --- a/src/detect-filemagic.c +++ b/src/detect-filemagic.c @@ -71,7 +71,7 @@ void DetectFilemagicRegister(void) { sigmatch_table[DETECT_FILEMAGIC].name = "filemagic"; sigmatch_table[DETECT_FILEMAGIC].desc = "match on the information libmagic returns about a file"; - sigmatch_table[DETECT_FILEMAGIC].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filemagic"; + sigmatch_table[DETECT_FILEMAGIC].url = "/rules/file-keywords.html#filemagic"; sigmatch_table[DETECT_FILEMAGIC].Setup = DetectFilemagicSetupNoSupport; sigmatch_table[DETECT_FILEMAGIC].flags = SIGMATCH_QUOTES_MANDATORY|SIGMATCH_HANDLE_NEGATION; } @@ -106,7 +106,7 @@ void DetectFilemagicRegister(void) { sigmatch_table[DETECT_FILEMAGIC].name = "filemagic"; sigmatch_table[DETECT_FILEMAGIC].desc = "match on the information libmagic returns about a file"; - sigmatch_table[DETECT_FILEMAGIC].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filemagic"; + sigmatch_table[DETECT_FILEMAGIC].url = "/rules/file-keywords.html#filemagic"; sigmatch_table[DETECT_FILEMAGIC].FileMatch = DetectFilemagicMatch; sigmatch_table[DETECT_FILEMAGIC].Setup = DetectFilemagicSetup; sigmatch_table[DETECT_FILEMAGIC].Free = DetectFilemagicFree; @@ -116,7 +116,7 @@ void DetectFilemagicRegister(void) sigmatch_table[DETECT_FILE_MAGIC].name = "file.magic"; sigmatch_table[DETECT_FILE_MAGIC].desc = "sticky buffer to match on the file magic"; - sigmatch_table[DETECT_FILE_MAGIC].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filemagic"; + sigmatch_table[DETECT_FILE_MAGIC].url = "/rules/file-keywords.html#filemagic"; sigmatch_table[DETECT_FILE_MAGIC].Setup = DetectFilemagicSetupSticky; sigmatch_table[DETECT_FILE_MAGIC].flags = SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-filemd5.c b/src/detect-filemd5.c index 8134290abf..cd629698a1 100644 --- a/src/detect-filemd5.c +++ b/src/detect-filemd5.c @@ -69,7 +69,7 @@ void DetectFileMd5Register(void) { sigmatch_table[DETECT_FILEMD5].name = "filemd5"; sigmatch_table[DETECT_FILEMD5].desc = "match file MD5 against list of MD5 checksums"; - sigmatch_table[DETECT_FILEMD5].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filemd5"; + sigmatch_table[DETECT_FILEMD5].url = "/rules/file-keywords.html#filemd5"; sigmatch_table[DETECT_FILEMD5].FileMatch = DetectFileHashMatch; sigmatch_table[DETECT_FILEMD5].Setup = DetectFileMd5Setup; sigmatch_table[DETECT_FILEMD5].Free = DetectFileHashFree; diff --git a/src/detect-filename.c b/src/detect-filename.c index 189f81a9ca..fd2d9a1f73 100644 --- a/src/detect-filename.c +++ b/src/detect-filename.c @@ -79,7 +79,7 @@ void DetectFilenameRegister(void) { sigmatch_table[DETECT_FILENAME].name = "filename"; sigmatch_table[DETECT_FILENAME].desc = "match on the file name"; - sigmatch_table[DETECT_FILENAME].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filename"; + sigmatch_table[DETECT_FILENAME].url = "/rules/file-keywords.html#filename"; sigmatch_table[DETECT_FILENAME].FileMatch = DetectFilenameMatch; sigmatch_table[DETECT_FILENAME].Setup = DetectFilenameSetup; sigmatch_table[DETECT_FILENAME].Free = DetectFilenameFree; @@ -89,7 +89,7 @@ void DetectFilenameRegister(void) sigmatch_table[DETECT_FILE_NAME].name = "file.name"; sigmatch_table[DETECT_FILE_NAME].desc = "sticky buffer to match on the file name"; - sigmatch_table[DETECT_FILE_NAME].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filename"; + sigmatch_table[DETECT_FILE_NAME].url = "/rules/file-keywords.html#filename"; sigmatch_table[DETECT_FILE_NAME].Setup = DetectFilenameSetupSticky; sigmatch_table[DETECT_FILE_NAME].flags = SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-filesha1.c b/src/detect-filesha1.c index feb2b908b4..beac4209e6 100644 --- a/src/detect-filesha1.c +++ b/src/detect-filesha1.c @@ -69,7 +69,7 @@ void DetectFileSha1Register(void) { sigmatch_table[DETECT_FILESHA1].name = "filesha1"; sigmatch_table[DETECT_FILESHA1].desc = "match file SHA-1 against list of SHA-1 checksums"; - sigmatch_table[DETECT_FILESHA1].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filesha1"; + sigmatch_table[DETECT_FILESHA1].url = "/rules/file-keywords.html#filesha1"; sigmatch_table[DETECT_FILESHA1].FileMatch = DetectFileHashMatch; sigmatch_table[DETECT_FILESHA1].Setup = DetectFileSha1Setup; sigmatch_table[DETECT_FILESHA1].Free = DetectFileHashFree; diff --git a/src/detect-filesha256.c b/src/detect-filesha256.c index 9fd068fe4e..1157b8d9ab 100644 --- a/src/detect-filesha256.c +++ b/src/detect-filesha256.c @@ -69,7 +69,7 @@ void DetectFileSha256Register(void) { sigmatch_table[DETECT_FILESHA256].name = "filesha256"; sigmatch_table[DETECT_FILESHA256].desc = "match file SHA-256 against list of SHA-256 checksums"; - sigmatch_table[DETECT_FILESHA256].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filesha256"; + sigmatch_table[DETECT_FILESHA256].url = "/rules/file-keywords.html#filesha256"; sigmatch_table[DETECT_FILESHA256].FileMatch = DetectFileHashMatch; sigmatch_table[DETECT_FILESHA256].Setup = DetectFileSha256Setup; sigmatch_table[DETECT_FILESHA256].Free = DetectFileHashFree; diff --git a/src/detect-filesize.c b/src/detect-filesize.c index e1ba7c58df..50a9145d46 100644 --- a/src/detect-filesize.c +++ b/src/detect-filesize.c @@ -64,7 +64,7 @@ void DetectFilesizeRegister(void) { sigmatch_table[DETECT_FILESIZE].name = "filesize"; sigmatch_table[DETECT_FILESIZE].desc = "match on the size of the file as it is being transferred"; - sigmatch_table[DETECT_FILESIZE].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filesize"; + sigmatch_table[DETECT_FILESIZE].url = "/rules/file-keywords.html#filesize"; sigmatch_table[DETECT_FILESIZE].FileMatch = DetectFilesizeMatch; sigmatch_table[DETECT_FILESIZE].Setup = DetectFilesizeSetup; sigmatch_table[DETECT_FILESIZE].Free = DetectFilesizeFree; diff --git a/src/detect-filestore.c b/src/detect-filestore.c index 93271de5c8..47d2ac0b20 100644 --- a/src/detect-filestore.c +++ b/src/detect-filestore.c @@ -77,7 +77,7 @@ void DetectFilestoreRegister(void) { sigmatch_table[DETECT_FILESTORE].name = "filestore"; sigmatch_table[DETECT_FILESTORE].desc = "stores files to disk if the rule matched"; - sigmatch_table[DETECT_FILESTORE].url = DOC_URL DOC_VERSION "/rules/file-keywords.html#filestore"; + sigmatch_table[DETECT_FILESTORE].url = "/rules/file-keywords.html#filestore"; sigmatch_table[DETECT_FILESTORE].FileMatch = DetectFilestoreMatch; sigmatch_table[DETECT_FILESTORE].Setup = DetectFilestoreSetup; sigmatch_table[DETECT_FILESTORE].Free = DetectFilestoreFree; diff --git a/src/detect-flow.c b/src/detect-flow.c index a0cb7b6b55..306c8db007 100644 --- a/src/detect-flow.c +++ b/src/detect-flow.c @@ -64,7 +64,7 @@ void DetectFlowRegister (void) { sigmatch_table[DETECT_FLOW].name = "flow"; sigmatch_table[DETECT_FLOW].desc = "match on direction and state of the flow"; - sigmatch_table[DETECT_FLOW].url = DOC_URL DOC_VERSION "/rules/flow-keywords.html#flow"; + sigmatch_table[DETECT_FLOW].url = "/rules/flow-keywords.html#flow"; sigmatch_table[DETECT_FLOW].Match = DetectFlowMatch; sigmatch_table[DETECT_FLOW].Setup = DetectFlowSetup; sigmatch_table[DETECT_FLOW].Free = DetectFlowFree; diff --git a/src/detect-flowbits.c b/src/detect-flowbits.c index c1dca111d2..2d77ba90be 100644 --- a/src/detect-flowbits.c +++ b/src/detect-flowbits.c @@ -61,7 +61,7 @@ void DetectFlowbitsRegister (void) { sigmatch_table[DETECT_FLOWBITS].name = "flowbits"; sigmatch_table[DETECT_FLOWBITS].desc = "operate on flow flag"; - sigmatch_table[DETECT_FLOWBITS].url = DOC_URL DOC_VERSION "/rules/flow-keywords.html#flowbits"; + sigmatch_table[DETECT_FLOWBITS].url = "/rules/flow-keywords.html#flowbits"; sigmatch_table[DETECT_FLOWBITS].Match = DetectFlowbitMatch; sigmatch_table[DETECT_FLOWBITS].Setup = DetectFlowbitSetup; sigmatch_table[DETECT_FLOWBITS].Free = DetectFlowbitFree; diff --git a/src/detect-flowint.c b/src/detect-flowint.c index 00a66585de..62ec3de151 100644 --- a/src/detect-flowint.c +++ b/src/detect-flowint.c @@ -62,7 +62,7 @@ void DetectFlowintRegister(void) { sigmatch_table[DETECT_FLOWINT].name = "flowint"; sigmatch_table[DETECT_FLOWINT].desc = "operate on a per-flow integer"; - sigmatch_table[DETECT_FLOWINT].url = DOC_URL DOC_VERSION "/rules/flow-keywords.html#flowint"; + sigmatch_table[DETECT_FLOWINT].url = "/rules/flow-keywords.html#flowint"; sigmatch_table[DETECT_FLOWINT].Match = DetectFlowintMatch; sigmatch_table[DETECT_FLOWINT].Setup = DetectFlowintSetup; sigmatch_table[DETECT_FLOWINT].Free = DetectFlowintFree; diff --git a/src/detect-fragbits.c b/src/detect-fragbits.c index 0c47488e7a..632a1298c1 100644 --- a/src/detect-fragbits.c +++ b/src/detect-fragbits.c @@ -83,7 +83,7 @@ void DetectFragBitsRegister (void) { sigmatch_table[DETECT_FRAGBITS].name = "fragbits"; sigmatch_table[DETECT_FRAGBITS].desc = "check if the fragmentation and reserved bits are set in the IP header"; - sigmatch_table[DETECT_FRAGBITS].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#fragbits-ip-fragmentation"; + sigmatch_table[DETECT_FRAGBITS].url = "/rules/header-keywords.html#fragbits-ip-fragmentation"; sigmatch_table[DETECT_FRAGBITS].Match = DetectFragBitsMatch; sigmatch_table[DETECT_FRAGBITS].Setup = DetectFragBitsSetup; sigmatch_table[DETECT_FRAGBITS].Free = DetectFragBitsFree; diff --git a/src/detect-fragoffset.c b/src/detect-fragoffset.c index 2528cf481f..ffb46c88a7 100644 --- a/src/detect-fragoffset.c +++ b/src/detect-fragoffset.c @@ -59,7 +59,7 @@ void DetectFragOffsetRegister (void) { sigmatch_table[DETECT_FRAGOFFSET].name = "fragoffset"; sigmatch_table[DETECT_FRAGOFFSET].desc = "match on specific decimal values of the IP fragment offset field"; - sigmatch_table[DETECT_FRAGOFFSET].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#fragoffset"; + sigmatch_table[DETECT_FRAGOFFSET].url = "/rules/header-keywords.html#fragoffset"; sigmatch_table[DETECT_FRAGOFFSET].Match = DetectFragOffsetMatch; sigmatch_table[DETECT_FRAGOFFSET].Setup = DetectFragOffsetSetup; sigmatch_table[DETECT_FRAGOFFSET].Free = DetectFragOffsetFree; diff --git a/src/detect-ftpbounce.c b/src/detect-ftpbounce.c index 71000992e2..d489580d74 100644 --- a/src/detect-ftpbounce.c +++ b/src/detect-ftpbounce.c @@ -72,7 +72,7 @@ void DetectFtpbounceRegister(void) sigmatch_table[DETECT_FTPBOUNCE].Setup = DetectFtpbounceSetup; sigmatch_table[DETECT_FTPBOUNCE].AppLayerTxMatch = DetectFtpbounceALMatch; sigmatch_table[DETECT_FTPBOUNCE].RegisterTests = DetectFtpbounceRegisterTests; - sigmatch_table[DETECT_FTPBOUNCE].url = DOC_URL DOC_VERSION "/rules/ftp-keywords.html#ftpbounce"; + sigmatch_table[DETECT_FTPBOUNCE].url = "/rules/ftp-keywords.html#ftpbounce"; sigmatch_table[DETECT_FTPBOUNCE].flags = SIGMATCH_NOOPT; g_ftp_request_list_id = DetectBufferTypeRegister("ftp_request"); diff --git a/src/detect-ftpdata.c b/src/detect-ftpdata.c index 6c71883bbc..33834278c0 100644 --- a/src/detect-ftpdata.c +++ b/src/detect-ftpdata.c @@ -64,7 +64,7 @@ void DetectFtpdataRegister(void) { sigmatch_table[DETECT_FTPDATA].name = "ftpdata_command"; /* description: listed in "suricata --list-keywords=all" */ sigmatch_table[DETECT_FTPDATA].desc = "match FTP command triggering a FTP data channel"; - sigmatch_table[DETECT_FTPDATA].url = DOC_URL DOC_VERSION "/rules/ftp-keywords.html#ftpdata-command"; + sigmatch_table[DETECT_FTPDATA].url = "/rules/ftp-keywords.html#ftpdata-command"; sigmatch_table[DETECT_FTPDATA].AppLayerTxMatch = DetectFtpdataMatch; /* setup function is called during signature parsing, when the ftpcommand * keyword is encountered in the rule */ diff --git a/src/detect-geoip.c b/src/detect-geoip.c index f25aff657b..b7a1fefea0 100644 --- a/src/detect-geoip.c +++ b/src/detect-geoip.c @@ -56,7 +56,7 @@ void DetectGeoipRegister(void) { sigmatch_table[DETECT_GEOIP].name = "geoip"; sigmatch_table[DETECT_GEOIP].desc = "match on the source, destination or source and destination IP addresses of network traffic, and to see to which country it belongs"; - sigmatch_table[DETECT_GEOIP].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#geoip"; + sigmatch_table[DETECT_GEOIP].url = "/rules/header-keywords.html#geoip"; sigmatch_table[DETECT_GEOIP].Setup = DetectGeoipSetupNoSupport; sigmatch_table[DETECT_GEOIP].Free = NULL; sigmatch_table[DETECT_GEOIP].RegisterTests = NULL; @@ -79,7 +79,7 @@ static void DetectGeoipDataFree(DetectEngineCtx *, void *); void DetectGeoipRegister(void) { sigmatch_table[DETECT_GEOIP].name = "geoip"; - sigmatch_table[DETECT_GEOIP].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#geoip"; + sigmatch_table[DETECT_GEOIP].url = "/rules/header-keywords.html#geoip"; sigmatch_table[DETECT_GEOIP].desc = "keyword to match on country of src and or dst IP"; sigmatch_table[DETECT_GEOIP].Match = DetectGeoipMatch; sigmatch_table[DETECT_GEOIP].Setup = DetectGeoipSetup; diff --git a/src/detect-gid.c b/src/detect-gid.c index 9dca683685..684dfed3c7 100644 --- a/src/detect-gid.c +++ b/src/detect-gid.c @@ -46,7 +46,7 @@ void DetectGidRegister (void) { sigmatch_table[DETECT_GID].name = "gid"; sigmatch_table[DETECT_GID].desc = "give different groups of signatures another id value"; - sigmatch_table[DETECT_GID].url = DOC_URL DOC_VERSION "/rules/meta.html#gid-group-id"; + sigmatch_table[DETECT_GID].url = "/rules/meta.html#gid-group-id"; sigmatch_table[DETECT_GID].Match = NULL; sigmatch_table[DETECT_GID].Setup = DetectGidSetup; sigmatch_table[DETECT_GID].Free = NULL; diff --git a/src/detect-hostbits.c b/src/detect-hostbits.c index 382e3022b7..fa20c4f74b 100644 --- a/src/detect-hostbits.c +++ b/src/detect-hostbits.c @@ -77,7 +77,7 @@ void DetectHostbitsRegister (void) { sigmatch_table[DETECT_HOSTBITS].name = "hostbits"; sigmatch_table[DETECT_HOSTBITS].desc = "operate on host flag"; -// sigmatch_table[DETECT_HOSTBITS].url = DOC_URL DOC_VERSION "/rules/flow-keywords.html#flowbits"; +// sigmatch_table[DETECT_HOSTBITS].url = "/rules/flow-keywords.html#flowbits"; sigmatch_table[DETECT_HOSTBITS].Match = DetectHostbitMatch; sigmatch_table[DETECT_HOSTBITS].Setup = DetectHostbitSetup; sigmatch_table[DETECT_HOSTBITS].Free = DetectHostbitFree; diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c index 15a0e13269..1894c0e0ea 100644 --- a/src/detect-http-client-body.c +++ b/src/detect-http-client-body.c @@ -81,7 +81,7 @@ void DetectHttpClientBodyRegister(void) /* http_client_body content modifier */ sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].name = "http_client_body"; sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].desc = "content modifier to match only on HTTP request-body"; - sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-client-body"; + sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].url = "/rules/http-keywords.html#http-client-body"; sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].Setup = DetectHttpClientBodySetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_CLIENT_BODY].RegisterTests = DetectHttpClientBodyRegisterTests; @@ -93,7 +93,7 @@ void DetectHttpClientBodyRegister(void) /* http.request_body sticky buffer */ sigmatch_table[DETECT_HTTP_REQUEST_BODY].name = "http.request_body"; sigmatch_table[DETECT_HTTP_REQUEST_BODY].desc = "sticky buffer to match the HTTP request body buffer"; - sigmatch_table[DETECT_HTTP_REQUEST_BODY].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-client-body"; + sigmatch_table[DETECT_HTTP_REQUEST_BODY].url = "/rules/http-keywords.html#http-client-body"; sigmatch_table[DETECT_HTTP_REQUEST_BODY].Setup = DetectHttpClientBodySetupSticky; sigmatch_table[DETECT_HTTP_REQUEST_BODY].flags |= SIGMATCH_NOOPT; sigmatch_table[DETECT_HTTP_REQUEST_BODY].flags |= SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c index 2256f2e6fe..74fc9f98a4 100644 --- a/src/detect-http-cookie.c +++ b/src/detect-http-cookie.c @@ -85,7 +85,7 @@ void DetectHttpCookieRegister(void) /* http_cookie content modifier */ sigmatch_table[DETECT_AL_HTTP_COOKIE].name = "http_cookie"; sigmatch_table[DETECT_AL_HTTP_COOKIE].desc = "content modifier to match only on the HTTP cookie-buffer"; - sigmatch_table[DETECT_AL_HTTP_COOKIE].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-cookie"; + sigmatch_table[DETECT_AL_HTTP_COOKIE].url = "/rules/http-keywords.html#http-cookie"; sigmatch_table[DETECT_AL_HTTP_COOKIE].Setup = DetectHttpCookieSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_COOKIE].RegisterTests = DetectHttpCookieRegisterTests; @@ -97,7 +97,7 @@ void DetectHttpCookieRegister(void) /* http.cookie sticky buffer */ sigmatch_table[DETECT_HTTP_COOKIE].name = "http.cookie"; sigmatch_table[DETECT_HTTP_COOKIE].desc = "sticky buffer to match on the HTTP Cookie/Set-Cookie buffers"; - sigmatch_table[DETECT_HTTP_COOKIE].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-cookie"; + sigmatch_table[DETECT_HTTP_COOKIE].url = "/rules/http-keywords.html#http-cookie"; sigmatch_table[DETECT_HTTP_COOKIE].Setup = DetectHttpCookieSetupSticky; sigmatch_table[DETECT_HTTP_COOKIE].flags |= SIGMATCH_NOOPT; sigmatch_table[DETECT_HTTP_COOKIE].flags |= SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-header-names.c b/src/detect-http-header-names.c index f05df8a281..dde59f9597 100644 --- a/src/detect-http-header-names.c +++ b/src/detect-http-header-names.c @@ -393,7 +393,7 @@ void DetectHttpHeaderNamesRegister(void) sigmatch_table[DETECT_AL_HTTP_HEADER_NAMES].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_HTTP_HEADER_NAMES].alias = KEYWORD_NAME_LEGACY; sigmatch_table[DETECT_AL_HTTP_HEADER_NAMES].desc = BUFFER_NAME " sticky buffer"; - sigmatch_table[DETECT_AL_HTTP_HEADER_NAMES].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_HTTP_HEADER_NAMES].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_HTTP_HEADER_NAMES].Setup = DetectHttpHeaderNamesSetup; sigmatch_table[DETECT_AL_HTTP_HEADER_NAMES].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-header.c b/src/detect-http-header.c index e22f5592ad..e2b1904ede 100644 --- a/src/detect-http-header.c +++ b/src/detect-http-header.c @@ -408,7 +408,7 @@ void DetectHttpHeaderRegister(void) /* http_header content modifier */ sigmatch_table[DETECT_AL_HTTP_HEADER].name = "http_header"; sigmatch_table[DETECT_AL_HTTP_HEADER].desc = "content modifier to match only on the HTTP header-buffer"; - sigmatch_table[DETECT_AL_HTTP_HEADER].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-header-and-http-raw-header"; + sigmatch_table[DETECT_AL_HTTP_HEADER].url = "/rules/http-keywords.html#http-header-and-http-raw-header"; sigmatch_table[DETECT_AL_HTTP_HEADER].Setup = DetectHttpHeaderSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_HEADER].RegisterTests = DetectHttpHeaderRegisterTests; @@ -420,7 +420,7 @@ void DetectHttpHeaderRegister(void) /* http.header sticky buffer */ sigmatch_table[DETECT_HTTP_HEADER].name = "http.header"; sigmatch_table[DETECT_HTTP_HEADER].desc = "sticky buffer to match on the normalized HTTP header-buffer"; - sigmatch_table[DETECT_HTTP_HEADER].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-header-and-http-raw-header"; + sigmatch_table[DETECT_HTTP_HEADER].url = "/rules/http-keywords.html#http-header-and-http-raw-header"; sigmatch_table[DETECT_HTTP_HEADER].Setup = DetectHttpHeaderSetupSticky; sigmatch_table[DETECT_HTTP_HEADER].flags |= SIGMATCH_NOOPT; sigmatch_table[DETECT_HTTP_HEADER].flags |= SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-headers-stub.h b/src/detect-http-headers-stub.h index fb1f0b15c8..07e18e7aae 100644 --- a/src/detect-http-headers-stub.h +++ b/src/detect-http-headers-stub.h @@ -142,7 +142,7 @@ static void DetectHttpHeadersRegisterStub(void) sigmatch_table[KEYWORD_ID].alias = KEYWORD_NAME_LEGACY; #endif sigmatch_table[KEYWORD_ID].desc = KEYWORD_NAME " sticky buffer for the " BUFFER_DESC; - sigmatch_table[KEYWORD_ID].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[KEYWORD_ID].url = "/rules/" KEYWORD_DOC; sigmatch_table[KEYWORD_ID].Setup = DetectHttpHeadersSetupSticky; sigmatch_table[KEYWORD_ID].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-host.c b/src/detect-http-host.c index 3b74206066..fdf47641fe 100644 --- a/src/detect-http-host.c +++ b/src/detect-http-host.c @@ -84,7 +84,7 @@ void DetectHttpHHRegister(void) /* http_host content modifier */ sigmatch_table[DETECT_AL_HTTP_HOST].name = "http_host"; sigmatch_table[DETECT_AL_HTTP_HOST].desc = "content modifier to match on the HTTP hostname"; - sigmatch_table[DETECT_AL_HTTP_HOST].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-host-and-http-raw-host"; + sigmatch_table[DETECT_AL_HTTP_HOST].url = "/rules/http-keywords.html#http-host-and-http-raw-host"; sigmatch_table[DETECT_AL_HTTP_HOST].Setup = DetectHttpHHSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_HOST].RegisterTests = DetectHttpHHRegisterTests; @@ -95,7 +95,7 @@ void DetectHttpHHRegister(void) /* http.host sticky buffer */ sigmatch_table[DETECT_HTTP_HOST].name = "http.host"; sigmatch_table[DETECT_HTTP_HOST].desc = "sticky buffer to match on the HTTP Host buffer"; - sigmatch_table[DETECT_HTTP_HOST].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-host-and-http-raw-host"; + sigmatch_table[DETECT_HTTP_HOST].url = "/rules/http-keywords.html#http-host-and-http-raw-host"; sigmatch_table[DETECT_HTTP_HOST].Setup = DetectHttpHostSetup; sigmatch_table[DETECT_HTTP_HOST].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; @@ -118,7 +118,7 @@ void DetectHttpHHRegister(void) /* http_raw_host content modifier */ sigmatch_table[DETECT_AL_HTTP_RAW_HOST].name = "http_raw_host"; sigmatch_table[DETECT_AL_HTTP_RAW_HOST].desc = "content modifier to match on the HTTP host header or the raw hostname from the HTTP uri"; - sigmatch_table[DETECT_AL_HTTP_RAW_HOST].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-host-and-http-raw-host"; + sigmatch_table[DETECT_AL_HTTP_RAW_HOST].url = "/rules/http-keywords.html#http-host-and-http-raw-host"; sigmatch_table[DETECT_AL_HTTP_RAW_HOST].Setup = DetectHttpHRHSetup; sigmatch_table[DETECT_AL_HTTP_RAW_HOST].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_CONTENT_MODIFIER; sigmatch_table[DETECT_AL_HTTP_RAW_HOST].alternative = DETECT_HTTP_HOST_RAW; @@ -126,7 +126,7 @@ void DetectHttpHHRegister(void) /* http.host sticky buffer */ sigmatch_table[DETECT_HTTP_HOST_RAW].name = "http.host.raw"; sigmatch_table[DETECT_HTTP_HOST_RAW].desc = "sticky buffer to match on the HTTP host header or the raw hostname from the HTTP uri"; - sigmatch_table[DETECT_HTTP_HOST_RAW].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-host-and-http-raw-host"; + sigmatch_table[DETECT_HTTP_HOST_RAW].url = "/rules/http-keywords.html#http-host-and-http-raw-host"; sigmatch_table[DETECT_HTTP_HOST_RAW].Setup = DetectHttpHostRawSetupSticky; sigmatch_table[DETECT_HTTP_HOST_RAW].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-method.c b/src/detect-http-method.c index d787dc50ce..9d185cedc0 100644 --- a/src/detect-http-method.c +++ b/src/detect-http-method.c @@ -79,7 +79,7 @@ void DetectHttpMethodRegister(void) /* http_method content modifier */ sigmatch_table[DETECT_AL_HTTP_METHOD].name = "http_method"; sigmatch_table[DETECT_AL_HTTP_METHOD].desc = "content modifier to match only on the HTTP method-buffer"; - sigmatch_table[DETECT_AL_HTTP_METHOD].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-method"; + sigmatch_table[DETECT_AL_HTTP_METHOD].url = "/rules/http-keywords.html#http-method"; sigmatch_table[DETECT_AL_HTTP_METHOD].Match = NULL; sigmatch_table[DETECT_AL_HTTP_METHOD].Setup = DetectHttpMethodSetup; #ifdef UNITTESTS @@ -91,7 +91,7 @@ void DetectHttpMethodRegister(void) /* http.method sticky buffer */ sigmatch_table[DETECT_HTTP_METHOD].name = "http.method"; sigmatch_table[DETECT_HTTP_METHOD].desc = "sticky buffer to match specifically and only on the HTTP method buffer"; - sigmatch_table[DETECT_HTTP_METHOD].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-method"; + sigmatch_table[DETECT_HTTP_METHOD].url = "/rules/http-keywords.html#http-method"; sigmatch_table[DETECT_HTTP_METHOD].Setup = DetectHttpMethodSetupSticky; sigmatch_table[DETECT_HTTP_METHOD].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-protocol.c b/src/detect-http-protocol.c index b9c200286c..1cae37e2d7 100644 --- a/src/detect-http-protocol.c +++ b/src/detect-http-protocol.c @@ -124,7 +124,7 @@ void DetectHttpProtocolRegister(void) sigmatch_table[DETECT_AL_HTTP_PROTOCOL].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_HTTP_PROTOCOL].alias = KEYWORD_NAME_LEGACY; sigmatch_table[DETECT_AL_HTTP_PROTOCOL].desc = BUFFER_NAME " sticky buffer"; - sigmatch_table[DETECT_AL_HTTP_PROTOCOL].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_HTTP_PROTOCOL].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_HTTP_PROTOCOL].Setup = DetectHttpProtocolSetup; sigmatch_table[DETECT_AL_HTTP_PROTOCOL].flags |= SIGMATCH_INFO_STICKY_BUFFER | SIGMATCH_NOOPT; diff --git a/src/detect-http-raw-header.c b/src/detect-http-raw-header.c index 9e2e20cdc0..45ceee2886 100644 --- a/src/detect-http-raw-header.c +++ b/src/detect-http-raw-header.c @@ -78,7 +78,7 @@ void DetectHttpRawHeaderRegister(void) /* http_raw_header content modifier */ sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].name = "http_raw_header"; sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].desc = "content modifier to match the raw HTTP header buffer"; - sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-header-and-http-raw-header"; + sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].url = "/rules/http-keywords.html#http-header-and-http-raw-header"; sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].Setup = DetectHttpRawHeaderSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_RAW_HEADER].RegisterTests = DetectHttpRawHeaderRegisterTests; @@ -89,7 +89,7 @@ void DetectHttpRawHeaderRegister(void) /* http.header.raw sticky buffer */ sigmatch_table[DETECT_HTTP_RAW_HEADER].name = "http.header.raw"; sigmatch_table[DETECT_HTTP_RAW_HEADER].desc = "sticky buffer to match the raw HTTP header buffer"; - sigmatch_table[DETECT_HTTP_RAW_HEADER].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-header-and-http-raw-header"; + sigmatch_table[DETECT_HTTP_RAW_HEADER].url = "/rules/http-keywords.html#http-header-and-http-raw-header"; sigmatch_table[DETECT_HTTP_RAW_HEADER].Setup = DetectHttpRawHeaderSetupSticky; sigmatch_table[DETECT_HTTP_RAW_HEADER].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-request-line.c b/src/detect-http-request-line.c index 08ec1e0cb8..101aa4a950 100644 --- a/src/detect-http-request-line.c +++ b/src/detect-http-request-line.c @@ -76,7 +76,7 @@ void DetectHttpRequestLineRegister(void) sigmatch_table[DETECT_AL_HTTP_REQUEST_LINE].name = "http.request_line"; sigmatch_table[DETECT_AL_HTTP_REQUEST_LINE].alias = "http_request_line"; sigmatch_table[DETECT_AL_HTTP_REQUEST_LINE].desc = "sticky buffer to match on the HTTP request line"; - sigmatch_table[DETECT_AL_HTTP_REQUEST_LINE].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-request-line"; + sigmatch_table[DETECT_AL_HTTP_REQUEST_LINE].url = "/rules/http-keywords.html#http-request-line"; sigmatch_table[DETECT_AL_HTTP_REQUEST_LINE].Match = NULL; sigmatch_table[DETECT_AL_HTTP_REQUEST_LINE].Setup = DetectHttpRequestLineSetup; sigmatch_table[DETECT_AL_HTTP_REQUEST_LINE].RegisterTests = DetectHttpRequestLineRegisterTests; diff --git a/src/detect-http-response-line.c b/src/detect-http-response-line.c index 06e12df9b5..4fe43da52c 100644 --- a/src/detect-http-response-line.c +++ b/src/detect-http-response-line.c @@ -76,7 +76,7 @@ void DetectHttpResponseLineRegister(void) sigmatch_table[DETECT_AL_HTTP_RESPONSE_LINE].name = "http.response_line"; sigmatch_table[DETECT_AL_HTTP_RESPONSE_LINE].alias = "http_response_line"; sigmatch_table[DETECT_AL_HTTP_RESPONSE_LINE].desc = "content modifier to match only on the HTTP response line"; - sigmatch_table[DETECT_AL_HTTP_RESPONSE_LINE].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-response-line"; + sigmatch_table[DETECT_AL_HTTP_RESPONSE_LINE].url = "/rules/http-keywords.html#http-response-line"; sigmatch_table[DETECT_AL_HTTP_RESPONSE_LINE].Setup = DetectHttpResponseLineSetup; sigmatch_table[DETECT_AL_HTTP_RESPONSE_LINE].RegisterTests = DetectHttpResponseLineRegisterTests; diff --git a/src/detect-http-server-body.c b/src/detect-http-server-body.c index bae9a11a70..8c330cdee8 100644 --- a/src/detect-http-server-body.c +++ b/src/detect-http-server-body.c @@ -74,7 +74,7 @@ void DetectHttpServerBodyRegister(void) /* http_server_body content modifier */ sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].name = "http_server_body"; sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].desc = "content modifier to match on the HTTP response-body"; - sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-server-body"; + sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].url = "/rules/http-keywords.html#http-server-body"; sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].Setup = DetectHttpServerBodySetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_SERVER_BODY].RegisterTests = DetectHttpServerBodyRegisterTests; @@ -86,7 +86,7 @@ void DetectHttpServerBodyRegister(void) /* http.request_body sticky buffer */ sigmatch_table[DETECT_HTTP_RESPONSE_BODY].name = "http.response_body"; sigmatch_table[DETECT_HTTP_RESPONSE_BODY].desc = "sticky buffer to match the HTTP response body buffer"; - sigmatch_table[DETECT_HTTP_RESPONSE_BODY].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-server-body"; + sigmatch_table[DETECT_HTTP_RESPONSE_BODY].url = "/rules/http-keywords.html#http-server-body"; sigmatch_table[DETECT_HTTP_RESPONSE_BODY].Setup = DetectHttpServerBodySetupSticky; sigmatch_table[DETECT_HTTP_RESPONSE_BODY].flags |= SIGMATCH_NOOPT; sigmatch_table[DETECT_HTTP_RESPONSE_BODY].flags |= SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-start.c b/src/detect-http-start.c index b1042a0583..4e6decc03f 100644 --- a/src/detect-http-start.c +++ b/src/detect-http-start.c @@ -377,7 +377,7 @@ void DetectHttpStartRegister(void) sigmatch_table[DETECT_AL_HTTP_START].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_HTTP_START].alias = KEYWORD_NAME_LEGACY; sigmatch_table[DETECT_AL_HTTP_START].desc = BUFFER_NAME " sticky buffer"; - sigmatch_table[DETECT_AL_HTTP_START].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_HTTP_START].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_HTTP_START].Setup = DetectHttpStartSetup; sigmatch_table[DETECT_AL_HTTP_START].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-stat-code.c b/src/detect-http-stat-code.c index 240c54fa02..22433a6b8e 100644 --- a/src/detect-http-stat-code.c +++ b/src/detect-http-stat-code.c @@ -81,7 +81,7 @@ void DetectHttpStatCodeRegister (void) /* http_stat_code content modifier */ sigmatch_table[DETECT_AL_HTTP_STAT_CODE].name = "http_stat_code"; sigmatch_table[DETECT_AL_HTTP_STAT_CODE].desc = "content modifier to match only on HTTP stat-code-buffer"; - sigmatch_table[DETECT_AL_HTTP_STAT_CODE].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-stat-code"; + sigmatch_table[DETECT_AL_HTTP_STAT_CODE].url = "/rules/http-keywords.html#http-stat-code"; sigmatch_table[DETECT_AL_HTTP_STAT_CODE].Setup = DetectHttpStatCodeSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_STAT_CODE].RegisterTests = DetectHttpStatCodeRegisterTests; @@ -92,7 +92,7 @@ void DetectHttpStatCodeRegister (void) /* http.stat_code content modifier */ sigmatch_table[DETECT_HTTP_STAT_CODE].name = "http.stat_code"; sigmatch_table[DETECT_HTTP_STAT_CODE].desc = "sticky buffer to match only on HTTP stat-code-buffer"; - sigmatch_table[DETECT_HTTP_STAT_CODE].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-stat-code"; + sigmatch_table[DETECT_HTTP_STAT_CODE].url = "/rules/http-keywords.html#http-stat-code"; sigmatch_table[DETECT_HTTP_STAT_CODE].Setup = DetectHttpStatCodeSetupSticky; sigmatch_table[DETECT_HTTP_STAT_CODE].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-stat-msg.c b/src/detect-http-stat-msg.c index 6fb5356887..c59f9c2671 100644 --- a/src/detect-http-stat-msg.c +++ b/src/detect-http-stat-msg.c @@ -81,7 +81,7 @@ void DetectHttpStatMsgRegister (void) /* http_stat_msg content modifier */ sigmatch_table[DETECT_AL_HTTP_STAT_MSG].name = "http_stat_msg"; sigmatch_table[DETECT_AL_HTTP_STAT_MSG].desc = "content modifier to match on HTTP stat-msg-buffer"; - sigmatch_table[DETECT_AL_HTTP_STAT_MSG].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-stat-msg"; + sigmatch_table[DETECT_AL_HTTP_STAT_MSG].url = "/rules/http-keywords.html#http-stat-msg"; sigmatch_table[DETECT_AL_HTTP_STAT_MSG].Setup = DetectHttpStatMsgSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_STAT_MSG].RegisterTests = DetectHttpStatMsgRegisterTests; @@ -92,7 +92,7 @@ void DetectHttpStatMsgRegister (void) /* http.stat_msg sticky buffer */ sigmatch_table[DETECT_HTTP_STAT_MSG].name = "http.stat_msg"; sigmatch_table[DETECT_HTTP_STAT_MSG].desc = "sticky buffer to match on the HTTP response status message"; - sigmatch_table[DETECT_HTTP_STAT_MSG].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-stat-msg"; + sigmatch_table[DETECT_HTTP_STAT_MSG].url = "/rules/http-keywords.html#http-stat-msg"; sigmatch_table[DETECT_HTTP_STAT_MSG].Setup = DetectHttpStatMsgSetupSticky; sigmatch_table[DETECT_HTTP_STAT_MSG].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-ua.c b/src/detect-http-ua.c index 7772c65351..a4d9f39ccf 100644 --- a/src/detect-http-ua.c +++ b/src/detect-http-ua.c @@ -78,7 +78,7 @@ void DetectHttpUARegister(void) /* http_user_agent content modifier */ sigmatch_table[DETECT_AL_HTTP_USER_AGENT].name = "http_user_agent"; sigmatch_table[DETECT_AL_HTTP_USER_AGENT].desc = "content modifier to match only on the HTTP User-Agent header"; - sigmatch_table[DETECT_AL_HTTP_USER_AGENT].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-user-agent"; + sigmatch_table[DETECT_AL_HTTP_USER_AGENT].url = "/rules/http-keywords.html#http-user-agent"; sigmatch_table[DETECT_AL_HTTP_USER_AGENT].Setup = DetectHttpUASetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_USER_AGENT].RegisterTests = DetectHttpUARegisterTests; @@ -90,7 +90,7 @@ void DetectHttpUARegister(void) /* http.user_agent sticky buffer */ sigmatch_table[DETECT_HTTP_UA].name = "http.user_agent"; sigmatch_table[DETECT_HTTP_UA].desc = "sticky buffer to match specifically and only on the HTTP User Agent buffer"; - sigmatch_table[DETECT_HTTP_UA].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-user-agent"; + sigmatch_table[DETECT_HTTP_UA].url = "/rules/http-keywords.html#http-user-agent"; sigmatch_table[DETECT_HTTP_UA].Setup = DetectHttpUserAgentSetup; sigmatch_table[DETECT_HTTP_UA].flags |= SIGMATCH_NOOPT; sigmatch_table[DETECT_HTTP_UA].flags |= SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-http-uri.c b/src/detect-http-uri.c index ace5d0300a..cd002dd0cf 100644 --- a/src/detect-http-uri.c +++ b/src/detect-http-uri.c @@ -90,7 +90,7 @@ void DetectHttpUriRegister (void) /* http_uri content modifier */ sigmatch_table[DETECT_AL_HTTP_URI].name = "http_uri"; sigmatch_table[DETECT_AL_HTTP_URI].desc = "content modifier to match specifically and only on the HTTP uri-buffer"; - sigmatch_table[DETECT_AL_HTTP_URI].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-uri-and-http-raw-uri"; + sigmatch_table[DETECT_AL_HTTP_URI].url = "/rules/http-keywords.html#http-uri-and-http-raw-uri"; sigmatch_table[DETECT_AL_HTTP_URI].Setup = DetectHttpUriSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_HTTP_URI].RegisterTests = DetectHttpUriRegisterTests; @@ -102,7 +102,7 @@ void DetectHttpUriRegister (void) sigmatch_table[DETECT_HTTP_URI].name = "http.uri"; sigmatch_table[DETECT_HTTP_URI].alias = "http.uri.normalized"; sigmatch_table[DETECT_HTTP_URI].desc = "sticky buffer to match specifically and only on the normalized HTTP URI buffer"; - sigmatch_table[DETECT_HTTP_URI].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-uri-and-http-raw-uri"; + sigmatch_table[DETECT_HTTP_URI].url = "/rules/http-keywords.html#http-uri-and-http-raw-uri"; sigmatch_table[DETECT_HTTP_URI].Setup = DetectHttpUriSetupSticky; sigmatch_table[DETECT_HTTP_URI].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; @@ -128,7 +128,7 @@ void DetectHttpUriRegister (void) /* http_raw_uri content modifier */ sigmatch_table[DETECT_AL_HTTP_RAW_URI].name = "http_raw_uri"; sigmatch_table[DETECT_AL_HTTP_RAW_URI].desc = "content modifier to match on the raw HTTP uri"; - sigmatch_table[DETECT_AL_HTTP_RAW_URI].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http_uri-and-http_raw-uri"; + sigmatch_table[DETECT_AL_HTTP_RAW_URI].url = "/rules/http-keywords.html#http_uri-and-http_raw-uri"; sigmatch_table[DETECT_AL_HTTP_RAW_URI].Setup = DetectHttpRawUriSetup; sigmatch_table[DETECT_AL_HTTP_RAW_URI].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_CONTENT_MODIFIER; sigmatch_table[DETECT_AL_HTTP_RAW_URI].alternative = DETECT_HTTP_URI_RAW; @@ -136,7 +136,7 @@ void DetectHttpUriRegister (void) /* http.uri.raw sticky buffer */ sigmatch_table[DETECT_HTTP_URI_RAW].name = "http.uri.raw"; sigmatch_table[DETECT_HTTP_URI_RAW].desc = "sticky buffer to match specifically and only on the raw HTTP URI buffer"; - sigmatch_table[DETECT_HTTP_URI_RAW].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#http-uri-and-http-raw-uri"; + sigmatch_table[DETECT_HTTP_URI_RAW].url = "/rules/http-keywords.html#http-uri-and-http-raw-uri"; sigmatch_table[DETECT_HTTP_URI_RAW].Setup = DetectHttpRawUriSetupSticky; sigmatch_table[DETECT_HTTP_URI_RAW].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-icmp-id.c b/src/detect-icmp-id.c index 4d3c0ad677..11ea25483e 100644 --- a/src/detect-icmp-id.c +++ b/src/detect-icmp-id.c @@ -57,7 +57,7 @@ void DetectIcmpIdRegister (void) { sigmatch_table[DETECT_ICMP_ID].name = "icmp_id"; sigmatch_table[DETECT_ICMP_ID].desc = "check for a ICMP ID"; - sigmatch_table[DETECT_ICMP_ID].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#icmp-id"; + sigmatch_table[DETECT_ICMP_ID].url = "/rules/header-keywords.html#icmp-id"; sigmatch_table[DETECT_ICMP_ID].Match = DetectIcmpIdMatch; sigmatch_table[DETECT_ICMP_ID].Setup = DetectIcmpIdSetup; sigmatch_table[DETECT_ICMP_ID].Free = DetectIcmpIdFree; diff --git a/src/detect-icmp-seq.c b/src/detect-icmp-seq.c index 4f85fadaaa..06ae828953 100644 --- a/src/detect-icmp-seq.c +++ b/src/detect-icmp-seq.c @@ -57,7 +57,7 @@ void DetectIcmpSeqRegister (void) { sigmatch_table[DETECT_ICMP_SEQ].name = "icmp_seq"; sigmatch_table[DETECT_ICMP_SEQ].desc = "check for a ICMP sequence number"; - sigmatch_table[DETECT_ICMP_SEQ].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#icmp-seq"; + sigmatch_table[DETECT_ICMP_SEQ].url = "/rules/header-keywords.html#icmp-seq"; sigmatch_table[DETECT_ICMP_SEQ].Match = DetectIcmpSeqMatch; sigmatch_table[DETECT_ICMP_SEQ].Setup = DetectIcmpSeqSetup; sigmatch_table[DETECT_ICMP_SEQ].Free = DetectIcmpSeqFree; diff --git a/src/detect-icmpv6-mtu.c b/src/detect-icmpv6-mtu.c index cf48ee217b..340b4f4280 100644 --- a/src/detect-icmpv6-mtu.c +++ b/src/detect-icmpv6-mtu.c @@ -49,7 +49,7 @@ void DetectICMPv6mtuRegister(void) { sigmatch_table[DETECT_ICMPV6MTU].name = "icmpv6.mtu"; sigmatch_table[DETECT_ICMPV6MTU].desc = "match on ICMPv6 MTU field"; - sigmatch_table[DETECT_ICMPV6MTU].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#icmpv6mtu"; + sigmatch_table[DETECT_ICMPV6MTU].url = "/rules/header-keywords.html#icmpv6mtu"; sigmatch_table[DETECT_ICMPV6MTU].Match = DetectICMPv6mtuMatch; sigmatch_table[DETECT_ICMPV6MTU].Setup = DetectICMPv6mtuSetup; sigmatch_table[DETECT_ICMPV6MTU].Free = DetectICMPv6mtuFree; diff --git a/src/detect-icmpv6hdr.c b/src/detect-icmpv6hdr.c index b169c870ce..f8dbf7f6ce 100644 --- a/src/detect-icmpv6hdr.c +++ b/src/detect-icmpv6hdr.c @@ -51,7 +51,7 @@ void DetectICMPv6hdrRegister(void) { sigmatch_table[DETECT_ICMPV6HDR].name = "icmpv6.hdr"; sigmatch_table[DETECT_ICMPV6HDR].desc = "sticky buffer to match on the ICMP V6 header"; - sigmatch_table[DETECT_ICMPV6HDR].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#icmpv6hdr"; + sigmatch_table[DETECT_ICMPV6HDR].url = "/rules/header-keywords.html#icmpv6hdr"; sigmatch_table[DETECT_ICMPV6HDR].Setup = DetectICMPv6hdrSetup; sigmatch_table[DETECT_ICMPV6HDR].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; #ifdef UNITTESTS diff --git a/src/detect-icode.c b/src/detect-icode.c index 228fc47a35..f174997a30 100644 --- a/src/detect-icode.c +++ b/src/detect-icode.c @@ -61,7 +61,7 @@ void DetectICodeRegister (void) { sigmatch_table[DETECT_ICODE].name = "icode"; sigmatch_table[DETECT_ICODE].desc = "match on specific ICMP id-value"; - sigmatch_table[DETECT_ICODE].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#icode"; + sigmatch_table[DETECT_ICODE].url = "/rules/header-keywords.html#icode"; sigmatch_table[DETECT_ICODE].Match = DetectICodeMatch; sigmatch_table[DETECT_ICODE].Setup = DetectICodeSetup; sigmatch_table[DETECT_ICODE].Free = DetectICodeFree; diff --git a/src/detect-id.c b/src/detect-id.c index 56368668a3..a9d2d1ce1b 100644 --- a/src/detect-id.c +++ b/src/detect-id.c @@ -65,7 +65,7 @@ void DetectIdRegister (void) { sigmatch_table[DETECT_ID].name = "id"; sigmatch_table[DETECT_ID].desc = "match on a specific IP ID value"; - sigmatch_table[DETECT_ID].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#id"; + sigmatch_table[DETECT_ID].url = "/rules/header-keywords.html#id"; sigmatch_table[DETECT_ID].Match = DetectIdMatch; sigmatch_table[DETECT_ID].Setup = DetectIdSetup; sigmatch_table[DETECT_ID].Free = DetectIdFree; diff --git a/src/detect-ipopts.c b/src/detect-ipopts.c index e71e515855..7d0282f83e 100644 --- a/src/detect-ipopts.c +++ b/src/detect-ipopts.c @@ -55,7 +55,7 @@ void DetectIpOptsRegister (void) { sigmatch_table[DETECT_IPOPTS].name = "ipopts"; sigmatch_table[DETECT_IPOPTS].desc = "check if a specific IP option is set"; - sigmatch_table[DETECT_IPOPTS].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#ipopts"; + sigmatch_table[DETECT_IPOPTS].url = "/rules/header-keywords.html#ipopts"; sigmatch_table[DETECT_IPOPTS].Match = DetectIpOptsMatch; sigmatch_table[DETECT_IPOPTS].Setup = DetectIpOptsSetup; sigmatch_table[DETECT_IPOPTS].Free = DetectIpOptsFree; diff --git a/src/detect-ipproto.c b/src/detect-ipproto.c index 3442ce9ccb..ea0373e67f 100644 --- a/src/detect-ipproto.c +++ b/src/detect-ipproto.c @@ -58,7 +58,7 @@ void DetectIPProtoRegister(void) { sigmatch_table[DETECT_IPPROTO].name = "ip_proto"; sigmatch_table[DETECT_IPPROTO].desc = "match on the IP protocol in the packet-header"; - sigmatch_table[DETECT_IPPROTO].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#ip-proto"; + sigmatch_table[DETECT_IPPROTO].url = "/rules/header-keywords.html#ip-proto"; sigmatch_table[DETECT_IPPROTO].Match = NULL; sigmatch_table[DETECT_IPPROTO].Setup = DetectIPProtoSetup; sigmatch_table[DETECT_IPPROTO].Free = DetectIPProtoFree; diff --git a/src/detect-iprep.c b/src/detect-iprep.c index 8f58045e4c..27616c5be0 100644 --- a/src/detect-iprep.c +++ b/src/detect-iprep.c @@ -61,7 +61,7 @@ void DetectIPRepRegister (void) { sigmatch_table[DETECT_IPREP].name = "iprep"; sigmatch_table[DETECT_IPREP].desc = "match on the IP reputation information for a host"; - sigmatch_table[DETECT_IPREP].url = DOC_URL DOC_VERSION "/rules/ip-reputation-rules.html#iprep"; + sigmatch_table[DETECT_IPREP].url = "/rules/ip-reputation-rules.html#iprep"; sigmatch_table[DETECT_IPREP].Match = DetectIPRepMatch; sigmatch_table[DETECT_IPREP].Setup = DetectIPRepSetup; sigmatch_table[DETECT_IPREP].Free = DetectIPRepFree; diff --git a/src/detect-ipv4hdr.c b/src/detect-ipv4hdr.c index e5583d886c..f963cd1a48 100644 --- a/src/detect-ipv4hdr.c +++ b/src/detect-ipv4hdr.c @@ -51,7 +51,7 @@ void DetectIpv4hdrRegister(void) { sigmatch_table[DETECT_IPV4HDR].name = "ipv4.hdr"; sigmatch_table[DETECT_IPV4HDR].desc = "sticky buffer to match on the IPV4 header"; - sigmatch_table[DETECT_IPV4HDR].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#ipv4hdr"; + sigmatch_table[DETECT_IPV4HDR].url = "/rules/header-keywords.html#ipv4hdr"; sigmatch_table[DETECT_IPV4HDR].Setup = DetectIpv4hdrSetup; sigmatch_table[DETECT_IPV4HDR].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; #ifdef UNITTESTS diff --git a/src/detect-ipv6hdr.c b/src/detect-ipv6hdr.c index 250b6e730f..8accf9a958 100644 --- a/src/detect-ipv6hdr.c +++ b/src/detect-ipv6hdr.c @@ -51,7 +51,7 @@ void DetectIpv6hdrRegister(void) { sigmatch_table[DETECT_IPV6HDR].name = "ipv6.hdr"; sigmatch_table[DETECT_IPV6HDR].desc = "sticky buffer to match on the IPV6 header"; - sigmatch_table[DETECT_IPV6HDR].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#ipv6hdr"; + sigmatch_table[DETECT_IPV6HDR].url = "/rules/header-keywords.html#ipv6hdr"; sigmatch_table[DETECT_IPV6HDR].Setup = DetectIpv6hdrSetup; sigmatch_table[DETECT_IPV6HDR].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; #ifdef UNITTESTS diff --git a/src/detect-isdataat.c b/src/detect-isdataat.c index 5319866ff7..093588d355 100644 --- a/src/detect-isdataat.c +++ b/src/detect-isdataat.c @@ -67,7 +67,7 @@ void DetectIsdataatRegister(void) { sigmatch_table[DETECT_ISDATAAT].name = "isdataat"; sigmatch_table[DETECT_ISDATAAT].desc = "check if there is still data at a specific part of the payload"; - sigmatch_table[DETECT_ISDATAAT].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#isdataat"; + sigmatch_table[DETECT_ISDATAAT].url = "/rules/payload-keywords.html#isdataat"; /* match is handled in DetectEngineContentInspection() */ sigmatch_table[DETECT_ISDATAAT].Match = NULL; sigmatch_table[DETECT_ISDATAAT].Setup = DetectIsdataatSetup; @@ -76,7 +76,7 @@ void DetectIsdataatRegister(void) sigmatch_table[DETECT_ENDS_WITH].name = "endswith"; sigmatch_table[DETECT_ENDS_WITH].desc = "make sure the previous content matches exactly at the end of the buffer"; - sigmatch_table[DETECT_ENDS_WITH].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#endswith"; + sigmatch_table[DETECT_ENDS_WITH].url = "/rules/payload-keywords.html#endswith"; sigmatch_table[DETECT_ENDS_WITH].Setup = DetectEndsWithSetup; sigmatch_table[DETECT_ENDS_WITH].flags = SIGMATCH_NOOPT; diff --git a/src/detect-itype.c b/src/detect-itype.c index 4171562a93..4e059cc18e 100644 --- a/src/detect-itype.c +++ b/src/detect-itype.c @@ -61,7 +61,7 @@ void DetectITypeRegister (void) { sigmatch_table[DETECT_ITYPE].name = "itype"; sigmatch_table[DETECT_ITYPE].desc = "match on a specific ICMP type"; - sigmatch_table[DETECT_ITYPE].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#itype"; + sigmatch_table[DETECT_ITYPE].url = "/rules/header-keywords.html#itype"; sigmatch_table[DETECT_ITYPE].Match = DetectITypeMatch; sigmatch_table[DETECT_ITYPE].Setup = DetectITypeSetup; sigmatch_table[DETECT_ITYPE].Free = DetectITypeFree; diff --git a/src/detect-krb5-cname.c b/src/detect-krb5-cname.c index 519e4f2945..251baa0d01 100644 --- a/src/detect-krb5-cname.c +++ b/src/detect-krb5-cname.c @@ -193,7 +193,7 @@ void DetectKrb5CNameRegister(void) { sigmatch_table[DETECT_AL_KRB5_CNAME].name = "krb5.cname"; sigmatch_table[DETECT_AL_KRB5_CNAME].alias = "krb5_cname"; - sigmatch_table[DETECT_AL_KRB5_CNAME].url = DOC_URL DOC_VERSION "/rules/kerberos-keywords.html#krb5-cname"; + sigmatch_table[DETECT_AL_KRB5_CNAME].url = "/rules/kerberos-keywords.html#krb5-cname"; sigmatch_table[DETECT_AL_KRB5_CNAME].Setup = DetectKrb5CNameSetup; sigmatch_table[DETECT_AL_KRB5_CNAME].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; sigmatch_table[DETECT_AL_KRB5_CNAME].desc = "sticky buffer to match on Kerberos 5 client name"; diff --git a/src/detect-krb5-errcode.c b/src/detect-krb5-errcode.c index 27a3040a87..16bd257152 100644 --- a/src/detect-krb5-errcode.c +++ b/src/detect-krb5-errcode.c @@ -62,7 +62,7 @@ static int g_krb5_err_code_list_id = 0; void DetectKrb5ErrCodeRegister(void) { sigmatch_table[DETECT_AL_KRB5_ERRCODE].name = "krb5_err_code"; sigmatch_table[DETECT_AL_KRB5_ERRCODE].desc = "match Kerberos 5 error code"; - sigmatch_table[DETECT_AL_KRB5_ERRCODE].url = DOC_URL DOC_VERSION "/rules/kerberos-keywords.html#krb5-err-code"; + sigmatch_table[DETECT_AL_KRB5_ERRCODE].url = "/rules/kerberos-keywords.html#krb5-err-code"; sigmatch_table[DETECT_AL_KRB5_ERRCODE].Match = NULL; sigmatch_table[DETECT_AL_KRB5_ERRCODE].AppLayerTxMatch = DetectKrb5ErrCodeMatch; sigmatch_table[DETECT_AL_KRB5_ERRCODE].Setup = DetectKrb5ErrCodeSetup; diff --git a/src/detect-krb5-msgtype.c b/src/detect-krb5-msgtype.c index 47af1241c8..e10ad3abca 100644 --- a/src/detect-krb5-msgtype.c +++ b/src/detect-krb5-msgtype.c @@ -62,7 +62,7 @@ static int g_krb5_msg_type_list_id = 0; void DetectKrb5MsgTypeRegister(void) { sigmatch_table[DETECT_AL_KRB5_MSGTYPE].name = "krb5_msg_type"; sigmatch_table[DETECT_AL_KRB5_MSGTYPE].desc = "match Kerberos 5 message type"; - sigmatch_table[DETECT_AL_KRB5_MSGTYPE].url = DOC_URL DOC_VERSION "/rules/kerberos-keywords.html#krb5-msg-type"; + sigmatch_table[DETECT_AL_KRB5_MSGTYPE].url = "/rules/kerberos-keywords.html#krb5-msg-type"; sigmatch_table[DETECT_AL_KRB5_MSGTYPE].Match = NULL; sigmatch_table[DETECT_AL_KRB5_MSGTYPE].AppLayerTxMatch = DetectKrb5MsgTypeMatch; sigmatch_table[DETECT_AL_KRB5_MSGTYPE].Setup = DetectKrb5MsgTypeSetup; diff --git a/src/detect-krb5-sname.c b/src/detect-krb5-sname.c index bd05823b27..e4d8634600 100644 --- a/src/detect-krb5-sname.c +++ b/src/detect-krb5-sname.c @@ -193,7 +193,7 @@ void DetectKrb5SNameRegister(void) { sigmatch_table[DETECT_AL_KRB5_SNAME].name = "krb5.sname"; sigmatch_table[DETECT_AL_KRB5_SNAME].alias = "krb5_sname"; - sigmatch_table[DETECT_AL_KRB5_SNAME].url = DOC_URL DOC_VERSION "/rules/kerberos-keywords.html#krb5-sname"; + sigmatch_table[DETECT_AL_KRB5_SNAME].url = "/rules/kerberos-keywords.html#krb5-sname"; sigmatch_table[DETECT_AL_KRB5_SNAME].Setup = DetectKrb5SNameSetup; sigmatch_table[DETECT_AL_KRB5_SNAME].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; sigmatch_table[DETECT_AL_KRB5_SNAME].desc = "sticky buffer to match on Kerberos 5 server name"; diff --git a/src/detect-lua.c b/src/detect-lua.c index 9942e657a0..93b071a476 100644 --- a/src/detect-lua.c +++ b/src/detect-lua.c @@ -76,7 +76,7 @@ void DetectLuaRegister(void) sigmatch_table[DETECT_LUA].name = "lua"; sigmatch_table[DETECT_LUA].alias = "luajit"; sigmatch_table[DETECT_LUA].desc = "support for lua scripting"; - sigmatch_table[DETECT_LUA].url = DOC_URL DOC_VERSION "/rules/rule-lua-scripting.html"; + sigmatch_table[DETECT_LUA].url = "/rules/rule-lua-scripting.html"; sigmatch_table[DETECT_LUA].Setup = DetectLuaSetupNoSupport; sigmatch_table[DETECT_LUA].Free = NULL; sigmatch_table[DETECT_LUA].RegisterTests = NULL; @@ -115,7 +115,7 @@ void DetectLuaRegister(void) sigmatch_table[DETECT_LUA].name = "lua"; sigmatch_table[DETECT_LUA].alias = "luajit"; sigmatch_table[DETECT_LUA].desc = "match via a lua script"; - sigmatch_table[DETECT_LUA].url = DOC_URL DOC_VERSION "/rules/rule-lua-scripting.html"; + sigmatch_table[DETECT_LUA].url = "/rules/rule-lua-scripting.html"; sigmatch_table[DETECT_LUA].Match = DetectLuaMatch; sigmatch_table[DETECT_LUA].AppLayerTxMatch = DetectLuaAppTxMatch; sigmatch_table[DETECT_LUA].Setup = DetectLuaSetup; diff --git a/src/detect-metadata.c b/src/detect-metadata.c index 7dd1f82adf..cceff6163b 100644 --- a/src/detect-metadata.c +++ b/src/detect-metadata.c @@ -41,7 +41,7 @@ void DetectMetadataRegister (void) { sigmatch_table[DETECT_METADATA].name = "metadata"; sigmatch_table[DETECT_METADATA].desc = "used for logging"; - sigmatch_table[DETECT_METADATA].url = DOC_URL DOC_VERSION "/rules/meta.html#metadata"; + sigmatch_table[DETECT_METADATA].url = "/rules/meta.html#metadata"; sigmatch_table[DETECT_METADATA].Match = NULL; sigmatch_table[DETECT_METADATA].Setup = DetectMetadataSetup; sigmatch_table[DETECT_METADATA].Free = NULL; diff --git a/src/detect-modbus.c b/src/detect-modbus.c index 45a608a035..f9beb4126a 100644 --- a/src/detect-modbus.c +++ b/src/detect-modbus.c @@ -512,7 +512,7 @@ void DetectModbusRegister(void) SCEnter(); sigmatch_table[DETECT_AL_MODBUS].name = "modbus"; sigmatch_table[DETECT_AL_MODBUS].desc = "match on various properties of Modbus requests"; - sigmatch_table[DETECT_AL_MODBUS].url = DOC_URL DOC_VERSION "/rules/modbus-keyword.html#modbus-keyword"; + sigmatch_table[DETECT_AL_MODBUS].url = "/rules/modbus-keyword.html#modbus-keyword"; sigmatch_table[DETECT_AL_MODBUS].Match = NULL; sigmatch_table[DETECT_AL_MODBUS].Setup = DetectModbusSetup; sigmatch_table[DETECT_AL_MODBUS].Free = DetectModbusFree; diff --git a/src/detect-msg.c b/src/detect-msg.c index 22b660928f..a8b9ac1174 100644 --- a/src/detect-msg.c +++ b/src/detect-msg.c @@ -41,7 +41,7 @@ void DetectMsgRegister (void) { sigmatch_table[DETECT_MSG].name = "msg"; sigmatch_table[DETECT_MSG].desc = "information about the rule and the possible alert"; - sigmatch_table[DETECT_MSG].url = DOC_URL DOC_VERSION "/rules/meta.html#msg-message"; + sigmatch_table[DETECT_MSG].url = "/rules/meta.html#msg-message"; sigmatch_table[DETECT_MSG].Match = NULL; sigmatch_table[DETECT_MSG].Setup = DetectMsgSetup; sigmatch_table[DETECT_MSG].Free = NULL; diff --git a/src/detect-nfs-procedure.c b/src/detect-nfs-procedure.c index d3f4674c0b..0778318c33 100644 --- a/src/detect-nfs-procedure.c +++ b/src/detect-nfs-procedure.c @@ -90,7 +90,7 @@ void DetectNfsProcedureRegister (void) { sigmatch_table[DETECT_AL_NFS_PROCEDURE].name = "nfs_procedure"; sigmatch_table[DETECT_AL_NFS_PROCEDURE].desc = "match NFS procedure"; - sigmatch_table[DETECT_AL_NFS_PROCEDURE].url = DOC_URL DOC_VERSION "/rules/nfs-keywords.html#procedure"; + sigmatch_table[DETECT_AL_NFS_PROCEDURE].url = "/rules/nfs-keywords.html#procedure"; sigmatch_table[DETECT_AL_NFS_PROCEDURE].Match = NULL; sigmatch_table[DETECT_AL_NFS_PROCEDURE].AppLayerTxMatch = DetectNfsProcedureMatch; sigmatch_table[DETECT_AL_NFS_PROCEDURE].Setup = DetectNfsProcedureSetup; diff --git a/src/detect-nfs-version.c b/src/detect-nfs-version.c index 7946efcf0d..95cac98d8c 100644 --- a/src/detect-nfs-version.c +++ b/src/detect-nfs-version.c @@ -91,7 +91,7 @@ void DetectNfsVersionRegister (void) sigmatch_table[DETECT_AL_NFS_VERSION].name = "nfs.version"; sigmatch_table[DETECT_AL_NFS_VERSION].alias = "nfs_version"; sigmatch_table[DETECT_AL_NFS_VERSION].desc = "match NFS version"; - sigmatch_table[DETECT_AL_NFS_VERSION].url = DOC_URL DOC_VERSION "/rules/nfs-keywords.html#version"; + sigmatch_table[DETECT_AL_NFS_VERSION].url = "/rules/nfs-keywords.html#version"; sigmatch_table[DETECT_AL_NFS_VERSION].AppLayerTxMatch = DetectNfsVersionMatch; sigmatch_table[DETECT_AL_NFS_VERSION].Setup = DetectNfsVersionSetup; sigmatch_table[DETECT_AL_NFS_VERSION].Free = DetectNfsVersionFree; diff --git a/src/detect-noalert.c b/src/detect-noalert.c index 6556687c1c..5625af79ab 100644 --- a/src/detect-noalert.c +++ b/src/detect-noalert.c @@ -34,7 +34,7 @@ void DetectNoalertRegister (void) { sigmatch_table[DETECT_NOALERT].name = "noalert"; sigmatch_table[DETECT_NOALERT].desc = "no alert will be generated by the rule"; - sigmatch_table[DETECT_NOALERT].url = DOC_URL DOC_VERSION "/rules/flow-keywords.html"; + sigmatch_table[DETECT_NOALERT].url = "/rules/flow-keywords.html"; sigmatch_table[DETECT_NOALERT].Match = NULL; sigmatch_table[DETECT_NOALERT].Setup = DetectNoalertSetup; sigmatch_table[DETECT_NOALERT].Free = NULL; diff --git a/src/detect-nocase.c b/src/detect-nocase.c index 6e2eec9a0e..fe094c0f5b 100644 --- a/src/detect-nocase.c +++ b/src/detect-nocase.c @@ -39,7 +39,7 @@ void DetectNocaseRegister(void) { sigmatch_table[DETECT_NOCASE].name = "nocase"; sigmatch_table[DETECT_NOCASE].desc = "modify content match to be case insensitive"; - sigmatch_table[DETECT_NOCASE].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#nocase"; + sigmatch_table[DETECT_NOCASE].url = "/rules/payload-keywords.html#nocase"; sigmatch_table[DETECT_NOCASE].Match = NULL; sigmatch_table[DETECT_NOCASE].Setup = DetectNocaseSetup; sigmatch_table[DETECT_NOCASE].Free = NULL; diff --git a/src/detect-offset.c b/src/detect-offset.c index 8d2c6b051d..b26c5c2108 100644 --- a/src/detect-offset.c +++ b/src/detect-offset.c @@ -46,7 +46,7 @@ void DetectOffsetRegister (void) { sigmatch_table[DETECT_OFFSET].name = "offset"; sigmatch_table[DETECT_OFFSET].desc = "designate from which byte in the payload will be checked to find a match"; - sigmatch_table[DETECT_OFFSET].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#offset"; + sigmatch_table[DETECT_OFFSET].url = "/rules/payload-keywords.html#offset"; sigmatch_table[DETECT_OFFSET].Match = NULL; sigmatch_table[DETECT_OFFSET].Setup = DetectOffsetSetup; sigmatch_table[DETECT_OFFSET].Free = NULL; diff --git a/src/detect-pcre.c b/src/detect-pcre.c index 550c743a4c..5f8ff6c79b 100644 --- a/src/detect-pcre.c +++ b/src/detect-pcre.c @@ -114,7 +114,7 @@ void DetectPcreRegister (void) { sigmatch_table[DETECT_PCRE].name = "pcre"; sigmatch_table[DETECT_PCRE].desc = "match on regular expression"; - sigmatch_table[DETECT_PCRE].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#pcre-perl-compatible-regular-expressions"; + sigmatch_table[DETECT_PCRE].url = "/rules/payload-keywords.html#pcre-perl-compatible-regular-expressions"; sigmatch_table[DETECT_PCRE].Match = NULL; sigmatch_table[DETECT_PCRE].Setup = DetectPcreSetup; sigmatch_table[DETECT_PCRE].Free = DetectPcreFree; diff --git a/src/detect-prefilter.c b/src/detect-prefilter.c index ba0020d4ed..b311b19153 100644 --- a/src/detect-prefilter.c +++ b/src/detect-prefilter.c @@ -38,7 +38,7 @@ void DetectPrefilterRegister(void) { sigmatch_table[DETECT_PREFILTER].name = "prefilter"; sigmatch_table[DETECT_PREFILTER].desc = "force a condition to be used as prefilter"; - sigmatch_table[DETECT_PREFILTER].url = DOC_URL DOC_VERSION "/rules/prefilter-keywords.html#prefilter"; + sigmatch_table[DETECT_PREFILTER].url = "/rules/prefilter-keywords.html#prefilter"; sigmatch_table[DETECT_PREFILTER].Match = NULL; sigmatch_table[DETECT_PREFILTER].Setup = DetectPrefilterSetup; sigmatch_table[DETECT_PREFILTER].Free = NULL; diff --git a/src/detect-priority.c b/src/detect-priority.c index 612dc692e4..c39b880e11 100644 --- a/src/detect-priority.c +++ b/src/detect-priority.c @@ -48,7 +48,7 @@ void DetectPriorityRegister (void) { sigmatch_table[DETECT_PRIORITY].name = "priority"; sigmatch_table[DETECT_PRIORITY].desc = "rules with a higher priority will be examined first"; - sigmatch_table[DETECT_PRIORITY].url = DOC_URL DOC_VERSION "/rules/meta.html#priority"; + sigmatch_table[DETECT_PRIORITY].url = "/rules/meta.html#priority"; sigmatch_table[DETECT_PRIORITY].Setup = DetectPrioritySetup; sigmatch_table[DETECT_PRIORITY].RegisterTests = SCPriorityRegisterTests; diff --git a/src/detect-reference.c b/src/detect-reference.c index 87ff66de25..2a4c132c7a 100644 --- a/src/detect-reference.c +++ b/src/detect-reference.c @@ -59,7 +59,7 @@ void DetectReferenceRegister(void) { sigmatch_table[DETECT_REFERENCE].name = "reference"; sigmatch_table[DETECT_REFERENCE].desc = "direct to places where information about the rule can be found"; - sigmatch_table[DETECT_REFERENCE].url = DOC_URL DOC_VERSION "/rules/meta.html#reference"; + sigmatch_table[DETECT_REFERENCE].url = "/rules/meta.html#reference"; sigmatch_table[DETECT_REFERENCE].Setup = DetectReferenceSetup; #ifdef UNITTESTS sigmatch_table[DETECT_REFERENCE].RegisterTests = ReferenceRegisterTests; diff --git a/src/detect-replace.c b/src/detect-replace.c index bb09221830..3e36fee688 100644 --- a/src/detect-replace.c +++ b/src/detect-replace.c @@ -69,7 +69,7 @@ void DetectReplaceRegister (void) { sigmatch_table[DETECT_REPLACE].name = "replace"; sigmatch_table[DETECT_REPLACE].desc = "only to be used in IPS-mode. Change the following content into another"; - sigmatch_table[DETECT_REPLACE].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#replace"; + sigmatch_table[DETECT_REPLACE].url = "/rules/payload-keywords.html#replace"; sigmatch_table[DETECT_REPLACE].Match = DetectReplacePostMatch; sigmatch_table[DETECT_REPLACE].Setup = DetectReplaceSetup; sigmatch_table[DETECT_REPLACE].Free = NULL; diff --git a/src/detect-rev.c b/src/detect-rev.c index faa066393f..8f5da5cf41 100644 --- a/src/detect-rev.c +++ b/src/detect-rev.c @@ -35,7 +35,7 @@ void DetectRevRegister (void) { sigmatch_table[DETECT_REV].name = "rev"; sigmatch_table[DETECT_REV].desc = "set version of the rule"; - sigmatch_table[DETECT_REV].url = DOC_URL DOC_VERSION "/rules/meta.html#rev-revision"; + sigmatch_table[DETECT_REV].url = "/rules/meta.html#rev-revision"; sigmatch_table[DETECT_REV].Match = NULL; sigmatch_table[DETECT_REV].Setup = DetectRevSetup; sigmatch_table[DETECT_REV].Free = NULL; diff --git a/src/detect-rfb-name.c b/src/detect-rfb-name.c index 440cb12336..d46819fd32 100644 --- a/src/detect-rfb-name.c +++ b/src/detect-rfb-name.c @@ -92,7 +92,7 @@ static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx, void DetectRfbNameRegister(void) { sigmatch_table[DETECT_AL_RFB_NAME].name = KEYWORD_NAME; - sigmatch_table[DETECT_AL_RFB_NAME].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC + sigmatch_table[DETECT_AL_RFB_NAME].url = "/rules/" KEYWORD_DOC sigmatch_table[DETECT_AL_RFB_NAME].desc = "sticky buffer to match on the RFB desktop name"; sigmatch_table[DETECT_AL_RFB_NAME].Setup = DetectRfbNameSetup; sigmatch_table[DETECT_AL_RFB_NAME].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-rfb-secresult.c b/src/detect-rfb-secresult.c index 512052f0f0..1f4dd00952 100644 --- a/src/detect-rfb-secresult.c +++ b/src/detect-rfb-secresult.c @@ -62,7 +62,7 @@ void DetectRfbSecresultRegister (void) { sigmatch_table[DETECT_AL_RFB_SECRESULT].name = "rfb.secresult"; sigmatch_table[DETECT_AL_RFB_SECRESULT].desc = "match RFB security result"; - sigmatch_table[DETECT_AL_RFB_SECRESULT].url = DOC_URL DOC_VERSION "/rules/rfb-keywords.html#rfb-secresult"; + sigmatch_table[DETECT_AL_RFB_SECRESULT].url = "/rules/rfb-keywords.html#rfb-secresult"; sigmatch_table[DETECT_AL_RFB_SECRESULT].AppLayerTxMatch = DetectRfbSecresultMatch; sigmatch_table[DETECT_AL_RFB_SECRESULT].Setup = DetectRfbSecresultSetup; sigmatch_table[DETECT_AL_RFB_SECRESULT].Free = DetectRfbSecresultFree; diff --git a/src/detect-rfb-sectype.c b/src/detect-rfb-sectype.c index ce1d23f3b8..caeaa2a0f1 100644 --- a/src/detect-rfb-sectype.c +++ b/src/detect-rfb-sectype.c @@ -73,7 +73,7 @@ void DetectRfbSectypeRegister (void) { sigmatch_table[DETECT_AL_RFB_SECTYPE].name = "rfb.sectype"; sigmatch_table[DETECT_AL_RFB_SECTYPE].desc = "match RFB security type"; - sigmatch_table[DETECT_AL_RFB_SECTYPE].url = DOC_URL DOC_VERSION "/rules/rfb-keywords.html#rfb-sectype"; + sigmatch_table[DETECT_AL_RFB_SECTYPE].url = "/rules/rfb-keywords.html#rfb-sectype"; sigmatch_table[DETECT_AL_RFB_SECTYPE].AppLayerTxMatch = DetectRfbSectypeMatch; sigmatch_table[DETECT_AL_RFB_SECTYPE].Setup = DetectRfbSectypeSetup; sigmatch_table[DETECT_AL_RFB_SECTYPE].Free = DetectRfbSectypeFree; diff --git a/src/detect-rpc.c b/src/detect-rpc.c index 267673fa87..5d1226c895 100644 --- a/src/detect-rpc.c +++ b/src/detect-rpc.c @@ -60,7 +60,7 @@ void DetectRpcRegister (void) { sigmatch_table[DETECT_RPC].name = "rpc"; sigmatch_table[DETECT_RPC].desc = "match RPC procedure numbers and RPC version"; - sigmatch_table[DETECT_RPC].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#rpc"; + sigmatch_table[DETECT_RPC].url = "/rules/payload-keywords.html#rpc"; sigmatch_table[DETECT_RPC].Match = DetectRpcMatch; sigmatch_table[DETECT_RPC].Setup = DetectRpcSetup; sigmatch_table[DETECT_RPC].Free = DetectRpcFree; diff --git a/src/detect-sameip.c b/src/detect-sameip.c index 61d7d32c2f..ca83429933 100644 --- a/src/detect-sameip.c +++ b/src/detect-sameip.c @@ -50,7 +50,7 @@ void DetectSameipRegister(void) { sigmatch_table[DETECT_SAMEIP].name = "sameip"; sigmatch_table[DETECT_SAMEIP].desc = "check if the IP address of the source is the same as the IP address of the destination"; - sigmatch_table[DETECT_SAMEIP].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#sameip"; + sigmatch_table[DETECT_SAMEIP].url = "/rules/header-keywords.html#sameip"; sigmatch_table[DETECT_SAMEIP].Match = DetectSameipMatch; sigmatch_table[DETECT_SAMEIP].Setup = DetectSameipSetup; sigmatch_table[DETECT_SAMEIP].Free = NULL; diff --git a/src/detect-sid.c b/src/detect-sid.c index 2421f993e2..94dedc8f0a 100644 --- a/src/detect-sid.c +++ b/src/detect-sid.c @@ -39,7 +39,7 @@ void DetectSidRegister (void) { sigmatch_table[DETECT_SID].name = "sid"; sigmatch_table[DETECT_SID].desc = "set rule ID"; - sigmatch_table[DETECT_SID].url = DOC_URL DOC_VERSION "/rules/meta.html#sid-signature-id"; + sigmatch_table[DETECT_SID].url = "/rules/meta.html#sid-signature-id"; sigmatch_table[DETECT_SID].Match = NULL; sigmatch_table[DETECT_SID].Setup = DetectSidSetup; sigmatch_table[DETECT_SID].Free = NULL; diff --git a/src/detect-sip-method.c b/src/detect-sip-method.c index fc054e3bde..477f961387 100644 --- a/src/detect-sip-method.c +++ b/src/detect-sip-method.c @@ -127,7 +127,7 @@ void DetectSipMethodRegister(void) /* sip.method sticky buffer */ sigmatch_table[DETECT_AL_SIP_METHOD].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_SIP_METHOD].desc = "sticky buffer to match on the SIP method buffer"; - sigmatch_table[DETECT_AL_SIP_METHOD].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_SIP_METHOD].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_SIP_METHOD].Setup = DetectSipMethodSetup; sigmatch_table[DETECT_AL_SIP_METHOD].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-sip-protocol.c b/src/detect-sip-protocol.c index 839261ff4e..e8e4de72f0 100644 --- a/src/detect-sip-protocol.c +++ b/src/detect-sip-protocol.c @@ -97,7 +97,7 @@ void DetectSipProtocolRegister(void) /* sip.protocol sticky buffer */ sigmatch_table[DETECT_AL_SIP_PROTOCOL].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_SIP_PROTOCOL].desc = "sticky buffer to match on the SIP protocol"; - sigmatch_table[DETECT_AL_SIP_PROTOCOL].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_SIP_PROTOCOL].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_SIP_PROTOCOL].Setup = DetectSipProtocolSetup; sigmatch_table[DETECT_AL_SIP_PROTOCOL].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-sip-request-line.c b/src/detect-sip-request-line.c index af1c446a00..9341f2b604 100644 --- a/src/detect-sip-request-line.c +++ b/src/detect-sip-request-line.c @@ -97,7 +97,7 @@ void DetectSipRequestLineRegister(void) /* sip.request_line sticky buffer */ sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].desc = "sticky buffer to match on the SIP request line"; - sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].Setup = DetectSipRequestLineSetup; sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-sip-response-line.c b/src/detect-sip-response-line.c index dabcf3e285..a6aaeb3795 100644 --- a/src/detect-sip-response-line.c +++ b/src/detect-sip-response-line.c @@ -97,7 +97,7 @@ void DetectSipResponseLineRegister(void) /* sip.response_line sticky buffer */ sigmatch_table[DETECT_AL_SIP_RESPONSE_LINE].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_SIP_RESPONSE_LINE].desc = "sticky buffer to match on the SIP response line"; - sigmatch_table[DETECT_AL_SIP_RESPONSE_LINE].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_SIP_RESPONSE_LINE].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_SIP_RESPONSE_LINE].Setup = DetectSipResponseLineSetup; sigmatch_table[DETECT_AL_SIP_RESPONSE_LINE].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-sip-stat-code.c b/src/detect-sip-stat-code.c index f06f67635b..b98e520217 100644 --- a/src/detect-sip-stat-code.c +++ b/src/detect-sip-stat-code.c @@ -100,7 +100,7 @@ void DetectSipStatCodeRegister (void) /* sip.stat_code sticky buffer */ sigmatch_table[DETECT_AL_SIP_STAT_CODE].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_SIP_STAT_CODE].desc = "sticky buffer to match on the SIP status code"; - sigmatch_table[DETECT_AL_SIP_STAT_CODE].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_SIP_STAT_CODE].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_SIP_STAT_CODE].Setup = DetectSipStatCodeSetup; sigmatch_table[DETECT_AL_SIP_STAT_CODE].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-sip-stat-msg.c b/src/detect-sip-stat-msg.c index c2d39af755..c29851b9e0 100644 --- a/src/detect-sip-stat-msg.c +++ b/src/detect-sip-stat-msg.c @@ -100,7 +100,7 @@ void DetectSipStatMsgRegister (void) /* sip.stat_msg sticky buffer */ sigmatch_table[DETECT_AL_SIP_STAT_MSG].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_SIP_STAT_MSG].desc = "sticky buffer to match on the SIP status message"; - sigmatch_table[DETECT_AL_SIP_STAT_MSG].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_SIP_STAT_MSG].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_SIP_STAT_MSG].Setup = DetectSipStatMsgSetup; sigmatch_table[DETECT_AL_SIP_STAT_MSG].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-sip-uri.c b/src/detect-sip-uri.c index 8aeb335608..074e8e43e8 100644 --- a/src/detect-sip-uri.c +++ b/src/detect-sip-uri.c @@ -109,7 +109,7 @@ void DetectSipUriRegister(void) { sigmatch_table[DETECT_AL_SIP_URI].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_SIP_URI].desc = "sticky buffer to match on the SIP URI"; - sigmatch_table[DETECT_AL_SIP_URI].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_SIP_URI].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_SIP_URI].Setup = DetectSipUriSetup; sigmatch_table[DETECT_AL_SIP_URI].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-snmp-community.c b/src/detect-snmp-community.c index 7e2efd8a8b..6769d7d4b4 100644 --- a/src/detect-snmp-community.c +++ b/src/detect-snmp-community.c @@ -57,7 +57,7 @@ void DetectSNMPCommunityRegister(void) #ifdef UNITTESTS sigmatch_table[DETECT_AL_SNMP_COMMUNITY].RegisterTests = DetectSNMPCommunityRegisterTests; #endif - sigmatch_table[DETECT_AL_SNMP_COMMUNITY].url = DOC_URL DOC_VERSION "/rules/snmp-keywords.html#snmp-community"; + sigmatch_table[DETECT_AL_SNMP_COMMUNITY].url = "/rules/snmp-keywords.html#snmp-community"; sigmatch_table[DETECT_AL_SNMP_COMMUNITY].flags |= SIGMATCH_NOOPT|SIGMATCH_INFO_STICKY_BUFFER; diff --git a/src/detect-snmp-pdu_type.c b/src/detect-snmp-pdu_type.c index b62851026a..680e330b6e 100644 --- a/src/detect-snmp-pdu_type.c +++ b/src/detect-snmp-pdu_type.c @@ -63,7 +63,7 @@ void DetectSNMPPduTypeRegister(void) { sigmatch_table[DETECT_AL_SNMP_PDU_TYPE].name = "snmp.pdu_type"; sigmatch_table[DETECT_AL_SNMP_PDU_TYPE].desc = "match SNMP PDU type"; - sigmatch_table[DETECT_AL_SNMP_PDU_TYPE].url = DOC_URL DOC_VERSION "/rules/snmp-keywords.html#snmp-pdu-type"; + sigmatch_table[DETECT_AL_SNMP_PDU_TYPE].url = "/rules/snmp-keywords.html#snmp-pdu-type"; sigmatch_table[DETECT_AL_SNMP_PDU_TYPE].Match = NULL; sigmatch_table[DETECT_AL_SNMP_PDU_TYPE].AppLayerTxMatch = DetectSNMPPduTypeMatch; sigmatch_table[DETECT_AL_SNMP_PDU_TYPE].Setup = DetectSNMPPduTypeSetup; diff --git a/src/detect-snmp-version.c b/src/detect-snmp-version.c index 4672fe3505..67cbf3147b 100644 --- a/src/detect-snmp-version.c +++ b/src/detect-snmp-version.c @@ -75,7 +75,7 @@ void DetectSNMPVersionRegister (void) { sigmatch_table[DETECT_AL_SNMP_VERSION].name = "snmp.version"; sigmatch_table[DETECT_AL_SNMP_VERSION].desc = "match SNMP version"; - sigmatch_table[DETECT_AL_SNMP_VERSION].url = DOC_URL DOC_VERSION "/rules/snmp-keywords.html#snmp-version"; + sigmatch_table[DETECT_AL_SNMP_VERSION].url = "/rules/snmp-keywords.html#snmp-version"; sigmatch_table[DETECT_AL_SNMP_VERSION].Match = NULL; sigmatch_table[DETECT_AL_SNMP_VERSION].AppLayerTxMatch = DetectSNMPVersionMatch; sigmatch_table[DETECT_AL_SNMP_VERSION].Setup = DetectSNMPVersionSetup; diff --git a/src/detect-ssh-proto-version.c b/src/detect-ssh-proto-version.c index f455200ddf..f9d8ae5728 100644 --- a/src/detect-ssh-proto-version.c +++ b/src/detect-ssh-proto-version.c @@ -76,7 +76,7 @@ void DetectSshVersionRegister(void) { sigmatch_table[DETECT_AL_SSH_PROTOVERSION].name = "ssh.protoversion"; sigmatch_table[DETECT_AL_SSH_PROTOVERSION].desc = "match SSH protocol version"; - sigmatch_table[DETECT_AL_SSH_PROTOVERSION].url = DOC_URL DOC_VERSION "/rules/ssh-keywords.html#ssh-protoversion"; + sigmatch_table[DETECT_AL_SSH_PROTOVERSION].url = "/rules/ssh-keywords.html#ssh-protoversion"; sigmatch_table[DETECT_AL_SSH_PROTOVERSION].AppLayerTxMatch = DetectSshVersionMatch; sigmatch_table[DETECT_AL_SSH_PROTOVERSION].Setup = DetectSshVersionSetup; sigmatch_table[DETECT_AL_SSH_PROTOVERSION].Free = DetectSshVersionFree; diff --git a/src/detect-ssh-proto.c b/src/detect-ssh-proto.c index 7db5503b48..2f0de667fc 100644 --- a/src/detect-ssh-proto.c +++ b/src/detect-ssh-proto.c @@ -106,7 +106,7 @@ void DetectSshProtocolRegister(void) sigmatch_table[DETECT_AL_SSH_PROTOCOL].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_SSH_PROTOCOL].alias = KEYWORD_NAME_LEGACY; sigmatch_table[DETECT_AL_SSH_PROTOCOL].desc = BUFFER_NAME " sticky buffer"; - sigmatch_table[DETECT_AL_SSH_PROTOCOL].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_SSH_PROTOCOL].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_SSH_PROTOCOL].Setup = DetectSshProtocolSetup; sigmatch_table[DETECT_AL_SSH_PROTOCOL].flags |= SIGMATCH_INFO_STICKY_BUFFER | SIGMATCH_NOOPT; diff --git a/src/detect-ssh-software-version.c b/src/detect-ssh-software-version.c index e41873e48c..d5736e8409 100644 --- a/src/detect-ssh-software-version.c +++ b/src/detect-ssh-software-version.c @@ -90,7 +90,7 @@ void DetectSshSoftwareVersionRegister(void) { sigmatch_table[DETECT_AL_SSH_SOFTWAREVERSION].name = "ssh.softwareversion"; sigmatch_table[DETECT_AL_SSH_SOFTWAREVERSION].desc = "match SSH software string"; - sigmatch_table[DETECT_AL_SSH_SOFTWAREVERSION].url = DOC_URL DOC_VERSION "/rules/ssh-keywords.html#ssh-softwareversion"; + sigmatch_table[DETECT_AL_SSH_SOFTWAREVERSION].url = "/rules/ssh-keywords.html#ssh-softwareversion"; sigmatch_table[DETECT_AL_SSH_SOFTWAREVERSION].AppLayerTxMatch = DetectSshSoftwareVersionMatch; sigmatch_table[DETECT_AL_SSH_SOFTWAREVERSION].Setup = DetectSshSoftwareVersionSetup; sigmatch_table[DETECT_AL_SSH_SOFTWAREVERSION].Free = DetectSshSoftwareVersionFree; diff --git a/src/detect-ssh-software.c b/src/detect-ssh-software.c index bd1ed1c045..4d1b8d9eb1 100644 --- a/src/detect-ssh-software.c +++ b/src/detect-ssh-software.c @@ -107,7 +107,7 @@ void DetectSshSoftwareRegister(void) sigmatch_table[DETECT_AL_SSH_SOFTWARE].name = KEYWORD_NAME; sigmatch_table[DETECT_AL_SSH_SOFTWARE].alias = KEYWORD_NAME_LEGACY; sigmatch_table[DETECT_AL_SSH_SOFTWARE].desc = BUFFER_NAME " sticky buffer"; - sigmatch_table[DETECT_AL_SSH_SOFTWARE].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC; + sigmatch_table[DETECT_AL_SSH_SOFTWARE].url = "/rules/" KEYWORD_DOC; sigmatch_table[DETECT_AL_SSH_SOFTWARE].Setup = DetectSshSoftwareSetup; sigmatch_table[DETECT_AL_SSH_SOFTWARE].flags |= SIGMATCH_INFO_STICKY_BUFFER | SIGMATCH_NOOPT; diff --git a/src/detect-ssl-state.c b/src/detect-ssl-state.c index 927b9084ee..5fd5b225c4 100644 --- a/src/detect-ssl-state.c +++ b/src/detect-ssl-state.c @@ -81,7 +81,7 @@ void DetectSslStateRegister(void) { sigmatch_table[DETECT_AL_SSL_STATE].name = "ssl_state"; sigmatch_table[DETECT_AL_SSL_STATE].desc = "match the state of the SSL connection"; - sigmatch_table[DETECT_AL_SSL_STATE].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#ssl-state"; + sigmatch_table[DETECT_AL_SSL_STATE].url = "/rules/tls-keywords.html#ssl-state"; sigmatch_table[DETECT_AL_SSL_STATE].AppLayerTxMatch = DetectSslStateMatch; sigmatch_table[DETECT_AL_SSL_STATE].Setup = DetectSslStateSetup; sigmatch_table[DETECT_AL_SSL_STATE].Free = DetectSslStateFree; diff --git a/src/detect-ssl-version.c b/src/detect-ssl-version.c index 325043b3ca..2f64332f4f 100644 --- a/src/detect-ssl-version.c +++ b/src/detect-ssl-version.c @@ -76,7 +76,7 @@ void DetectSslVersionRegister(void) { sigmatch_table[DETECT_AL_SSL_VERSION].name = "ssl_version"; sigmatch_table[DETECT_AL_SSL_VERSION].desc = "match version of SSL/TLS record"; - sigmatch_table[DETECT_AL_SSL_VERSION].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#ssl-version"; + sigmatch_table[DETECT_AL_SSL_VERSION].url = "/rules/tls-keywords.html#ssl-version"; sigmatch_table[DETECT_AL_SSL_VERSION].AppLayerTxMatch = DetectSslVersionMatch; sigmatch_table[DETECT_AL_SSL_VERSION].Setup = DetectSslVersionSetup; sigmatch_table[DETECT_AL_SSL_VERSION].Free = DetectSslVersionFree; diff --git a/src/detect-stream_size.c b/src/detect-stream_size.c index c226d381e2..476a3aca19 100644 --- a/src/detect-stream_size.c +++ b/src/detect-stream_size.c @@ -57,7 +57,7 @@ void DetectStreamSizeRegister(void) { sigmatch_table[DETECT_STREAM_SIZE].name = "stream_size"; sigmatch_table[DETECT_STREAM_SIZE].desc = "match on amount of bytes of a stream"; - sigmatch_table[DETECT_STREAM_SIZE].url = DOC_URL DOC_VERSION "/rules/flow-keywords.html#stream-size"; + sigmatch_table[DETECT_STREAM_SIZE].url = "/rules/flow-keywords.html#stream-size"; sigmatch_table[DETECT_STREAM_SIZE].Match = DetectStreamSizeMatch; sigmatch_table[DETECT_STREAM_SIZE].Setup = DetectStreamSizeSetup; sigmatch_table[DETECT_STREAM_SIZE].Free = DetectStreamSizeFree; diff --git a/src/detect-target.c b/src/detect-target.c index ec049bce69..52680a351b 100644 --- a/src/detect-target.c +++ b/src/detect-target.c @@ -52,7 +52,7 @@ void DetectTargetRegister(void) { /* description: listed in "suricata --list-keywords=all" */ sigmatch_table[DETECT_TARGET].desc = "indicate to output module which side is the target of the attack"; /* link to further documentation of the keyword. Normally on the Suricata redmine/wiki */ - sigmatch_table[DETECT_TARGET].url = DOC_URL DOC_VERSION "/rules/meta.html#target"; + sigmatch_table[DETECT_TARGET].url = "/rules/meta.html#target"; /* match function is called when the signature is inspected on a packet */ sigmatch_table[DETECT_TARGET].Match = NULL; /* setup function is called during signature parsing, when the target diff --git a/src/detect-tcp-ack.c b/src/detect-tcp-ack.c index 6e8bde515f..31680b1543 100644 --- a/src/detect-tcp-ack.c +++ b/src/detect-tcp-ack.c @@ -56,7 +56,7 @@ void DetectAckRegister(void) sigmatch_table[DETECT_ACK].name = "tcp.ack"; sigmatch_table[DETECT_ACK].alias = "ack"; sigmatch_table[DETECT_ACK].desc = "check for a specific TCP acknowledgement number"; - sigmatch_table[DETECT_ACK].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#ack"; + sigmatch_table[DETECT_ACK].url = "/rules/header-keywords.html#ack"; sigmatch_table[DETECT_ACK].Match = DetectAckMatch; sigmatch_table[DETECT_ACK].Setup = DetectAckSetup; sigmatch_table[DETECT_ACK].Free = DetectAckFree; diff --git a/src/detect-tcp-flags.c b/src/detect-tcp-flags.c index a61fca62f0..c35d1c79a2 100644 --- a/src/detect-tcp-flags.c +++ b/src/detect-tcp-flags.c @@ -74,7 +74,7 @@ void DetectFlagsRegister (void) sigmatch_table[DETECT_FLAGS].name = "tcp.flags"; sigmatch_table[DETECT_FLAGS].alias = "flags"; sigmatch_table[DETECT_FLAGS].desc = "detect which flags are set in the TCP header"; - sigmatch_table[DETECT_FLAGS].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#tcp-flags"; + sigmatch_table[DETECT_FLAGS].url = "/rules/header-keywords.html#tcp-flags"; sigmatch_table[DETECT_FLAGS].Match = DetectFlagsMatch; sigmatch_table[DETECT_FLAGS].Setup = DetectFlagsSetup; sigmatch_table[DETECT_FLAGS].Free = DetectFlagsFree; diff --git a/src/detect-tcp-seq.c b/src/detect-tcp-seq.c index f654b72822..f364afd99c 100644 --- a/src/detect-tcp-seq.c +++ b/src/detect-tcp-seq.c @@ -53,7 +53,7 @@ void DetectSeqRegister(void) sigmatch_table[DETECT_SEQ].name = "tcp.seq"; sigmatch_table[DETECT_SEQ].alias = "seq"; sigmatch_table[DETECT_SEQ].desc = "check for a specific TCP sequence number"; - sigmatch_table[DETECT_SEQ].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#seq"; + sigmatch_table[DETECT_SEQ].url = "/rules/header-keywords.html#seq"; sigmatch_table[DETECT_SEQ].Match = DetectSeqMatch; sigmatch_table[DETECT_SEQ].Setup = DetectSeqSetup; sigmatch_table[DETECT_SEQ].Free = DetectSeqFree; diff --git a/src/detect-tcp-window.c b/src/detect-tcp-window.c index 5536607560..f45bdb8344 100644 --- a/src/detect-tcp-window.c +++ b/src/detect-tcp-window.c @@ -60,7 +60,7 @@ void DetectWindowRegister (void) sigmatch_table[DETECT_WINDOW].name = "tcp.window"; sigmatch_table[DETECT_WINDOW].alias = "window"; sigmatch_table[DETECT_WINDOW].desc = "check for a specific TCP window size"; - sigmatch_table[DETECT_WINDOW].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#window"; + sigmatch_table[DETECT_WINDOW].url = "/rules/header-keywords.html#window"; sigmatch_table[DETECT_WINDOW].Match = DetectWindowMatch; sigmatch_table[DETECT_WINDOW].Setup = DetectWindowSetup; sigmatch_table[DETECT_WINDOW].Free = DetectWindowFree; diff --git a/src/detect-tcphdr.c b/src/detect-tcphdr.c index 5d42957104..30a3c828fd 100644 --- a/src/detect-tcphdr.c +++ b/src/detect-tcphdr.c @@ -51,7 +51,7 @@ void DetectTcphdrRegister(void) { sigmatch_table[DETECT_TCPHDR].name = "tcp.hdr"; sigmatch_table[DETECT_TCPHDR].desc = "sticky buffer to match on the TCP header"; - sigmatch_table[DETECT_TCPHDR].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#tcphdr"; + sigmatch_table[DETECT_TCPHDR].url = "/rules/header-keywords.html#tcphdr"; sigmatch_table[DETECT_TCPHDR].Setup = DetectTcphdrSetup; sigmatch_table[DETECT_TCPHDR].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; #ifdef UNITTESTS diff --git a/src/detect-tcpmss.c b/src/detect-tcpmss.c index 980da85053..6e28dca05f 100644 --- a/src/detect-tcpmss.c +++ b/src/detect-tcpmss.c @@ -56,7 +56,7 @@ void DetectTcpmssRegister(void) { sigmatch_table[DETECT_TCPMSS].name = "tcp.mss"; sigmatch_table[DETECT_TCPMSS].desc = "match on TCP MSS option field"; - sigmatch_table[DETECT_TCPMSS].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#tcpmss"; + sigmatch_table[DETECT_TCPMSS].url = "/rules/header-keywords.html#tcpmss"; sigmatch_table[DETECT_TCPMSS].Match = DetectTcpmssMatch; sigmatch_table[DETECT_TCPMSS].Setup = DetectTcpmssSetup; sigmatch_table[DETECT_TCPMSS].Free = DetectTcpmssFree; diff --git a/src/detect-template2.c b/src/detect-template2.c index 215b370eb5..eef205a569 100644 --- a/src/detect-template2.c +++ b/src/detect-template2.c @@ -56,7 +56,7 @@ void DetectTemplate2Register(void) { sigmatch_table[DETECT_TEMPLATE2].name = "template2"; sigmatch_table[DETECT_TEMPLATE2].desc = "TODO describe the keyword"; - sigmatch_table[DETECT_TEMPLATE2].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#template2"; + sigmatch_table[DETECT_TEMPLATE2].url = "/rules/header-keywords.html#template2"; sigmatch_table[DETECT_TEMPLATE2].Match = DetectTemplate2Match; sigmatch_table[DETECT_TEMPLATE2].Setup = DetectTemplate2Setup; sigmatch_table[DETECT_TEMPLATE2].Free = DetectTemplate2Free; diff --git a/src/detect-threshold.c b/src/detect-threshold.c index 3af137b2d7..1398fb7d01 100644 --- a/src/detect-threshold.c +++ b/src/detect-threshold.c @@ -76,7 +76,7 @@ void DetectThresholdRegister(void) { sigmatch_table[DETECT_THRESHOLD].name = "threshold"; sigmatch_table[DETECT_THRESHOLD].desc = "control the rule's alert frequency"; - sigmatch_table[DETECT_THRESHOLD].url = DOC_URL DOC_VERSION "/rules/thresholding.html#threshold"; + sigmatch_table[DETECT_THRESHOLD].url = "/rules/thresholding.html#threshold"; sigmatch_table[DETECT_THRESHOLD].Match = DetectThresholdMatch; sigmatch_table[DETECT_THRESHOLD].Setup = DetectThresholdSetup; sigmatch_table[DETECT_THRESHOLD].Free = DetectThresholdFree; diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c index e923b5a75c..7bb827bc75 100644 --- a/src/detect-tls-cert-fingerprint.c +++ b/src/detect-tls-cert-fingerprint.c @@ -76,7 +76,7 @@ void DetectTlsFingerprintRegister(void) sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].name = "tls.cert_fingerprint"; sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].alias = "tls_cert_fingerprint"; sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].desc = "match on the TLS cert fingerprint buffer"; - sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-fingerprint"; + sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].url = "/rules/tls-keywords.html#tls-cert-fingerprint"; sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].Setup = DetectTlsFingerprintSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].RegisterTests = DetectTlsFingerprintRegisterTests; diff --git a/src/detect-tls-cert-issuer.c b/src/detect-tls-cert-issuer.c index b2c3bec678..18591661dd 100644 --- a/src/detect-tls-cert-issuer.c +++ b/src/detect-tls-cert-issuer.c @@ -72,7 +72,7 @@ void DetectTlsIssuerRegister(void) sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].name = "tls.cert_issuer"; sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].alias = "tls_cert_issuer"; sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].desc = "content modifier to match specifically and only on the TLS cert issuer buffer"; - sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-issuer"; + sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].url = "/rules/tls-keywords.html#tls-cert-issuer"; sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].Setup = DetectTlsIssuerSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].RegisterTests = DetectTlsIssuerRegisterTests; diff --git a/src/detect-tls-cert-serial.c b/src/detect-tls-cert-serial.c index 4c9cccfee1..ce0950b321 100644 --- a/src/detect-tls-cert-serial.c +++ b/src/detect-tls-cert-serial.c @@ -76,7 +76,7 @@ void DetectTlsSerialRegister(void) sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].name = "tls.cert_serial"; sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].alias = "tls_cert_serial"; sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].desc = "content modifier to match the TLS cert serial buffer"; - sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-serial"; + sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].url = "/rules/tls-keywords.html#tls-cert-serial"; sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].Setup = DetectTlsSerialSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].RegisterTests = DetectTlsSerialRegisterTests; diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c index 1e05d5c363..d22a686cbe 100644 --- a/src/detect-tls-cert-subject.c +++ b/src/detect-tls-cert-subject.c @@ -72,7 +72,7 @@ void DetectTlsSubjectRegister(void) sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].name = "tls.cert_subject"; sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].alias = "tls_cert_subject"; sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].desc = "content modifier to match specifically and only on the TLS cert subject buffer"; - sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-subject"; + sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].url = "/rules/tls-keywords.html#tls-cert-subject"; sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].Setup = DetectTlsSubjectSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].RegisterTests = DetectTlsSubjectRegisterTests; diff --git a/src/detect-tls-cert-validity.c b/src/detect-tls-cert-validity.c index e4d9d00b40..8d64db9a48 100644 --- a/src/detect-tls-cert-validity.c +++ b/src/detect-tls-cert-validity.c @@ -88,7 +88,7 @@ void DetectTlsValidityRegister (void) { sigmatch_table[DETECT_AL_TLS_NOTBEFORE].name = "tls_cert_notbefore"; sigmatch_table[DETECT_AL_TLS_NOTBEFORE].desc = "match TLS certificate notBefore field"; - sigmatch_table[DETECT_AL_TLS_NOTBEFORE].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-notbefore"; + sigmatch_table[DETECT_AL_TLS_NOTBEFORE].url = "/rules/tls-keywords.html#tls-cert-notbefore"; sigmatch_table[DETECT_AL_TLS_NOTBEFORE].AppLayerTxMatch = DetectTlsValidityMatch; sigmatch_table[DETECT_AL_TLS_NOTBEFORE].Setup = DetectTlsNotBeforeSetup; sigmatch_table[DETECT_AL_TLS_NOTBEFORE].Free = DetectTlsValidityFree; @@ -98,7 +98,7 @@ void DetectTlsValidityRegister (void) sigmatch_table[DETECT_AL_TLS_NOTAFTER].name = "tls_cert_notafter"; sigmatch_table[DETECT_AL_TLS_NOTAFTER].desc = "match TLS certificate notAfter field"; - sigmatch_table[DETECT_AL_TLS_NOTAFTER].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-notafter"; + sigmatch_table[DETECT_AL_TLS_NOTAFTER].url = "/rules/tls-keywords.html#tls-cert-notafter"; sigmatch_table[DETECT_AL_TLS_NOTAFTER].AppLayerTxMatch = DetectTlsValidityMatch; sigmatch_table[DETECT_AL_TLS_NOTAFTER].Setup = DetectTlsNotAfterSetup; sigmatch_table[DETECT_AL_TLS_NOTAFTER].Free = DetectTlsValidityFree; @@ -108,7 +108,7 @@ void DetectTlsValidityRegister (void) sigmatch_table[DETECT_AL_TLS_EXPIRED].name = "tls_cert_expired"; sigmatch_table[DETECT_AL_TLS_EXPIRED].desc = "match expired TLS certificates"; - sigmatch_table[DETECT_AL_TLS_EXPIRED].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-expired"; + sigmatch_table[DETECT_AL_TLS_EXPIRED].url = "/rules/tls-keywords.html#tls-cert-expired"; sigmatch_table[DETECT_AL_TLS_EXPIRED].AppLayerTxMatch = DetectTlsValidityMatch; sigmatch_table[DETECT_AL_TLS_EXPIRED].Setup = DetectTlsExpiredSetup; sigmatch_table[DETECT_AL_TLS_EXPIRED].Free = DetectTlsValidityFree; @@ -119,7 +119,7 @@ void DetectTlsValidityRegister (void) sigmatch_table[DETECT_AL_TLS_VALID].name = "tls_cert_valid"; sigmatch_table[DETECT_AL_TLS_VALID].desc = "match valid TLS certificates"; - sigmatch_table[DETECT_AL_TLS_VALID].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-valid"; + sigmatch_table[DETECT_AL_TLS_VALID].url = "/rules/tls-keywords.html#tls-cert-valid"; sigmatch_table[DETECT_AL_TLS_VALID].AppLayerTxMatch = DetectTlsValidityMatch; sigmatch_table[DETECT_AL_TLS_VALID].Setup = DetectTlsValidSetup; sigmatch_table[DETECT_AL_TLS_VALID].Free = DetectTlsValidityFree; diff --git a/src/detect-tls-certs.c b/src/detect-tls-certs.c index 09f7d7bc9f..01244d1657 100644 --- a/src/detect-tls-certs.c +++ b/src/detect-tls-certs.c @@ -88,7 +88,7 @@ void DetectTlsCertsRegister(void) { sigmatch_table[DETECT_AL_TLS_CERTS].name = "tls.certs"; sigmatch_table[DETECT_AL_TLS_CERTS].desc = "content modifier to match the TLS certificate sticky buffer"; - sigmatch_table[DETECT_AL_TLS_CERTS].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-certs"; + sigmatch_table[DETECT_AL_TLS_CERTS].url = "/rules/tls-keywords.html#tls-certs"; sigmatch_table[DETECT_AL_TLS_CERTS].Setup = DetectTlsCertsSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_CERTS].RegisterTests = DetectTlsCertsRegisterTests; diff --git a/src/detect-tls-ja3-hash.c b/src/detect-tls-ja3-hash.c index 57a79ef6e5..03787ce2cc 100644 --- a/src/detect-tls-ja3-hash.c +++ b/src/detect-tls-ja3-hash.c @@ -80,7 +80,7 @@ void DetectTlsJa3HashRegister(void) sigmatch_table[DETECT_AL_TLS_JA3_HASH].name = "ja3.hash"; sigmatch_table[DETECT_AL_TLS_JA3_HASH].alias = "ja3_hash"; sigmatch_table[DETECT_AL_TLS_JA3_HASH].desc = "content modifier to match the JA3 hash buffer"; - sigmatch_table[DETECT_AL_TLS_JA3_HASH].url = DOC_URL DOC_VERSION "/rules/ja3-keywords.html#ja3-hash"; + sigmatch_table[DETECT_AL_TLS_JA3_HASH].url = "/rules/ja3-keywords.html#ja3-hash"; sigmatch_table[DETECT_AL_TLS_JA3_HASH].Setup = DetectTlsJa3HashSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_JA3_HASH].RegisterTests = DetectTlsJa3HashRegisterTests; diff --git a/src/detect-tls-ja3-string.c b/src/detect-tls-ja3-string.c index 199e6e80e8..6869ea9604 100644 --- a/src/detect-tls-ja3-string.c +++ b/src/detect-tls-ja3-string.c @@ -76,7 +76,7 @@ void DetectTlsJa3StringRegister(void) sigmatch_table[DETECT_AL_TLS_JA3_STRING].name = "ja3.string"; sigmatch_table[DETECT_AL_TLS_JA3_STRING].alias = "ja3_string"; sigmatch_table[DETECT_AL_TLS_JA3_STRING].desc = "content modifier to match the JA3 string buffer"; - sigmatch_table[DETECT_AL_TLS_JA3_STRING].url = DOC_URL DOC_VERSION "/rules/ja3-keywords.html#ja3-string"; + sigmatch_table[DETECT_AL_TLS_JA3_STRING].url = "/rules/ja3-keywords.html#ja3-string"; sigmatch_table[DETECT_AL_TLS_JA3_STRING].Setup = DetectTlsJa3StringSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_JA3_STRING].RegisterTests = DetectTlsJa3StringRegisterTests; diff --git a/src/detect-tls-ja3s-hash.c b/src/detect-tls-ja3s-hash.c index d7f97a2329..d8acf0344c 100644 --- a/src/detect-tls-ja3s-hash.c +++ b/src/detect-tls-ja3s-hash.c @@ -79,7 +79,7 @@ void DetectTlsJa3SHashRegister(void) { sigmatch_table[DETECT_AL_TLS_JA3S_HASH].name = "ja3s.hash"; sigmatch_table[DETECT_AL_TLS_JA3S_HASH].desc = "content modifier to match the JA3S hash sticky buffer"; - sigmatch_table[DETECT_AL_TLS_JA3S_HASH].url = DOC_URL DOC_VERSION "/rules/ja3-keywords.html#ja3s-hash"; + sigmatch_table[DETECT_AL_TLS_JA3S_HASH].url = "/rules/ja3-keywords.html#ja3s-hash"; sigmatch_table[DETECT_AL_TLS_JA3S_HASH].Setup = DetectTlsJa3SHashSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_JA3S_HASH].RegisterTests = DetectTlsJa3SHashRegisterTests; diff --git a/src/detect-tls-ja3s-string.c b/src/detect-tls-ja3s-string.c index 74af16234d..ea4c9aa5e4 100644 --- a/src/detect-tls-ja3s-string.c +++ b/src/detect-tls-ja3s-string.c @@ -75,7 +75,7 @@ void DetectTlsJa3SStringRegister(void) { sigmatch_table[DETECT_AL_TLS_JA3S_STRING].name = "ja3s.string"; sigmatch_table[DETECT_AL_TLS_JA3S_STRING].desc = "content modifier to match the JA3S string sticky buffer"; - sigmatch_table[DETECT_AL_TLS_JA3S_STRING].url = DOC_URL DOC_VERSION "/rules/ja3-keywords.html#ja3s-string"; + sigmatch_table[DETECT_AL_TLS_JA3S_STRING].url = "/rules/ja3-keywords.html#ja3s-string"; sigmatch_table[DETECT_AL_TLS_JA3S_STRING].Setup = DetectTlsJa3SStringSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_JA3S_STRING].RegisterTests = DetectTlsJa3SStringRegisterTests; diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c index e5ea416d4b..0fe36c0208 100644 --- a/src/detect-tls-sni.c +++ b/src/detect-tls-sni.c @@ -72,7 +72,7 @@ void DetectTlsSniRegister(void) sigmatch_table[DETECT_AL_TLS_SNI].name = "tls.sni"; sigmatch_table[DETECT_AL_TLS_SNI].alias = "tls_sni"; sigmatch_table[DETECT_AL_TLS_SNI].desc = "content modifier to match specifically and only on the TLS SNI buffer"; - sigmatch_table[DETECT_AL_TLS_SNI].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-sni"; + sigmatch_table[DETECT_AL_TLS_SNI].url = "/rules/tls-keywords.html#tls-sni"; sigmatch_table[DETECT_AL_TLS_SNI].Setup = DetectTlsSniSetup; #ifdef UNITTESTS sigmatch_table[DETECT_AL_TLS_SNI].RegisterTests = DetectTlsSniRegisterTests; diff --git a/src/detect-tls-version.c b/src/detect-tls-version.c index 721a12d670..eddef6d4b7 100644 --- a/src/detect-tls-version.c +++ b/src/detect-tls-version.c @@ -75,7 +75,7 @@ void DetectTlsVersionRegister (void) { sigmatch_table[DETECT_AL_TLS_VERSION].name = "tls.version"; sigmatch_table[DETECT_AL_TLS_VERSION].desc = "match on TLS/SSL version"; - sigmatch_table[DETECT_AL_TLS_VERSION].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-version"; + sigmatch_table[DETECT_AL_TLS_VERSION].url = "/rules/tls-keywords.html#tls-version"; sigmatch_table[DETECT_AL_TLS_VERSION].AppLayerTxMatch = DetectTlsVersionMatch; sigmatch_table[DETECT_AL_TLS_VERSION].Setup = DetectTlsVersionSetup; sigmatch_table[DETECT_AL_TLS_VERSION].Free = DetectTlsVersionFree; diff --git a/src/detect-tls.c b/src/detect-tls.c index 2c816bd4c1..0ce262f89b 100644 --- a/src/detect-tls.c +++ b/src/detect-tls.c @@ -114,7 +114,7 @@ void DetectTlsRegister (void) { sigmatch_table[DETECT_AL_TLS_SUBJECT].name = "tls.subject"; sigmatch_table[DETECT_AL_TLS_SUBJECT].desc = "match TLS/SSL certificate Subject field"; - sigmatch_table[DETECT_AL_TLS_SUBJECT].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-subject"; + sigmatch_table[DETECT_AL_TLS_SUBJECT].url = "/rules/tls-keywords.html#tls-subject"; sigmatch_table[DETECT_AL_TLS_SUBJECT].AppLayerTxMatch = DetectTlsSubjectMatch; sigmatch_table[DETECT_AL_TLS_SUBJECT].Setup = DetectTlsSubjectSetup; sigmatch_table[DETECT_AL_TLS_SUBJECT].Free = DetectTlsSubjectFree; @@ -124,7 +124,7 @@ void DetectTlsRegister (void) sigmatch_table[DETECT_AL_TLS_ISSUERDN].name = "tls.issuerdn"; sigmatch_table[DETECT_AL_TLS_ISSUERDN].desc = "match TLS/SSL certificate IssuerDN field"; - sigmatch_table[DETECT_AL_TLS_ISSUERDN].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-issuerdn"; + sigmatch_table[DETECT_AL_TLS_ISSUERDN].url = "/rules/tls-keywords.html#tls-issuerdn"; sigmatch_table[DETECT_AL_TLS_ISSUERDN].AppLayerTxMatch = DetectTlsIssuerDNMatch; sigmatch_table[DETECT_AL_TLS_ISSUERDN].Setup = DetectTlsIssuerDNSetup; sigmatch_table[DETECT_AL_TLS_ISSUERDN].Free = DetectTlsIssuerDNFree; @@ -134,7 +134,7 @@ void DetectTlsRegister (void) sigmatch_table[DETECT_AL_TLS_FINGERPRINT].name = "tls.fingerprint"; sigmatch_table[DETECT_AL_TLS_FINGERPRINT].desc = "match TLS/SSL certificate SHA1 fingerprint"; - sigmatch_table[DETECT_AL_TLS_FINGERPRINT].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-fingerprint"; + sigmatch_table[DETECT_AL_TLS_FINGERPRINT].url = "/rules/tls-keywords.html#tls-fingerprint"; sigmatch_table[DETECT_AL_TLS_FINGERPRINT].AppLayerTxMatch = DetectTlsFingerprintMatch; sigmatch_table[DETECT_AL_TLS_FINGERPRINT].Setup = DetectTlsFingerprintSetup; sigmatch_table[DETECT_AL_TLS_FINGERPRINT].Free = DetectTlsFingerprintFree; @@ -145,7 +145,7 @@ void DetectTlsRegister (void) sigmatch_table[DETECT_AL_TLS_STORE].name = "tls_store"; sigmatch_table[DETECT_AL_TLS_STORE].alias = "tls.store"; sigmatch_table[DETECT_AL_TLS_STORE].desc = "store TLS/SSL certificate on disk"; - sigmatch_table[DETECT_AL_TLS_STORE].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-store"; + sigmatch_table[DETECT_AL_TLS_STORE].url = "/rules/tls-keywords.html#tls-store"; sigmatch_table[DETECT_AL_TLS_STORE].Match = DetectTlsStorePostMatch; sigmatch_table[DETECT_AL_TLS_STORE].Setup = DetectTlsStoreSetup; sigmatch_table[DETECT_AL_TLS_STORE].Free = NULL; diff --git a/src/detect-tos.c b/src/detect-tos.c index e9c8e0667d..746c6cce63 100644 --- a/src/detect-tos.c +++ b/src/detect-tos.c @@ -70,7 +70,7 @@ void DetectTosRegister(void) sigmatch_table[DETECT_TOS].flags = (SIGMATCH_QUOTES_OPTIONAL|SIGMATCH_HANDLE_NEGATION); sigmatch_table[DETECT_TOS].url = - DOC_URL DOC_VERSION "/rules/header-keywords.html#tos"; + "/rules/header-keywords.html#tos"; DetectSetupParseRegexes(PARSE_REGEX, &parse_regex); } diff --git a/src/detect-transform-compress-whitespace.c b/src/detect-transform-compress-whitespace.c index ada53cb5b8..5b54c00b30 100644 --- a/src/detect-transform-compress-whitespace.c +++ b/src/detect-transform-compress-whitespace.c @@ -46,7 +46,7 @@ void DetectTransformCompressWhitespaceRegister(void) "modify buffer to compress consecutive whitespace characters " "into a single one before inspection"; sigmatch_table[DETECT_TRANSFORM_COMPRESS_WHITESPACE].url = - DOC_URL DOC_VERSION "/rules/transforms.html#compress-whitespace"; + "/rules/transforms.html#compress-whitespace"; sigmatch_table[DETECT_TRANSFORM_COMPRESS_WHITESPACE].Transform = TransformCompressWhitespace; sigmatch_table[DETECT_TRANSFORM_COMPRESS_WHITESPACE].Setup = diff --git a/src/detect-transform-dotprefix.c b/src/detect-transform-dotprefix.c index 070dfade7f..3c18b19a92 100644 --- a/src/detect-transform-dotprefix.c +++ b/src/detect-transform-dotprefix.c @@ -47,7 +47,7 @@ void DetectTransformDotPrefixRegister(void) sigmatch_table[DETECT_TRANSFORM_DOTPREFIX].desc = "modify buffer to extract the dotprefix"; sigmatch_table[DETECT_TRANSFORM_DOTPREFIX].url = - DOC_URL DOC_VERSION "/rules/transforms.html#dotprefix"; + "/rules/transforms.html#dotprefix"; sigmatch_table[DETECT_TRANSFORM_DOTPREFIX].Transform = TransformDotPrefix; sigmatch_table[DETECT_TRANSFORM_DOTPREFIX].Setup = DetectTransformDotPrefixSetup; sigmatch_table[DETECT_TRANSFORM_DOTPREFIX].RegisterTests = diff --git a/src/detect-transform-md5.c b/src/detect-transform-md5.c index 10989eb27f..78d99f8615 100644 --- a/src/detect-transform-md5.c +++ b/src/detect-transform-md5.c @@ -46,7 +46,7 @@ void DetectTransformMd5Register(void) sigmatch_table[DETECT_TRANSFORM_MD5].desc = "convert to md5 hash of the buffer"; sigmatch_table[DETECT_TRANSFORM_MD5].url = - DOC_URL DOC_VERSION "/rules/transforms.html#to-md5"; + "/rules/transforms.html#to-md5"; sigmatch_table[DETECT_TRANSFORM_MD5].Setup = DetectTransformToMd5Setup; #ifdef HAVE_NSS diff --git a/src/detect-transform-sha1.c b/src/detect-transform-sha1.c index 7a3a929d98..2d7fde9297 100644 --- a/src/detect-transform-sha1.c +++ b/src/detect-transform-sha1.c @@ -46,7 +46,7 @@ void DetectTransformSha1Register(void) sigmatch_table[DETECT_TRANSFORM_SHA1].desc = "convert to sha1 hash of the buffer"; sigmatch_table[DETECT_TRANSFORM_SHA1].url = - DOC_URL DOC_VERSION "/rules/transforms.html#to-sha1"; + "/rules/transforms.html#to-sha1"; sigmatch_table[DETECT_TRANSFORM_SHA1].Setup = DetectTransformToSha1Setup; #ifdef HAVE_NSS diff --git a/src/detect-transform-sha256.c b/src/detect-transform-sha256.c index 5187f8f74d..9ab6755625 100644 --- a/src/detect-transform-sha256.c +++ b/src/detect-transform-sha256.c @@ -46,7 +46,7 @@ void DetectTransformSha256Register(void) sigmatch_table[DETECT_TRANSFORM_SHA256].desc = "convert to sha256 hash of the buffer"; sigmatch_table[DETECT_TRANSFORM_SHA256].url = - DOC_URL DOC_VERSION "/rules/transforms.html#to-sha256"; + "/rules/transforms.html#to-sha256"; sigmatch_table[DETECT_TRANSFORM_SHA256].Setup = DetectTransformToSha256Setup; #ifdef HAVE_NSS diff --git a/src/detect-transform-strip-whitespace.c b/src/detect-transform-strip-whitespace.c index c7184d85a1..9b444f9c2b 100644 --- a/src/detect-transform-strip-whitespace.c +++ b/src/detect-transform-strip-whitespace.c @@ -45,7 +45,7 @@ void DetectTransformStripWhitespaceRegister(void) sigmatch_table[DETECT_TRANSFORM_STRIP_WHITESPACE].desc = "modify buffer to strip whitespace before inspection"; sigmatch_table[DETECT_TRANSFORM_STRIP_WHITESPACE].url = - DOC_URL DOC_VERSION "/rules/transforms.html#strip-whitespace"; + "/rules/transforms.html#strip-whitespace"; sigmatch_table[DETECT_TRANSFORM_STRIP_WHITESPACE].Transform = TransformStripWhitespace; sigmatch_table[DETECT_TRANSFORM_STRIP_WHITESPACE].Setup = diff --git a/src/detect-ttl.c b/src/detect-ttl.c index 02d0483171..488abc77a7 100644 --- a/src/detect-ttl.c +++ b/src/detect-ttl.c @@ -60,7 +60,7 @@ void DetectTtlRegister(void) { sigmatch_table[DETECT_TTL].name = "ttl"; sigmatch_table[DETECT_TTL].desc = "check for a specific IP time-to-live value"; - sigmatch_table[DETECT_TTL].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#ttl"; + sigmatch_table[DETECT_TTL].url = "/rules/header-keywords.html#ttl"; sigmatch_table[DETECT_TTL].Match = DetectTtlMatch; sigmatch_table[DETECT_TTL].Setup = DetectTtlSetup; sigmatch_table[DETECT_TTL].Free = DetectTtlFree; diff --git a/src/detect-udphdr.c b/src/detect-udphdr.c index 9059510b21..6054193f96 100644 --- a/src/detect-udphdr.c +++ b/src/detect-udphdr.c @@ -50,7 +50,7 @@ void DetectUdphdrRegister(void) { sigmatch_table[DETECT_UDPHDR].name = "udp.hdr"; sigmatch_table[DETECT_UDPHDR].desc = "sticky buffer to match on the UDP header"; - sigmatch_table[DETECT_UDPHDR].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#udphdr"; + sigmatch_table[DETECT_UDPHDR].url = "/rules/header-keywords.html#udphdr"; sigmatch_table[DETECT_UDPHDR].Setup = DetectUdphdrSetup; sigmatch_table[DETECT_UDPHDR].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; #ifdef UNITTESTS diff --git a/src/detect-uricontent.c b/src/detect-uricontent.c index 7c495fab2b..26ff2370c8 100644 --- a/src/detect-uricontent.c +++ b/src/detect-uricontent.c @@ -69,7 +69,7 @@ void DetectUricontentRegister (void) { sigmatch_table[DETECT_URICONTENT].name = "uricontent"; sigmatch_table[DETECT_URICONTENT].desc = "legacy keyword to match on the request URI buffer"; - sigmatch_table[DETECT_URICONTENT].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#uricontent"; + sigmatch_table[DETECT_URICONTENT].url = "/rules/http-keywords.html#uricontent"; sigmatch_table[DETECT_URICONTENT].Match = NULL; sigmatch_table[DETECT_URICONTENT].Setup = DetectUricontentSetup; sigmatch_table[DETECT_URICONTENT].Free = DetectUricontentFree; diff --git a/src/detect-urilen.c b/src/detect-urilen.c index 6b1c4e8a04..1e6bc05568 100644 --- a/src/detect-urilen.c +++ b/src/detect-urilen.c @@ -65,7 +65,7 @@ void DetectUrilenRegister(void) { sigmatch_table[DETECT_AL_URILEN].name = "urilen"; sigmatch_table[DETECT_AL_URILEN].desc = "match on the length of the HTTP uri"; - sigmatch_table[DETECT_AL_URILEN].url = DOC_URL DOC_VERSION "/rules/http-keywords.html#urilen"; + sigmatch_table[DETECT_AL_URILEN].url = "/rules/http-keywords.html#urilen"; sigmatch_table[DETECT_AL_URILEN].Match = NULL; sigmatch_table[DETECT_AL_URILEN].Setup = DetectUrilenSetup; sigmatch_table[DETECT_AL_URILEN].Free = DetectUrilenFree; diff --git a/src/detect-within.c b/src/detect-within.c index 4eb2eab53d..05adf06d52 100644 --- a/src/detect-within.c +++ b/src/detect-within.c @@ -52,7 +52,7 @@ void DetectWithinRegister(void) { sigmatch_table[DETECT_WITHIN].name = "within"; sigmatch_table[DETECT_WITHIN].desc = "indicate that this content match has to be within a certain distance of the previous content keyword match"; - sigmatch_table[DETECT_WITHIN].url = DOC_URL DOC_VERSION "/rules/payload-keywords.html#within"; + sigmatch_table[DETECT_WITHIN].url = "/rules/payload-keywords.html#within"; sigmatch_table[DETECT_WITHIN].Match = NULL; sigmatch_table[DETECT_WITHIN].Setup = DetectWithinSetup; sigmatch_table[DETECT_WITHIN].Free = NULL; diff --git a/src/detect-xbits.c b/src/detect-xbits.c index 4487388975..31b0a6b697 100644 --- a/src/detect-xbits.c +++ b/src/detect-xbits.c @@ -66,7 +66,7 @@ void DetectXbitsRegister (void) { sigmatch_table[DETECT_XBITS].name = "xbits"; sigmatch_table[DETECT_XBITS].desc = "operate on bits"; - sigmatch_table[DETECT_XBITS].url = DOC_URL DOC_VERSION "/rules/xbits.html"; + sigmatch_table[DETECT_XBITS].url = "/rules/xbits.html"; sigmatch_table[DETECT_XBITS].Match = DetectXbitMatch; sigmatch_table[DETECT_XBITS].Setup = DetectXbitSetup; sigmatch_table[DETECT_XBITS].Free = DetectXbitFree; diff --git a/src/output-json-stats.c b/src/output-json-stats.c index cc5a59b57e..666ec1763b 100644 --- a/src/output-json-stats.c +++ b/src/output-json-stats.c @@ -385,7 +385,7 @@ static OutputInitResult OutputStatsLogInit(ConfNode *conf) if (!StatsEnabled()) { SCLogError(SC_ERR_STATS_LOG_GENERIC, "stats.json: stats are disabled globally: set stats.enabled to true. " - "See %s%s/configuration/suricata-yaml.html#stats", DOC_URL, DOC_VERSION); + "See %s/configuration/suricata-yaml.html#stats", GetDocURL()); return result; } @@ -464,7 +464,7 @@ static OutputInitResult OutputStatsLogInitSub(ConfNode *conf, OutputCtx *parent_ if (!StatsEnabled()) { SCLogError(SC_ERR_STATS_LOG_GENERIC, "eve.stats: stats are disabled globally: set stats.enabled to true. " - "See %s%s/configuration/suricata-yaml.html#stats", DOC_URL, DOC_VERSION); + "See %s/configuration/suricata-yaml.html#stats", GetDocURL()); return result; } diff --git a/src/suricata.c b/src/suricata.c index f2376be305..60d421df2d 100644 --- a/src/suricata.c +++ b/src/suricata.c @@ -1019,6 +1019,15 @@ static void SCInstanceInit(SCInstance *suri, const char *progname) #endif } +const char *GetDocURL(void) +{ + const char *prog_ver = GetProgramVersion(); + if (strstr(prog_ver, "RELEASE") != NULL) { + return DOC_URL "suricata-" PROG_VER; + } + return DOC_URL "latest"; +} + /** \brief get string with program version * * Get the program version as passed to us from AC_INIT diff --git a/src/suricata.h b/src/suricata.h index 1b4111610b..3aa2406afc 100644 --- a/src/suricata.h +++ b/src/suricata.h @@ -84,12 +84,7 @@ #define DEFAULT_PID_FILENAME DEFAULT_PID_DIR DEFAULT_PID_BASENAME #define DOC_URL "https://suricata.readthedocs.io/en/" - -#if defined RELEASE -#define DOC_VERSION "suricata-" PROG_VER -#else -#define DOC_VERSION "latest" -#endif +const char *GetDocURL(void); /* runtime engine control flags */ #define SURICATA_STOP (1 << 0) /**< gracefully stop the engine: process all -- 2.47.2