From: wessels <>
Date: Wed, 10 Apr 1996 23:58:26 +0000 (+0000)
Subject: call neighbors_open after ICP socket opened
X-Git-Tag: SQUID_3_0_PRE1~6227
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb8b9a42a83040b77ab299d4b2043b4e09fdb4fa;p=thirdparty%2Fsquid.git

call neighbors_open after ICP socket opened
---

diff --git a/src/main.cc b/src/main.cc
index 3bd9bc9d0a..2ee70a05a9 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-/* $Id: main.cc,v 1.27 1996/04/10 17:28:37 wessels Exp $ */
+/* $Id: main.cc,v 1.28 1996/04/10 17:58:26 wessels Exp $ */
 
 /* DEBUG: Section 1             main: startup and main loop */
 
@@ -173,8 +173,6 @@ static void mainInitialize()
     static int first_time = 1;
     parseConfigFile(config_file);
 
-    neighbors_create();
-
     if (asciiPortNumOverride > 0)
 	setAsciiPortNum(asciiPortNumOverride);
     if (udpPortNumOverride > 0)
@@ -197,10 +195,6 @@ static void mainInitialize()
     /* do suid checking here */
     check_suid();
 
-    /* Now that the fd's are open, initialize neighbor connections */
-    if (theUdpConnection >= 0 && (!httpd_accel_mode || getAccelWithProxy()))
-	neighbors_open(theUdpConnection);
-
     if (first_time) {
 	first_time = 0;
 	/* module initialization */
@@ -214,6 +208,8 @@ static void mainInitialize()
 	do_mallinfo = 1;
     }
     serverConnectionsOpen();
+    if (theUdpConnection >= 0 && (!httpd_accel_mode || getAccelWithProxy()))
+	neighbors_open(theUdpConnection);
     debug(1, 0, "Ready to serve requests.\n");
 }