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
dms3
go-unixfs
Commits
555bc871
Commit
555bc871
authored
Oct 09, 2014
by
Juan Batiz-Benet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfixes to prev commit
parent
972c0f7b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
net/mux/mux_test.go
net/mux/mux_test.go
+2
-1
routing/dht/Message.go
routing/dht/Message.go
+1
-1
No files found.
net/mux/mux_test.go
View file @
555bc871
...
@@ -9,7 +9,6 @@ import (
...
@@ -9,7 +9,6 @@ import (
mh
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
mh
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
msg
"github.com/jbenet/go-ipfs/net/message"
msg
"github.com/jbenet/go-ipfs/net/message"
peer
"github.com/jbenet/go-ipfs/peer"
peer
"github.com/jbenet/go-ipfs/peer"
u
"github.com/jbenet/go-ipfs/util"
context
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
context
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
)
)
...
@@ -167,6 +166,7 @@ func TestSimultMuxer(t *testing.T) {
...
@@ -167,6 +166,7 @@ func TestSimultMuxer(t *testing.T) {
}
}
// log.Debug("got %v", string(data))
// log.Debug("got %v", string(data))
_
=
data
counts
[
pid
][
1
][
1
]
++
counts
[
pid
][
1
][
1
]
++
case
<-
ctx
.
Done
()
:
case
<-
ctx
.
Done
()
:
...
@@ -181,6 +181,7 @@ func TestSimultMuxer(t *testing.T) {
...
@@ -181,6 +181,7 @@ func TestSimultMuxer(t *testing.T) {
case
m
:=
<-
mux1
.
Protocols
[
pid
]
.
GetPipe
()
.
Incoming
:
case
m
:=
<-
mux1
.
Protocols
[
pid
]
.
GetPipe
()
.
Incoming
:
counts
[
pid
][
0
][
1
]
++
counts
[
pid
][
0
][
1
]
++
// log.Debug("got %v", string(m.Data()))
// log.Debug("got %v", string(m.Data()))
_
=
m
case
<-
ctx
.
Done
()
:
case
<-
ctx
.
Done
()
:
return
return
}
}
...
...
routing/dht/Message.go
View file @
555bc871
...
@@ -41,7 +41,7 @@ func peersToPBPeers(peers []*peer.Peer) []*Message_Peer {
...
@@ -41,7 +41,7 @@ func peersToPBPeers(peers []*peer.Peer) []*Message_Peer {
func
(
m
*
Message
)
GetClusterLevel
()
int
{
func
(
m
*
Message
)
GetClusterLevel
()
int
{
level
:=
m
.
GetClusterLevelRaw
()
-
1
level
:=
m
.
GetClusterLevelRaw
()
-
1
if
level
<
0
{
if
level
<
0
{
log
.
Error
(
"GetClusterLevel: no routing level specified, assuming 0"
)
log
.
Debug
(
"GetClusterLevel: no routing level specified, assuming 0"
)
level
=
0
level
=
0
}
}
return
int
(
level
)
return
int
(
level
)
...
...
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