update clf agent

This commit is contained in:
Fish 2004-10-05 04:49:26 +00:00
parent eef12830b3
commit 8a5553ad58
6 changed files with 27 additions and 21 deletions

View file

@ -310,15 +310,16 @@ char * EventlogNext(int log, int * level)
message_file = LookupMessageFile(EventlogList[log].name, source);
if (message_file == NULL)
return NULL;
/* Format eventlog message */
formatted_string = FormatLibraryMessage(message_file, event->EventID, string_array);
if (formatted_string == NULL)
return NULL;
/* Output message */
_snprintf(message, sizeof(message), "%s: %s: %s",
_snprintf(message, sizeof(message), "%s (%lu): %s: %s",
source,
event->EventID & 0x0000FFFF,
username,
formatted_string);
return message;

View file

@ -54,7 +54,7 @@ int LogStart()
LogInteractive = _isatty(_fileno(stdout));
/* Open connection to event logger */
LogSource = RegisterEventSource(NULL, "EvtSys");
LogSource = RegisterEventSource(NULL, "CLFAgent");
if (LogSource == NULL) {
Log(LOG_ERROR|LOG_SYS, "Cannot register source for event logging");
return 1;
@ -156,6 +156,7 @@ void Log(int level, char * message, ...)
LogSend(eventlog_priority, error_message);
/* Output to console */
if (LogInteractive) {
fputs(error_message, stderr);
fputc('\n', stderr);

View file

@ -57,7 +57,7 @@ int MainLoop()
return 1;
/* Service is now running */
Log(LOG_INFO, "Eventlog to Syslog Service Started: Version 3.4");
Log(LOG_INFO, "Centralized Logging Agent Service Started: Version 1.0");
/* Loop while service is running */
do {
@ -79,7 +79,7 @@ int MainLoop()
} while (ServiceIsRunning);
/* Service is stopped */
Log(LOG_INFO, "Eventlog to Syslog Service Stopped");
Log(LOG_INFO, "Centralized Logging Agent Service Stopped");
/* Close eventlogs */
EventlogsClose();

View file

@ -121,8 +121,11 @@ static void mainUsage()
fputc('\n', stderr);
fprintf(stderr, "Default port: %u\n", SYSLOG_DEF_PORT);
fputs("Host (-h) required if installing.\n", stderr);
} else
Sleep(10000);
} else {
Log(LOG_ERROR, "Invalid flag usage; Check startup parameters");
Sleep(10000);
}
}
/* Process flags */
@ -144,6 +147,7 @@ static int mainProcessFlags(int argc, char ** argv)
break;
case 'h':
ProgramSyslogLogHost = GetOptArg;
printf("%s\n", ProgramSyslogLogHost);
break;
case 'p':
ProgramSyslogPort = GetOptArg;

View file

@ -48,7 +48,7 @@ static void WINAPI ServiceMain(DWORD argc, LPTSTR * argv);
/* Service dispatch table */
static SERVICE_TABLE_ENTRY ServiceDispatchTable[] = {
{ "EvtSys", ServiceMain },
{ "CLFAgent", ServiceMain },
{ NULL, NULL }
};
@ -70,7 +70,7 @@ int ServiceInstall()
}
/* Create a new service */
new_service = CreateService(service_manager, "EvtSys", "Eventlog to Syslog", SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, "%SystemRoot%\\System32\\evtsys.exe", NULL, NULL, "eventlog\0", NULL, NULL);
new_service = CreateService(service_manager, "CLFAgent", "CSC CLF Agent", SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, "%SystemRoot%\\System32\\evtsys.exe", NULL, NULL, "eventlog\0", NULL, NULL);
if (new_service == NULL)
Log(LOG_ERROR|LOG_SYS, "Cannot create service");
else
@ -99,7 +99,7 @@ int ServiceRemove()
}
/* Connect to service */
service_handle = OpenService(service_manager, "EvtSys", SERVICE_ALL_ACCESS);
service_handle = OpenService(service_manager, "CLFAgent", SERVICE_ALL_ACCESS);
if (service_handle == NULL) {
Log(LOG_ERROR|LOG_SYS, "Cannot open service");
} else {
@ -147,7 +147,7 @@ static void WINAPI ServiceChange(DWORD code)
static void WINAPI ServiceMain(DWORD argc, LPTSTR * argv)
{
/* Register a control function to the service manager */
ServiceStatusHandle = RegisterServiceCtrlHandler("EvtSys", ServiceChange);
ServiceStatusHandle = RegisterServiceCtrlHandler("CLFAgent", ServiceChange);
if (ServiceStatusHandle == 0) {
Log(LOG_ERROR|LOG_SYS, "Cannot register a control handler for service");
return;

View file

@ -1,11 +1,11 @@
@echo off
rem
rem Set up for Visual Studio C
rem
call "C:\Program Files\Microsoft Visual Studio\VC98\Bin\vcvars32.bat"
rem
rem Set up for Wordpad
rem
set PATH=%PATH%;C:\Program Files\Windows NT\Accessories
@echo off
rem
rem Set up for Visual Studio C
rem
call "C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\vcvars32.bat"
rem
rem Set up for Wordpad
rem
set PATH=%PATH%;C:\Program Files\Windows NT\Accessories