Commit41ab80f

committed

review 2

1 parent416b5ff commit41ab80fCopy full SHA for 41ab80f

File tree

+20

-6

lines changed

+20

-6

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -377,8 +377,9 @@ func ConnDiagnostics(w io.Writer, d ConnDiags) {`
`377`	`377`
`378`	`378`	`ifd.PingP2P {`
`379`	`379`	`_,_=fmt.Fprint(w,"✔ You are connected directly (p2p)\n")`
	`380`	`+}else {`
	`381`	`+_,_=fmt.Fprint(w,"❗ You are connected via a DERP relay, not directly (p2p)\n")`
`380`	`382`	`}`
`381`		`-_,_=fmt.Fprint(w,"❗ You are connected via a DERP relay, not directly (p2p)\n")`
`382`	`383`
`383`	`384`	`ifd.DisableDirect {`
`384`	`385`	_,_=fmt.Fprint(w,"❗ Direct connections are disabled locally, by `--disable-direct` or `CODER_DISABLE_DIRECT`\n")

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,9 @@ func FetchAWSIPRanges(ctx context.Context, url string) (*AWSIPRanges, error) {`
`71`	`71`	`iferr!=nil {`
`72`	`72`	`returnnil,xerrors.Errorf("parse ip prefix: %w",err)`
`73`	`73`	`}`
	`74`	`+ifprefix.Addr().Is6() {`
	`75`	`+returnnil,xerrors.Errorf("ipv4 prefix contains ipv6 address: %s",p.Prefix)`
	`76`	`+}`
`74`	`77`	`out.V4=append(out.V4,prefix)`
`75`	`78`	`}`
`76`	`79`
`@@ -79,6 +82,9 @@ func FetchAWSIPRanges(ctx context.Context, url string) (*AWSIPRanges, error) {`
`79`	`82`	`iferr!=nil {`
`80`	`83`	`returnnil,xerrors.Errorf("parse ip prefix: %w",err)`
`81`	`84`	`}`
	`85`	`+ifprefix.Addr().Is4() {`
	`86`	`+returnnil,xerrors.Errorf("ipv6 prefix contains ipv4 address: %s",p.Prefix)`
	`87`	`+}`
`82`	`88`	`out.V6=append(out.V6,prefix)`
`83`	`89`	`}`
`84`	`90`

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -224,10 +224,17 @@ func (r RootCmd) ping() serpent.Command {`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`funcisAWSIP(awsRangescliutil.AWSIPRanges,nitailcfg.NetInfo)bool {`
`227`		`-checkIP:=func(ipStrstring)bool {`
`228`		`-ip,err:=netip.ParseAddr(ipStr)`
`229`		`-returnerr==nil&&awsRanges.CheckIP(ip)`
	`227`	`+ifni.GlobalV4!="" {`
	`228`	`+ip,err:=netip.ParseAddr(ni.GlobalV4)`
	`229`	`+iferr==nil&&awsRanges.CheckIP(ip) {`
	`230`	`+returntrue`
	`231`	`+}`
`230`	`232`	`}`
`231`		`-`
`232`		`-returncheckIP(ni.GlobalV4)\|\|checkIP(ni.GlobalV6)`
	`233`	`+ifni.GlobalV6!="" {`
	`234`	`+ip,err:=netip.ParseAddr(ni.GlobalV6)`
	`235`	`+iferr==nil&&awsRanges.CheckIP(ip) {`
	`236`	`+returntrue`
	`237`	`+}`
	`238`	`+}`
	`239`	`+returnfalse`
`233`	`240`	`}`

Comments

(0)