mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-05-07 17:54:08 +00:00
Code Issues Releases Wiki Activity

NewListener(): Code cleanup

Browse Source
This commit is contained in:
Alexander Barton 2013-01-27 20:57:25 +01:00
parent 84a599ece4
commit 3a3b3225d4
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ngircd/conn.c
View File

@ -620,8 +620,9 @@ NewListener(const char *listen_addr, UINT16 Port)
af = ng_ipaddr_af(&addr); af = ng_ipaddr_af(&addr);
sock = socket(af, SOCK_STREAM, 0); sock = socket(af, SOCK_STREAM, 0);
if( sock < 0 ) { if (sock < 0) {
Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, strerror(errno)); Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af,
strerror(errno));
return -1; return -1;
} }
@ -632,21 +633,22 @@ NewListener(const char *listen_addr, UINT16 Port)
if (bind(sock, (struct sockaddr *)&addr, ng_ipaddr_salen(&addr)) != 0) { if (bind(sock, (struct sockaddr *)&addr, ng_ipaddr_salen(&addr)) != 0) {
Log(LOG_CRIT, "Can't bind socket to address %s:%d - %s!", Log(LOG_CRIT, "Can't bind socket to address %s:%d - %s!",
ng_ipaddr_tostr(&addr), Port, strerror(errno)); ng_ipaddr_tostr(&addr), Port, strerror(errno));
close(sock); close(sock);
return -1; return -1;
} }
if( listen( sock, 10 ) != 0 ) { if (listen(sock, 10) != 0) {
Log( LOG_CRIT, "Can't listen on socket: %s!", strerror( errno )); Log(LOG_CRIT, "Can't listen on socket: %s!", strerror(errno));
close( sock ); close(sock);
return -1; return -1;
} }
/* keep fd in list so we can close it when ngircd restarts/shuts down */ /* keep fd in list so we can close it when ngircd restarts/shuts down */
if (!array_catb( &My_Listeners,(char*) &sock, sizeof(int) )) { if (!array_catb(&My_Listeners, (char *)&sock, sizeof(int))) {
Log( LOG_CRIT, "Can't add socket to My_Listeners array: %s!", strerror( errno )); Log(LOG_CRIT, "Can't add socket to My_Listeners array: %s!",
close( sock ); strerror(errno));
close(sock);
return -1; return -1;
} }