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

New function Conn_GetFromProc() to get CONN_ID of a subprocess 

Get CONN_ID from file descriptor associated to a subprocess structure.
This commit is contained in:
Alexander Barton 2010-06-29 23:38:39 +02:00
parent 2d4ea28835
commit 3d49fa5bff
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/ngircd/conn.c
View File

@ -1986,7 +1986,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
* IDENT user name.*/ * IDENT user name.*/
CLIENT *c; CLIENT *c;
int i; CONN_ID i;
size_t len; size_t len;
char *identptr; char *identptr;
#ifdef IDENTAUTH #ifdef IDENTAUTH
@ -1996,14 +1996,8 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
#endif #endif
LogDebug("Resolver: Got callback on fd %d, events %d", r_fd, events ); LogDebug("Resolver: Got callback on fd %d, events %d", r_fd, events );
i = Conn_GetFromProc(r_fd);
/* Search associated connection ... */ if (i == NONE) {
for( i = 0; i < Pool_Size; i++ ) {
if(( My_Connections[i].sock != NONE )
&& (Proc_GetPipeFd(&My_Connections[i].proc_stat) == r_fd))
break;
}
if( i >= Pool_Size ) {
/* Ops, none found? Probably the connection has already /* Ops, none found? Probably the connection has already
* been closed!? We'll ignore that ... */ * been closed!? We'll ignore that ... */
io_close( r_fd ); io_close( r_fd );
@ -2108,6 +2102,26 @@ Conn_GetClient( CONN_ID Idx )
} }
/**
* Get CONN_ID from file descriptor associated to a subprocess structure.
* @param fd File descriptor
* @return CONN_ID or NONE (-1)
*/
GLOBAL CONN_ID
Conn_GetFromProc(int fd)
{
int i;
assert(fd > 0);
for (i = 0; i < Pool_Size; i++) {
if ((My_Connections[i].sock != NONE)
&& (Proc_GetPipeFd(&My_Connections[i].proc_stat) == fd))
return i;
}
return NONE;
} /* Conn_GetFromProc */
#ifdef SSL_SUPPORT #ifdef SSL_SUPPORT
/** /**

1
src/ngircd/conn.h
View File

@ -113,6 +113,7 @@ GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, const char *LogMsg, const char *Fwd
GLOBAL void Conn_SyncServerStruct PARAMS(( void )); GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
GLOBAL CONN_ID Conn_GetFromProc PARAMS((int fd));
GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i)); GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i));
#ifdef SSL_SUPPORT #ifdef SSL_SUPPORT
GLOBAL bool Conn_GetCipherInfo PARAMS((CONN_ID Idx, char *buf, size_t len)); GLOBAL bool Conn_GetCipherInfo PARAMS((CONN_ID Idx, char *buf, size_t len));