ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Alexander Barton : Refactor Wall_ServerNotice() into more generic Log_ServerNotice()
by alex＠arthur.barton.de 25 Jun '10

25 Jun '10

Module: ngircd.git Branch: master Commit: 51ed74205432036f729d96bf5683ca858aae9f10 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=51ed7420… Author: Alexander Barton <alex(a)barton.de> Date: Sat May 22 17:10:22 2010 +0200 Refactor Wall_ServerNotice() into more generic Log_ServerNotice() Log_ServerNotice() sends a messages to all users having a given user mode set. --- src/ngircd/log.c | 46 ++++++++++++++++++++++++++++++---------------- src/ngircd/log.h | 7 +++---- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/ngircd/log.c b/src/ngircd/log.c index ff81163..439ca41 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2005 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)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 @@ -50,8 +50,6 @@ static char Error_File[FNAME_LEN]; #endif -static void Wall_ServerNotice PARAMS(( char *Msg )); - static void Log_Message(int Level, const char *msg) { @@ -260,7 +258,7 @@ va_dcl if (snotice) { /* Send NOTICE to all local users with mode +s and to the * local &SERVER channel */ - Wall_ServerNotice(msg); + Log_ServerNotice('s', "%s", msg); Channel_LogServer(msg); } } /* Log */ @@ -328,25 +326,41 @@ va_dcl /** - * Send log messages to users flagged with the "s" mode. - * @param Msg The message to send. + * Send a log message to all local users flagged with the given user mode. + * @param UserMode User mode which the target user must have set, + * @param Format The format string. */ -static void -Wall_ServerNotice( char *Msg ) +#ifdef PROTOTYPES +GLOBAL void +Log_ServerNotice(const char UserMode, const char *Format, ... ) +#else +GLOBAL void +Log_ServerNotice(UserMode, Format, va_alist) +const char UserMode; +const char *Format; +va_dcl +#endif { CLIENT *c; + char msg[MAX_LOG_MSG_LEN]; + va_list ap; - assert( Msg != NULL ); + assert(Format != NULL); - c = Client_First( ); - while(c) { - if (Client_Conn(c) > NONE && Client_HasMode(c, 's')) - IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c), - NOTICE_TXTPREFIX, Msg); +#ifdef PROTOTYPES + va_start(ap, Format); +#else + va_start(ap); +#endif + vsnprintf(msg, MAX_LOG_MSG_LEN, Format, ap); + va_end(ap); - c = Client_Next( c ); + for(c=Client_First(); c != NULL; c=Client_Next(c)) { + if (Client_Conn(c) > NONE && Client_HasMode(c, UserMode)) + IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c), + NOTICE_TXTPREFIX, msg); } -} /* Wall_ServerNotice */ +} /* Log_ServerNotice */ /* -eof- */ diff --git a/src/ngircd/log.h b/src/ngircd/log.h index 529b164..e7e6b61 100644 --- a/src/ngircd/log.h +++ b/src/ngircd/log.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)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 @@ -8,8 +8,6 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: log.h,v 1.20 2006/08/05 09:16:21 fw Exp $ - * * Logging functions (header) */ @@ -40,13 +38,14 @@ GLOBAL void Log_Exit PARAMS(( void )); GLOBAL void Log PARAMS(( int Level, const char *Format, ... )); +GLOBAL void Log_ServerNotice PARAMS((char UserMode, const char *Format, ...)); + #ifdef DEBUG GLOBAL void LogDebug PARAMS(( const char *Format, ... )); #else static inline void LogDebug PARAMS(( UNUSED const char *Format, ... )){/* Do nothing. The compiler should optimize this out, please ;-) */} #endif - GLOBAL void Log_Init_Resolver PARAMS(( void )); GLOBAL void Log_Exit_Resolver PARAMS(( void ));

1 0

Alexander Barton : Add some documentation for using BOPM with ngIRCd
by alex＠arthur.barton.de 25 Jun '10

25 Jun '10

Module: ngircd.git Branch: master Commit: 8ad1c23ae453e2f8ff95bccfdabdfed688539760 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8ad1c23a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jun 25 15:19:39 2010 +0200 Add some documentation for using BOPM with ngIRCd --- doc/Bopm.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/doc/Bopm.txt b/doc/Bopm.txt new file mode 100644 index 0000000..bd14450 --- /dev/null +++ b/doc/Bopm.txt @@ -0,0 +1,53 @@ + + ngIRCd - Next Generation IRC Server + + (c)2001-2010 Alexander Barton, + alex(a)barton.de, http://www.barton.de/ + + ngIRCd is free software and published under the + terms of the GNU General Public License. + + -- BOPM.txt -- + + +I. Introduction +~~~~~~~~~~~~~~~~ + +Citing <http://wiki.blitzed.org/BOPM>: "BOPM is an open source open proxy +monitor, designed for use with hybrid-based ircds, although it can be used +with slight modification on any server which has the ability to show connects +to opers and that supports KLINEs." + +And starting with Release 17, ngIRCd supports all required log messages that +BOPM requires to be useful. + +II. Installation +~~~~~~~~~~~~~~~~~ + +Install BOPM as usual, please see the BOPM documentation for details. +Afterwards adjust the following configuration parameters that are important +for ngIRCd: + +a) BOPM "IRC" section: + + 1) Set "server" and "port" accordingly, + + 2) adjust the "oper" line to match an [Operator] block in ngircd.conf, + + 3) change "mode" to "+ci" or "+c". + + 4) Set "connregex" to the following string, everything in one line(!): + "\\*\\*\\* Notice -- Client connecting: ([^ ]+) \$([^@]+)@([^\$]+)\\) \\[([0-9\\.]+)\\].*"; + and comment all the other "connregex" examples (prepend a "#" character). + + 5) Set "kline" to "KILL %n :Open proxy found on your host!"; for example, + and comment all the other "kline" examples. + +b) BOPM "scanner" section: + + Make sure you configure a valid "target_ip" and "target_port" for the + configured scanners to test. And please note that you CAN'T USE the port + of ngIRCd, because ngIRCd doesn't send any banner message by default! + + So you need a service what sends a banner, so for example POP3, SMTP, + IMAP, or SSH daemons should work ...

1 0

Alexander Barton : Implement user mode "c": receive connect/ disconnect NOTICEs
by alex＠arthur.barton.de 25 Jun '10

25 Jun '10

Module: ngircd.git Branch: master Commit: f76e0a1db689dadfe32f211002248d03416b3982 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f76e0a1d… Author: Alexander Barton <alex(a)barton.de> Date: Sat May 22 17:19:24 2010 +0200 Implement user mode "c": receive connect/disconnect NOTICEs Users having the user mode "c" set receive NOTICE messages on each new client connection to the local server as well as disconnects. Only IRC operators (users having the mode "o" set) are allowed to set the 'c' user mode. These connect/disconnect messages can be useful for open proxy scanners -- BOPM (http://wiki.blitzed.org/BOPM) is now functional with ngIRCd, for example. --- src/ngircd/client.c | 3 +++ src/ngircd/defines.h | 2 +- src/ngircd/irc-login.c | 8 +++++++- src/ngircd/irc-mode.c | 10 ++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index c565830..671bf6c 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1136,6 +1136,9 @@ Destroy_UserOrService(CLIENT *Client, const char *Txt, const char *FwdMsg, bool "%s \"%s\" unregistered (connection %d): %s", Client_TypeText(Client), Client_Mask(Client), Client->conn_id, Txt); + Log_ServerNotice('c', "Client exiting: %s (%s@%s) [%s]", + Client_ID(Client), Client_User(Client), + Client_Hostname(Client), Txt); if (SendQuit) { /* Inforam all the other servers */ diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 94c7dd1..b463c5f 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -80,7 +80,7 @@ #define RECONNECT_DELAY 3 /* Time to delay re-connect attempts in seconds. */ -#define USERMODES "aiorsw" /* Supported user modes. */ +#define USERMODES "aciorsw" /* Supported user modes. */ #define CHANMODES "biIklmnoPstvz" /* Supported channel modes. */ #define CONNECTED true /* Internal status codes. */ diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index c8b44db..8e77e7f 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -840,10 +840,16 @@ Introduce_Client(CLIENT *From, CLIENT *Client, int Type) Client_Modes(Client), Client_ID(From), Client_ID(Client_Introducer(Client)), Client_Hops(Client), Client_Hops(Client) > 1 ? "s": ""); - } else + } else { Log(LOG_NOTICE, "%s \"%s\" registered (connection %d).", Client_TypeText(Client), Client_Mask(Client), Client_Conn(Client)); + Log_ServerNotice('c', "Client connecting: %s (%s@%s) [%s] - %s", + Client_ID(Client), Client_User(Client), + Client_Hostname(Client), + Conn_IPA(Client_Conn(Client)), + Client_TypeText(Client)); + } /* Inform other servers */ IRC_WriteStrServersPrefixFlag_CB(From, diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index d22d32f..cd47086 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -172,6 +172,16 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin )); break; + case 'c': /* Receive connect notices + * (only settable by IRC operators!) */ + if(!set || Client_OperByMe(Origin) + || Client_Type(Client) == CLIENT_SERVER) + x[0] = 'c'; + else + ok = IRC_WriteStrClient(Origin, + ERR_NOPRIVILEGES_MSG, + Client_ID(Origin)); + break; case 'o': /* IRC operator (only unsettable!) */ if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER )) {

1 0

Alexander Barton : ngircd.init: require $network $remote_fs when stopping ngircd
by alex＠arthur.barton.de 25 Jun '10

25 Jun '10

Module: ngircd.git Branch: master Commit: 139d6303e73079f48adfe37be2b88efed31e47df URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=139d6303… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jun 25 00:10:56 2010 +0200 ngircd.init: require $network $remote_fs when stopping ngircd --- contrib/Debian/ngircd.init | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/Debian/ngircd.init b/contrib/Debian/ngircd.init index e550747..6a418d7 100755 --- a/contrib/Debian/ngircd.init +++ b/contrib/Debian/ngircd.init @@ -1,13 +1,13 @@ #!/bin/sh # # ngIRCd start and stop script for Debian-based systems -# Copyright 2008,2009 Alexander Barton <alex(a)barton.de> +# Copyright 2008-2010 Alexander Barton <alex(a)barton.de> # ### BEGIN INIT INFO # Provides: ngircd # Required-Start: $network $remote_fs -# Required-Stop: +# Required-Stop: $network $remote_fs # Should-Start: $syslog $named # Should-Stop: $syslog # Default-Start: 2 3 4 5

1 0

Neale Pickett : Show SSL status in WHOIS, numeric 275
by alex＠arthur.barton.de 23 Jun '10

23 Jun '10

Module: ngircd.git Branch: master Commit: 28f8b501744a3c24cd7f5eec44707d656cc987c7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=28f8b501… Author: Neale Pickett <neale(a)woozle.org> Date: Fri Jun 11 17:32:41 2010 -0500 Show SSL status in WHOIS, numeric 275 "I've been wanting this for years and finally took the 5 minutes to patch it in. I took the response code (275) from whatever's running OFTC's IRC network." -- Neale Pickett <neale(a)woozle.org>, Fri, 11 Jun 2010 17:32:41 -0500 (OFTC is running Hybrid ircd.) --- src/ngircd/irc-info.c | 7 +++++++ src/ngircd/messages.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 7d7bb88..7e0bf63 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -993,6 +993,13 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED; } + /* Connected using SSL? */ + if (Conn_UsesSSL(Client_Conn(c))) { + if (!IRC_WriteStrClient + (from, RPL_WHOISSSL_MSG, Client_ID(from), Client_ID(c))) + return DISCONNECTED; + } + /* Idle and signon time (local clients only!) */ if (Client_Conn(c) > NONE ) { if (! IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index c356e42..03ddc36 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -47,6 +47,7 @@ #define RPL_LOCALUSERS_MSG "265 %s %lu %lu :Current local users: %lu, Max: %lu" #define RPL_NETUSERS_MSG "266 %s %lu %lu :Current global users: %lu, Max: %lu" #define RPL_STATSCONN_MSG "250 %s :Highest connection count: %lu (%lu connections received)" +#define RPL_WHOISSSL_MSG "275 %s %s :is connected via SSL (secure link)" #define RPL_AWAY_MSG "301 %s %s :%s" #define RPL_USERHOST_MSG "302 %s :"

1 0

Alexander Barton : Show SSL status in WHOIS, numeric 275
by alex＠arthur.barton.de 23 Jun '10

23 Jun '10

Module: ngircd.git Branch: master Commit: a85f86e19b8c7ab17c8a0ee6a7f662b65d78a615 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a85f86e1… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jun 23 10:44:09 2010 +0200 Show SSL status in WHOIS, numeric 275 "I've been wanting this for years and finally took the 5 minutes to patch it in. I took the response code (275) from whatever's running OFTC's IRC network." -- Neale Pickett <neale(a)woozle.org>, Fri, 11 Jun 2010 17:32:41 -0500 (OFTC is running Hybrid ircd.) --- src/ngircd/irc-info.c | 7 +++++++ src/ngircd/messages.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 7d7bb88..7e0bf63 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -993,6 +993,13 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED; } + /* Connected using SSL? */ + if (Conn_UsesSSL(Client_Conn(c))) { + if (!IRC_WriteStrClient + (from, RPL_WHOISSSL_MSG, Client_ID(from), Client_ID(c))) + return DISCONNECTED; + } + /* Idle and signon time (local clients only!) */ if (Client_Conn(c) > NONE ) { if (! IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index c356e42..03ddc36 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -47,6 +47,7 @@ #define RPL_LOCALUSERS_MSG "265 %s %lu %lu :Current local users: %lu, Max: %lu" #define RPL_NETUSERS_MSG "266 %s %lu %lu :Current global users: %lu, Max: %lu" #define RPL_STATSCONN_MSG "250 %s :Highest connection count: %lu (%lu connections received)" +#define RPL_WHOISSSL_MSG "275 %s %s :is connected via SSL (secure link)" #define RPL_AWAY_MSG "301 %s %s :%s" #define RPL_USERHOST_MSG "302 %s :"

1 0

Florian Westphal : Revert "configure: make implicit declarations fatal"
by alex＠arthur.barton.de 09 Jun '10

09 Jun '10

Module: ngircd.git Branch: master Commit: 059e70724945264c2ab4f25edd48a50d173697f6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=059e7072… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 29 18:47:27 2010 +0200 Revert "configure: make implicit declarations fatal" This reverts commit b3a6c33da0b12ba74dc395979b677813d4bc2c0f. apparently not all gcc versions support this 8-( --- configure.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 8526af6..6d9312d 100644 --- a/configure.in +++ b/configure.in @@ -542,7 +542,6 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" ) # Add additional CFLAGS, eventually specified on the command line, but after # running this configure script. Useful for "-Werror" for example. -test "$GCC" = "yes" && CFLAGS="$CFLAGS -Werror=implicit-function-declaration" test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" # -- Generate files --

1 0

Alexander Barton : Include correct header files when testing for arpa/inet. h (Closes: #105)
by alex＠arthur.barton.de 09 Jun '10

09 Jun '10

Module: ngircd.git Branch: master Commit: e2930f3f5e7356d24f4b5e1616cb7674bd0123ec URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e2930f3f… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jun 8 15:23:04 2010 +0200 Include correct header files when testing for arpa/inet.h (Closes: #105) Tested on OpenBSD 4.7, OpenBSD 4.1, FreeBSD 8, Linux and Mac OS X. Thanks to rck <dev.rck(a)gmail.com> for reporting and testing! --- configure.in | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 6d9312d..57883ed 100644 --- a/configure.in +++ b/configure.in @@ -108,9 +108,14 @@ AC_CHECK_HEADERS([ \ AC_CHECK_HEADERS([ \ arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h \ ],[],[],[[ - #include <netinet/in.h> - #ifdef HAVE_NETINET_IN_SYSTM_H - #include <netinet/in_systm.h> + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> #endif ]] )

1 0

Florian Westphal : configure: make implicit declarations fatal
by alex＠arthur.barton.de 09 Jun '10

09 Jun '10

Module: ngircd.git Branch: master Commit: b849e63fbfcddae7c770944816544c4799856042 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b849e63f… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 29 13:06:19 2010 +0200 configure: make implicit declarations fatal from bugzilla #105: "ngircd-16 works great under openbsd4.7/i386, but it segfaults on openbsd4.7/amd64." Caused by missing function prototypes and the resulting truncation of pointer to int. Lets try to catch these bugs during compilation instead of SIGSEGV. --- configure.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 6d9312d..8526af6 100644 --- a/configure.in +++ b/configure.in @@ -542,6 +542,7 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" ) # Add additional CFLAGS, eventually specified on the command line, but after # running this configure script. Useful for "-Werror" for example. +test "$GCC" = "yes" && CFLAGS="$CFLAGS -Werror=implicit-function-declaration" test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" # -- Generate files --

1 0

Florian Westphal : partially revert Include netinet/{in.h, in_systm. h} when checking for netinet/ip.h
by alex＠arthur.barton.de 09 Jun '10

09 Jun '10

Module: ngircd.git Branch: master Commit: b8ed3110305bd5a89face219b276cc7ffbeb9e37 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b8ed3110… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 29 17:18:33 2010 +0200 partially revert Include netinet/{in.h, in_systm.h} when checking for netinet/ip.h This partially reverts 6b0bb665c3cb31ba93fb5ac8197f033532614fd4. restrict the kludge to netinet/ip.h. --- configure.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 8526af6..d8a35ef 100644 --- a/configure.in +++ b/configure.in @@ -106,7 +106,10 @@ AC_CHECK_HEADERS([ \ ],,AC_MSG_ERROR([required C header missing!])) AC_CHECK_HEADERS([ \ - arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h \ + arpa/inet.h ctype.h malloc.h stdbool.h stddef.h varargs.h]) + +AC_CHECK_HEADERS([ \ + netinet/ip.h \ ],[],[],[[ #include <netinet/in.h> #ifdef HAVE_NETINET_IN_SYSTM_H

1 0

Springe zur Seite:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates