Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mf
go-multiaddr
Commits
7cb054e4
Unverified
Commit
7cb054e4
authored
Jun 23, 2021
by
Marten Seemann
Committed by
GitHub
Jun 23, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #155 from marten-seemann/guard-against-nil-addrs
guard against nil {Local,Remote}Addr() return values
parents
2f4fae41
1a8d3e4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
net/net.go
net/net.go
+4
-4
No files found.
net/net.go
View file @
7cb054e4
...
...
@@ -248,16 +248,16 @@ func (l *maListener) Accept() (Conn, error) {
var
raddr
ma
.
Multiaddr
// This block protects us in transports (i.e. unix sockets) that don't have
// remote addresses for inbound connections.
if
nconn
.
RemoteAddr
()
.
String
()
!=
""
{
raddr
,
err
=
FromNetAddr
(
nconn
.
RemoteA
ddr
()
)
if
addr
:=
nconn
.
RemoteAddr
()
;
addr
!=
nil
&&
addr
.
String
()
!=
""
{
raddr
,
err
=
FromNetAddr
(
a
ddr
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"failed to convert conn.RemoteAddr: %s"
,
err
)
}
}
var
laddr
ma
.
Multiaddr
if
nconn
.
LocalAddr
()
.
String
()
!=
""
{
laddr
,
err
=
FromNetAddr
(
nconn
.
LocalA
ddr
()
)
if
addr
:=
nconn
.
LocalAddr
()
;
addr
!=
nil
&&
addr
.
String
()
!=
""
{
laddr
,
err
=
FromNetAddr
(
a
ddr
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"failed to convert conn.LocalAddr: %s"
,
err
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment