From: michael Date: Mon, 12 Jan 2015 19:56:33 +0000 (+0000) Subject: - irc.c: cleaned up irc_connect() X-Git-Tag: 1.1.0beta1~174 X-Git-Url: http://git.serene-ircd.net/?a=commitdiff_plain;h=6054730ea00b9c7fb862f5c0f8096a14bab86c45;p=hopm.git - irc.c: cleaned up irc_connect() git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5364 82007160-df01-0410-b94d-b575c5fd34c7 --- diff --git a/src/irc.c b/src/irc.c index efe5426..50a9c4e 100644 --- a/src/irc.c +++ b/src/irc.c @@ -315,32 +315,11 @@ irc_connect(void) /* Connect to IRC server as client. */ if (connect(IRC_FD, (struct sockaddr *)&IRC_SVR, sizeof(IRC_SVR)) == -1) { - switch (errno) - { - case EISCONN: - /* Already connected */ - return; - case ECONNREFUSED: - log_printf("IRC -> connect(): Connection refused by (%s)", - IRCItem->server); - break; - case ETIMEDOUT: - log_printf("IRC -> connect(): Timed out connecting to (%s)", - IRCItem->server); - break; - case ENETUNREACH: - log_printf("IRC -> connect(): Network unreachable"); - break; - case EALREADY: - /* Previous attempt not complete */ - return; - default: - log_printf("IRC -> connect(): Unknown error connecting to (%s)", - IRCItem->server); - - if (OPT_DEBUG >= 1) - log_printf("%s", strerror(errno)); - } + log_printf("IRC -> connect(): error connecting to %s: %s", + IRCItem->server, strerror(errno)); + + if (errno == EISCONN /* Already connected */ || errno == EALREADY /* Previous attempt not complete */) + return; /* Try to connect again */ irc_reconnect();