Address review comments

Author: plorenz

controller/network/routesender.go

@@ -189,6 +189,7 @@ func (self *routeSender) handleRouteSend(attempt uint32, path *model.Path, strat
 			self.serviceCounters.ServiceDialOtherError(terminator.GetServiceId())
 			failureCause = CircuitFailureRouterErrPortNotAllowed
 		case ctrl_msg.ErrorTypeInvalidLinkDestination:
+			self.serviceCounters.ServiceDialOtherError(terminator.GetServiceId())
 			failureCause = CircuitFailureRouterErrInvalidLinkDest
 		case ctrl_msg.ErrorTypeResourcesNotAvailable:
 			self.serviceCounters.ServiceDialOtherError(terminator.GetServiceId())

router/handler_ctrl/classify_dial_error_test.go

@@ -19,6 +19,7 @@ package handler_ctrl
 import (
 	"fmt"
 	"net"
+	"os"
 	"syscall"
 	"testing"
 
@@ -65,6 +66,15 @@ func Test_classifyDialError(t *testing.T) {
 		require.Equal(t, byte(ctrl_msg.ErrorTypeDialTimedOut), classifyDialError(err))
 	})
 
+	t.Run("timeout via net.OpError", func(t *testing.T) {
+		err := &net.OpError{
+			Op:  "dial",
+			Net: "tcp",
+			Err: &os.SyscallError{Syscall: "connect", Err: syscall.ETIMEDOUT},
+		}
+		require.Equal(t, byte(ctrl_msg.ErrorTypeDialTimedOut), classifyDialError(err))
+	})
+
 	t.Run("misconfigured terminator", func(t *testing.T) {
 		err := xgress.MisconfiguredTerminatorError{InnerError: fmt.Errorf("bad address")}
 		require.Equal(t, byte(ctrl_msg.ErrorTypeMisconfiguredTerminator), classifyDialError(err))

router/handler_ctrl/route.go

@@ -197,7 +197,7 @@ func classifyDialError(err error) byte {
 		return ctrl_msg.ErrorTypeResourcesNotAvailable
 	case isDnsError(err):
 		return ctrl_msg.ErrorTypeDnsResolutionFailed
-	case isNetworkTimeout(err) || errors.Is(err, syscall.ETIMEDOUT):
+	case isNetworkTimeout(err):
 		return ctrl_msg.ErrorTypeDialTimedOut
 	case errors.As(err, &xgress.MisconfiguredTerminatorError{}):
 		return ctrl_msg.ErrorTypeMisconfiguredTerminator
@@ -237,7 +237,7 @@ func isRejectedByApplicationError(err error) bool {
 
 func isNetworkTimeout(err error) bool {
 	var netErr net.Error
-	return errors.As(err, &netErr)
+	return (errors.As(err, &netErr) && netErr.Timeout()) || errors.Is(err, syscall.ETIMEDOUT)
 }
 
 func newDialParams(ctrlId string, route *ctrl_pb.Route, bindHandler xgress.BindHandler, logContext logcontext.Context, deadline time.Time) *dialParams {