Fix reg nil pointer bug (#211)

refraction-networking · Aug 16, 2023 · 77a85af · 77a85af
1 parent 88af533
commit 77a85af
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/cmd/application/conns.go b/cmd/application/conns.go
@@ -315,13 +315,7 @@ readLoop:
 
 	transports:
 		for i, t := range possibleTransports {
-			wrappedReg, wrapped, err := t.WrapConnection(&received, clientConn, originalDstIP, regManager)
-			reg, ok := wrappedReg.(*cj.DecoyRegistration)
-			if !ok {
-				logger.Errorf("unexpected returned reg type from transport: %T, expected: %T", wrapped, reg)
-				delete(possibleTransports, i)
-				continue transports
-			}
+			wrappedReg, wrappedConn, err := t.WrapConnection(&received, clientConn, originalDstIP, regManager)
 
 			err = generalizeErr(err)
 			if errors.Is(err, transports.ErrTryAgain) {
@@ -342,6 +336,16 @@ readLoop:
 				return
 			}
 
+			ok := false
+			reg, ok = wrappedReg.(*cj.DecoyRegistration)
+			if !ok {
+				logger.Errorf("unexpected returned reg type from transport: %T, expected: %T", wrapped, reg)
+				delete(possibleTransports, i)
+				continue transports
+			}
+			// set outer wrapped var
+			wrapped = wrappedConn
+
 			// We found our transport! First order of business: disable deadline
 			err = wrapped.SetDeadline(time.Time{})
 			if err != nil {