Merge branch 'v5-stable-newstats' into v5-devel

Conflicts:
	configure.ac
	doc/manual.html

3 files changed, 3 insertions, 56 deletions

diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c
index 1666473d..aa500084 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -77,7 +77,6 @@ int symbols_twice = 0;
 int use_syscall = 0;
 int symbol_lookup = 0; /* on recent kernels > 2.6, the kernel does this */
 int bPermitNonKernel = 0; /* permit logging of messages not having LOG_KERN facility */
-static uchar *pLocalIPIF = NULL;
 int iFacilIntMsg; /* the facility to use for internal messages (set by driver) */
 uchar *pszPath = NULL;
 int console_log_level = -1;
@@ -262,22 +261,10 @@ ENDrunInput
 
 
 BEGINwillRun
-	uchar myIP[128];
-	rsRetVal localRet;
 CODESTARTwillRun
 	/* we need to create the inputName property (only once during our lifetime) */
 	CHKiRet(prop.CreateStringProp(&pInputName, UCHAR_CONSTANT("imklog"), sizeof("imklog") - 1));
-	if(pLocalIPIF == NULL) {
-		strcpy((char*)myIP, "127.0.0.1");
-	} else {
-		localRet = net.GetIFIPAddr(pLocalIPIF, AF_UNSPEC, myIP, (int) sizeof(myIP));
-		if(localRet != RS_RET_OK) {
-			DBGPRINTF("imuxsock: could not obtain my IP, using 127.0.0.1 instead\n");
-			strcpy((char*)myIP, "127.0.0.1");
-		}
-	}
-	DBGPRINTF("imklog: using '%s' as localhost IP\n", myIP);
-	CHKiRet(prop.CreateStringProp(&pLocalHostIP, myIP, ustrlen(myIP)));
+	pLocalHostIP = glbl.GetLocalHostIP();
 
         iRet = klogWillRun();
 finalize_it:
@@ -290,9 +277,6 @@ CODESTARTafterRun
 
 	if(pInputName != NULL)
 		prop.Destruct(&pInputName);
-	if(pLocalHostIP != NULL)
-		prop.Destruct(&pLocalHostIP);
-	free(pLocalIPIF);
 ENDafterRun
 
 
@@ -325,10 +309,6 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
 		free(pszPath);
 		pszPath = NULL;
 	}
-	if(pLocalIPIF != NULL) {
-		free(pLocalIPIF);
-		pLocalIPIF = NULL;
-	}
 	iFacilIntMsg = klogFacilIntMsg();
 	return RS_RET_OK;
 }
@@ -352,8 +332,6 @@ CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"klogpermitnonkernelfacility", 0, eCmdHdlrBinary, NULL, &bPermitNonKernel, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"klogconsoleloglevel", 0, eCmdHdlrInt, NULL, &console_log_level, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"kloginternalmsgfacility", 0, eCmdHdlrFacility, NULL, &iFacilIntMsg, STD_LOADABLE_MODULE_ID));
-	CHKiRet(omsdRegCFSLineHdlr((uchar *)"kloglocalipif", 0, eCmdHdlrGetWord,
-		NULL, &pLocalIPIF, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
 ENDmodInit
 /* vim:set ai:
diff --git a/plugins/impstats/impstats.c b/plugins/impstats/impstats.c
index 3012136c..ba497e01 100644
--- a/plugins/impstats/impstats.c
+++ b/plugins/impstats/impstats.c
@@ -62,7 +62,6 @@ typedef struct configSettings_s {
 static configSettings_t cs;
 
 static prop_t *pInputName = NULL;
-static prop_t *pLocalHostIP = NULL;
 
 BEGINisCompatibleWithFeature
 CODESTARTisCompatibleWithFeature
@@ -92,7 +91,7 @@ doSubmitMsg(uchar *line)
 	MsgSetRawMsgWOSize(pMsg, (char*)line);
 	MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName(), ustrlen(glbl.GetLocalHostName()));
 	MsgSetRcvFrom(pMsg, glbl.GetLocalHostNameProp());
-	MsgSetRcvFromIP(pMsg, pLocalHostIP);
+	MsgSetRcvFromIP(pMsg, glbl.GetLocalHostIP());
 	MsgSetMSGoffs(pMsg, 0);
 	MsgSetTAG(pMsg, UCHAR_CONSTANT("rsyslogd-pstats:"), sizeof("rsyslogd-pstats:") - 1);
 	pMsg->iFacility = cs.iFacility;
@@ -169,7 +168,6 @@ ENDafterRun
 BEGINmodExit
 CODESTARTmodExit
 	prop.Destruct(&pInputName);
-	prop.Destruct(&pLocalHostIP);
 	/* release objects we used */
 	objRelease(glbl, CORE_COMPONENT);
 	objRelease(prop, CORE_COMPONENT);
@@ -212,10 +210,6 @@ CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(prop.Construct(&pInputName));
 	CHKiRet(prop.SetString(pInputName, UCHAR_CONSTANT("impstats"), sizeof("impstats") - 1));
 	CHKiRet(prop.ConstructFinalize(pInputName));
-
-	CHKiRet(prop.Construct(&pLocalHostIP));
-	CHKiRet(prop.SetString(pLocalHostIP, UCHAR_CONSTANT("127.0.0.1"), sizeof("127.0.0.1") - 1));
-	CHKiRet(prop.ConstructFinalize(pLocalHostIP));
 ENDmodInit
 /* vi:set ai:
  */
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 8e6dc7bc..7b122c50 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -161,7 +161,6 @@ static int sd_fds = 0;			/* number of systemd activated sockets */
 /* config settings */
 static int bOmitLocalLogging = 0;
 static uchar *pLogSockName = NULL;
-static uchar *pLocalIPIF = NULL;
 static uchar *pLogHostName = NULL;	/* host name to use with this socket */
 static int bUseFlowCtl = 0;		/* use flow control or not (if yes, only LIGHT is used! */
 static int bIgnoreTimestamp = 1;	/* ignore timestamps present in the incoming message? */
@@ -949,8 +948,6 @@ ENDrunInput
 
 
 BEGINwillRun
-	uchar myIP[128];
-	rsRetVal localRet;
 CODESTARTwillRun
 	register int i;
 	int actSocks;
@@ -1015,22 +1012,7 @@ CODESTARTwillRun
 	CHKiRet(prop.SetString(pInputName, UCHAR_CONSTANT("imuxsock"), sizeof("imuxsock") - 1));
 	CHKiRet(prop.ConstructFinalize(pInputName));
 
-	if(pLocalIPIF == NULL) {
-		strcpy((char*)myIP, "127.0.0.1");
-	} else {
-		localRet = net.GetIFIPAddr((uchar*)pLocalIPIF, AF_UNSPEC, myIP, (int) sizeof(myIP));
-		if(localRet != RS_RET_OK) {
-			DBGPRINTF("imuxsock: could not obtain my IP, using 127.0.0.1 instead\n");
-			strcpy((char*)myIP, "127.0.0.1");
-		}
-	}
-
-	DBGPRINTF("imuxsock: using '%s' as localhost IP\n", myIP);
-
-	CHKiRet(prop.Construct(&pLocalHostIP));
-	CHKiRet(prop.SetString(pLocalHostIP, myIP, ustrlen(myIP)));
-	CHKiRet(prop.ConstructFinalize(pLocalHostIP));
-
+	pLocalHostIP = glbl.GetLocalHostIP();
 
 finalize_it:
 ENDwillRun
@@ -1062,7 +1044,6 @@ CODESTARTafterRun
 		}
 	/* free no longer needed string */
 	free(pLogSockName);
-	free(pLocalIPIF);
 	free(pLogHostName);
 
 	discardLogSockets();
@@ -1107,10 +1088,6 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
 		free(pLogSockName);
 		pLogSockName = NULL;
 	}
-	if(pLocalIPIF != NULL) {
-		free(pLocalIPIF);
-		pLocalIPIF = NULL;
-	}
 	if(pLogHostName != NULL) {
 		free(pLogHostName);
 		pLogHostName = NULL;
@@ -1203,8 +1180,6 @@ CODEmodInit_QueryRegCFSLineHdlr
 		NULL, &ratelimitSeverity, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler,
 		resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
-	CHKiRet(omsdRegCFSLineHdlr((uchar *)"imuxsocklocalipif", 0, eCmdHdlrGetWord,
-		NULL, &pLocalIPIF, STD_LOADABLE_MODULE_ID));
 	/* the following one is a (dirty) trick: the system log socket is not added via
 	 * an "addUnixListenSocket" config format. As such, it's properties can not be modified
 	 * via $InputUnixListenSocket*". So we need to add a special directive