Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
189dee26
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
189dee26
编写于
2月 20, 2017
作者:
P
Péter Szilágyi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
p2p: remove trailing newlines from log messages
上级
b9d48b4a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
19 deletion
+19
-19
p2p/dial.go
p2p/dial.go
+1
-1
p2p/discover/udp.go
p2p/discover/udp.go
+3
-3
p2p/discv5/udp.go
p2p/discv5/udp.go
+2
-2
p2p/nat/nat.go
p2p/nat/nat.go
+5
-5
p2p/peer.go
p2p/peer.go
+8
-8
未找到文件。
p2p/dial.go
浏览文件 @
189dee26
...
...
@@ -296,7 +296,7 @@ func (t *dialTask) resolve(srv *Server) bool {
// dial performs the actual connection attempt.
func
(
t
*
dialTask
)
dial
(
srv
*
Server
,
dest
*
discover
.
Node
)
bool
{
addr
:=
&
net
.
TCPAddr
{
IP
:
dest
.
IP
,
Port
:
int
(
dest
.
TCP
)}
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"dial tcp %v (%x)
\n
"
,
addr
,
dest
.
ID
[
:
6
])
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"dial tcp %v (%x)"
,
addr
,
dest
.
ID
[
:
6
])
fd
,
err
:=
srv
.
Dialer
.
Dial
(
"tcp"
,
addr
.
String
())
if
err
!=
nil
{
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v"
,
err
)
...
...
p2p/discover/udp.go
浏览文件 @
189dee26
...
...
@@ -464,7 +464,7 @@ func (t *udp) send(toaddr *net.UDPAddr, ptype byte, req interface{}) error {
if
err
!=
nil
{
return
err
}
glog
.
V
(
logger
.
Detail
)
.
Infof
(
">>> %v %T
\n
"
,
toaddr
,
req
)
glog
.
V
(
logger
.
Detail
)
.
Infof
(
">>> %v %T"
,
toaddr
,
req
)
if
_
,
err
=
t
.
conn
.
WriteToUDP
(
packet
,
toaddr
);
err
!=
nil
{
glog
.
V
(
logger
.
Detail
)
.
Infoln
(
"UDP send failed:"
,
err
)
}
...
...
@@ -518,14 +518,14 @@ func (t *udp) readLoop() {
func
(
t
*
udp
)
handlePacket
(
from
*
net
.
UDPAddr
,
buf
[]
byte
)
error
{
packet
,
fromID
,
hash
,
err
:=
decodePacket
(
buf
)
if
err
!=
nil
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"Bad packet from %v: %v
\n
"
,
from
,
err
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"Bad packet from %v: %v"
,
from
,
err
)
return
err
}
status
:=
"ok"
if
err
=
packet
.
handle
(
t
,
from
,
fromID
,
hash
);
err
!=
nil
{
status
=
err
.
Error
()
}
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"<<< %v %T: %s
\n
"
,
from
,
packet
,
status
)
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"<<< %v %T: %s"
,
from
,
packet
,
status
)
return
err
}
...
...
p2p/discv5/udp.go
浏览文件 @
189dee26
...
...
@@ -348,7 +348,7 @@ func (t *udp) sendPacket(toid NodeID, toaddr *net.UDPAddr, ptype byte, req inter
//fmt.Println(err)
return
hash
,
err
}
glog
.
V
(
logger
.
Detail
)
.
Infof
(
">>> %v to %x@%v
\n
"
,
nodeEvent
(
ptype
),
toid
[
:
8
],
toaddr
)
glog
.
V
(
logger
.
Detail
)
.
Infof
(
">>> %v to %x@%v"
,
nodeEvent
(
ptype
),
toid
[
:
8
],
toaddr
)
if
_
,
err
=
t
.
conn
.
WriteToUDP
(
packet
,
toaddr
);
err
!=
nil
{
glog
.
V
(
logger
.
Detail
)
.
Infoln
(
"UDP send failed:"
,
err
)
}
...
...
@@ -407,7 +407,7 @@ func (t *udp) readLoop() {
func
(
t
*
udp
)
handlePacket
(
from
*
net
.
UDPAddr
,
buf
[]
byte
)
error
{
pkt
:=
ingressPacket
{
remoteAddr
:
from
}
if
err
:=
decodePacket
(
buf
,
&
pkt
);
err
!=
nil
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"Bad packet from %v: %v
\n
"
,
from
,
err
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"Bad packet from %v: %v"
,
from
,
err
)
//fmt.Println("bad packet", err)
return
err
}
...
...
p2p/nat/nat.go
浏览文件 @
189dee26
...
...
@@ -102,13 +102,13 @@ func Map(m Interface, c chan struct{}, protocol string, extport, intport int, na
refresh
:=
time
.
NewTimer
(
mapUpdateInterval
)
defer
func
()
{
refresh
.
Stop
()
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"deleting port mapping: %s %d -> %d (%s) using %s
\n
"
,
protocol
,
extport
,
intport
,
name
,
m
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"deleting port mapping: %s %d -> %d (%s) using %s"
,
protocol
,
extport
,
intport
,
name
,
m
)
m
.
DeleteMapping
(
protocol
,
extport
,
intport
)
}()
if
err
:=
m
.
AddMapping
(
protocol
,
extport
,
intport
,
name
,
mapTimeout
);
err
!=
nil
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"network port %s:%d could not be mapped: %v
\n
"
,
protocol
,
intport
,
err
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"network port %s:%d could not be mapped: %v"
,
protocol
,
intport
,
err
)
}
else
{
glog
.
V
(
logger
.
Info
)
.
Infof
(
"mapped network port %s:%d -> %d (%s) using %s
\n
"
,
protocol
,
extport
,
intport
,
name
,
m
)
glog
.
V
(
logger
.
Info
)
.
Infof
(
"mapped network port %s:%d -> %d (%s) using %s"
,
protocol
,
extport
,
intport
,
name
,
m
)
}
for
{
select
{
...
...
@@ -117,9 +117,9 @@ func Map(m Interface, c chan struct{}, protocol string, extport, intport int, na
return
}
case
<-
refresh
.
C
:
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"refresh port mapping %s:%d -> %d (%s) using %s
\n
"
,
protocol
,
extport
,
intport
,
name
,
m
)
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"refresh port mapping %s:%d -> %d (%s) using %s"
,
protocol
,
extport
,
intport
,
name
,
m
)
if
err
:=
m
.
AddMapping
(
protocol
,
extport
,
intport
,
name
,
mapTimeout
);
err
!=
nil
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"network port %s:%d could not be mapped: %v
\n
"
,
protocol
,
intport
,
err
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"network port %s:%d could not be mapped: %v"
,
protocol
,
intport
,
err
)
}
refresh
.
Reset
(
mapUpdateInterval
)
}
...
...
p2p/peer.go
浏览文件 @
189dee26
...
...
@@ -157,27 +157,27 @@ loop:
// A write finished. Allow the next write to start if
// there was no error.
if
err
!=
nil
{
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: write error: %v
\n
"
,
p
,
err
)
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: write error: %v"
,
p
,
err
)
reason
=
DiscNetworkError
break
loop
}
writeStart
<-
struct
{}{}
case
err
:=
<-
readErr
:
if
r
,
ok
:=
err
.
(
DiscReason
);
ok
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"%v: remote requested disconnect: %v
\n
"
,
p
,
r
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"%v: remote requested disconnect: %v"
,
p
,
r
)
requested
=
true
reason
=
r
}
else
{
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: read error: %v
\n
"
,
p
,
err
)
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: read error: %v"
,
p
,
err
)
reason
=
DiscNetworkError
}
break
loop
case
err
:=
<-
p
.
protoErr
:
reason
=
discReasonForError
(
err
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"%v: protocol error: %v (%v)
\n
"
,
p
,
err
,
reason
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"%v: protocol error: %v (%v)"
,
p
,
err
,
reason
)
break
loop
case
reason
=
<-
p
.
disc
:
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"%v: locally requested disconnect: %v
\n
"
,
p
,
reason
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"%v: locally requested disconnect: %v"
,
p
,
reason
)
break
loop
}
}
...
...
@@ -298,14 +298,14 @@ func (p *Peer) startProtocols(writeStart <-chan struct{}, writeErr chan<- error)
proto
.
closed
=
p
.
closed
proto
.
wstart
=
writeStart
proto
.
werr
=
writeErr
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: Starting protocol %s/%d
\n
"
,
p
,
proto
.
Name
,
proto
.
Version
)
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: Starting protocol %s/%d"
,
p
,
proto
.
Name
,
proto
.
Version
)
go
func
()
{
err
:=
proto
.
Run
(
p
,
proto
)
if
err
==
nil
{
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: Protocol %s/%d returned
\n
"
,
p
,
proto
.
Name
,
proto
.
Version
)
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: Protocol %s/%d returned"
,
p
,
proto
.
Name
,
proto
.
Version
)
err
=
errors
.
New
(
"protocol returned"
)
}
else
if
err
!=
io
.
EOF
{
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: Protocol %s/%d error: %v
\n
"
,
p
,
proto
.
Name
,
proto
.
Version
,
err
)
glog
.
V
(
logger
.
Detail
)
.
Infof
(
"%v: Protocol %s/%d error: %v"
,
p
,
proto
.
Name
,
proto
.
Version
,
err
)
}
p
.
protoErr
<-
err
p
.
wg
.
Done
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录