Rename ports_initlisteners() to Init_Listeners()

This commit is contained in:
Alexander Barton 2013-01-27 21:10:50 +01:00
parent 3a3b3225d4
commit f16d230530
1 changed files with 10 additions and 6 deletions

View File

@ -454,7 +454,7 @@ Conn_CloseAllSockets(int ExceptOf)
* @returns Number of listening sockets created. * @returns Number of listening sockets created.
*/ */
static unsigned int static unsigned int
ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short)) Init_Listeners(array *a, const char *listen_addr, void (*func)(int,short))
{ {
unsigned int created = 0; unsigned int created = 0;
size_t len; size_t len;
@ -470,8 +470,9 @@ ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short))
continue; continue;
} }
if (!io_event_create( fd, IO_WANTREAD, func )) { if (!io_event_create( fd, IO_WANTREAD, func )) {
Log( LOG_ERR, "io_event_create(): Could not add listening fd %d (port %u): %s!", Log(LOG_ERR,
fd, (unsigned int) *port, strerror(errno)); "io_event_create(): Can't add fd %d (port %u): %s!",
fd, (unsigned int) *port, strerror(errno));
close(fd); close(fd);
port++; port++;
continue; continue;
@ -500,7 +501,8 @@ Conn_InitListeners( void )
/* can't use Conf_ListenAddress directly, see below */ /* can't use Conf_ListenAddress directly, see below */
copy = strdup(Conf_ListenAddress); copy = strdup(Conf_ListenAddress);
if (!copy) { if (!copy) {
Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress, strerror(errno)); Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress,
strerror(errno));
return 0; return 0;
} }
listen_addr = strtok(copy, ","); listen_addr = strtok(copy, ",");
@ -508,9 +510,11 @@ Conn_InitListeners( void )
while (listen_addr) { while (listen_addr) {
ngt_TrimStr(listen_addr); ngt_TrimStr(listen_addr);
if (*listen_addr) { if (*listen_addr) {
created += ports_initlisteners(&Conf_ListenPorts, listen_addr, cb_listen); created += Init_Listeners(&Conf_ListenPorts,
listen_addr, cb_listen);
#ifdef SSL_SUPPORT #ifdef SSL_SUPPORT
created += ports_initlisteners(&Conf_SSLOptions.ListenPorts, listen_addr, cb_listen_ssl); created += Init_Listeners(&Conf_SSLOptions.ListenPorts,
listen_addr, cb_listen_ssl);
#endif #endif
} }