sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slcand: log to stdout when running in foreground 

when slcand runs in daemon mode, it makes sense to output via syslog.
but when running in foreground, it is nicer to have all the info on the stdout.
pull/15/head
IOhannes m zmölnig 2016-10-04 17:18:56 +02:00 committed by Marc Kleine-Budde
parent cddb2612b1
commit ea6219b0b4
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
slcand.c
View File

@ -39,6 +39,7 @@
#include <termios.h>
#include <linux/tty.h>
#include <linux/sockios.h>
#include <stdarg.h>
/* Change this to whatever your daemon is called */
#define DAEMON_NAME "slcand"
@ -54,6 +55,20 @@
#define FLOW_HW 1
#define FLOW_SW 2
static void fake_syslog(int priority, const char *format, ...)
{
va_list ap;
printf("[%d] ", priority);
va_start(ap, format);
vprintf(format, ap);
va_end(ap);
printf("\n");
}
typedef void (*syslog_t)(int priority, const char *format, ...);
static syslog_t syslogger = syslog;
void print_usage(char *prg)
{
fprintf(stderr, "\nUsage: %s [options] <tty> [canif-name]\n\n", prg);
@ -89,13 +104,13 @@ static void child_handler(int signum)
break;
case SIGALRM:
case SIGCHLD:
syslog(LOG_NOTICE, "received signal %i on %s", signum, ttypath);
syslogger(LOG_NOTICE, "received signal %i on %s", signum, ttypath);
exit_code = EXIT_FAILURE;
slcand_running = 0;
break;
case SIGINT:
case SIGTERM:
syslog(LOG_NOTICE, "received signal %i on %s", signum, ttypath);
syslogger(LOG_NOTICE, "received signal %i on %s", signum, ttypath);
exit_code = EXIT_SUCCESS;
slcand_running = 0;
break;
@ -242,6 +257,9 @@ int main(int argc, char *argv[])
}
}
if (!run_as_daemon)
syslogger = fake_syslog;
/* Initialize the logging interface */
openlog(DAEMON_NAME, LOG_PID, LOG_LOCAL5);
@ -259,12 +277,12 @@ int main(int argc, char *argv[])
else
snprintf(ttypath, TTYPATH_LENGTH, "%s", tty);
syslog(LOG_INFO, "starting on TTY device %s", ttypath);
syslogger(LOG_INFO, "starting on TTY device %s", ttypath);
/* Daemonize */
if (run_as_daemon) {
if (daemon(0, 0)) {
syslog(LOG_ERR, "failed to daemonize");
syslogger(LOG_ERR, "failed to daemonize");
exit(EXIT_FAILURE);
}
}
@ -280,7 +298,7 @@ int main(int argc, char *argv[])
/* Now we are a daemon -- do the work for which we were paid */
fd = open(ttypath, O_RDWR | O_NONBLOCK | O_NOCTTY);
if (fd < 0) {
syslog(LOG_NOTICE, "failed to open TTY device %s\n", ttypath);
syslogger(LOG_NOTICE, "failed to open TTY device %s\n", ttypath);
perror(ttypath);
exit(EXIT_FAILURE);
}
@ -288,7 +306,7 @@ int main(int argc, char *argv[])
/* Configure baud rate */
memset(&tios, 0, sizeof(struct termios));
if (tcgetattr(fd, &tios) < 0) {
syslog(LOG_NOTICE, "failed to get attributes for TTY device %s: %s\n", ttypath, strerror(errno));
syslogger(LOG_NOTICE, "failed to get attributes for TTY device %s: %s\n", ttypath, strerror(errno));
exit(EXIT_FAILURE);
}
@ -313,7 +331,7 @@ int main(int argc, char *argv[])
/* apply changes */
if (tcsetattr(fd, TCSADRAIN, &tios) < 0)
syslog(LOG_NOTICE, "Cannot set attributes for device \"%s\": %s!\n", ttypath, strerror(errno));
syslogger(LOG_NOTICE, "Cannot set attributes for device \"%s\": %s!\n", ttypath, strerror(errno));
if (speed) {
sprintf(buf, "C\rS%s\r", speed);
@ -350,7 +368,7 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
syslog(LOG_NOTICE, "attached TTY %s to netdevice %s\n", ttypath, buf);
syslogger(LOG_NOTICE, "attached TTY %s to netdevice %s\n", ttypath, buf);
/* try to rename the created netdevice */
if (name) {
@ -364,11 +382,11 @@ int main(int argc, char *argv[])
strncpy(ifr.ifr_newname, name, IFNAMSIZ);
if (ioctl(s, SIOCSIFNAME, &ifr) < 0) {
syslog(LOG_NOTICE, "netdevice %s rename to %s failed\n", buf, name);
syslogger(LOG_NOTICE, "netdevice %s rename to %s failed\n", buf, name);
perror("ioctl SIOCSIFNAME rename");
exit(EXIT_FAILURE);
} else
syslog(LOG_NOTICE, "netdevice %s renamed to %s\n", buf, name);
syslogger(LOG_NOTICE, "netdevice %s renamed to %s\n", buf, name);
close(s);
}
@ -379,7 +397,7 @@ int main(int argc, char *argv[])
sleep(1); /* wait 1 second */
/* Reset line discipline */
syslog(LOG_INFO, "stopping on TTY device %s", ttypath);
syslogger(LOG_INFO, "stopping on TTY device %s", ttypath);
ldisc = N_TTY;
if (ioctl(fd, TIOCSETD, &ldisc) < 0) {
perror("ioctl TIOCSETD");
@ -397,10 +415,10 @@ int main(int argc, char *argv[])
/* apply changes */
if (tcsetattr(fd, TCSADRAIN, &tios) < 0)
syslog(LOG_NOTICE, "Cannot set attributes for device \"%s\": %s!\n", ttypath, strerror(errno));
syslogger(LOG_NOTICE, "Cannot set attributes for device \"%s\": %s!\n", ttypath, strerror(errno));
/* Finish up */
syslog(LOG_NOTICE, "terminated on %s", ttypath);
syslogger(LOG_NOTICE, "terminated on %s", ttypath);
closelog();
return exit_code;
}