Merge branch 'bug165-005-NETWORK' of git://arthur.barton.de/ngircd-alex

* 'bug165-005-NETWORK' of git://arthur.barton.de/ngircd-alex:
  Implement new configuration option "Network"

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index ab4023ac9c964471aa4e6b025d80a19221978c93..49768bc7e8f2b7974b0dd9c0048155bfdf7432c5 100644 (file)
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -387,6 +387,7 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
        CLIENT *from, *c, *c_next;
        char reason[COMMAND_LEN], class_c;
        struct list_head *list;
+       time_t timeout;
        int class;
 
        assert(Client != NULL);
@@ -431,8 +432,11 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
                }
        } else {
                /* Add new mask to list */
+               timeout = atol(Req->argv[1]);
+               if (timeout > 0)
+                       timeout += time(NULL);
                if (Class_AddMask(class, Req->argv[0],
-                                 time(NULL) + atol(Req->argv[1]),
+                                 timeout,
                                  Req->argv[2])) {
                        Log(LOG_NOTICE|LOG_snotice,
                            "\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).",

diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c
index 09afbfd18cb13d1c70495c2175e8df5422d4dd00..9e6bd228bae0df847ab6d32fc52401d9bfc0aa37 100644 (file)
--- a/src/portab/portabtest.c
+++ b/src/portab/portabtest.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
  *
  * 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
@@ -24,40 +24,162 @@
 
 #include "exp.h"
 
+static void
+Panic(char *Reason)
+{
+       /* Oops, something failed!? */
+       fprintf(stderr, "Oops, test for %s failed!?\n", Reason);
+       exit(1);
+} /* Panic */
 
-static void Panic PARAMS (( char *Reason, int Code ));
+static void
+Check_snprintf(void)
+{
+       char str[5];
 
+       snprintf(str, sizeof(str), "%s", "1234567890");
+       if (str[4] != '\0')
+               Panic("snprintf NULL byte");
+       if (strlen(str) != 4)
+               Panic("snprintf string length");
+}
 
-GLOBAL int
-main( void )
+static void
+Check_strdup(void)
 {
-       /* validate datatypes */
-       if( false != 0 ) Panic( "false", 1 );
-       if( true != 1 ) Panic( "true", 1 );
-       if( sizeof( UINT8 ) != 1 ) Panic( "UINT8", 1 );
-       if( sizeof( UINT16 ) != 2 ) Panic( "UINT16", 1 );
-       if( sizeof( UINT32 ) != 4 ) Panic( "UINT32", 1 );
+       char *ptr;
+
+       ptr = strdup("1234567890");
+       if (!ptr)
+               Panic("strdup");
+       if (ptr[10] != '\0')
+               Panic("strdup NULL byte");
+       if (strlen(ptr) != 10)
+               Panic("strdup string length");
+       free(ptr);
+}
+
+static void
+Check_strndup(void)
+{
+       char *ptr;
+
+       ptr = strndup("1234567890", 5);
+       if (!ptr)
+               Panic("strndup");
+       if (ptr[5] != '\0')
+               Panic("strndup NULL byte");
+       if (strlen(ptr) != 5)
+               Panic("strndup string length");
+       free(ptr);
+}
+
+static void
+Check_strlcpy(void)
+{
+       char str[5];
+
+       if (strlcpy(str, "1234567890", sizeof(str)) != 10)
+               Panic("strlcpy return code");
+       if (str[4] != '\0')
+               Panic("strlcpy NULL byte");
+       if (strlen(str) != 4)
+               Panic("strlcpy string length");
+}
+
+static void
+Check_strlcat(void)
+{
+       char str[5];
+
+       if (strlcpy(str, "12", sizeof(str)) != 2)
+               Panic("strlcpy for strlcat");
+       if (strlcat(str, "1234567890", sizeof(str)) != 12)
+               Panic("strlcat return code");
+       if (str[4] != '\0')
+               Panic("strlcat NULL byte");
+       if (strlen(str) != 4)
+               Panic("strlcat string length");
+}
+
+static void
+Check_strtok_r(void)
+{
+       char *ptr, *last;
+
+       ptr = strdup("12,abc");
+
+       ptr = strtok_r(ptr, ",", &last);
+       if (!ptr)
+               Panic("strtok_r result #1");
+       if (strcmp(ptr, "12") != 0)
+               Panic("strtok_r token #1");
+
+       ptr = strtok_r(NULL, ",", &last);
+       if (!ptr)
+               Panic("strtok_r result #2");
+       if (strcmp(ptr, "abc") != 0)
+               Panic("strtok_r token #2");
+
+       ptr = strtok_r(NULL, ",", &last);
+       if (ptr)
+               Panic("strtok_r result #3");
+}
 
 #ifdef PROTOTYPES
-       /* check functions */
-       if( ! snprintf ) Panic( "snprintf", 2 );
-       if( ! vsnprintf ) Panic( "vsnprintf", 2 );
-       if( ! strlcpy ) Panic( "strlcpy", 2 );
-       if( ! strlcat ) Panic( "strlcat", 2 );
+static void
+Check_vsnprintf(const int Len, const char *Format, ...)
+#else
+static void
+Check_vsnprintf(Len, Format, va_alist)
+const int Len;
+const char *Format;
+va_dcl
 #endif
-       
-       /* ok, no error */
-       return 0;
-} /* portab_check_types */
+{
+       char str[5];
+       va_list ap;
 
+#ifdef PROTOTYPES
+       va_start(ap, Format);
+#else
+       va_start(ap);
+#endif
+       if (vsnprintf(str, sizeof(str), Format, ap) != Len)
+               Panic("vsnprintf return code");
+       va_end(ap);
 
-static void
-Panic( char *Reason, int Code )
+       if (str[4] != '\0')
+               Panic("vsnprintf NULL byte");
+       if (strlen(str) != 4)
+               Panic("vsnprintf string length");
+}
+
+GLOBAL int
+main(void)
 {
-       /* Oops, something failed!? */
-       fprintf( stderr, "Oops, test for %s failed!?", Reason );
-       exit( Code );
-} /* Panic */
+       /* validate datatypes */
+       if (false != 0)
+               Panic("false");
+       if (true != 1)
+               Panic("true");
+       if (sizeof(UINT8) != 1)
+               Panic("UINT8");
+       if (sizeof(UINT16) != 2)
+               Panic("UINT16");
+       if (sizeof(UINT32) != 4)
+               Panic("UINT32");
 
+       /* check functions */
+       Check_snprintf();
+       Check_strdup();
+       Check_strndup();
+       Check_strlcpy();
+       Check_strlcat();
+       Check_strtok_r();
+       Check_vsnprintf(2+10, "%s%s", "ab", "1234567890");
+       
+       return 0;
+}
 
 /* -eof- */