suricata: move WindowsInitService to SuricataMain

Move WindowsInitService from SuricataInit() to SuricataMain(), as
initializing Suricata as a service is very specific to the application
and not something you'd want to happen in a library, and SuricataInit
is more common initialization for application and library usage.
pull/10720/head
Jason Ish 3 years ago committed by Victor Julien
parent 2dc39d31c6
commit db44740fd8

@ -2899,13 +2899,6 @@ void SuricataPreInit(const char *progname)
void SuricataInit(int argc, char **argv)
{
#ifdef OS_WIN32
/* service initialization */
if (WindowsInitService(argc, argv) != 0) {
exit(EXIT_FAILURE);
}
#endif /* OS_WIN32 */
if (ParseCommandLine(argc, argv, &suricata) != TM_ECODE_OK) {
exit(EXIT_FAILURE);
}
@ -3086,6 +3079,13 @@ int SuricataMain(int argc, char **argv)
/* Pre-initialization tasks: initialize global context and variables. */
SuricataPreInit(argv[0]);
#ifdef OS_WIN32
/* service initialization */
if (WindowsInitService(argc, argv) != 0) {
exit(EXIT_FAILURE);
}
#endif /* OS_WIN32 */
/* Initialization tasks: parse command line options, load yaml, start runmode... */
SuricataInit(argc, argv);

Loading…
Cancel
Save