- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : ngircd.8: document debugging options
by alex＠arthur.barton.de 28 Jun '11

28 Jun '11

Module: ngircd.git Branch: master Commit: 7ae7ace579915dc023722f733f30e941d371cab3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7ae7ace5… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jun 28 13:45:16 2011 +0200 ngircd.8: document debugging options --- man/ngircd.8.tmpl | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/man/ngircd.8.tmpl b/man/ngircd.8.tmpl index d907e6f..9da7ef8 100644 --- a/man/ngircd.8.tmpl +++ b/man/ngircd.8.tmpl @@ -76,6 +76,31 @@ re-initialize the daemon. .SH HINTS It's wise to use "ngircd \-\-configtest" to validate the configuration file after changing it. +.SH DEBUGGING +When ngIRCd is compiled with debug code, that is, its source code has +been ./configure'd with "--enable-debug" and/or "--enable-sniffer" (witch +enables debug mode automatically as well), you can use two more command +line options and two more signals to debug problems with the daemon itself +or IRC clients: +.PP +\fBOptions:\fR +.TP +\fB\-d\fR, \fB\-\-debug\fR +Enable debug mode and log extra messages. +.TP +\fB\-s\fR, \fB\-\-sniffer\fR +Enable IRC protocol sniffer, which logs all sent and received IRC commands to +the console/syslog. This option requires that ngIRCd has been ./configure'd +with "--enable-sniffer" and enables debug mode automatically, too. +.PP +\fBSignals:\fR +.TP +\fBUSR1\fR +Toggle debug mode on and off during runtime. +.TP +\fBUSR2\fR +Dump internal server state to the console/syslog when debug mode is on (use +command line option \-\-debug or signal USR1). .SH AUTHORS Alexander Barton, <alex(a)barton.de> .br

1 0

Alexander Barton : ngircd.8: document debugging options
by alex＠arthur.barton.de 28 Jun '11

28 Jun '11

Module: ngircd.git Branch: master Commit: 91b6c05d1d33c1569d96d6ffcf1277a463ddcb4e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=91b6c05d… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jun 28 13:39:01 2011 +0200 ngircd.8: document debugging options --- man/ngircd.8.tmpl | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/man/ngircd.8.tmpl b/man/ngircd.8.tmpl index d907e6f..d0c30e8 100644 --- a/man/ngircd.8.tmpl +++ b/man/ngircd.8.tmpl @@ -76,6 +76,30 @@ re-initialize the daemon. .SH HINTS It's wise to use "ngircd \-\-configtest" to validate the configuration file after changing it. +.SH DEBUGGING +When ngIRCd is compiled with debug code, that is, its source code has been +./configure'd with "--enable-debug" and/or "--enable-sniffer" (witch enables +debug mode automatically as well), you can use two more command line options +and two more signals to debug problems with the daemon itself or IRC clients: +.PP +\fBOptions:\fR +.TP +\fB\-d\fR, \fB\-\-debug\fR +Enable debug mode and log extra messages. +.TP +\fB\-s\fR, \fB\-\-sniffer\fR +Enable IRC protocol sniffer, which logs all sent and received IRC commands to +the console/syslog. This option requires that ngIRCd has been ./configure'd +with "--enable-sniffer" and enables debug mode automatically, too. +.PP +\fBSignals:\fR +.TP +\fBUSR1\fR +Toggle debug mode on and off during runtime. +.TP +\fBUSR2\fR +Dump internal server state to the console/syslog when debug mode is on (use +command line option \-\-debug or signal USR1). .SH AUTHORS Alexander Barton, <alex(a)barton.de> .br

1 0

Alexander Barton : ngircd.conf.5: strip "SSL" prefix from variables in [SSL ] section
by alex＠arthur.barton.de 28 Jun '11

28 Jun '11

Module: ngircd.git Branch: master Commit: 5f400694cfee5bed6be0ac0a5c1638ed9b413c55 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5f400694… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jun 28 13:21:38 2011 +0200 ngircd.conf.5: strip "SSL" prefix from variables in [SSL] section --- man/ngircd.conf.5.tmpl | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index ccf3d94..38ac40b 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -314,10 +314,10 @@ All SSL-related configuration variables are located in the section. Please note that this whole section is only recognized by ngIRCd when it is compiled with support for SSL using OpenSSL or GnuTLS! .TP -\fBSSLCertFile\fR (string) +\fBCertFile\fR (string) SSL Certificate file of the private server key. .TP -\fBSSLDHFile\fR (string) +\fBDHFile\fR (string) Name of the Diffie-Hellman Parameter file. Can be created with GnuTLS "certtool \-\-generate-dh-params" or "openssl dhparam". If this file is not present, it will be generated on startup when ngIRCd was compiled with GnuTLS @@ -325,14 +325,14 @@ support (this may take some time). If ngIRCd was compiled with OpenSSL, then (Ephemeral)-Diffie-Hellman Key Exchanges and several Cipher Suites will not be available. .TP -\fBSSLKeyFile\fR (string) +\fBKeyFile\fR (string) Filename of SSL Server Key to be used for SSL connections. This is required for SSL/TLS support. .TP -\fBSSLKeyFilePassword\fR (string) +\fBKeyFilePassword\fR (string) OpenSSL only: Password to decrypt the private key file. .TP -\fBSSLPorts\fR (list of numbers) +\fBPorts\fR (list of numbers) Same as \fBPorts\fR , except that ngIRCd will expect incoming connections to be SSL/TLS encrypted. Common port numbers for SSL-encrypted IRC are 6669 and 6697. Default: none.

1 0

Alexander Barton : doc/SSL.txt: adopt to new configuration file layout
by alex＠arthur.barton.de 28 Jun '11

28 Jun '11

Module: ngircd.git Branch: master Commit: 29c49f643fdaa5db2604d129a2dc3814e3f54700 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=29c49f64… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jun 28 13:11:14 2011 +0200 doc/SSL.txt: adopt to new configuration file layout --- doc/SSL.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/SSL.txt b/doc/SSL.txt index b98c2fb..28ea2cd 100644 --- a/doc/SSL.txt +++ b/doc/SSL.txt @@ -34,7 +34,7 @@ possible to handle unencrypted and encrypted connections on the same port! This is a limitation of the IRC protocol ... You have to set (at least) the following configuration variables in the -[GLOBAL] section of ngircd.conf(5): SSLPorts, SSLKeyFile, and SSLCertFile. +[SSL] section of ngircd.conf(5): Ports, KeyFile, and CertFile. Now IRC clients are able to connect using SSL on the configured port(s). (Using port 6697 for encrypted connections is common.)

1 0

Alexander Barton : Fix some wording, use spellchecker ; -)
by alex＠arthur.barton.de 28 Jun '11

28 Jun '11

Module: ngircd.git Branch: master Commit: bd118c65fdb1428daf4775205b0f40918b3f22fb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bd118c65… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jun 28 13:12:06 2011 +0200 Fix some wording, use spellchecker ;-) --- ChangeLog | 20 ++++++++++---------- INSTALL | 2 +- NEWS | 10 +++++----- doc/sample-ngircd.conf.tmpl | 6 +++--- man/ngircd.8.tmpl | 4 ++-- man/ngircd.conf.5.tmpl | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=bd11…

1 0

Tag rel-18-rc1: Alexander Barton : ngIRCd release 18~rc1
by alex＠arthur.barton.de 27 Jun '11

27 Jun '11

Module: ngircd.git Branch: refs/tags/rel-18-rc1 Tag: b98892464bed5498a771ea325a8d0b54bd54270e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=b98892464be… Tagger: Alexander Barton <alex(a)barton.de> Date: Mon Jun 27 23:00:52 2011 +0200 ngIRCd release 18~rc1

1 0

Alexander Barton : ngIRCd release 18~rc1
by alex＠arthur.barton.de 27 Jun '11

27 Jun '11

Module: ngircd.git Branch: master Commit: b6185b1ac8dedfc3a0f261c82aaf1facde5b55ee URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b6185b1a… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jun 27 23:00:30 2011 +0200 ngIRCd release 18~rc1 --- ChangeLog | 2 +- NEWS | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9108083..ce68efc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,7 @@ ngIRCd Release 18 - ngIRCd 18~rc1 + ngIRCd 18~rc1 (2011-06-27) - PAM warning message: make clear which "Password" config option is ignored. - New configuration opion "MorePrivacy" to "censor" some user information. When enabled, signon time and idle time is censored. Part and quit diff --git a/NEWS b/NEWS index 65a1eea..1d7e049 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ ngIRCd Release 18 - ngIRCd 18~rc1 + ngIRCd 18~rc1 (2011-06-27) - New configuration opion "MorePrivacy" to "censor" some user information. When enabled, signon time and idle time is censored. Part and quit messages are made to look the same. WHOWAS requests are silently dropped. diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 06e9194..1b7997e 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (18~rc1-0ab1) unstable; urgency=low + + * New "upstream" release candidate 1 for ngIRCd Release 18. + + -- Alexander Barton <alex(a)barton.de> Mon, 27 Jun 2011 22:58:36 +0200 + ngircd (17.1-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 17.1. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index da0c2f7..6a2165b 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 17.1 +%define version 18~rc1 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : hash: Use UINT32 instead of uint32_t
by alex＠arthur.barton.de 27 Jun '11

27 Jun '11

Module: ngircd.git Branch: master Commit: 14afdaee087dd1243800dd0697785c47ccbf931e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=14afdaee… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jun 27 10:27:07 2011 +0200 hash: Use UINT32 instead of uint32_t --- src/ngircd/hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c index 7b7976c..c75b57d 100644 --- a/src/ngircd/hash.c +++ b/src/ngircd/hash.c @@ -58,7 +58,7 @@ Hash( const char *String ) * Not all of his functions are used here. */ -#define hashsize(n) ((uint32_t)1<<(n)) +#define hashsize(n) ((UINT32)1<<(n)) #define hashmask(n) (hashsize(n)-1) #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))

1 0

Alexander Barton : Update NEWS and ChangeLog file for our upcoming next release
by alex＠arthur.barton.de 27 Jun '11

27 Jun '11

Module: ngircd.git Branch: master Commit: 949c8ea7c74c81c7a5387ff4334553ceb31ecb86 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=949c8ea7… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jun 27 00:33:58 2011 +0200 Update NEWS and ChangeLog file for our upcoming next release --- ChangeLog | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ NEWS | 73 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 160 insertions(+), 19 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=949c…

1 0

Florian Westphal : hash: use more recent lookup3 algorithm instead of lookup2
by fw＠arthur.barton.de 27 Jun '11

27 Jun '11

Module: ngircd.git Branch: master Commit: 1765f0ae0b8932a4977c181c07d174f124143cef URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1765f0ae… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Jun 27 00:16:37 2011 +0200 hash: use more recent lookup3 algorithm instead of lookup2 Bob Jenkins published a newer hash function in May 2006, it has better distribution. See http://burtleburtle.net/bob/hash/doobs.html for lengthy comparisions. --- src/ngircd/hash.c | 82 ++++++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 38 deletions(-) diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c index 113133d..7b7976c 100644 --- a/src/ngircd/hash.c +++ b/src/ngircd/hash.c @@ -26,8 +26,7 @@ #include "exp.h" #include "hash.h" -static UINT32 jenkins_hash PARAMS((register UINT8 *k, register UINT32 length, - register UINT32 initval)); +static UINT32 jenkins_hash PARAMS((UINT8 *k, UINT32 length, UINT32 initval)); /** * Calculate hash value for a given string. @@ -46,66 +45,74 @@ Hash( const char *String ) } /* Hash */ /* - * This hash function originates from lookup2.c of Bob Jenkins - * (URL: <http://burtleburtle.net/bob/c/lookup2.c>): + * This hash function originates from lookup3.c of Bob Jenkins + * (URL: <http://burtleburtle.net/bob/c/lookup3.c>): * -------------------------------------------------------------------- - * lookup2.c, by Bob Jenkins, December 1996, Public Domain. - * hash(), hash2(), hash3, and mix() are externally useful functions. - * Routines to test the hash are included if SELF_TEST is defined. - * You can use this free for any purpose. It has no warranty. + * lookup3.c, by Bob Jenkins, May 2006, Public Domain. + * These are functions for producing 32-bit hashes for hash table lookup. + * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() + * are externally useful functions. Routines to test the hash are included + * if SELF_TEST is defined. You can use this free for any purpose. It's in + * the public domain. It has no warranty. * -------------------------------------------------------------------- * Not all of his functions are used here. */ -#define hashsize(n) ((UINT32)1<<(n)) +#define hashsize(n) ((uint32_t)1<<(n)) #define hashmask(n) (hashsize(n)-1) +#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k)))) #define mix(a,b,c) \ { \ - a -= b; a -= c; a ^= (c>>13); \ - b -= c; b -= a; b ^= (a<<8); \ - c -= a; c -= b; c ^= (b>>13); \ - a -= b; a -= c; a ^= (c>>12); \ - b -= c; b -= a; b ^= (a<<16); \ - c -= a; c -= b; c ^= (b>>5); \ - a -= b; a -= c; a ^= (c>>3); \ - b -= c; b -= a; b ^= (a<<10); \ - c -= a; c -= b; c ^= (b>>15); \ + a -= c; a ^= rot(c, 4); c += b; \ + b -= a; b ^= rot(a, 6); a += c; \ + c -= b; c ^= rot(b, 8); b += a; \ + a -= c; a ^= rot(c,16); c += b; \ + b -= a; b ^= rot(a,19); a += c; \ + c -= b; c ^= rot(b, 4); b += a; \ } /* mix */ +#define final(a,b,c) \ +{ \ + c ^= b; c -= rot(b,14); \ + a ^= c; a -= rot(c,11); \ + b ^= a; b -= rot(a,25); \ + c ^= b; c -= rot(b,16); \ + a ^= c; a -= rot(c,4); \ + b ^= a; b -= rot(a,14); \ + c ^= b; c -= rot(b,24); \ +} + static UINT32 -jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval ) +jenkins_hash(UINT8 *k, UINT32 length, UINT32 initval) { /* k: the key * length: length of the key * initval: the previous hash, or an arbitrary value */ - - register UINT32 a,b,c,len; + UINT32 a,b,c; /* Set up the internal state */ - len = length; - a = b = 0x9e3779b9; /* the golden ratio; an arbitrary value */ - c = initval; /* the previous hash value */ + a = b = c = 0xdeadbeef + length + initval; /* handle most of the key */ - while (len >= 12) - { + while (length > 12) { a += (k[0] +((UINT32)k[1]<<8) +((UINT32)k[2]<<16) +((UINT32)k[3]<<24)); b += (k[4] +((UINT32)k[5]<<8) +((UINT32)k[6]<<16) +((UINT32)k[7]<<24)); c += (k[8] +((UINT32)k[9]<<8) +((UINT32)k[10]<<16)+((UINT32)k[11]<<24)); mix(a,b,c); - k += 12; len -= 12; + length -= 12; + k += 12; } - /* handle the last 11 bytes */ - c += length; - switch( (int)len ) /* all the case statements fall through */ + /*-------------------------------- last block: affect all 32 bits of (c) */ + switch(length) /* all the case statements fall through */ + { - case 11: c+=((UINT32)k[10]<<24); - case 10: c+=((UINT32)k[9]<<16); - case 9 : c+=((UINT32)k[8]<<8); - /* the first byte of c is reserved for the length */ + case 12: c+=((UINT32)k[11])<<24; + case 11: c+=((UINT32)k[10]<<16); + case 10: c+=((UINT32)k[9]<<8); + case 9 : c+=k[8]; case 8 : b+=((UINT32)k[7]<<24); case 7 : b+=((UINT32)k[6]<<16); case 6 : b+=((UINT32)k[5]<<8); @@ -114,11 +121,10 @@ jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval case 3 : a+=((UINT32)k[2]<<16); case 2 : a+=((UINT32)k[1]<<8); case 1 : a+=k[0]; - /* case 0: nothing left to add */ + break; + case 0 : return c; } - mix(a,b,c); - - /* report the result */ + final(a,b,c); return c; } /* jenkins_hash */

1 0