toybox: toys/pending/syslogd.c comparison

comparison toys/pending/syslogd.c @ 1026:09cc81f6e411 draft

syslogd: stop abusing arg_list

author	Felix Janda <felix.janda at posteo.de>
date	Fri, 23 Aug 2013 22:50:29 +0200
parents	f19286ac3e7f
children	4b0ad1c7af42

comparison

equal deleted inserted replaced

-:f19286ac3e7f
+:09cc81f6e411
 #define FOR_syslogd
 #define SYSLOG_NAMES
 #include "toys.h"
 #include "toynet.h"
+// UNIX Sockets for listening
+struct unsocks {
+struct unsocks *next;
+char *path;
+struct sockaddr_un sdu;
+int sd;
+};
+// Log file entry to log into.
+struct logfile {
+struct logfile *next;
+char *filename;
+char *config;
+int isNetwork;
+uint32_t facility[8];
+uint8_t level[LOG_NFACILITIES];
+int logfd;
+struct sockaddr_in saddr;
+};
 GLOBALS(
 char *socket;
 char *config_file;
 char *unix_socket;
 char *logfile;
 long rot_size;
 long rot_count;
 char *remote_log;
 long log_prio;
-struct arg_list *lsocks;  // list of listen sockets
+struct unsocks *lsocks;  // list of listen sockets
-struct arg_list *lfiles;  // list of write logfiles
+struct logfile *lfiles;  // list of write logfiles
 fd_set rfds;        // fds for reading
 int sd;            // socket for logging remote messeges.
 int sigfd[2];
 )
-// UNIX Sockets for listening
-struct unsocks {
-char *path;
-struct sockaddr_un sdu;
-int sd;
-};
-// Log file entry to log into.
-struct logfile {
-char *filename;
-char *config;
-int isNetwork;
-uint32_t facility[8];
-uint8_t level[LOG_NFACILITIES];
-int logfd;
-struct sockaddr_in saddr;
-};
 // Lookup numerical code from name
 // Also used in logger
 int logger_lookup(int where, char *key)
 {
 CODE *w = ((CODE *[]){facilitynames, prioritynames})[where];
 }
 // Adds opened socks to rfds for select()
 static int addrfds(void)
 {
-struct unsocks *sock;
+struct unsocks *sock = TT.lsocks;
 int ret = 0;
-struct arg_list *node = TT.lsocks;
 FD_ZERO(&TT.rfds);
-while (node) {
+for (; sock; sock = sock->next) {
-sock = (struct unsocks*) node->arg;
 if (sock->sd > 2) {
 FD_SET(sock->sd, &TT.rfds);
 ret = sock->sd;
 }
-node = node->next;
 }
 FD_SET(TT.sigfd[0], &TT.rfds);
 return (TT.sigfd[0] > ret) ? TT.sigfd[0] : ret;
 }
 * and opens socket for reading
 * and adds to global lsock list.
 */
 static int open_unix_socks(void)
 {
-struct arg_list *node;
 struct unsocks *sock;
 int ret = 0;
-for(node = TT.lsocks; node; node = node->next) {
+for(sock = TT.lsocks; sock; sock = sock->next) {
-sock = (struct unsocks*) node->arg;
 sock->sdu.sun_family = AF_UNIX;
 strcpy(sock->sdu.sun_path, sock->path);
 sock->sd = socket(AF_UNIX, SOCK_DGRAM, 0);
 if (sock->sd < 0) {
 perror_msg("OPEN SOCKS : failed");
 }
 chmod(sock->path, 0777);
 ret++;
 }
 return ret;
-}
-// Returns node having filename
-static struct arg_list *get_file_node(char *filename, struct arg_list *list)
-{
-while (list) {
-if (!strcmp(((struct logfile*) list->arg)->filename, filename)) return list;
-list = list->next;
-}
-return list;
 }
 /*
 * recurses the logfile list and resolves config
 * for evry file and updates facilty and log level bits.
 struct logfile *file;
 FILE *fp;
 char *confline = NULL, *tk = NULL, *tokens[2] = {NULL, NULL};
 int len, tcount, lineno = 0;
 size_t linelen;
-struct arg_list *node;
 /*
 * if -K then open only /dev/kmsg
 * all other log files are neglected
 * thus no need to open config either.
 */
 if (toys.optflags & FLAG_K) {
-node = xzalloc(sizeof(struct arg_list));
 file = xzalloc(sizeof(struct logfile));
 file->filename = "/dev/kmsg";
 file->config = "*.*";
 memset(file->level, 0xFF, sizeof(file->level));
 memset(file->facility, 0xFFFFFFFF, sizeof(file->facility));
-node->arg = (char*) file;
+TT.lfiles = file;
-TT.lfiles = node;
 return 0;
 }
 /*
 * if -R then add remote host to log list
 * if -L is not provided all other log
 * files are neglected thus no need to
 * open config either so just return.
 */
 if (toys.optflags & FLAG_R) {
-node = xzalloc(sizeof(struct arg_list));
 file = xzalloc(sizeof(struct logfile));
 file->filename = xmsprintf("@%s",TT.remote_log);
 file->isNetwork = 1;
 file->config = "*.*";
 memset(file->level, 0xFF, sizeof(file->level));
 memset(file->facility, 0xFFFFFFFF, sizeof(file->facility));
-node->arg = (char*) file;
+TT.lfiles = file;
-TT.lfiles = node;
 if (!(toys.optflags & FLAG_L)) return 0;
 }
 /*
 * Read config file and add logfiles to the list
 * with their configuration.
 if (*tokens[1] == '\0') {
 error_msg("bad line %d: 1 tokens found, 2 needed", lineno);
 return -1;
 }
 if (*tokens[1] != '*') {
-node = get_file_node(tokens[1], TT.lfiles);
+file = TT.lfiles;
-if (!node) {
+while (file && !strcmp(file->filename, tokens[1])) file = file->next;
-node = xzalloc(sizeof(struct arg_list));
+if (!file) {
 file = xzalloc(sizeof(struct logfile));
 file->config = xstrdup(tokens[0]);
 if (resolve_config(file)==-1) {
 error_msg("error in '%s' at line %d", TT.config_file, lineno);
 return -1;
 }
 file->filename = xstrdup(tokens[1]);
 if (*file->filename == '@') file->isNetwork = 1;
-node->arg = (char*) file;
+file->next = TT.lfiles;
-node->next = TT.lfiles;
+TT.lfiles = file;
-TT.lfiles = node;
 } else {
-file = (struct logfile*) node->arg;
 int rel = strlen(file->config) + strlen(tokens[0]) + 2;
 file->config = xrealloc(file->config, rel);
 sprintf(file->config, "%s;%s", file->config, tokens[0]);
 }
 }
 /*
 * Can't open config file or support is not enabled
 * adding default logfile to the head of list.
 */
 if (!fp){
-node = xzalloc(sizeof(struct arg_list));
 file = xzalloc(sizeof(struct logfile));
 file->filename = (toys.optflags & FLAG_O) ?
 TT.logfile : "/var/log/messages"; //DEFLOGFILE
 file->config = "*.*";
 memset(file->level, 0xFF, sizeof(file->level));
 memset(file->facility, 0xFFFFFFFF, sizeof(file->facility));
-node->arg = (char*) file;
+file->next = TT.lfiles;
-node->next = TT.lfiles;
+TT.lfiles = file;
-TT.lfiles = node;
 } else fclose(fp);
 return 0;
 }
 // open every log file in list.
 static void open_logfiles(void)
 {
-struct arg_list *node;
+struct logfile *tfd;
-for (node = TT.lfiles; node; node = node->next) {
+for (tfd = TT.lfiles; tfd; tfd = tfd->next) {
-struct logfile *tfd = (struct logfile*) node->arg;
 char *p, *tmpfile;
 long port = 514;
 if (tfd->isNetwork) {
 struct addrinfo *info, rp;
 {
 time_t now;
 char *p, *ts, *lvlstr, *facstr;
 struct utsname uts;
 int pri = 0;
-struct arg_list *lnode = TT.lfiles;
+struct logfile *tf = TT.lfiles;
 char *omsg = msg;
 int olen = len, fac, lvl;
 if (*msg == '<') { // Extract the priority no.
 if (toys.optflags & FLAG_S) len = sprintf(toybuf, "%s %s\n", ts, msg);
 else len = sprintf(toybuf, "%s %s %s.%s %s\n", ts, p, facstr, lvlstr, msg);
 }
 if (lvl >= TT.log_prio) return;
-while (lnode) {
+for (; tf; tf = tf->next) {
-struct logfile *tf = (struct logfile*) lnode->arg;
 if (tf->logfd > 0) {
 if ((tf->facility[lvl] & (1 << fac)) && (tf->level[fac] & (1<<lvl))) {
 int wlen;
 if (tf->isNetwork)
 wlen = sendto(tf->logfd, omsg, olen, 0, (struct sockaddr*)&tf->saddr, sizeof(tf->saddr));
 else wlen = write_rotate(tf, len);
 if (wlen < 0) perror_msg("write failed file : %s ", tf->filename + tf->isNetwork);
 }
 }
-lnode = lnode->next;
 }
 }
 /*
 * closes all read and write fds
 * and frees all nodes and lists
 */
 static void cleanup(void)
 {
-struct arg_list *fnode;
 while (TT.lsocks) {
-fnode = TT.lsocks;
+struct unsocks *fnode = TT.lsocks;
-if (((struct unsocks*) fnode->arg)->sd >= 0)
-close(((struct unsocks*) fnode->arg)->sd);
+if (fnode->sd >= 0) close(fnode->sd);
-free(fnode->arg);
 TT.lsocks = fnode->next;
 free(fnode);
 }
 unlink("/dev/log");
 while (TT.lfiles) {
-fnode = TT.lfiles;
+struct logfile *fnode = TT.lfiles;
-if (((struct logfile*) fnode->arg)->logfd >= 0)
-close(((struct logfile*) fnode->arg)->logfd);
+if (fnode->logfd >= 0) close(fnode->logfd);
-free(fnode->arg);
 TT.lfiles = fnode->next;
 free(fnode);
 }
 }
 void syslogd_main(void)
 {
 struct unsocks *tsd;
 int maxfd, retval, last_len=0;
 struct timeval tv;
-struct arg_list *node;
 char *temp, *buffer = (toybuf +2048), *last_buf = (toybuf + 3072); //these two buffs are of 1K each
 if ((toys.optflags & FLAG_p) && (strlen(TT.unix_socket) > 108))
 error_exit("Socket path should not be more than 108");
 TT.config_file = (toys.optflags & FLAG_f) ?
 TT.config_file : "/etc/syslog.conf"; //DEFCONFFILE
 init_jumpin:
-TT.lsocks = xzalloc(sizeof(struct arg_list));
 tsd = xzalloc(sizeof(struct unsocks));
 tsd->path = (toys.optflags & FLAG_p) ? TT.unix_socket : "/dev/log"; // DEFLOGSOCK
-TT.lsocks->arg = (char*) tsd;
+TT.lsocks = tsd;
 if (toys.optflags & FLAG_a) {
 for (temp = strtok(TT.socket, ":"); temp; temp = strtok(NULL, ":")) {
-struct arg_list *ltemp = xzalloc(sizeof(struct arg_list));
 if (strlen(temp) > 107) temp[108] = '\0';
 tsd = xzalloc(sizeof(struct unsocks));
 tsd->path = temp;
-ltemp->arg = (char*) tsd;
+tsd->next = TT.lsocks;
-ltemp->next = TT.lsocks;
+TT.lsocks = tsd;
-TT.lsocks = ltemp;
 }
 }
 if (!open_unix_socks()) {
 error_msg("Can't open single socket for listenning.");
 goto clean_and_exit;
 goto init_jumpin;
 default: break;
 }
 }
 if (retval > 0) { /* Some activity on listen sockets. */
-node = TT.lsocks;
+for (tsd = TT.lsocks; tsd; tsd = tsd->next) {
-while (node) {
+int sd = tsd->sd;
-int sd = ((struct unsocks*) node->arg)->sd;
 if (FD_ISSET(sd, &TT.rfds)) {
 int len = read(sd, buffer, 1023); //buffer is of 1K, hence readingonly 1023 bytes, 1 for NUL
 if (len > 0) {
 buffer[len] = '\0';
 if((toys.optflags & FLAG_D) && (len == last_len))
 last_len = len;
 logmsg(buffer, len);
 }
 break;
 }
-node = node->next;
 }
 }
 }
 clean_and_exit:
 logmsg("<46>syslogd exiting", 19);

Mercurial > hg > toybox

comparison toys/pending/syslogd.c @ 1026:09cc81f6e411 draft