ngIRCd GIT Updates Juli 2010

ngircd-commits@lists.barton.de

2 Teilnehmer
36 Diskussionen

Alexander Barton : Resolver: Implement signal handler and catch TERM signal
by alex＠arthur.barton.de 14 Jul '10

14 Jul '10

Module: ngircd.git Branch: master Commit: 2d4ea288353c2240c8d13e41c8da1557fc32168b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2d4ea288… Author: Alexander Barton <alex(a)barton.de> Date: Fri May 21 23:53:48 2010 +0200 Resolver: Implement signal handler and catch TERM signal --- src/ngircd/resolve.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index e64688e..295a559 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -42,6 +42,7 @@ #include "io.h" +static void Init_Subprocess PARAMS(( void )); static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd )); static void Do_ResolveName PARAMS(( const char *Host, int w_fd )); @@ -69,7 +70,7 @@ Resolve_Addr(PROC_STAT * s, const ng_ipaddr_t *Addr, int identsock, return true; } else if( pid == 0 ) { /* Sub process */ - Log_Init_Resolver(); + Init_Subprocess(); Do_ResolveAddr( Addr, identsock, pipefd[1]); Log_Exit_Resolver( ); exit(0); @@ -98,7 +99,7 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short)) return true; } else if( pid == 0 ) { /* Sub process */ - Log_Init_Resolver(); + Init_Subprocess(); Do_ResolveName(Host, pipefd[1]); Log_Exit_Resolver( ); exit(0); @@ -107,6 +108,33 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short)) } /* Resolve_Name */ +/** + * Signal handler for the forked resolver subprocess. + */ +static void +Signal_Handler(int Signal) +{ + switch(Signal) { + case SIGTERM: +#ifdef DEBUG + Log_Resolver(LOG_DEBUG, "Resolver: Got TERM signal, exiting."); +#endif + exit(1); + } +} + + +/** + * Initialize forked resolver subprocess. + */ +static void +Init_Subprocess(void) +{ + signal(SIGTERM, Signal_Handler); + Log_Init_Resolver(); +} + + #if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) #if !defined(WANT_IPV6) && defined(h_errno) static char *

1 0

Alexander Barton : Don't set a penalty time when doing DNS lookups
by alex＠arthur.barton.de 14 Jul '10

14 Jul '10

Module: ngircd.git Branch: master Commit: d4632a727fbee65cb1585c6f6e9968d830f23a19 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d4632a72… Author: Alexander Barton <alex(a)barton.de> Date: Fri May 21 23:47:28 2010 +0200 Don't set a penalty time when doing DNS lookups The logic isn't as described in the source and intended by this code: ngIRCd doesn't wait for the asynchronous resolver process until the set penalty time is over, but until the forked process terminates or the initial connection timeout (= PongTimeout) triggers. So don't set the penalty time at all and remove the wrong comment. --- src/ngircd/conn.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index dff9336..0d82d53 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1382,11 +1382,6 @@ New_Connection(int Sock) Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr, identsock, cb_Read_Resolver_Result); - /* ngIRCd waits up to 4 seconds for the result of the asynchronous - * DNS and IDENT resolver subprocess using the "penalty" mechanism. - * If there are results earlier, the delay is aborted. */ - Conn_SetPenalty(new_sock, 4); - Account_Connection(); return new_sock; } /* New_Connection */

1 0

Alexander Barton : Update comments: subprocesses not only can be resolver processes
by alex＠arthur.barton.de 14 Jul '10

14 Jul '10

Module: ngircd.git Branch: master Commit: 60f5dd5b29e701b3ab601addd3cdefb508acc7d1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=60f5dd5b… Author: Alexander Barton <alex(a)barton.de> Date: Fri May 21 23:44:20 2010 +0200 Update comments: subprocesses not only can be resolver processes --- src/ngircd/conn.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 91ff779..dff9336 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -756,7 +756,8 @@ Conn_Handler(void) continue; /* TLS/SSL layer needs to write data; deal with this first */ #endif if (Proc_InProgress(&My_Connections[i].proc_stat)) { - /* Wait for completion of resolver sub-process ... */ + /* Wait for completion of forked subprocess + * and ignore the socket in the meantime ... */ io_event_del(My_Connections[i].sock, IO_WANTREAD); continue; @@ -772,6 +773,7 @@ Conn_Handler(void) IO_WANTREAD); continue; } + io_event_add(My_Connections[i].sock, IO_WANTREAD); } @@ -1073,7 +1075,7 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie in_k, out_k); } - /* cancel running resolver */ + /* Kill possibly running subprocess */ if (Proc_InProgress(&My_Connections[Idx].proc_stat)) Proc_Kill(&My_Connections[Idx].proc_stat);

1 0

Alexander Barton : Refactoring: Rename CONNECTION.res_stat to .proc_stat
by alex＠arthur.barton.de 14 Jul '10

14 Jul '10

Module: ngircd.git Branch: master Commit: 89e73ad4b4e66921fc20c5afbe17042aee77a329 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=89e73ad4… Author: Alexander Barton <alex(a)barton.de> Date: Fri May 21 22:48:34 2010 +0200 Refactoring: Rename CONNECTION.res_stat to .proc_stat We want to use this process status variable not only for the resolver subprocesses but other asynchronous tasks as well; so let's name it more generic. --- src/ngircd/conn.c | 14 +++++++------- src/ngircd/conn.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 495c54f..91ff779 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -755,7 +755,7 @@ Conn_Handler(void) if (SSL_WantWrite(&My_Connections[i])) continue; /* TLS/SSL layer needs to write data; deal with this first */ #endif - if (Proc_InProgress(&My_Connections[i].res_stat)) { + if (Proc_InProgress(&My_Connections[i].proc_stat)) { /* Wait for completion of resolver sub-process ... */ io_event_del(My_Connections[i].sock, IO_WANTREAD); @@ -1074,8 +1074,8 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie } /* cancel running resolver */ - if (Proc_InProgress(&My_Connections[Idx].res_stat)) - Proc_Kill(&My_Connections[Idx].res_stat); + if (Proc_InProgress(&My_Connections[Idx].proc_stat)) + Proc_Kill(&My_Connections[Idx].proc_stat); /* Servers: Modify time of next connect attempt? */ Conf_UnsetServer( Idx ); @@ -1377,7 +1377,7 @@ New_Connection(int Sock) identsock = -1; #endif if (!Conf_NoDNS) - Resolve_Addr(&My_Connections[new_sock].res_stat, &new_addr, + Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr, identsock, cb_Read_Resolver_Result); /* ngIRCd waits up to 4 seconds for the result of the asynchronous @@ -1889,7 +1889,7 @@ Init_Conn_Struct(CONN_ID Idx) My_Connections[Idx].signon = now; My_Connections[Idx].lastdata = now; My_Connections[Idx].lastprivmsg = now; - Proc_InitStruct(&My_Connections[Idx].res_stat); + Proc_InitStruct(&My_Connections[Idx].proc_stat); } /* Init_Conn_Struct */ @@ -2003,7 +2003,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) /* Search associated connection ... */ for( i = 0; i < Pool_Size; i++ ) { if(( My_Connections[i].sock != NONE ) - && (Proc_GetPipeFd(&My_Connections[i].res_stat) == r_fd)) + && (Proc_GetPipeFd(&My_Connections[i].proc_stat) == r_fd)) break; } if( i >= Pool_Size ) { @@ -2015,7 +2015,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) } /* Read result from pipe */ - len = Resolve_Read(&My_Connections[i].res_stat, readbuf, sizeof readbuf -1); + len = Resolve_Read(&My_Connections[i].proc_stat, readbuf, sizeof readbuf -1); if (len == 0) return; diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 2ca0d62..7665bb3 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -69,7 +69,7 @@ typedef struct _Connection { int sock; /* Socket handle */ ng_ipaddr_t addr; /* Client address */ - PROC_STAT res_stat; /* Status of resolver process */ + PROC_STAT proc_stat; /* Status of resolver process */ char host[HOST_LEN]; /* Hostname */ array rbuf; /* Read buffer */ array wbuf; /* Write buffer */

1 0

Alexander Barton : New "module" proc.c/proc.h for generic process handling
by alex＠arthur.barton.de 14 Jul '10

14 Jul '10

Module: ngircd.git Branch: master Commit: 54e67ea9ee6c2b00c43f759edc55b57b969c9e2d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=54e67ea9… Author: Alexander Barton <alex(a)barton.de> Date: Tue May 18 17:38:12 2010 +0200 New "module" proc.c/proc.h for generic process handling The new "module" proc.c is used for functions dealing with child processes. At the moment, it is only used by the asynchronous resolver. All the functions already implemented habe been migrated from the resolver code base, and the rest of the ngIRCd source code has been adepted to the new namespace and calling conventions. The goal is to develop "generic" process handling functions that can be used for other purposes as well, e.g. running processes on client connects etc. --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 6 ++ src/ngircd/Makefile.am | 10 +-- src/ngircd/conf.c | 2 +- src/ngircd/conf.h | 4 +- src/ngircd/conn.c | 23 +++-- src/ngircd/conn.h | 4 +- src/ngircd/io.c | 3 +- src/ngircd/proc.c | 102 +++++++++++++++++++++++ src/ngircd/proc.h | 35 ++++++++ src/ngircd/resolve.c | 99 +++------------------- src/ngircd/resolve.h | 30 ++----- 11 files changed, 187 insertions(+), 131 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=54e6…

1 0

Alexander Barton : Only #include resolve.h if it is really needed
by alex＠arthur.barton.de 14 Jul '10

14 Jul '10

Module: ngircd.git Branch: master Commit: cc336b75580d012c1caee58a252d1ad14b2cee23 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cc336b75… Author: Alexander Barton <alex(a)barton.de> Date: Tue May 18 17:06:31 2010 +0200 Only #include resolve.h if it is really needed --- src/ngircd/channel.c | 1 - src/ngircd/client.c | 1 - src/ngircd/conf.c | 1 - src/ngircd/irc-channel.c | 1 - src/ngircd/irc-info.c | 1 - src/ngircd/irc-login.c | 1 - src/ngircd/irc-mode.c | 1 - src/ngircd/irc-oper.c | 1 - src/ngircd/irc-server.c | 1 - src/ngircd/irc.c | 1 - src/ngircd/ngircd.c | 1 - src/ngircd/numeric.c | 1 - 12 files changed, 0 insertions(+), 12 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 6e9e0f4..0fa38de 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -34,7 +34,6 @@ #include "imp.h" #include "irc-write.h" -#include "resolve.h" #include "conf.h" #include "hash.h" #include "lists.h" diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 7cf10da..e6dbf15 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -35,7 +35,6 @@ #include <imp.h> #include "ngircd.h" #include "channel.h" -#include "resolve.h" #include "conf.h" #include "hash.h" #include "irc-write.h" diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 694b5d4..f9db5c7 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -44,7 +44,6 @@ #include "defines.h" #include "log.h" #include "match.h" -#include "resolve.h" #include "tool.h" #include "exp.h" diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 1014d3a..138a94a 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -32,7 +32,6 @@ #include "parse.h" #include "irc-info.h" #include "irc-write.h" -#include "resolve.h" #include "conf.h" #include "exp.h" diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 7e0bf63..806ab27 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -27,7 +27,6 @@ #include "conn-zip.h" #include "client.h" #include "channel.h" -#include "resolve.h" #include "conf.h" #include "defines.h" #include "log.h" diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 8e77e7f..cd1899c 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -22,7 +22,6 @@ #include <strings.h> #include "ngircd.h" -#include "resolve.h" #include "conn-func.h" #include "conf.h" #include "client.h" diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 10d4641..9a0f397 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -29,7 +29,6 @@ #include "log.h" #include "parse.h" #include "messages.h" -#include "resolve.h" #include "conf.h" #include "exp.h" diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 8492603..900c860 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -21,7 +21,6 @@ #include <string.h> #include "ngircd.h" -#include "resolve.h" #include "conn-func.h" #include "conf.h" #include "client.h" diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index a0a9468..987513b 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -22,7 +22,6 @@ #include <strings.h> #include "defines.h" -#include "resolve.h" #include "conn.h" #include "conn-func.h" #include "conn-zip.h" diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 0cb9a6e..f913d8d 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -22,7 +22,6 @@ static char UNUSED id[] = "$Id: irc.c,v 1.132 2008/01/15 22:28:14 fw Exp $"; #include <string.h> #include "ngircd.h" -#include "resolve.h" #include "conn-func.h" #include "conf.h" #include "client.h" diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index b951bad..8b2e4a8 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -39,7 +39,6 @@ #endif #include "defines.h" -#include "resolve.h" #include "conn.h" #include "conf-ssl.h" #include "client.h" diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index c3d94c3..b0a7798 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -20,7 +20,6 @@ #include <string.h> #include "defines.h" -#include "resolve.h" #include "conn.h" #include "conf.h" #include "conn.h"

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates Juli 2010