- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : doc/Platforms.txt: add OpenBSD 5.4 on HPPA
by alex＠arthur.barton.de 12 Nov '13

12 Nov '13

Module: ngircd.git Branch: master Commit: df7ea9e7b4a3953e8ee2e60865e20984fbc3895a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=df7ea9e7… Author: Alexander Barton <alex(a)barton.de> Date: Tue Nov 12 00:33:30 2013 +0100 doc/Platforms.txt: add OpenBSD 5.4 on HPPA --- doc/Platforms.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 5d53451..b0b487b 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -31,6 +31,7 @@ armv6l/unk./linux-gnueabi gcc 4.7.2 20.2 13-03-08 goetz Y Y Y Y 5 armv6l/unk./linux-gnueabihf gcc 4.6.3 21~rc2 13-10-26 pi Y Y Y Y 5 armv7l/unk./linux-gnueabi gcc 4.4.3 19.1 12-04-29 goetz Y Y Y Y 5 hppa/unknown/openbsd3.5 gcc 2.95.3 CVSHEAD 04-05-25 alex Y Y Y Y +hppa/unknown/openbsd5.4 gcc 4.2.1 21 13-11-10 alex Y Y Y Y 3 hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y hppa2.0/unknown/linux-gnu gcc 3.3.5 13~rc1 08-12-02 alex Y Y Y Y hppa2.0w-hp-hpux11.11 gcc 4.2.3 14.1 09-07-22 goetz Y Y Y Y

1 0

Alexander Barton : configure: clean up function definitions
by alex＠arthur.barton.de 12 Nov '13

12 Nov '13

Module: ngircd.git Branch: master Commit: 34824abe0dbf86477ec77385ed97c25f0a2375d8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=34824abe… Author: Alexander Barton <alex(a)barton.de> Date: Tue Nov 12 00:25:28 2013 +0100 configure: clean up function definitions --- configure.ng | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ng b/configure.ng index b9e9270..9a4cc99 100644 --- a/configure.ng +++ b/configure.ng @@ -75,23 +75,26 @@ AC_C_CONST AC_C_INLINE __ng_PROTOTYPES__ -# -- Hard coded system and compiler dependencies/features/options ... -- +# -- Function Definitions -- AC_DEFUN([GCC_STACK_PROTECT_CC],[ - ssp_cc=yes - # we use -fstack-protector-all for the test to enfoce the use of the guard variable - AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector]) - ssp_old_cflags="$CFLAGS" - CFLAGS="$CFLAGS -fstack-protector-all" - AC_TRY_LINK(,,, ssp_cc=no) - echo $ssp_cc - CFLAGS="$ssp_old_cflags" - if test "X$ssp_cc" = "Xyes"; then - CFLAGS="$CFLAGS -fstack-protector" - AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.]) - fi + ssp_cc=yes + # Use -fstack-protector-all for the test to enfoce the use of the + # guard variable + AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector]) + ssp_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fstack-protector-all" + AC_TRY_LINK(,,, ssp_cc=no) + echo $ssp_cc + CFLAGS="$ssp_old_cflags" + if test "X$ssp_cc" = "Xyes"; then + CFLAGS="$CFLAGS -fstack-protector" + AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.]) + fi ]) +# -- Hard coded system and compiler dependencies/features/options ... -- + if test "$GCC" = "yes"; then # We are using the GNU C compiler. Good! CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"

1 0

Alexander Barton : Only use unsetenv() when it is available
by alex＠arthur.barton.de 12 Nov '13

12 Nov '13

Module: ngircd.git Branch: master Commit: ae00c100acdb4d2d3f99524d30258d07eefcfb6d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ae00c100… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 10 17:08:41 2013 +0100 Only use unsetenv() when it is available AIX 4.3 dosn't support it, for example. --- configure.ng | 2 +- src/ngircd/conn.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ng b/configure.ng index e3f51cf..b9e9270 100644 --- a/configure.ng +++ b/configure.ng @@ -189,7 +189,7 @@ AC_CHECK_FUNCS([ \ AC_CHECK_FUNCS_ONCE([ \ arc4random arc4random_stir gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat \ - strtok_r waitpid]) + strtok_r unsetenv waitpid]) # -- Configuration options -- diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 324fa42..e8bfcf1 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -152,7 +152,9 @@ my_sd_listen_fds(void) if (!e || !*e) return -1; count = atoi(e); +#ifdef HAVE_UNSETENV unsetenv("LISTEN_FDS"); +#endif return count; }

1 0

Alexander Barton : conf-ssl.h: make code compatible with pre-ANSI C compilers
by alex＠arthur.barton.de 09 Nov '13

09 Nov '13

Module: ngircd.git Branch: master Commit: 61d1c864c55291c1f5f81f284e984b044fe2722f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=61d1c864… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 9 23:42:56 2013 +0100 conf-ssl.h: make code compatible with pre-ANSI C compilers --- src/ngircd/conf-ssl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/conf-ssl.h b/src/ngircd/conf-ssl.h index 439298c..c237379 100644 --- a/src/ngircd/conf-ssl.h +++ b/src/ngircd/conf-ssl.h @@ -42,7 +42,7 @@ struct ConnSSL_State { #endif -bool ConnSSL_InitLibrary(void); +GLOBAL bool ConnSSL_InitLibrary PARAMS((void)); #endif /* conf_ssl_h */

1 0

Alexander Barton : vsnprintf.c: make code compatible with ansi2knr tool
by alex＠arthur.barton.de 09 Nov '13

09 Nov '13

Module: ngircd.git Branch: master Commit: 8d25044ce515e25f453d22426c484a11d00af0f1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8d25044c… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 9 23:41:20 2013 +0100 vsnprintf.c: make code compatible with ansi2knr tool --- src/portab/vsnprintf.c | 67 +++++++++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/src/portab/vsnprintf.c b/src/portab/vsnprintf.c index 843f4ff..39a6c5f 100644 --- a/src/portab/vsnprintf.c +++ b/src/portab/vsnprintf.c @@ -107,15 +107,16 @@ void dummy_snprintf PARAMS(( void )) { } #define LLONG long #endif -static size_t dopr(char *buffer, size_t maxlen, const char *format, - va_list args); -static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, - char *value, int flags, int min, int max); -static void fmtint(char *buffer, size_t *currlen, size_t maxlen, - long value, int base, int min, int max, int flags); -static void fmtfp(char *buffer, size_t *currlen, size_t maxlen, - LDOUBLE fvalue, int min, int max, int flags); -static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c); +static size_t dopr PARAMS((char *buffer, size_t maxlen, const char *format, + va_list args)); +static void fmtstr PARAMS((char *buffer, size_t *currlen, size_t maxlen, + char *value, int flags, int min, int max)); +static void fmtint PARAMS((char *buffer, size_t *currlen, size_t maxlen, + long value, int base, int min, int max, int flags)); +static void fmtfp PARAMS((char *buffer, size_t *currlen, size_t maxlen, + LDOUBLE fvalue, int min, int max, int flags)); +static void dopr_outch PARAMS((char *buffer, size_t *currlen, size_t maxlen, + char c)); /* * dopr(): poor man's version of doprintf @@ -151,7 +152,8 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c); #define MAX(p,q) (((p) >= (q)) ? (p) : (q)) #endif -static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args) +static size_t +dopr(char *buffer, size_t maxlen, const char *format, va_list args) { char ch; LLONG value; @@ -408,8 +410,9 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args return currlen; } -static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, - char *value, int flags, int min, int max) +static void +fmtstr(char *buffer, size_t *currlen, size_t maxlen, char *value, int flags, + int min, int max) { int padlen, strln; /* amount to pad */ int cnt = 0; @@ -446,8 +449,9 @@ static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, /* Have to handle DP_F_NUM (ie 0x and 0 alternates) */ -static void fmtint(char *buffer, size_t *currlen, size_t maxlen, - long value, int base, int min, int max, int flags) +static void +fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base, + int min, int max, int flags) { int signvalue = 0; unsigned long uvalue; @@ -530,7 +534,8 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen, } } -static LDOUBLE abs_val(LDOUBLE value) +static LDOUBLE +abs_val(LDOUBLE value) { LDOUBLE result = value; @@ -540,7 +545,8 @@ static LDOUBLE abs_val(LDOUBLE value) return result; } -static LDOUBLE POW10(int exp) +static LDOUBLE +POW10(int exp) { LDOUBLE result = 1; @@ -552,7 +558,8 @@ static LDOUBLE POW10(int exp) return result; } -static LLONG ROUND(LDOUBLE value) +static LLONG +ROUND(LDOUBLE value) { LLONG intpart; @@ -565,7 +572,8 @@ static LLONG ROUND(LDOUBLE value) /* a replacement for modf that doesn't need the math library. Should be portable, but slow */ -static double my_modf(double x0, double *iptr) +static double +my_modf(double x0, double *iptr) { int i; long l; @@ -599,8 +607,9 @@ static double my_modf(double x0, double *iptr) } -static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, - LDOUBLE fvalue, int min, int max, int flags) +static void +fmtfp (char *buffer, size_t *currlen, size_t maxlen, LDOUBLE fvalue, + int min, int max, int flags) { int signvalue = 0; double ufvalue; @@ -745,7 +754,8 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, } } -static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) +static void +dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) { if (*currlen < maxlen) { buffer[(*currlen)] = c; @@ -754,14 +764,25 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) } #if !defined(HAVE_VSNPRINTF) -int vsnprintf (char *str, size_t count, const char *fmt, va_list args) +int +vsnprintf (char *str, size_t count, const char *fmt, va_list args) { return dopr(str, count, fmt, args); } #endif #if !defined(HAVE_SNPRINTF) -int snprintf(char *str,size_t count,const char *fmt,...) +#ifdef PROTOTYPES +int +snprintf(char *str, size_t count, const char *fmt, ...) +#else +int +snprintf(str, count, fmt, va_alist) +char *str; +size_t count; +const char *fmt; +va_dcl +#endif { size_t ret; va_list ap;

1 0

Alexander Barton : Remove unused vsnprintf.c test function
by alex＠arthur.barton.de 09 Nov '13

09 Nov '13

Module: ngircd.git Branch: master Commit: c3c719b978698f016c7084f2b88c70523f73cf68 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c3c719b9… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 9 23:31:51 2013 +0100 Remove unused vsnprintf.c test function --- src/portab/vsnprintf.c | 144 ------------------------------------------------ 1 file changed, 144 deletions(-) diff --git a/src/portab/vsnprintf.c b/src/portab/vsnprintf.c index c97a53e..843f4ff 100644 --- a/src/portab/vsnprintf.c +++ b/src/portab/vsnprintf.c @@ -72,7 +72,6 @@ * removed [v]asprintf() and C99 tests: not needed by ngIRCd. */ - #ifdef HAVE_STRING_H #include <string.h> #endif @@ -88,7 +87,6 @@ #include <stdlib.h> #endif - #if defined(HAVE_SNPRINTF) && defined(HAVE_VSNPRINTF) /* only include stdio.h if we are not re-defining snprintf or vsnprintf */ #include <stdio.h> @@ -638,14 +636,6 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, } } -#if 0 - if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */ -#endif - -#if 0 - if (max == 0) ufvalue += 0.5; /* if max = 0 we must round */ -#endif - /* * Sorry, we only support 16 digits past the decimal because of our * conversion method @@ -785,138 +775,4 @@ int snprintf(char *str,size_t count,const char *fmt,...) #endif - -#ifdef TEST_SNPRINTF -int sprintf(char *str,const char *fmt,...); -int main (void) -{ - char buf1[1024]; - char buf2[1024]; - char *fp_fmt[] = { - "%1.1f", - "%-1.5f", - "%1.5f", - "%123.9f", - "%10.5f", - "% 10.5f", - "%+22.9f", - "%+4.9f", - "%01.3f", - "%4f", - "%3.1f", - "%3.2f", - "%.0f", - "%f", - "-16.16f", - NULL - }; - double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, - 0.9996, 1.996, 4.136, 0}; - char *int_fmt[] = { - "%-1.5d", - "%1.5d", - "%123.9d", - "%5.5d", - "%10.5d", - "% 10.5d", - "%+22.33d", - "%01.3d", - "%4d", - "%d", - NULL - }; - long int_nums[] = { -1, 134, 91340, 341, 0203, 0}; - char *str_fmt[] = { - "10.5s", - "5.10s", - "10.1s", - "0.10s", - "10.0s", - "1.10s", - "%s", - "%.1s", - "%.10s", - "%10s", - NULL - }; - char *str_vals[] = {"hello", "a", "", "a longer string", NULL}; - int x, y; - int fail = 0; - int num = 0; - - printf ("Testing snprintf format codes against system sprintf...\n"); - - for (x = 0; fp_fmt[x] ; x++) { - for (y = 0; fp_nums[y] != 0 ; y++) { - int l1 = snprintf(NULL, 0, fp_fmt[x], fp_nums[y]); - int l2 = snprintf(buf1, sizeof(buf1), fp_fmt[x], fp_nums[y]); - sprintf (buf2, fp_fmt[x], fp_nums[y]); - if (strcmp (buf1, buf2)) { - printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", - fp_fmt[x], buf1, buf2); - fail++; - } - if (l1 != l2) { - printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, fp_fmt[x]); - fail++; - } - num++; - } - } - - for (x = 0; int_fmt[x] ; x++) { - for (y = 0; int_nums[y] != 0 ; y++) { - int l1 = snprintf(NULL, 0, int_fmt[x], int_nums[y]); - int l2 = snprintf(buf1, sizeof(buf1), int_fmt[x], int_nums[y]); - sprintf (buf2, int_fmt[x], int_nums[y]); - if (strcmp (buf1, buf2)) { - printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", - int_fmt[x], buf1, buf2); - fail++; - } - if (l1 != l2) { - printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, int_fmt[x]); - fail++; - } - num++; - } - } - - for (x = 0; str_fmt[x] ; x++) { - for (y = 0; str_vals[y] != 0 ; y++) { - int l1 = snprintf(NULL, 0, str_fmt[x], str_vals[y]); - int l2 = snprintf(buf1, sizeof(buf1), str_fmt[x], str_vals[y]); - sprintf (buf2, str_fmt[x], str_vals[y]); - if (strcmp (buf1, buf2)) { - printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", - str_fmt[x], buf1, buf2); - fail++; - } - if (l1 != l2) { - printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, str_fmt[x]); - fail++; - } - num++; - } - } - - printf ("%d tests failed out of %d.\n", fail, num); - - printf("seeing how many digits we support\n"); - { - double v0 = 0.12345678901234567890123456789012345678901; - for (x=0; x<100; x++) { - snprintf(buf1, sizeof(buf1), "%1.1f", v0*pow(10, x)); - sprintf(buf2, "%1.1f", v0*pow(10, x)); - if (strcmp(buf1, buf2)) { - printf("we seem to support %d digits\n", x-1); - break; - } - } - } - return 0; -} -#endif /* SNPRINTF_TEST */ - - /* -eof- */

1 0

Federico G. Schwindt : Add comments around some IRC_SetPenalty() calls
by alex＠arthur.barton.de 09 Nov '13

09 Nov '13

Module: ngircd.git Branch: master Commit: 9ee3760493a8c64f7d84ffb69c0b04a3e1a8a1c0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9ee37604… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Nov 7 18:17:58 2013 +0000 Add comments around some IRC_SetPenalty() calls --- src/ngircd/irc-info.c | 3 ++- src/ngircd/irc-oper.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index f1d0271..56cae2a 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -189,7 +189,7 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) } } - /* If there are a lot of clients, augment penalty a bit */ + /* If there are a lot of clients, increase the penalty a bit */ if (count > MAX_RPL_WHO) IRC_SetPenalty(Client, 1); @@ -1233,6 +1233,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) continue; } got_wildcard = true; + /* Increase penalty for wildcard queries */ IRC_SetPenalty(Client, 3); for (c = Client_First(); c; c = Client_Next(c)) { diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 0b50bca..ab4023a 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -50,6 +50,7 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) { Log(LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s", Client_Mask(Client), errtoken, errmsg); + /* Increase penalty to slow down possible brute force attacks */ IRC_SetPenalty(Client, 10); return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG, Client_ID(Client));

1 0

Federico G. Schwindt : Rework the penalty handling slightly
by alex＠arthur.barton.de 09 Nov '13

09 Nov '13

Module: ngircd.git Branch: master Commit: 344185b1bd6254ac4a198b3caeaf08db285016c8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=344185b1… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Nov 7 16:53:29 2013 +0000 Rework the penalty handling slightly Increase the penalty for a command before checking its arguments. This makes the handling more consistent and allow us to move more penalties to Handle_Request(). --- src/ngircd/irc-info.c | 5 ----- src/ngircd/irc-mode.c | 2 -- src/ngircd/parse.c | 10 +++++----- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 202f427..f1d0271 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -152,8 +152,6 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) assert( Client != NULL ); assert( Chan != NULL ); - IRC_SetPenalty(Client, 1); - is_member = Channel_IsMemberOf(Chan, Client); /* Secret channel? */ @@ -1152,7 +1150,6 @@ IRC_WHO(CLIENT *Client, REQUEST *Req) } /* No channel or (valid) mask given */ - IRC_SetPenalty(Client, 2); return IRC_WHO_Mask(Client, NULL, only_ops); } /* IRC_WHO */ @@ -1175,8 +1172,6 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - IRC_SetPenalty(Client, 1); - /* Wrong number of parameters? */ if (Req->argc < 1) return IRC_WriteErrClient(Client, ERR_NONICKNAMEGIVEN_MSG, diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 8e76db1..a29ed23 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -357,7 +357,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) Client_Modes(Target)); } - IRC_SetPenalty(Client, 1); return ok; } /* Client_Mode */ @@ -918,7 +917,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) } } - IRC_SetPenalty(Client, 1); return connected; } /* Channel_Mode */ diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 4235497..fdb957c 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -86,7 +86,7 @@ static COMMAND My_Commands[] = _CMD("LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 2, 2), _CMD("LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 2, 1), _CMD("METADATA", IRC_METADATA, CLIENT_SERVER, 3, 3, 0), - _CMD("MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1, 0), + _CMD("MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1, 1), _CMD("MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 1, 3), _CMD("NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 2, 1), _CMD("NICK", IRC_NICK, CLIENT_ANY, 0, -1, 0), @@ -119,7 +119,7 @@ static COMMAND My_Commands[] = _CMD("WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 1, 1, 0), _CMD("WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 4, 4, 0), _CMD("WHO", IRC_WHO, CLIENT_USER, 0, 2, 1), - _CMD("WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), + _CMD("WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1, 1), _CMD("WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), #ifdef IRCPLUS @@ -533,14 +533,14 @@ Handle_Request( CONN_ID Idx, REQUEST *Req ) Client_ID(client)); } + if (cmd->penalty) + IRC_SetPenalty(client, cmd->penalty); + if (Req->argc < cmd->min_argc || (cmd->max_argc != -1 && Req->argc > cmd->max_argc)) return IRC_WriteErrClient(client, ERR_NEEDMOREPARAMS_MSG, Client_ID(client), Req->command); - if (cmd->penalty) - IRC_SetPenalty(client, cmd->penalty); - /* Command is allowed for this client: call it and count * generated bytes in output */ Conn_ResetWCounter();

1 0

Federico G. Schwindt : Move IRC_SetPenalty() to Handle_Request() when possible
by alex＠arthur.barton.de 09 Nov '13

09 Nov '13

Module: ngircd.git Branch: master Commit: fcf61e9e0264d081e72eedddbd4a45b619e82b01 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fcf61e9e… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Nov 7 16:29:21 2013 +0000 Move IRC_SetPenalty() to Handle_Request() when possible This centralizes the penalty handling. It also exposes some commands that lack it for our attention. --- src/ngircd/irc-channel.c | 4 -- src/ngircd/irc-info.c | 25 --------- src/ngircd/irc.c | 4 -- src/ngircd/parse.c | 129 ++++++++++++++++++++++++---------------------- src/ngircd/parse.h | 1 + 5 files changed, 67 insertions(+), 96 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=fcf6…

1 0

Federico G. Schwindt : Introduce a macro to define the command list
by alex＠arthur.barton.de 09 Nov '13

09 Nov '13

Module: ngircd.git Branch: master Commit: 9f236c4b9155f3d4f1c7f1bf3b22e8a106e29df3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9f236c4b… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Nov 7 13:20:08 2013 +0000 Introduce a macro to define the command list This will pave the way to other changes and simplifies the entries somewhat. --- src/ngircd/parse.c | 125 +++++++++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 5295440..ae6f4d2 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -60,78 +60,81 @@ struct _NUMERIC { static COMMAND My_Commands[] = { - { "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 }, - { "AWAY", IRC_AWAY, CLIENT_USER, 0, 1, 0, 0, 0 }, - { "CAP", IRC_CAP, CLIENT_ANY, 1, 2, 0, 0, 0 }, - { "CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 }, +#define _CMD(name, func, type, min, max) \ + { (name), (func), (type), (min), (max), 0, 0, 0 } + _CMD("ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 1), + _CMD("AWAY", IRC_AWAY, CLIENT_USER, 0, 1), + _CMD("CAP", IRC_CAP, CLIENT_ANY, 1, 2), + _CMD("CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, -1), #ifdef STRICT_RFC - { "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0, 0, 0 }, + _CMD("DIE", IRC_DIE, CLIENT_USER, 0, 0), #else - { "DIE", IRC_DIE, CLIENT_USER, 0, 1, 0, 0, 0 }, + _CMD("DIE", IRC_DIE, CLIENT_USER, 0, 1), #endif - { "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 1, 1, 0, 0, 0 }, - { "ERROR", IRC_ERROR, CLIENT_ANY, 0, -1, 0, 0, 0 }, - { "GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 }, - { "HELP", IRC_HELP, CLIENT_USER, 0, 1, 0, 0, 0 }, - { "INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 }, - { "INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2, 0, 0, 0 }, - { "ISON", IRC_ISON, CLIENT_USER, 1, -1, 0, 0, 0 }, - { "JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 1, 2, 0, 0, 0 }, - { "KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 2, 3, 0, 0, 0 }, - { "KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 2, 2, 0, 0, 0 }, - { "KLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 }, - { "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 }, - { "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 }, - { "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 }, - { "METADATA", IRC_METADATA, CLIENT_SERVER, 3, 3, 0, 0, 0 }, - { "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1, 0, 0, 0 }, - { "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 }, - { "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 }, - { "NICK", IRC_NICK, CLIENT_ANY, 0, -1, 0, 0, 0 }, - { "NJOIN", IRC_NJOIN, CLIENT_SERVER, 2, 2, 0, 0, 0 }, - { "NOTICE", IRC_NOTICE, CLIENT_ANY, 0, -1, 0, 0, 0 }, - { "OPER", IRC_OPER, CLIENT_USER, 2, 2, 0, 0, 0 }, - { "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 1, 2, 0, 0, 0 }, - { "PASS", IRC_PASS, CLIENT_ANY, 0, -1, 0, 0, 0 }, - { "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 }, - { "PONG", IRC_PONG, CLIENT_ANY, 0, -1, 0, 0, 0 }, - { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 }, - { "QUIT", IRC_QUIT, CLIENT_ANY, 0, 1, 0, 0, 0 }, - { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0, 0, 0 }, - { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0, 0, 0 }, - { "SERVER", IRC_SERVER, CLIENT_ANY, 0, -1, 0, 0, 0 }, - { "SERVICE", IRC_SERVICE, CLIENT_ANY, 6, 6, 0, 0, 0 }, - { "SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 2, 0, 0, 0 }, - { "SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 }, - { "SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 2, 2, 0, 0, 0 }, - { "STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 }, - { "SVSNICK", IRC_SVSNICK, CLIENT_SERVER, 2, 2, 0, 0, 0 }, - { "SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 }, - { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 }, - { "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 1, 2, 0, 0, 0 }, - { "TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 }, - { "USER", IRC_USER, CLIENT_ANY, 0, -1, 0, 0, 0 }, - { "USERHOST", IRC_USERHOST, CLIENT_USER, 1, -1, 0, 0, 0 }, - { "USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 }, - { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 }, - { "WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 1, 1, 0, 0, 0 }, - { "WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 4, 4, 0, 0, 0 }, - { "WHO", IRC_WHO, CLIENT_USER, 0, 2, 0, 0, 0 }, - { "WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 }, - { "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 }, + _CMD("DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 1, 1), + _CMD("ERROR", IRC_ERROR, CLIENT_ANY, 0, -1), + _CMD("GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1), + _CMD("HELP", IRC_HELP, CLIENT_USER, 0, 1), + _CMD("INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 1), + _CMD("INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2), + _CMD("ISON", IRC_ISON, CLIENT_USER, 1, -1), + _CMD("JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 1, 2), + _CMD("KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 2, 3), + _CMD("KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 2, 2), + _CMD("KLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1), + _CMD("LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 2), + _CMD("LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 2), + _CMD("LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 2), + _CMD("METADATA", IRC_METADATA, CLIENT_SERVER, 3, 3), + _CMD("MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1), + _CMD("MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 1), + _CMD("NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 2), + _CMD("NICK", IRC_NICK, CLIENT_ANY, 0, -1), + _CMD("NJOIN", IRC_NJOIN, CLIENT_SERVER, 2, 2), + _CMD("NOTICE", IRC_NOTICE, CLIENT_ANY, 0, -1), + _CMD("OPER", IRC_OPER, CLIENT_USER, 2, 2), + _CMD("PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 1, 2), + _CMD("PASS", IRC_PASS, CLIENT_ANY, 0, -1), + _CMD("PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, -1), + _CMD("PONG", IRC_PONG, CLIENT_ANY, 0, -1), + _CMD("PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 2), + _CMD("QUIT", IRC_QUIT, CLIENT_ANY, 0, 1), + _CMD("REHASH", IRC_REHASH, CLIENT_USER, 0, 0), + _CMD("RESTART", IRC_RESTART, CLIENT_USER, 0, 0), + _CMD("SERVER", IRC_SERVER, CLIENT_ANY, 0, -1), + _CMD("SERVICE", IRC_SERVICE, CLIENT_ANY, 6, 6), + _CMD("SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 2), + _CMD("SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 2), + _CMD("SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 2, 2), + _CMD("STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 2), + _CMD("SVSNICK", IRC_SVSNICK, CLIENT_SERVER, 2, 2), + _CMD("SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, -1), + _CMD("TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 1), + _CMD("TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 1, 2), + _CMD("TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 1), + _CMD("USER", IRC_USER, CLIENT_ANY, 0, -1), + _CMD("USERHOST", IRC_USERHOST, CLIENT_USER, 1, -1), + _CMD("USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, -1), + _CMD("VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 1), + _CMD("WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 1, 1), + _CMD("WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 4, 4), + _CMD("WHO", IRC_WHO, CLIENT_USER, 0, 2), + _CMD("WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1), + _CMD("WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, -1), #ifdef IRCPLUS - { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, -1, 0, 0, 0 }, + _CMD("CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, -1), # ifdef ICONV - { "CHARCONV", IRC_CHARCONV, CLIENT_USER, 1, 1, 0, 0, 0 }, + _CMD("CHARCONV", IRC_CHARCONV, CLIENT_USER, 1, 1), # endif #endif #ifndef STRICT_RFC - { "GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1, 0, 0, 0 }, - { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1, 0, 0, 0 }, + _CMD("GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1), + _CMD("POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1), #endif - { NULL, NULL, 0x0, 0, 0, 0, 0, 0 } /* End-Mark */ + _CMD(NULL, NULL, 0, 0, 0) /* End-Mark */ +#undef _CMD }; static void Init_Request PARAMS(( REQUEST *Req ));

1 0