ipfs · Jul 6, 2015
diff --git a/‎p2p/protocol/mux.go
-142 b/‎p2p/protocol/mux.go
-142
diff --git a/‎p2p/protocol/mux_test.go
-67 b/‎p2p/protocol/mux_test.go
-67
diff --git a/‎p2p/protocol/protocol.go
-31 b/‎p2p/protocol/protocol.go
-31
diff --git a/‎p2p/protocol/relay/relay_test.go
+6-5 b/‎p2p/protocol/relay/relay_test.go
+6-5
@@ -1,40 +1,9 @@
 package protocol
 
-import (
-	"io"
-
-	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
-)
-
 // ID is an identifier used to write protocol headers in streams.
 type ID string
 
 // These are reserved protocol.IDs.
 const (
 	TestingID ID = "/p2p/_testing"
 )
-
-// WriteHeader writes a protocol.ID header to an io.Writer. This is so
-// multiple protocols can be multiplexed on top of the same transport.
-//
-// We use go-msgio varint encoding:
-//   <varint length><string name>\n
-// (the varint includes the \n)
-func WriteHeader(w io.Writer, id ID) error {
-	vw := msgio.NewVarintWriter(w)
-	s := string(id) + "\n" // add \n
-	return vw.WriteMsg([]byte(s))
-}
-
-// ReadHeader reads a protocol.ID header from an io.Reader. This is so
-// multiple protocols can be multiplexed on top of the same transport.
-// See WriteHeader.
-func ReadHeader(r io.Reader) (ID, error) {
-	vr := msgio.NewVarintReader(r)
-	msg, err := vr.ReadMsg()
-	if err != nil {
-		return ID(""), err
-	}
-	msg = msg[:len(msg)-1] // remove \n
-	return ID(msg), nil
-}
@@ -10,6 +10,7 @@ import (
 	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
 	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 
+	msmux "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/whyrusleeping/go-multistream"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
@@ -62,7 +63,7 @@ func TestRelaySimple(t *testing.T) {
 
 	// ok now the header's there, we can write the next protocol header.
 	log.Debug("write testing header")
-	if err := protocol.WriteHeader(s, protocol.TestingID); err != nil {
+	if err := msmux.SelectProtoOrFail(string(protocol.TestingID), s); err != nil {
 		t.Fatal(err)
 	}
 
@@ -155,15 +156,15 @@ func TestRelayAcrossFour(t *testing.T) {
 	}
 
 	log.Debugf("write relay header n1->n4 (%s -> %s)", n1p, n4p)
-	if err := protocol.WriteHeader(s, relay.ID); err != nil {
+	if err := msmux.SelectProtoOrFail(string(relay.ID), s); err != nil {
 		t.Fatal(err)
 	}
 	if err := relay.WriteHeader(s, n1p, n4p); err != nil {
 		t.Fatal(err)
 	}
 
 	log.Debugf("write relay header n1->n5 (%s -> %s)", n1p, n5p)
-	if err := protocol.WriteHeader(s, relay.ID); err != nil {
+	if err := msmux.SelectProtoOrFail(string(relay.ID), s); err != nil {
 		t.Fatal(err)
 	}
 	if err := relay.WriteHeader(s, n1p, n5p); err != nil {
@@ -172,7 +173,7 @@ func TestRelayAcrossFour(t *testing.T) {
 
 	// ok now the header's there, we can write the next protocol header.
 	log.Debug("write testing header")
-	if err := protocol.WriteHeader(s, protocol.TestingID); err != nil {
+	if err := msmux.SelectProtoOrFail(string(protocol.TestingID), s); err != nil {
 		t.Fatal(err)
 	}
 
@@ -257,7 +258,7 @@ func TestRelayStress(t *testing.T) {
 
 	// ok now the header's there, we can write the next protocol header.
 	log.Debug("write testing header")
-	if err := protocol.WriteHeader(s, protocol.TestingID); err != nil {
+	if err := msmux.SelectProtoOrFail(string(protocol.TestingID), s); err != nil {
 		t.Fatal(err)
 	}
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`testutil "github.com/ipfs/go-ipfs/p2p/test/util"`
`11`	`11`	`eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"`
`12`	`12`
	`13`	`+ msmux "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/whyrusleeping/go-multistream"`
`13`	`14`	`context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"`
`14`	`15`	`)`
`15`	`16`
`@@ -62,7 +63,7 @@ func TestRelaySimple(t *testing.T) {`
`62`	`63`
`63`	`64`	`// ok now the header's there, we can write the next protocol header.`
`64`	`65`	`log.Debug("write testing header")`
`65`		`- if err := protocol.WriteHeader(s, protocol.TestingID); err != nil {`
	`66`	`+ if err := msmux.SelectProtoOrFail(string(protocol.TestingID), s); err != nil {`
`66`	`67`	`t.Fatal(err)`
`67`	`68`	`}`
`68`	`69`
`@@ -155,15 +156,15 @@ func TestRelayAcrossFour(t *testing.T) {`
`155`	`156`	`}`
`156`	`157`
`157`	`158`	`log.Debugf("write relay header n1->n4 (%s -> %s)", n1p, n4p)`
`158`		`- if err := protocol.WriteHeader(s, relay.ID); err != nil {`
	`159`	`+ if err := msmux.SelectProtoOrFail(string(relay.ID), s); err != nil {`
`159`	`160`	`t.Fatal(err)`
`160`	`161`	`}`
`161`	`162`	`if err := relay.WriteHeader(s, n1p, n4p); err != nil {`
`162`	`163`	`t.Fatal(err)`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`log.Debugf("write relay header n1->n5 (%s -> %s)", n1p, n5p)`
`166`		`- if err := protocol.WriteHeader(s, relay.ID); err != nil {`
	`167`	`+ if err := msmux.SelectProtoOrFail(string(relay.ID), s); err != nil {`
`167`	`168`	`t.Fatal(err)`
`168`	`169`	`}`
`169`	`170`	`if err := relay.WriteHeader(s, n1p, n5p); err != nil {`
`@@ -172,7 +173,7 @@ func TestRelayAcrossFour(t *testing.T) {`
`172`	`173`
`173`	`174`	`// ok now the header's there, we can write the next protocol header.`
`174`	`175`	`log.Debug("write testing header")`
`175`		`- if err := protocol.WriteHeader(s, protocol.TestingID); err != nil {`
	`176`	`+ if err := msmux.SelectProtoOrFail(string(protocol.TestingID), s); err != nil {`
`176`	`177`	`t.Fatal(err)`
`177`	`178`	`}`
`178`	`179`
`@@ -257,7 +258,7 @@ func TestRelayStress(t *testing.T) {`
`257`	`258`
`258`	`259`	`// ok now the header's there, we can write the next protocol header.`
`259`	`260`	`log.Debug("write testing header")`
`260`		`- if err := protocol.WriteHeader(s, protocol.TestingID); err != nil {`
	`261`	`+ if err := msmux.SelectProtoOrFail(string(protocol.TestingID), s); err != nil {`
`261`	`262`	`t.Fatal(err)`
`262`	`263`	`}`
`263`	`264`