v1.0.3 : updateCache have its own connection, minor msg modeling and error check

mynettcptable.go

@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	version = "1.0.0-rc3"
+	version = "1.0.3"
 )
 
 var (
@@ -176,6 +176,8 @@ func handleConnection(connClt net.Conn, conLdap *ldap.Conn) {
 			// Dont notice if client closed connection
 			if err.Error() != "EOF" && !strings.HasSuffix(err.Error(), "i/o timeout") {
 				logstream.Errorf("Error reading connection: %v\n", err.Error())
+			} else {
+				logstream.Debug("Error reading on connection : %s", err.Error())
 			}
 			return
 		}
@@ -227,7 +229,12 @@ func handleConnection(connClt net.Conn, conLdap *ldap.Conn) {
 		// First query netCache built with ipNetworkNumber
 		res, err := isIPContainedInNetCache(ip)
 		if err != nil {
-			logstream.Error(err.Error())
+			if strings.EqualFold(err.Error(), fmt.Sprintf("Invalid IP: %s", ip)) {
+				// We don't want those msg to pollute logs
+				logstream.Info(err.Error())
+			} else {
+				logstream.Error(err.Error())
+			}
 			sendResponse(connClt, err.Error(), 500)
 			continue
 		}
@@ -271,22 +278,29 @@ func sendResponse(con net.Conn, respMsg string, respCode int) error {
 	return nil
 }
 
+// attempt is useless now. It was introduced to break after N attempts, but this is not implemented. Should it be?
 func searchLdap(searchReq *ldap.SearchRequest, attempt int) (*ldap.SearchResult, error) {
 	mutex.Lock()
 	result, err := conLdap.Search(searchReq)
 	mutex.Unlock()
 	// Let's just manage connection errors here
-	if err != nil && strings.HasSuffix(err.Error(), "ldap: connection closed") {
+	if err != nil {
-		logstream.Error("LDAP connection closed, retrying")
+		if strings.HasSuffix(err.Error(), "ldap: connection closed") || err == ldap.ErrNilConnection {
-		mutex.Lock()
+			logstream.Error("LDAP connection closed, retrying")
-		conLdap.Close()
+			mutex.Lock()
-		conLdap, err = connectLdap()
+			// 16/01/2023: panic: runtime error: invalid memory address or nil pointer dereference
-		mutex.Unlock()
+			// probably bc connection is already closed
-		if err != nil {
+			if conLdap != nil {
-			return result, err
+				conLdap.Close()
-		} else {
+			}
-			attempt = attempt + 1
+			conLdap, err = connectLdap()
-			return searchLdap(searchReq, attempt)
+			mutex.Unlock()
+			if err != nil {
+				return result, err
+			} else {
+				attempt = attempt + 1
+				return searchLdap(searchReq, attempt)
+			}
 		}
 	}
 	return result, err
@@ -297,23 +311,32 @@ func connectLdap() (*ldap.Conn, error) {
 	conLdap, err = ldap.DialURL(*ldapURL)
 	if err != nil {
 		logstream.Errorf("Error dialing LDAP on %s: %v\n", *ldapURL, err)
-		return conLdap, err
+		return nil, err
 	}
 	err = conLdap.Bind(*ldapUser, *ldapPass)
 	if err != nil {
 		logstream.Errorf("Error binding LDAP: %s", err)
-		return conLdap, err
+		return nil, err
 	}
 	return conLdap, err
 }
 
-// TODO : buildNetCache should have its own LDAP connection
+func periodicallyUpdateCache() {
-func periodicallyUpdateCache(conLdap *ldap.Conn) {
+	myLdap, err := connectLdap()
+	if err != nil {
+		return
+	}
 	// On initialise immediatement le cache
-	buildNetCacheFromIPNetwork(conLdap)
+	buildNetCacheFromIPNetwork(myLdap)
+	myLdap.Close()
 
 	for range time.Tick(time.Second * time.Duration(*refreshInterval)) {
-		buildNetCacheFromIPNetwork(conLdap)
+		myLdap, err := connectLdap()
+		if err != nil {
+			return
+		}
+		buildNetCacheFromIPNetwork(myLdap)
+		myLdap.Close()
 	}
 }
 
@@ -327,7 +350,7 @@ func run() {
 		return
 	}
 
-	go periodicallyUpdateCache(conLdap)
+	go periodicallyUpdateCache()
 
 	// Spawn a go routine for incoming connection
 	for {
@@ -366,7 +389,7 @@ func main() {
 		return
 	}
 
-	fmt.Printf("MyNetTCPTable v.%s\n", version)
+	fmt.Printf("%s: MyNetTCPTable v.%s listening on %s\n", time.Now().Format(time.RFC3339), version, *listen)
 
 	logstream = logrus.New()
 	level, err := logrus.ParseLevel(*logLevel)