Skip to content

main/options: Limit verbose option count #14267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −3
Open

main/options: Limit verbose option count #14267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/suricata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ SC_ATOMIC_DECLARE(unsigned int, engine_stage);
/* Max packets processed simultaneously per thread. */
#define DEFAULT_MAX_PENDING_PACKETS 1024

/* Maximum number of v's supported */
#define VERBOSE_MAX (SC_LOG_CONFIG - SC_LOG_NOTICE)

/** suricata engine control flags */
volatile uint8_t suricata_ctl_flags = 0;

Expand Down Expand Up @@ -2084,9 +2087,15 @@ TmEcode SCParseCommandLine(int argc, char **argv)

SetBpfStringFromFile(optarg);
break;
case 'v':
suri->verbose++;
break;
case 'v': {
static bool ignore_extra = false;
if (suri->verbose < VERBOSE_MAX)
suri->verbose++;
else if (!ignore_extra) {
SCLogNotice("extraneous verbose option(s) ignored");
ignore_extra = true;
}
} break;
case 'k':
if (optarg == NULL) {
SCLogError("no option argument (optarg) for -k");
Expand Down Expand Up @@ -3045,6 +3054,10 @@ void SuricataInit(void)
if (suricata.run_mode == RUNMODE_CONF_TEST)
SCLogInfo("Running suricata under test mode");

if (suricata.verbose) {
SCLogInfo("Running with verbose level %d", suricata.verbose);
}

if (ParseInterfacesList(suricata.aux_run_mode, suricata.pcap_dev) != TM_ECODE_OK) {
exit(EXIT_FAILURE);
}
Expand Down
Loading