Merge pull request #155 from jbenet/netfixes

Some fixes to bitswap + dht

cmd/ipfs/init.go

@@ -10,7 +10,7 @@ import (
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander"
 	config "github.com/jbenet/go-ipfs/config"
 	ci "github.com/jbenet/go-ipfs/crypto"
-	spipe "github.com/jbenet/go-ipfs/crypto/spipe"
+	peer "github.com/jbenet/go-ipfs/peer"
 	updates "github.com/jbenet/go-ipfs/updates"
 	u "github.com/jbenet/go-ipfs/util"
 )
@@ -121,7 +121,7 @@ func initCmd(c *commander.Command, inp []string) error {
 	}
 	cfg.Identity.PrivKey = base64.StdEncoding.EncodeToString(skbytes)
 
-	id, err := spipe.IDFromPubKey(pk)
+	id, err := peer.IDFromPubKey(pk)
 	if err != nil {
 		return err
 	}

cmd/ipfs/ipfs.go

@@ -41,8 +41,7 @@ Advanced Commands:
 
     mount         Mount an ipfs read-only mountpoint.
     serve         Serve an interface to ipfs.
-
-	net-diag	  Print network diagnostic
+    net-diag      Print network diagnostic
 
 Use "ipfs help <command>" for more information about a command.
 `,

core/commands/diag.go

@@ -8,8 +8,22 @@ import (
 	"time"
 
 	"github.com/jbenet/go-ipfs/core"
+	diagn "github.com/jbenet/go-ipfs/diagnostics"
 )
 
+func PrintDiagnostics(info []*diagn.DiagInfo, out io.Writer) {
+	for _, i := range info {
+		fmt.Fprintf(out, "Peer: %s\n", i.ID)
+		fmt.Fprintf(out, "\tUp for: %s\n", i.LifeSpan.String())
+		fmt.Fprintf(out, "\tConnected To:\n")
+		for _, c := range i.Connections {
+			fmt.Fprintf(out, "\t%s\n\t\tLatency = %s\n", c.ID, c.Latency.String())
+		}
+		fmt.Fprintln(out)
+	}
+
+}
+
 func Diag(n *core.IpfsNode, args []string, opts map[string]interface{}, out io.Writer) error {
 	if n.Diagnostics == nil {
 		return errors.New("Cannot run diagnostic in offline mode!")
@@ -29,15 +43,7 @@ func Diag(n *core.IpfsNode, args []string, opts map[string]interface{}, out io.W
 			return err
 		}
 	} else {
-		for _, i := range info {
-			fmt.Fprintf(out, "Peer: %s\n", i.ID)
-			fmt.Fprintf(out, "\tUp for: %s\n", i.LifeSpan.String())
-			fmt.Fprintf(out, "\tConnected To:\n")
-			for _, c := range i.Connections {
-				fmt.Fprintf(out, "\t%s\n\t\tLatency = %s\n", c.ID, c.Latency.String())
-			}
-			fmt.Fprintln(out)
-		}
+		PrintDiagnostics(info, out)
 	}
 	return nil
 }

core/core.go

@@ -108,6 +108,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
 		route           *dht.IpfsDHT
 		exchangeSession exchange.Interface
 		diagnostics     *diag.Diagnostics
+		network         inet.Network
 	)
 
 	if online {
@@ -135,11 +136,12 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
 		if err != nil {
 			return nil, err
 		}
+		network = net
 
 		diagnostics = diag.NewDiagnostics(local, net, diagService)
 		diagService.SetHandler(diagnostics)
 
-		route = dht.NewDHT(local, peerstore, net, dhtService, d)
+		route = dht.NewDHT(ctx, local, peerstore, net, dhtService, d)
 		// TODO(brian): perform this inside NewDHT factory method
 		dhtService.SetHandler(route) // wire the handler to the service.
 
@@ -173,6 +175,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
 		Routing:     route,
 		Namesys:     ns,
 		Diagnostics: diagnostics,
+		Network:     network,
 	}, nil
 }
 

crypto/key.go

@@ -99,7 +99,7 @@ func GenerateEKeyPair(curveName string) ([]byte, GenSharedKey, error) {
 	}
 
 	pubKey := elliptic.Marshal(curve, x, y)
-	log.Debug("GenerateEKeyPair %d", len(pubKey))
+	// log.Debug("GenerateEKeyPair %d", len(pubKey))
 
 	done := func(theirPub []byte) ([]byte, error) {
 		// Verify and unpack node's public key.

crypto/spipe/handshake.go

@@ -18,6 +18,7 @@ import (
 	"hash"
 
 	proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+
 	ci "github.com/jbenet/go-ipfs/crypto"
 	peer "github.com/jbenet/go-ipfs/peer"
 	u "github.com/jbenet/go-ipfs/util"
@@ -204,7 +205,7 @@ func (s *SecurePipe) handshake() error {
 	}
 
 	if bytes.Compare(resp2, finished) != 0 {
-		return errors.New("Negotiation failed.")
+		return fmt.Errorf("Negotiation failed, got: %s", resp2)
 	}
 
 	log.Debug("%s handshake: Got node id: %s", s.local, s.remote)
@@ -229,7 +230,15 @@ func (s *SecurePipe) handleSecureIn(hashType string, tIV, tCKey, tMKey []byte) {
 	theirMac, macSize := makeMac(hashType, tMKey)
 
 	for {
-		data, ok := <-s.insecure.In
+		var data []byte
+		ok := true
+
+		select {
+		case <-s.ctx.Done():
+			ok = false // return out
+		case data, ok = <-s.insecure.In:
+		}
+
 		if !ok {
 			close(s.Duplex.In)
 			return
@@ -266,8 +275,17 @@ func (s *SecurePipe) handleSecureOut(hashType string, mIV, mCKey, mMKey []byte)
 	myMac, macSize := makeMac(hashType, mMKey)
 
 	for {
-		data, ok := <-s.Out
+		var data []byte
+		ok := true
+
+		select {
+		case <-s.ctx.Done():
+			ok = false // return out
+		case data, ok = <-s.Out:
+		}
+
 		if !ok {
+			close(s.insecure.Out)
 			return
 		}
 
@@ -288,16 +306,6 @@ func (s *SecurePipe) handleSecureOut(hashType string, mIV, mCKey, mMKey []byte)
 	}
 }
 
-// IDFromPubKey retrieves a Public Key from the peer given by pk
-func IDFromPubKey(pk ci.PubKey) (peer.ID, error) {
-	b, err := pk.Bytes()
-	if err != nil {
-		return nil, err
-	}
-	hash := u.Hash(b)
-	return peer.ID(hash), nil
-}
-
 // Determines which algorithm to use.  Note:  f(a, b) = f(b, a)
 func selectBest(myPrefs, theirPrefs string) (string, error) {
 	// Person with greatest hash gets first choice.
@@ -334,7 +342,7 @@ func selectBest(myPrefs, theirPrefs string) (string, error) {
 // else, construct it.
 func getOrConstructPeer(peers peer.Peerstore, rpk ci.PubKey) (*peer.Peer, error) {
 
-	rid, err := IDFromPubKey(rpk)
+	rid, err := peer.IDFromPubKey(rpk)
 	if err != nil {
 		return nil, err
 	}
@@ -373,7 +381,8 @@ func getOrConstructPeer(peers peer.Peerstore, rpk ci.PubKey) (*peer.Peer, error)
 	// this shouldn't ever happen, given we hashed, etc, but it could mean
 	// expected code (or protocol) invariants violated.
 	if !npeer.PubKey.Equals(rpk) {
-		return nil, fmt.Errorf("WARNING: PubKey mismatch: %v", npeer)
+		log.Error("WARNING: PubKey mismatch: %v", npeer)
+		panic("secure channel pubkey mismatch")
 	}
 	return npeer, nil
 }

crypto/spipe/pipe.go

@@ -34,34 +34,29 @@ type params struct {
 
 // NewSecurePipe constructs a pipe with channels of a given buffer size.
 func NewSecurePipe(ctx context.Context, bufsize int, local *peer.Peer,
-	peers peer.Peerstore) (*SecurePipe, error) {
+	peers peer.Peerstore, insecure Duplex) (*SecurePipe, error) {
+
+	ctx, cancel := context.WithCancel(ctx)
 
 	sp := &SecurePipe{
 		Duplex: Duplex{
 			In:  make(chan []byte, bufsize),
 			Out: make(chan []byte, bufsize),
 		},
-		local: local,
-		peers: peers,
-	}
-	return sp, nil
-}
+		local:    local,
+		peers:    peers,
+		insecure: insecure,
 
-// Wrap creates a secure connection on top of an insecure duplex channel.
-func (s *SecurePipe) Wrap(ctx context.Context, insecure Duplex) error {
-	if s.ctx != nil {
-		return errors.New("Pipe in use")
+		ctx:    ctx,
+		cancel: cancel,
 	}
 
-	s.insecure = insecure
-	s.ctx, s.cancel = context.WithCancel(ctx)
-
-	if err := s.handshake(); err != nil {
-		s.cancel()
-		return err
+	if err := sp.handshake(); err != nil {
+		sp.Close()
+		return nil, err
 	}
 
-	return nil
+	return sp, nil
 }
 
 // LocalPeer retrieves the local peer.
@@ -76,11 +71,12 @@ func (s *SecurePipe) RemotePeer() *peer.Peer {
 
 // Close closes the secure pipe
 func (s *SecurePipe) Close() error {
-	if s.cancel == nil {
-		return errors.New("pipe already closed")
+	select {
+	case <-s.ctx.Done():
+		return errors.New("already closed")
+	default:
 	}
 
 	s.cancel()
-	s.cancel = nil
 	return nil
 }

daemon/daemon_client.go

@@ -47,26 +47,43 @@ func getDaemonAddr(confdir string) (string, error) {
 // over network RPC API. The address of the daemon is retrieved from the config
 // directory, where live daemons write their addresses to special files.
 func SendCommand(command *Command, confdir string) error {
-	//check if daemon is running
-	log.Info("Checking if daemon is running...")
+	server := os.Getenv("IPFS_ADDRESS_RPC")
+
+	if server == "" {
+		//check if daemon is running
+		log.Info("Checking if daemon is running...")
+		if !serverIsRunning(confdir) {
+			return ErrDaemonNotRunning
+		}
+
+		log.Info("Daemon is running!")
+
+		var err error
+		server, err = getDaemonAddr(confdir)
+		if err != nil {
+			return err
+		}
+	}
+
+	return serverComm(server, command)
+}
+
+func serverIsRunning(confdir string) bool {
 	var err error
 	confdir, err = u.TildeExpansion(confdir)
 	if err != nil {
-		return err
+		log.Error("Tilde Expansion Failed: %s", err)
+		return false
 	}
 	lk, err := daemonLock(confdir)
 	if err == nil {
 		lk.Close()
-		return ErrDaemonNotRunning
-	}
-
-	log.Info("Daemon is running! [reason = %s]", err)
-
-	server, err := getDaemonAddr(confdir)
-	if err != nil {
-		return err
+		return false
 	}
+	return true
+}
 
+func serverComm(server string, command *Command) error {
 	log.Info("Daemon address: %s", server)
 	maddr, err := ma.NewMultiaddr(server)
 	if err != nil {

daemon/daemon_test.go

@@ -9,7 +9,7 @@ import (
 	config "github.com/jbenet/go-ipfs/config"
 	core "github.com/jbenet/go-ipfs/core"
 	ci "github.com/jbenet/go-ipfs/crypto"
-	spipe "github.com/jbenet/go-ipfs/crypto/spipe"
+	peer "github.com/jbenet/go-ipfs/peer"
 )
 
 func TestInitializeDaemonListener(t *testing.T) {
@@ -23,7 +23,7 @@ func TestInitializeDaemonListener(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	ident, _ := spipe.IDFromPubKey(pub)
+	ident, _ := peer.IDFromPubKey(pub)
 	privKey := base64.StdEncoding.EncodeToString(prbytes)
 	pID := ident.Pretty()