albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Alexander Barton 2010-05-21 22:48:34 +02:00
parent 54e67ea9ee
commit 89e73ad4b4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ngircd/conn.c
View File

@ -755,7 +755,7 @@ Conn_Handler(void)
if (SSL_WantWrite(&My_Connections[i])) if (SSL_WantWrite(&My_Connections[i]))
continue; /* TLS/SSL layer needs to write data; deal with this first */ continue; /* TLS/SSL layer needs to write data; deal with this first */
#endif #endif
if (Proc_InProgress(&My_Connections[i].res_stat)) { if (Proc_InProgress(&My_Connections[i].proc_stat)) {
/* Wait for completion of resolver sub-process ... */ /* Wait for completion of resolver sub-process ... */
io_event_del(My_Connections[i].sock, io_event_del(My_Connections[i].sock,
IO_WANTREAD); IO_WANTREAD);
@ -1074,8 +1074,8 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie
} }
/* cancel running resolver */ /* cancel running resolver */
if (Proc_InProgress(&My_Connections[Idx].res_stat)) if (Proc_InProgress(&My_Connections[Idx].proc_stat))
Proc_Kill(&My_Connections[Idx].res_stat); Proc_Kill(&My_Connections[Idx].proc_stat);
/* Servers: Modify time of next connect attempt? */ /* Servers: Modify time of next connect attempt? */
Conf_UnsetServer( Idx ); Conf_UnsetServer( Idx );
@ -1377,7 +1377,7 @@ New_Connection(int Sock)
identsock = -1; identsock = -1;
#endif #endif
if (!Conf_NoDNS) 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); identsock, cb_Read_Resolver_Result);
/* ngIRCd waits up to 4 seconds for the result of the asynchronous /* 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].signon = now;
My_Connections[Idx].lastdata = now; My_Connections[Idx].lastdata = now;
My_Connections[Idx].lastprivmsg = now; My_Connections[Idx].lastprivmsg = now;
Proc_InitStruct(&My_Connections[Idx].res_stat); Proc_InitStruct(&My_Connections[Idx].proc_stat);
} /* Init_Conn_Struct */ } /* Init_Conn_Struct */
@ -2003,7 +2003,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
/* Search associated connection ... */ /* Search associated connection ... */
for( i = 0; i < Pool_Size; i++ ) { for( i = 0; i < Pool_Size; i++ ) {
if(( My_Connections[i].sock != NONE ) 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; break;
} }
if( i >= Pool_Size ) { if( i >= Pool_Size ) {
@ -2015,7 +2015,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
} }
/* Read result from pipe */ /* 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) if (len == 0)
return; return;

2
src/ngircd/conn.h
View File

@ -69,7 +69,7 @@ typedef struct _Connection
{ {
int sock; /* Socket handle */ int sock; /* Socket handle */
ng_ipaddr_t addr; /* Client address */ 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 */ char host[HOST_LEN]; /* Hostname */
array rbuf; /* Read buffer */ array rbuf; /* Read buffer */
array wbuf; /* Write buffer */ array wbuf; /* Write buffer */