ipn: Status idle iff proxy is dialable

Author: ignoramous

intra/ipn/http1.go

@@ -209,7 +209,10 @@ func (h *http1) GetAddr() string {
 // Status implements Proxy.
 func (h *http1) Status() int32 {
 	s := h.status.Load()
-	if s != END && idling(h.lastdial.Load()) {
+	if candial2(s) != nil {
+		return s // paused or ended
+	}
+	if idling(h.lastdial.Load()) {
 		return TZZ
 	}
 	return s

intra/ipn/piph2.go

@@ -333,7 +333,10 @@ func (t *piph2) Stop() error {
 // Status implements Proxy.
 func (t *piph2) Status() int32 {
 	st := t.status.Load()
-	if st != END && idling(t.lastdial.Load()) {
+	if candial2(st) != nil {
+		return st // paused or ended
+	}
+	if idling(t.lastdial.Load()) {
 		return TZZ
 	}
 	return st

intra/ipn/pipws.go

@@ -330,7 +330,10 @@ func (t *pipws) Stop() error {
 // Status implements Proxy.
 func (t *pipws) Status() int32 {
 	s := t.status.Load()
-	if s != END && idling(t.lastdial.Load()) {
+	if candial2(s) != nil {
+		return s // paused or ended
+	}
+	if idling(t.lastdial.Load()) {
 		return TZZ
 	}
 	return s

intra/ipn/socks5.go

@@ -309,7 +309,10 @@ func (h *socks5) GetAddr() string {
 // Status implements Proxy.
 func (h *socks5) Status() int32 {
 	s := h.status.Load()
-	if s != END && idling(h.lastdial.Load()) {
+	if candial2(s) != nil {
+		return s // paused or ended
+	}
+	if idling(h.lastdial.Load()) {
 		return TZZ
 	}
 	return s