Juni 2010 - ngIRCd GIT Updates

Alexander Barton : Fix redundant redeclaration of Conn_Count*() functions
by alex＠arthur.barton.de 26 Jun '10

26 Jun '10

Module: ngircd.git Branch: master Commit: ae55d4f500703114cf10d07be786f1108d66b27d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ae55d4f5… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 26 00:45:11 2010 +0200 Fix redundant redeclaration of Conn_Count*() functions The wrongly placed #endif lead to the following compiler warnings: conn.h:125: warning: redundant redeclaration of ‘Conn_Count’ conn.h:125: warning: previous declaration of ‘Conn_Count’ was here conn.h:126: warning: redundant redeclaration of ‘Conn_CountMax’ conn.h:126: warning: previous declaration of ‘Conn_CountMax’ was here conn.h:127: warning: redundant redeclaration of ‘Conn_CountAccepted’ conn.h:127: warning: previous declaration of ‘Conn_CountAccepted’ was here --- src/ngircd/conn.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 1cfa466..96d1f33 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -120,11 +120,12 @@ GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx)); #else static inline bool Conn_UsesSSL(UNUSED CONN_ID Idx) { return false; } #endif -#endif GLOBAL long Conn_Count PARAMS((void)); GLOBAL long Conn_CountMax PARAMS((void)); GLOBAL long Conn_CountAccepted PARAMS((void)); +#endif + /* -eof- */

1 0

Alexander Barton : const'ify Conn_WriteStr() function
by alex＠arthur.barton.de 26 Jun '10

26 Jun '10

Module: ngircd.git Branch: master Commit: edfa2154816932ce184f9db65093711bc9957cb3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=edfa2154… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 26 00:44:37 2010 +0200 const'ify Conn_WriteStr() function --- src/ngircd/conn.c | 6 +++--- src/ngircd/conn.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 6994c8b..bfcb8d4 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -809,12 +809,12 @@ Conn_Handler(void) */ #ifdef PROTOTYPES GLOBAL bool -Conn_WriteStr( CONN_ID Idx, char *Format, ... ) +Conn_WriteStr(CONN_ID Idx, const char *Format, ...) #else GLOBAL bool -Conn_WriteStr( Idx, Format, va_alist ) +Conn_WriteStr(Idx, Format, va_alist) CONN_ID Idx; -char *Format; +const char *Format; va_dcl #endif { diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index f2ec823..1cfa466 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -107,7 +107,7 @@ GLOBAL void Conn_ExitListeners PARAMS(( void )); GLOBAL void Conn_Handler PARAMS(( void )); -GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, char *Format, ... )); +GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, const char *Format, ... )); GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient ));

1 0

Alexander Barton : const'ify Send_ListChange() function in irc-mode.c
by alex＠arthur.barton.de 26 Jun '10

26 Jun '10

Module: ngircd.git Branch: master Commit: c6742192a6d64d0fd74a23f49dca7cdbf72037ac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c6742192… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 26 00:42:12 2010 +0200 const'ify Send_ListChange() function in irc-mode.c --- src/ngircd/irc-mode.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index cd47086..10d4641 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -36,13 +36,18 @@ #include "irc-mode.h" -static bool Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )); -static bool Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )); +static bool Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, + CLIENT *Target )); +static bool Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, + CHANNEL *Channel )); -static bool Add_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern)); -static bool Del_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern)); +static bool Add_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); +static bool Del_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); -static bool Send_ListChange PARAMS(( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Mask )); +static bool Send_ListChange PARAMS((const char *Mode, CLIENT *Prefix, + CLIENT *Client, CHANNEL *Channel, const char *Mask)); GLOBAL bool @@ -758,7 +763,8 @@ Del_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const static bool -Send_ListChange( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Mask ) +Send_ListChange(const char *Mode, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Mask) { bool ok;

1 0

Alexander Barton : const'ify IRC_WriteStrXXX() and Get_Prefix() functions
by alex＠arthur.barton.de 26 Jun '10

26 Jun '10

Module: ngircd.git Branch: master Commit: 0c0d4af55ae6d098ccfabc258508a6b85b8c7449 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0c0d4af5… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 26 00:38:20 2010 +0200 const'ify IRC_WriteStrXXX() and Get_Prefix() functions --- src/ngircd/irc-write.c | 57 ++++++++++++++++++++++++++--------------------- src/ngircd/irc-write.h | 17 +++++++------ 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index 9b5b5e2..afefefb 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -37,19 +37,19 @@ #define SEND_TO_SERVER 2 -static char *Get_Prefix PARAMS((CLIENT *Target, CLIENT *Client)); +static const char *Get_Prefix PARAMS((CLIENT *Target, CLIENT *Client)); static void cb_writeStrServersPrefixFlag PARAMS((CLIENT *Client, CLIENT *Prefix, void *Buffer)); #ifdef PROTOTYPES GLOBAL bool -IRC_WriteStrClient( CLIENT *Client, char *Format, ... ) +IRC_WriteStrClient( CLIENT *Client, const char *Format, ... ) #else GLOBAL bool IRC_WriteStrClient( Client, Format, va_alist ) CLIENT *Client; -char *Format; +const char *Format; va_dcl #endif { @@ -77,13 +77,13 @@ va_dcl #ifdef PROTOTYPES GLOBAL bool -IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, char *Format, ... ) +IRC_WriteStrClientPrefix(CLIENT *Client, CLIENT *Prefix, const char *Format, ...) #else GLOBAL bool -IRC_WriteStrClientPrefix( Client, Prefix, Format, va_alist ) +IRC_WriteStrClientPrefix(Client, Prefix, Format, va_alist) CLIENT *Client; CLIENT *Prefix; -char *Format; +const char *Format; va_dcl #endif { @@ -110,14 +110,15 @@ va_dcl #ifdef PROTOTYPES GLOBAL bool -IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, bool Remote, char *Format, ... ) +IRC_WriteStrChannel(CLIENT *Client, CHANNEL *Chan, bool Remote, + const char *Format, ...) #else GLOBAL bool -IRC_WriteStrChannel( Client, Chan, Remote, Format, va_alist ) +IRC_WriteStrChannel(Client, Chan, Remote, Format, va_alist) CLIENT *Client; CHANNEL *Chan; bool Remote; -char *Format; +const char *Format; va_dcl #endif { @@ -146,15 +147,16 @@ va_dcl */ #ifdef PROTOTYPES GLOBAL bool -IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, bool Remote, char *Format, ... ) +IRC_WriteStrChannelPrefix(CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, + bool Remote, const char *Format, ...) #else GLOBAL bool -IRC_WriteStrChannelPrefix( Client, Chan, Prefix, Remote, Format, va_alist ) +IRC_WriteStrChannelPrefix(Client, Chan, Prefix, Remote, Format, va_alist) CLIENT *Client; CHANNEL *Chan; CLIENT *Prefix; bool Remote; -char *Format; +const char *Format; va_dcl #endif { @@ -218,12 +220,12 @@ va_dcl #ifdef PROTOTYPES GLOBAL void -IRC_WriteStrServers( CLIENT *ExceptOf, char *Format, ... ) +IRC_WriteStrServers(CLIENT *ExceptOf, const char *Format, ...) #else GLOBAL void -IRC_WriteStrServers( ExceptOf, Format, va_alist ) +IRC_WriteStrServers(ExceptOf, Format, va_alist) CLIENT *ExceptOf; -char *Format; +const char *Format; va_dcl #endif { @@ -246,13 +248,14 @@ va_dcl #ifdef PROTOTYPES GLOBAL void -IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, char *Format, ... ) +IRC_WriteStrServersPrefix(CLIENT *ExceptOf, CLIENT *Prefix, + const char *Format, ...) #else GLOBAL void -IRC_WriteStrServersPrefix( ExceptOf, Prefix, Format, va_alist ) +IRC_WriteStrServersPrefix(ExceptOf, Prefix, Format, va_alist) CLIENT *ExceptOf; CLIENT *Prefix; -char *Format; +const char *Format; va_dcl #endif { @@ -276,14 +279,15 @@ va_dcl #ifdef PROTOTYPES GLOBAL void -IRC_WriteStrServersPrefixFlag( CLIENT *ExceptOf, CLIENT *Prefix, char Flag, char *Format, ... ) +IRC_WriteStrServersPrefixFlag(CLIENT *ExceptOf, CLIENT *Prefix, char Flag, + const char *Format, ...) #else GLOBAL void -IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, Flag, Format, va_alist ) +IRC_WriteStrServersPrefixFlag(ExceptOf, Prefix, Flag, Format, va_alist) CLIENT *ExceptOf; CLIENT *Prefix; char Flag; -char *Format; +const char *Format; va_dcl #endif { @@ -331,14 +335,15 @@ IRC_WriteStrServersPrefixFlag_CB(CLIENT *ExceptOf, CLIENT *Prefix, char Flag, */ #ifdef PROTOTYPES GLOBAL bool -IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, bool Remote, char *Format, ... ) +IRC_WriteStrRelatedPrefix(CLIENT *Client, CLIENT *Prefix, bool Remote, + const char *Format, ...) #else GLOBAL bool -IRC_WriteStrRelatedPrefix( Client, Prefix, Remote, Format, va_alist ) +IRC_WriteStrRelatedPrefix(Client, Prefix, Remote, Format, va_alist) CLIENT *Client; CLIENT *Prefix; bool Remote; -char *Format; +const char *Format; va_dcl #endif { @@ -416,7 +421,7 @@ GLOBAL void IRC_SendWallops(Client, From, Format, va_alist ) CLIENT *Client; CLIENT *From; -char *Format; +const char *Format; va_dcl #endif { @@ -468,7 +473,7 @@ IRC_SetPenalty( CLIENT *Client, time_t Seconds ) } /* IRC_SetPenalty */ -static char * +static const char * Get_Prefix( CLIENT *Target, CLIENT *Client ) { assert( Target != NULL ); diff --git a/src/ngircd/irc-write.h b/src/ngircd/irc-write.h index a984997..f054314 100644 --- a/src/ngircd/irc-write.h +++ b/src/ngircd/irc-write.h @@ -14,26 +14,27 @@ #ifndef __irc_write_h__ #define __irc_write_h__ -GLOBAL bool IRC_WriteStrClient PARAMS((CLIENT *Client, char *Format, ...)); +GLOBAL bool IRC_WriteStrClient PARAMS((CLIENT *Client, const char *Format, ...)); GLOBAL bool IRC_WriteStrClientPrefix PARAMS((CLIENT *Client, CLIENT *Prefix, - char *Format, ...)); + const char *Format, ...)); GLOBAL bool IRC_WriteStrChannel PARAMS((CLIENT *Client, CHANNEL *Chan, - bool Remote, char *Format, ...)); + bool Remote, const char *Format, ...)); GLOBAL bool IRC_WriteStrChannelPrefix PARAMS((CLIENT *Client, CHANNEL *Chan, - CLIENT *Prefix, bool Remote, char *Format, ...)); + CLIENT *Prefix, bool Remote, const char *Format, ...)); -GLOBAL void IRC_WriteStrServers PARAMS((CLIENT *ExceptOf, char *Format, ...)); +GLOBAL void IRC_WriteStrServers PARAMS((CLIENT *ExceptOf, + const char *Format, ...)); GLOBAL void IRC_WriteStrServersPrefix PARAMS((CLIENT *ExceptOf, CLIENT *Prefix, - char *Format, ...)); + const char *Format, ...)); GLOBAL void IRC_WriteStrServersPrefixFlag PARAMS((CLIENT *ExceptOf, - CLIENT *Prefix, char Flag, char *Format, ...)); + CLIENT *Prefix, char Flag, const char *Format, ...)); GLOBAL void IRC_WriteStrServersPrefixFlag_CB PARAMS((CLIENT *ExceptOf, CLIENT *Prefix, char Flag, void (*callback)(CLIENT *, CLIENT *, void *), void *cb_data)); GLOBAL bool IRC_WriteStrRelatedPrefix PARAMS((CLIENT *Client, CLIENT *Prefix, - bool Remote, char *Format, ...)); + bool Remote, const char *Format, ...)); GLOBAL void IRC_SendWallops PARAMS((CLIENT *Client, CLIENT *From, const char *Format, ...));

1 0

Alexander Barton : const'ify command name variable in _COMMAND strcuture
by alex＠arthur.barton.de 26 Jun '10

26 Jun '10

Module: ngircd.git Branch: master Commit: 8605e9c0fe7ffa42149271c9af31288bd4a0dfac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8605e9c0… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 26 00:37:06 2010 +0200 const'ify command name variable in _COMMAND strcuture --- src/ngircd/parse.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/parse.h b/src/ngircd/parse.h index a3f764e..205dbb8 100644 --- a/src/ngircd/parse.h +++ b/src/ngircd/parse.h @@ -30,7 +30,7 @@ typedef struct _REQUEST /* vgl. RFC 2812, 2.3 */ typedef struct _COMMAND { - char *name; /* command name */ + const char *name; /* command name */ bool (*function) PARAMS(( CLIENT *Client, REQUEST *Request )); CLIENT_TYPE type; /* valid client types (bit mask) */ long lcount, rcount; /* number of local and remote calls */

1 0

Alexander Barton : const'ify Client_TypeText()
by alex＠arthur.barton.de 26 Jun '10

26 Jun '10

Module: ngircd.git Branch: master Commit: a68103771ccdf041c426277bc3a1f8dc345f3642 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a6810377… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 26 00:31:08 2010 +0200 const'ify Client_TypeText() --- src/ngircd/client.c | 2 +- src/ngircd/client.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 671bf6c..7cf10da 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1104,7 +1104,7 @@ Client_RegisterWhowas( CLIENT *Client ) } /* Client_RegisterWhowas */ -GLOBAL char * +GLOBAL const char * Client_TypeText(CLIENT *Client) { assert(Client != NULL); diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 1064917..90fd6f2 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -146,7 +146,7 @@ GLOBAL int Client_GetLastWhowasIndex PARAMS(( void )); GLOBAL void Client_RegisterWhowas PARAMS(( CLIENT *Client )); -GLOBAL char * Client_TypeText PARAMS((CLIENT *Client)); +GLOBAL const char *Client_TypeText PARAMS((CLIENT *Client)); #endif

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 : 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 : 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 : New function Conn_IPA(): get client IP address as string
by alex＠arthur.barton.de 25 Jun '10

25 Jun '10

Module: ngircd.git Branch: master Commit: 60eac5e952ef4096557d63e323e34498cc88928f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=60eac5e9… Author: Alexander Barton <alex(a)barton.de> Date: Sat May 22 16:35:02 2010 +0200 New function Conn_IPA(): get client IP address as string --- src/ngircd/conn-func.c | 10 ++++++++++ src/ngircd/conn-func.h | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index 196325e..15bc7cc 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -273,6 +273,16 @@ Conn_RecvBytes( CONN_ID Idx ) return My_Connections[Idx].bytes_in; } /* Conn_RecvBytes */ +/** + * Return the remote IP address of this connection as string. + */ +GLOBAL const char * +Conn_IPA(CONN_ID Idx) +{ + assert (Idx > NONE); + return ng_ipaddr_tostr(&My_Connections[Idx].addr); +} + GLOBAL void Conn_ResetWCounter( void ) diff --git a/src/ngircd/conn-func.h b/src/ngircd/conn-func.h index 9a1859d..d504592 100644 --- a/src/ngircd/conn-func.h +++ b/src/ngircd/conn-func.h @@ -39,6 +39,7 @@ GLOBAL long Conn_SendMsg PARAMS(( CONN_ID Idx )); GLOBAL long Conn_RecvMsg PARAMS(( CONN_ID Idx )); GLOBAL long Conn_SendBytes PARAMS(( CONN_ID Idx )); GLOBAL long Conn_RecvBytes PARAMS(( CONN_ID Idx )); +GLOBAL const char *Conn_IPA PARAMS(( CONN_ID Idx )); GLOBAL void Conn_SetPenalty PARAMS(( CONN_ID Idx, time_t Seconds )); GLOBAL void Conn_ResetPenalty PARAMS(( CONN_ID Idx ));

1 0