emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* syslogd can now log messages to a remote host -- patch thanks

Browse Source 
to Gyepi Sam <gyepi@praxis-sw.com>
 -Erik
This commit is contained in:
Eric Andersen 2000-07-20 23:41:24 +00:00
parent 1f45b268cb
commit ced2cefcca
9 changed files with 239 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -46,6 +46,9 @@ Bruce Perens <bruce@pixar.com>
Pavel Roskin <proski@gnu.org>
Lots of bugs fixes and patches.
Gyepi Sam <gyepi@praxis-sw.com>
Remote logging feature for syslogd
Linus Torvalds <torvalds@transmeta.com>
mkswap, fsck.minix, mkfs.minix

11
Changelog
View File

@ -1,3 +1,14 @@
0.47
* 'make install' now creates relative symlinks, and added a new
'make install-hardlinks' target to (tada) install hardlinks.
* syslogd can now log messages to a remote host -- patch thanks
to Gyepi Sam <gyepi@praxis-sw.com>
-Erik Andersen
0.46
* Better portability. Now should compile cleanly with libc5,

3
applets/usage.c
View File

@ -998,6 +998,9 @@ const char syslogd_usage[] =
"\t-K\t\tDo not start up the klogd process\n"
#endif
"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
#ifdef BB_FEATURE_REMOTE_LOG
"\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
#endif
#endif
;
#endif

3
busybox.def.h
View File

@ -186,6 +186,9 @@
//Should syslogd also provide klogd support?
#define BB_FEATURE_KLOGD
//
// enable syslogd -R remotehost
#define BB_FEATURE_REMOTE_LOG
//
//Simple tail implementation (2k vs 6k for the full one). Still
//provides 'tail -f' support -- but for only one file at a time.
#define BB_FEATURE_SIMPLE_TAIL

8
docs/busybox.pod
View File

@ -1577,6 +1577,12 @@ Options:
-n Run as a foreground process
-K Do not start up the klogd process
-O FILE Use an alternate log file (default=/var/log/messages)
-R HOST[:PORT] Log messages to HOST on PORT (default=514) over UDP.
Example:
$ syslogd -R masterlog:514
$ syslogd -R 192.168.1.1:601
-------------------------------
@ -2028,4 +2034,4 @@ Enrique Zanardi <ezanardi@ull.es>
=cut
# $Id: busybox.pod,v 1.56 2000/07/11 17:29:36 andersen Exp $
# $Id: busybox.pod,v 1.57 2000/07/20 23:41:24 andersen Exp $

3
docs/busybox.sgml
View File

@ -2804,6 +2804,7 @@
-n Run as a foreground process
-K Do not start up the klogd process
-O FILE Use an alternate log file (default=/var/log/messages)
-R HOST[:PORT] Log messages to HOST on PORT (default=514) over UDP.
</screen>
</para>
@ -2813,6 +2814,8 @@
<para>
<screen>
$ syslogd -R masterlog:514
$ syslogd -R 192.168.1.1:601
</screen>
</para>
</sect1>

104
sysklogd/syslogd.c
View File

@ -61,6 +61,7 @@ static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
/* SYSLOG_NAMES defined to pull some extra junk from syslog.h */
#define SYSLOG_NAMES
#include <sys/syslog.h>
#include <sys/uio.h>
/* Path for the file where all log messages are written */
#define __LOG_FILE "/var/log/messages"
@ -76,6 +77,18 @@ static int MarkInterval = 20 * 60;
/* localhost's name */
static char LocalHostName[32];
#ifdef BB_FEATURE_REMOTE_LOG
#include <netinet/in.h>
/* udp socket for logging to remote host */
static int remotefd = -1;
/* where do we log? */
static char *RemoteHost;
/* what port to log to? */
static int RemotePort = 514;
/* To remote log or not to remote log, that is the question. */
static int doRemoteLog = FALSE;
#endif
/* Note: There is also a function called "message()" in init.c */
/* Print a message to the log file. */
static void message (char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
@ -151,6 +164,30 @@ static void logMessage (int pri, char *msg)
/* now spew out the message to wherever it is supposed to go */
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
#ifdef BB_FEATURE_REMOTE_LOG
/* send message to remote logger */
if ( -1 != remotefd){
#define IOV_COUNT 2
struct iovec iov[IOV_COUNT];
struct iovec *v = iov;
bzero(&res, sizeof(res));
snprintf(res, sizeof(res), "<%d>", pri);
v->iov_base = res ;
v->iov_len = strlen(res);
v++;
v->iov_base = msg;
v->iov_len = strlen(msg);
if ( -1 == writev(remotefd,iov, IOV_COUNT)){
fatalError("syslogd: cannot write to remote file handle on"
"%s:%d\n",RemoteHost,RemotePort);
}
}
#endif
}
static void quit_signal(int sig)
@ -191,8 +228,9 @@ static int serveConnection (int conn)
while (isdigit (*(++p))) {
pri = 10 * pri + (*p - '0');
}
if (pri & ~(LOG_FACMASK | LOG_PRIMASK))
if (pri & ~(LOG_FACMASK | LOG_PRIMASK)){
pri = (LOG_USER | LOG_NOTICE);
}
} else if (c == '\n') {
*q++ = ' ';
} else if (iscntrl (c) && (c < 0177)) {
@ -210,6 +248,43 @@ static int serveConnection (int conn)
return (0);
}
#ifdef BB_FEATURE_REMOTE_LOG
static void init_RemoteLog (void){
struct sockaddr_in remoteaddr;
struct hostent *hostinfo;
int len = sizeof(remoteaddr);
bzero(&remoteaddr, len);
remotefd = socket(AF_INET, SOCK_DGRAM, 0);
if (remotefd < 0) {
fatalError("syslogd: cannot create socket\n");
}
hostinfo = (struct hostent *) gethostbyname(RemoteHost);
if (!hostinfo) {
fatalError("syslogd: cannot resolve remote host name [%s]\n", RemoteHost);
}
remoteaddr.sin_family = AF_INET;
remoteaddr.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list;
remoteaddr.sin_port = htons(RemotePort);
/*
Since we are using UDP sockets, connect just sets the default host and port
for future operations
*/
if ( 0 != (connect(remotefd, (struct sockaddr *) &remoteaddr, len))){
fatalError("syslogd: cannot connect to remote host %s:%d\n", RemoteHost, RemotePort);
}
}
#endif
static void doSyslogd (void) __attribute__ ((noreturn));
static void doSyslogd (void)
{
@ -254,6 +329,12 @@ static void doSyslogd (void)
FD_ZERO (&fds);
FD_SET (sock_fd, &fds);
#ifdef BB_FEATURE_REMOTE_LOG
if (doRemoteLog == TRUE){
init_RemoteLog();
}
#endif
logMessage (0, "syslogd started: BusyBox v" BB_VER " (" BB_BT ")");
for (;;) {
@ -322,6 +403,13 @@ static void doKlogd (void)
signal(SIGKILL, klogd_signal);
signal(SIGTERM, klogd_signal);
signal(SIGHUP, SIG_IGN);
#ifdef BB_FEATURE_REMOTE_LOG
if (doRemoteLog == TRUE){
init_RemoteLog();
}
#endif
logMessage(0, "klogd started: "
"BusyBox v" BB_VER " (" BB_BT ")");
@ -423,6 +511,20 @@ extern int syslogd_main(int argc, char **argv)
logFilePath = *(++argv1);
stopDoingThat = TRUE;
break;
#ifdef BB_FEATURE_REMOTE_LOG
case 'R':
if (--argc == 0) {
usage(syslogd_usage);
}
RemoteHost = *(++argv1);
if ( (p = strchr(RemoteHost, ':'))){
RemotePort = atoi(p+1);
*p = '\0';
}
doRemoteLog = TRUE;
stopDoingThat = TRUE;
break;
#endif
default:
usage(syslogd_usage);
}

104
syslogd.c
View File

@ -61,6 +61,7 @@ static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
/* SYSLOG_NAMES defined to pull some extra junk from syslog.h */
#define SYSLOG_NAMES
#include <sys/syslog.h>
#include <sys/uio.h>
/* Path for the file where all log messages are written */
#define __LOG_FILE "/var/log/messages"
@ -76,6 +77,18 @@ static int MarkInterval = 20 * 60;
/* localhost's name */
static char LocalHostName[32];
#ifdef BB_FEATURE_REMOTE_LOG
#include <netinet/in.h>
/* udp socket for logging to remote host */
static int remotefd = -1;
/* where do we log? */
static char *RemoteHost;
/* what port to log to? */
static int RemotePort = 514;
/* To remote log or not to remote log, that is the question. */
static int doRemoteLog = FALSE;
#endif
/* Note: There is also a function called "message()" in init.c */
/* Print a message to the log file. */
static void message (char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
@ -151,6 +164,30 @@ static void logMessage (int pri, char *msg)
/* now spew out the message to wherever it is supposed to go */
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
#ifdef BB_FEATURE_REMOTE_LOG
/* send message to remote logger */
if ( -1 != remotefd){
#define IOV_COUNT 2
struct iovec iov[IOV_COUNT];
struct iovec *v = iov;
bzero(&res, sizeof(res));
snprintf(res, sizeof(res), "<%d>", pri);
v->iov_base = res ;
v->iov_len = strlen(res);
v++;
v->iov_base = msg;
v->iov_len = strlen(msg);
if ( -1 == writev(remotefd,iov, IOV_COUNT)){
fatalError("syslogd: cannot write to remote file handle on"
"%s:%d\n",RemoteHost,RemotePort);
}
}
#endif
}
static void quit_signal(int sig)
@ -191,8 +228,9 @@ static int serveConnection (int conn)
while (isdigit (*(++p))) {
pri = 10 * pri + (*p - '0');
}
if (pri & ~(LOG_FACMASK | LOG_PRIMASK))
if (pri & ~(LOG_FACMASK | LOG_PRIMASK)){
pri = (LOG_USER | LOG_NOTICE);
}
} else if (c == '\n') {
*q++ = ' ';
} else if (iscntrl (c) && (c < 0177)) {
@ -210,6 +248,43 @@ static int serveConnection (int conn)
return (0);
}
#ifdef BB_FEATURE_REMOTE_LOG
static void init_RemoteLog (void){
struct sockaddr_in remoteaddr;
struct hostent *hostinfo;
int len = sizeof(remoteaddr);
bzero(&remoteaddr, len);
remotefd = socket(AF_INET, SOCK_DGRAM, 0);
if (remotefd < 0) {
fatalError("syslogd: cannot create socket\n");
}
hostinfo = (struct hostent *) gethostbyname(RemoteHost);
if (!hostinfo) {
fatalError("syslogd: cannot resolve remote host name [%s]\n", RemoteHost);
}
remoteaddr.sin_family = AF_INET;
remoteaddr.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list;
remoteaddr.sin_port = htons(RemotePort);
/*
Since we are using UDP sockets, connect just sets the default host and port
for future operations
*/
if ( 0 != (connect(remotefd, (struct sockaddr *) &remoteaddr, len))){
fatalError("syslogd: cannot connect to remote host %s:%d\n", RemoteHost, RemotePort);
}
}
#endif
static void doSyslogd (void) __attribute__ ((noreturn));
static void doSyslogd (void)
{
@ -254,6 +329,12 @@ static void doSyslogd (void)
FD_ZERO (&fds);
FD_SET (sock_fd, &fds);
#ifdef BB_FEATURE_REMOTE_LOG
if (doRemoteLog == TRUE){
init_RemoteLog();
}
#endif
logMessage (0, "syslogd started: BusyBox v" BB_VER " (" BB_BT ")");
for (;;) {
@ -322,6 +403,13 @@ static void doKlogd (void)
signal(SIGKILL, klogd_signal);
signal(SIGTERM, klogd_signal);
signal(SIGHUP, SIG_IGN);
#ifdef BB_FEATURE_REMOTE_LOG
if (doRemoteLog == TRUE){
init_RemoteLog();
}
#endif
logMessage(0, "klogd started: "
"BusyBox v" BB_VER " (" BB_BT ")");
@ -423,6 +511,20 @@ extern int syslogd_main(int argc, char **argv)
logFilePath = *(++argv1);
stopDoingThat = TRUE;
break;
#ifdef BB_FEATURE_REMOTE_LOG
case 'R':
if (--argc == 0) {
usage(syslogd_usage);
}
RemoteHost = *(++argv1);
if ( (p = strchr(RemoteHost, ':'))){
RemotePort = atoi(p+1);
*p = '\0';
}
doRemoteLog = TRUE;
stopDoingThat = TRUE;
break;
#endif
default:
usage(syslogd_usage);
}

3
usage.c
View File

@ -998,6 +998,9 @@ const char syslogd_usage[] =
"\t-K\t\tDo not start up the klogd process\n"
#endif
"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
#ifdef BB_FEATURE_REMOTE_LOG
"\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
#endif
#endif
;
#endif