nilaway: ipn/wg/wgconn, ipn/wg/agw, dns53/upstream

celzero · Dec 1, 2024 · 1187776 · 1187776
1 parent 54d9543
commit 1187776
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/intra/dns53/upstream.go b/intra/dns53/upstream.go
@@ -265,7 +265,7 @@ func (t *transport) chooseProxy(pids []string) string {
 	}
 	for _, ipp := range t.IPPorts() {
 		if px, err := t.proxies.ProxyTo(ipp, core.UNKNOWN_UID_STR, pids); err == nil {
-			pid = px.ID()
+			pid = proxyID(px) // px is never nil, but nilaway complains
 			foundProxy = true
 			log.VV("dns53: proxy: choose: (%s) proxy(%s) for %s@%s; among %v",
 				t.id, pid, t.addrport, ipp, pids)

diff --git a/intra/ipn/warp/agw.go b/intra/ipn/warp/agw.go
@@ -529,8 +529,8 @@ func (a *agwc) reg() (*AmzWgConfig, error) {
 	req.Header.Set("Accept", "application/json")
 
 	resp, err := a.http.Do(req)
-	if err != nil {
-		return nil, err
+	if err != nil || resp == nil {
+		return nil, core.OneErr(err, errNoApiResponse)
 	}
 	defer resp.Body.Close()
 

diff --git a/intra/ipn/warp/id.go b/intra/ipn/warp/id.go
@@ -23,7 +23,7 @@ import (
 )
 
 var (
-	errNoApiResponse = errors.New("warp: no api response")
+	errNoApiResponse = errors.New("warp/agw: no api response")
 	errNoApiData     = errors.New("warp: no api data")
 	errZeroIdentity  = errors.New("warp: identity content empty")
 	errZeroPeers     = errors.New("warp: no peers")

diff --git a/intra/ipn/wg/wgconn.go b/intra/ipn/wg/wgconn.go
@@ -411,7 +411,7 @@ func (s *StdNetBind) Send(buf [][]byte, peer conn.Endpoint) (err error) {
 		if blackhole || !bufok {
 			return nil
 		}
-		if noconn {
+		if noconn || uc == nil {
 			return syscall.EAFNOSUPPORT
 		}