rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 23:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

created first version of imtcp (still very much depending on syslogd.c for

Browse Source 
configuration and a lot of other things)
This commit is contained in:
Rainer Gerhards 2007-12-21 14:37:50 +00:00
parent 783d2c0368
commit 4e6bba7df8
4 changed files with 136 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
plugins/imtcp/imtcp.c
View File

@ -26,18 +26,16 @@
* A copy of the GPL can be found in the file "COPYING" in this distribution. * A copy of the GPL can be found in the file "COPYING" in this distribution.
*/ */
#include "config.h" #include "config.h"
#include "rsyslog.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include "rsyslog.h"
#include <sys/un.h>
#include "syslogd.h" #include "syslogd.h"
#include "cfsysline.h" #include "cfsysline.h"
#include "module-template.h" #include "module-template.h"
#include "tcpsyslog.h"
MODULE_TYPE_INPUT MODULE_TYPE_INPUT
TERM_SYNC_TYPE(eTermSync_NONE) TERM_SYNC_TYPE(eTermSync_NONE)
@ -59,7 +57,7 @@ BEGINrunInput
int maxfds; int maxfds;
int nfds; int nfds;
int i; int i;
int fd; int iTCPSess;
fd_set readfds; fd_set readfds;
CODESTARTrunInput CODESTARTrunInput
/* this is an endless loop - it is terminated when the thread is /* this is an endless loop - it is terminated when the thread is
@ -76,17 +74,119 @@ CODESTARTrunInput
maxfds = 0; maxfds = 0;
FD_ZERO (&readfds); FD_ZERO (&readfds);
/* Add the TCP listen sockets to the list of read descriptors.
*/
if(sockTCPLstn != NULL && *sockTCPLstn) {
for (i = 0; i < *sockTCPLstn; i++) {
/* The if() below is theoretically not needed, but I leave it in
* so that a socket may become unsuable during execution. That
* feature is not yet supported by the current code base.
*/
if (sockTCPLstn[i+1] != -1) {
if(Debug)
debugListenInfo(sockTCPLstn[i+1], "TCP");
FD_SET(sockTCPLstn[i+1], &readfds);
if(sockTCPLstn[i+1]>maxfds) maxfds=sockTCPLstn[i+1];
}
}
/* do the sessions */
iTCPSess = TCPSessGetNxtSess(-1);
while(iTCPSess != -1) {
int fdSess;
fdSess = pTCPSessions[iTCPSess].sock;
dbgprintf("Adding TCP Session %d\n", fdSess);
FD_SET(fdSess, &readfds);
if (fdSess>maxfds) maxfds=fdSess;
/* now get next... */
iTCPSess = TCPSessGetNxtSess(iTCPSess);
}
}
if(Debug) { if(Debug) {
dbgprintf("--------imTCP calling select, active file descriptors (max %d): ", maxfds); dbgprintf("--------imTCP calling select, active file descriptors (max %d): ", maxfds);
for (nfds= 0; nfds <= maxfds; ++nfds) for (nfds = 0; nfds <= maxfds; ++nfds)
if ( FD_ISSET(nfds, &readfds) ) if ( FD_ISSET(nfds, &readfds) )
dbgprintf("%d ", nfds); dbgprintf("%d ", nfds);
dbgprintf("\n"); dbgprintf("\n");
} }
/* wait for io to become ready */ /* wait for io to become ready */
/* select here */ nfds = select(maxfds+1, (fd_set *) &readfds, NULL, NULL, NULL);
for (i = 0; i < *sockTCPLstn; i++) {
if (FD_ISSET(sockTCPLstn[i+1], &readfds)) {
dbgprintf("New connect on TCP inetd socket: #%d\n", sockTCPLstn[i+1]);
# ifdef USE_GSSAPI
if(bEnableTCP & ALLOWEDMETHOD_GSS)
TCPSessGSSAccept(sockTCPLstn[i+1]);
else
# endif
TCPSessAccept(sockTCPLstn[i+1]);
--nfds; /* indicate we have processed one */
}
}
/* now check the sessions */
iTCPSess = TCPSessGetNxtSess(-1);
while(nfds && iTCPSess != -1) {
int fdSess;
int state;
fdSess = pTCPSessions[iTCPSess].sock;
if(FD_ISSET(fdSess, &readfds)) {
char buf[MAXLINE];
dbgprintf("tcp session socket with new data: #%d\n", fdSess);
/* Receive message */
# ifdef USE_GSSAPI
int allowedMethods = pTCPSessions[iTCPSess].allowedMethods;
if(allowedMethods & ALLOWEDMETHOD_GSS)
state = TCPSessGSSRecv(iTCPSess, buf, sizeof(buf));
else
# endif
state = recv(fdSess, buf, sizeof(buf), 0);
if(state == 0) {
# ifdef USE_GSSAPI
if(allowedMethods & ALLOWEDMETHOD_GSS)
TCPSessGSSClose(iTCPSess);
else {
# endif
/* process any incomplete frames left over */
TCPSessPrepareClose(iTCPSess);
/* Session closed */
TCPSessClose(iTCPSess);
# ifdef USE_GSSAPI
}
# endif
} else if(state == -1) {
logerrorInt("TCP session %d will be closed, error ignored\n",
fdSess);
# ifdef USE_GSSAPI
if(allowedMethods & ALLOWEDMETHOD_GSS)
TCPSessGSSClose(iTCPSess);
else
# endif
TCPSessClose(iTCPSess);
} else {
/* valid data received, process it! */
if(TCPSessDataRcvd(iTCPSess, buf, state) == 0) {
/* in this case, something went awfully wrong.
* We are instructed to terminate the session.
*/
logerrorInt("Tearing down TCP Session %d - see "
"previous messages for reason(s)\n",
iTCPSess);
# ifdef USE_GSSAPI
if(allowedMethods & ALLOWEDMETHOD_GSS)
TCPSessGSSClose(iTCPSess);
else
# endif
TCPSessClose(iTCPSess);
}
}
--nfds; /* indicate we have processed one */
}
iTCPSess = TCPSessGetNxtSess(iTCPSess);
}
} }
return iRet; return iRet;
@ -97,6 +197,29 @@ ENDrunInput
BEGINwillRun BEGINwillRun
CODESTARTwillRun CODESTARTwillRun
/* first apply some config settings */ /* first apply some config settings */
dbgprintf("imtcp: bEnableTCP %d\n", bEnableTCP);
if (bEnableTCP) {
if(sockTCPLstn == NULL) {
/* even when doing a re-init, we do not shut down and
* re-open the TCP socket. That would break existing TCP
* session, which we do not desire. Should at some time arise
* need to do that, I recommend controlling that via a
* user-selectable option. rgerhards, 2007-06-21
*/
# ifdef USE_GSSAPI
if(bEnableTCP & ALLOWEDMETHOD_GSS) {
if(TCPSessGSSInit()) {
logerror("GSS-API initialization failed\n");
bEnableTCP &= ~(ALLOWEDMETHOD_GSS);
}
}
if(bEnableTCP)
# endif
if((sockTCPLstn = create_tcp_socket()) != NULL) {
dbgprintf("Opened %d syslog TCP port(s).\n", *sockTCPLstn);
}
}
}
ENDwillRun ENDwillRun
@ -140,6 +263,9 @@ CODEmodInit_QueryRegCFSLineHdlr
/* register config file handlers */ /* register config file handlers */
//CHKiRet(omsdRegCFSLineHdlr((uchar *)"omitlocallogging", 0, eCmdHdlrBinary, //CHKiRet(omsdRegCFSLineHdlr((uchar *)"omitlocallogging", 0, eCmdHdlrBinary,
// NULL, &bOmitLocalLogging, STD_LOADABLE_MODULE_ID)); // NULL, &bOmitLocalLogging, STD_LOADABLE_MODULE_ID));
#if defined(USE_GSSAPI)
CHKiRet(regCfSysLineHdlr((uchar *)"gsslistenservicename", 0, eCmdHdlrGetWord, NULL, &gss_listen_service_name, NULL));
#endif
CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler,
resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID)); resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
ENDmodInit ENDmodInit

140
syslogd.c
View File

@ -4386,29 +4386,6 @@ init(void)
/* this case can happen during HUP processing. */ /* this case can happen during HUP processing. */
closeUDPListenSockets(); closeUDPListenSockets();
} }
if (bEnableTCP) {
if(sockTCPLstn == NULL) {
/* even when doing a re-init, we do not shut down and
* re-open the TCP socket. That would break existing TCP
* session, which we do not desire. Should at some time arise
* need to do that, I recommend controlling that via a
* user-selectable option. rgerhards, 2007-06-21
*/
# ifdef USE_GSSAPI
if(bEnableTCP & ALLOWEDMETHOD_GSS) {
if(TCPSessGSSInit()) {
logerror("GSS-API initialization failed\n");
bEnableTCP &= ~(ALLOWEDMETHOD_GSS);
}
}
if(bEnableTCP)
# endif
if((sockTCPLstn = create_tcp_socket()) != NULL) {
dbgprintf("Opened %d syslog TCP port(s).\n", *sockTCPLstn);
}
}
}
#endif #endif
/* create message queue */ /* create message queue */
@ -5391,7 +5368,7 @@ int getSubString(uchar **ppSrc, char *pDst, size_t DstSize, char cSep)
/* print out which socket we are listening on. This is only /* print out which socket we are listening on. This is only
* a debug aid. rgerhards, 2007-07-02 * a debug aid. rgerhards, 2007-07-02
*/ */
static void debugListenInfo(int fd, char *type) void debugListenInfo(int fd, char *type)
{ {
char *szFamily; char *szFamily;
int port; int port;
@ -5528,84 +5505,6 @@ static rsRetVal processSelectAfter(int maxfds, int nfds, fd_set *pReadfds)
} }
} }
} }
if(sockTCPLstn != NULL && *sockTCPLstn) {
for (i = 0; i < *sockTCPLstn; i++) {
if (FD_ISSET(sockTCPLstn[i+1], pReadfds)) {
dbgprintf("New connect on TCP inetd socket: #%d\n", sockTCPLstn[i+1]);
# ifdef USE_GSSAPI
if(bEnableTCP & ALLOWEDMETHOD_GSS)
TCPSessGSSAccept(sockTCPLstn[i+1]);
else
# endif
TCPSessAccept(sockTCPLstn[i+1]);
FDPROCESSED();
}
}
/* now check the sessions */
iTCPSess = TCPSessGetNxtSess(-1);
while(iTCPSess != -1) {
int fdSess;
int state;
fdSess = pTCPSessions[iTCPSess].sock;
if(FD_ISSET(fdSess, pReadfds)) {
char buf[MAXLINE];
dbgprintf("tcp session socket with new data: #%d\n", fdSess);
/* Receive message */
# ifdef USE_GSSAPI
int allowedMethods = pTCPSessions[iTCPSess].allowedMethods;
if(allowedMethods & ALLOWEDMETHOD_GSS)
state = TCPSessGSSRecv(iTCPSess, buf, sizeof(buf));
else
# endif
state = recv(fdSess, buf, sizeof(buf), 0);
if(state == 0) {
# ifdef USE_GSSAPI
if(allowedMethods & ALLOWEDMETHOD_GSS)
TCPSessGSSClose(iTCPSess);
else {
# endif
/* process any incomplete frames left over */
TCPSessPrepareClose(iTCPSess);
/* Session closed */
TCPSessClose(iTCPSess);
# ifdef USE_GSSAPI
}
# endif
} else if(state == -1) {
logerrorInt("TCP session %d will be closed, error ignored\n",
fdSess);
# ifdef USE_GSSAPI
if(allowedMethods & ALLOWEDMETHOD_GSS)
TCPSessGSSClose(iTCPSess);
else
# endif
TCPSessClose(iTCPSess);
} else {
/* valid data received, process it! */
if(TCPSessDataRcvd(iTCPSess, buf, state) == 0) {
/* in this case, something went awfully wrong.
* We are instructed to terminate the session.
*/
logerrorInt("Tearing down TCP Session %d - see "
"previous messages for reason(s)\n",
iTCPSess);
# ifdef USE_GSSAPI
if(allowedMethods & ALLOWEDMETHOD_GSS)
TCPSessGSSClose(iTCPSess);
else
# endif
TCPSessClose(iTCPSess);
}
}
FDPROCESSED();
}
iTCPSess = TCPSessGetNxtSess(iTCPSess);
}
}
#endif #endif
finalize_it: finalize_it:
return iRet; return iRet;
@ -5646,35 +5545,6 @@ static void mainloop(void)
} }
} }
} }
/* Add the TCP listen sockets to the list of read descriptors.
*/
if(sockTCPLstn != NULL && *sockTCPLstn) {
for (i = 0; i < *sockTCPLstn; i++) {
/* The if() below is theoretically not needed, but I leave it in
* so that a socket may become unsuable during execution. That
* feature is not yet supported by the current code base.
*/
if (sockTCPLstn[i+1] != -1) {
if(Debug)
debugListenInfo(sockTCPLstn[i+1], "TCP");
FD_SET(sockTCPLstn[i+1], &readfds);
if(sockTCPLstn[i+1]>maxfds) maxfds=sockTCPLstn[i+1];
}
}
/* do the sessions */
iTCPSess = TCPSessGetNxtSess(-1);
while(iTCPSess != -1) {
int fdSess;
fdSess = pTCPSessions[iTCPSess].sock;
dbgprintf("Adding TCP Session %d\n", fdSess);
FD_SET(fdSess, &readfds);
if (fdSess>maxfds) maxfds=fdSess;
/* now get next... */
iTCPSess = TCPSessGetNxtSess(iTCPSess);
}
}
#endif #endif
if ( debugging_on ) { if ( debugging_on ) {
@ -5802,8 +5672,6 @@ static rsRetVal loadBuildInModules(void)
NULL, &bDebugPrintCfSysLineHandlerList, NULL)); NULL, &bDebugPrintCfSysLineHandlerList, NULL));
CHKiRet(regCfSysLineHdlr((uchar *)"moddir", 0, eCmdHdlrGetWord, NULL, &pModDir, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"moddir", 0, eCmdHdlrGetWord, NULL, &pModDir, NULL));
CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL));
#if defined(SYSLOG_INET) && defined(USE_GSSAPI)
CHKiRet(regCfSysLineHdlr((uchar *)"gsslistenservicename", 0, eCmdHdlrGetWord, NULL, &gss_listen_service_name, NULL));
#endif #endif
finalize_it: finalize_it:
@ -5832,11 +5700,6 @@ static void printVersion(void)
#else #else
printf("\tFEATURE_NETZIP (message compression):\tNo\n"); printf("\tFEATURE_NETZIP (message compression):\tNo\n");
#endif #endif
#ifdef SYSLOG_INET
printf("\tSYSLOG_INET (Internet/remote support):\tYes\n");
#else
printf("\tSYSLOG_INET (Internet/remote support):\tNo\n");
#endif
#if defined(SYSLOG_INET) && defined(USE_GSSAPI) #if defined(SYSLOG_INET) && defined(USE_GSSAPI)
printf("\tFEATURE_GSSAPI (GSSAPI Kerberos 5 support):\tYes\n"); printf("\tFEATURE_GSSAPI (GSSAPI Kerberos 5 support):\tYes\n");
#else #else
@ -6189,7 +6052,6 @@ int main(int argc, char **argv)
/* do any de-init's that need to be done AFTER this comment */ /* do any de-init's that need to be done AFTER this comment */
dbgprintf("reaching die\n");
die(bFinished); die(bFinished);
thrdExit(); thrdExit();

1
syslogd.h
View File

@ -71,6 +71,7 @@ int getSubString(uchar **ppSrc, char *pDst, size_t DstSize, char cSep);
*/ */
void logmsgInternal(int pri, char *msg, int flags); void logmsgInternal(int pri, char *msg, int flags);
void logmsg(int pri, msg_t *pMsg, int flags); void logmsg(int pri, msg_t *pMsg, int flags);
void debugListenInfo(int fd, char *type);
extern int bFinished; /* used by termination signal handler, read-only except there */ extern int bFinished; /* used by termination signal handler, read-only except there */
extern int glblHadMemShortage; /* indicates if we had memory shortage some time during the run */ extern int glblHadMemShortage; /* indicates if we had memory shortage some time during the run */

1
tcpsyslog.c
View File

@ -276,6 +276,7 @@ int *create_tcp_socket(void)
* many existing configurations. * many existing configurations.
* rgerhards, 2007-06-28 * rgerhards, 2007-06-28
*/ */
dbgprintf("creating tcp socket on port %s\n", TCPLstnPort);
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_PASSIVE | AI_NUMERICSERV; hints.ai_flags = AI_PASSIVE | AI_NUMERICSERV;
hints.ai_family = family; hints.ai_family = family;