From e3c4df4fc91118a23cf5339796836f0dfa81f4b7 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Thu, 5 Aug 2004 08:26:32 +0000 Subject: [PATCH] Changed reusing port back to old scheme SVN revision: 1032 --- src/elogd.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index 6d3aef12..66454d93 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.441 2004/08/05 08:26:32 midas + Changed reusing port back to old scheme + Revision 1.440 2004/08/05 08:15:24 midas Changed way of reusing port @@ -19497,21 +19500,15 @@ void server_loop(int tcp_port) serv_addr.sin_port = htons((short) tcp_port); - /* first try without reusing address */ + /* switch on reuse of port */ + flag = 1; + setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, (char *) &flag, sizeof(INT)); status = bind(lsock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)); if (status < 0) { - eprintf("Warning: another server might already run on port %d.\n\n",tcp_port); - - /* now try with reusing address */ - flag = 1; - setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, (char *) &flag, sizeof(INT)); - status = bind(lsock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)); - if (status < 0) { - eprintf - ("Cannot bind to port %d.\nPlease use the \"-p\" flag to specify a different port.\n", - tcp_port); - exit(EXIT_FAILURE); - } + eprintf + ("Cannot bind to port %d.\nPlease use the \"-p\" flag to specify a different port.\n", + tcp_port); + exit(EXIT_FAILURE); } /* get host name for mail notification */