New functions ngt_SyslogFacilityName() and ngt_SyslogFacilityID()

[ngircd-alex.git] / src / tool / tool.c

diff --git a/src/tool/tool.c b/src/tool/tool.c
index dc2384519cd54e6337a0fd2cdc35722a83ecb257..fa69ffb12e654a1cbd008e37119fa06c914d7e5f 100644 (file)
--- a/src/tool/tool.c
+++ b/src/tool/tool.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,6 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: tool.c,v 1.7 2007/11/23 16:26:05 fw Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <ctype.h>
@@ -23,8 +21,10 @@ static char UNUSED id[] = "$Id: tool.c,v 1.7 2007/11/23 16:26:05 fw Exp $";
 #include <string.h>
 
 #include <netinet/in.h>
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
+
+#ifdef SYSLOG
+#define SYSLOG_NAMES 1
+#include <syslog.h>
 #endif
 
 #include "exp.h"
@@ -68,25 +68,40 @@ ngt_TrimStr(char *String)
 } /* ngt_TrimStr */
 
 
+/**
+ * Convert a string to uppercase letters.
+ */
 GLOBAL char *
-ngt_LowerStr( char *String )
+ngt_UpperStr(char *String)
 {
-       /* String in Kleinbuchstaben konvertieren. Der uebergebene
-        * Speicherbereich wird durch das Ergebnis ersetzt, zusaetzlich
-        * wird dieser auch als Pointer geliefert. */
+       char *ptr;
+
+       assert(String != NULL);
+
+       ptr = String;
+       while(*ptr) {
+               *ptr = toupper(*ptr);
+               ptr++;
+       }
+       return String;
+} /* ngt_UpperStr */
 
+
+/**
+ * Convert a string to lowercase letters.
+ */
+GLOBAL char *
+ngt_LowerStr(char *String)
+{
        char *ptr;
 
-       assert( String != NULL );
+       assert(String != NULL);
 
-       /* Zeichen konvertieren */
        ptr = String;
-       while( *ptr )
-       {
-               *ptr = tolower( *ptr );
+       while(*ptr) {
+               *ptr = tolower(*ptr);
                ptr++;
        }
-       
        return String;
 } /* ngt_LowerStr */
 
@@ -97,35 +112,107 @@ ngt_TrimLastChr( char *String, const char Chr)
        /* If last character in the string matches Chr, remove it.
         * Empty strings are handled correctly. */
 
-        unsigned int len;
+       size_t len;
 
-       assert( String != NULL );
+       assert(String != NULL);
 
-       len = strlen( String );
-       if( len == 0 ) return;
+       len = strlen(String);
+       if(len == 0)
+               return;
 
        len--;
 
-       if( String[len] == Chr ) String[len] = '\0';
+       if(String[len] == Chr)
+               String[len] = '\0';
 } /* ngt_TrimLastChr */
 
 
-GLOBAL bool
-ngt_IPStrToBin(const char *ip_str, struct in_addr *inaddr)
-{
-       /* AF is always AF_INET for now */
-#ifdef HAVE_INET_ATON
-       if (inet_aton(ip_str, inaddr) == 0)
-               return false;
-#else
-       inaddr->s_addr = inet_addr(ip_str);
-       if (inaddr->s_addr == (unsigned)-1)
-               return false;
+#ifdef SYSLOG
+
+
+#ifndef INTERNAL_MARK
+
+#ifndef _code
+typedef struct _code {
+        char    *c_name;
+        int     c_val;
+} CODE;
 #endif
-       return true;
+
+CODE facilitynames[] = {
+#ifdef LOG_AUTH
+       { "auth",       LOG_AUTH },
+#endif
+#ifdef LOG_AUTHPRIV
+       { "authpriv",   LOG_AUTHPRIV },
+#endif
+#ifdef LOG_CRON
+       { "cron",       LOG_CRON },
+#endif
+#ifdef LOG_DAEMON
+       { "daemon",     LOG_DAEMON },
+#endif
+#ifdef LOG_FTP
+       { "ftp",        LOG_FTP },
+#endif
+#ifdef LOG_LPR
+       { "lpr",        LOG_LPR },
+#endif
+#ifdef LOG_MAIL
+       { "mail",       LOG_MAIL },
+#endif
+#ifdef LOG_NEWS
+       { "news",       LOG_NEWS },
+#endif
+#ifdef LOG_UUCP
+       { "uucp",       LOG_UUCP },
+#endif
+#ifdef LOG_USER
+       { "user",       LOG_USER },
+#endif
+#ifdef LOG_LOCAL7
+       { "local0",     LOG_LOCAL0 },
+       { "local1",     LOG_LOCAL1 },
+       { "local2",     LOG_LOCAL2 },
+       { "local3",     LOG_LOCAL3 },
+       { "local4",     LOG_LOCAL4 },
+       { "local5",     LOG_LOCAL5 },
+       { "local6",     LOG_LOCAL6 },
+       { "local7",     LOG_LOCAL7 },
+#endif
+       { 0,            -1 }
+};
+
+#endif
+
+
+GLOBAL char
+*ngt_SyslogFacilityName(int Facility)
+{
+       int i = 0;
+       while(facilitynames[i].c_name) {
+               if (facilitynames[i].c_val == Facility)
+                       return facilitynames[i].c_name;
+               i++;
+       }
+       return "unknown";
 }
 
 
+GLOBAL int
+ngt_SyslogFacilityID(char *Name, int DefaultFacility)
+{
+       int i = 0;
+       while(facilitynames[i].c_name) {
+               if (strcasecmp(facilitynames[i].c_name, Name) == 0)
+                       return facilitynames[i].c_val;
+               i++;
+       }
+       return DefaultFacility;
+}
+
+
+#endif
 
 
 /* -eof- */