From 117f66e82375b752cc6a9ff22aa0d398ac337bb4 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 6 Jan 2015 12:13:57 +0100 Subject: Added license headers --- cmd/peerserver/main.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'cmd/peerserver') diff --git a/cmd/peerserver/main.go b/cmd/peerserver/main.go index 18d183f0b..eb0900f8b 100644 --- a/cmd/peerserver/main.go +++ b/cmd/peerserver/main.go @@ -1,3 +1,19 @@ +/* + This file is part of go-ethereum + + go-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + go-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with go-ethereum. If not, see . +*/ package main import ( -- cgit v1.2.3 From 545e14691bd467992c905aa34fac71e25ef76108 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 6 Jan 2015 11:09:47 +0100 Subject: cmd/peerserver: fix for new client identity type --- cmd/peerserver/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/peerserver') diff --git a/cmd/peerserver/main.go b/cmd/peerserver/main.go index eb0900f8b..ce0c7ba0c 100644 --- a/cmd/peerserver/main.go +++ b/cmd/peerserver/main.go @@ -35,7 +35,7 @@ func main() { srv := p2p.Server{ MaxPeers: 100, - Identity: p2p.NewSimpleClientIdentity("Ethereum(G)", "0.1", "Peer Server Two", string(marshaled)), + Identity: p2p.NewSimpleClientIdentity("Ethereum(G)", "0.1", "Peer Server Two", marshaled), ListenAddr: ":30301", NAT: p2p.UPNP(), } -- cgit v1.2.3 From 4c8c115a7633e39b85738cd7919c7d3e3e722e7a Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 6 Jan 2015 11:10:20 +0100 Subject: cmd/peerserver: use NoDial, don't use seed peers --- cmd/peerserver/main.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'cmd/peerserver') diff --git a/cmd/peerserver/main.go b/cmd/peerserver/main.go index ce0c7ba0c..7a5d5708e 100644 --- a/cmd/peerserver/main.go +++ b/cmd/peerserver/main.go @@ -18,9 +18,7 @@ package main import ( "crypto/elliptic" - "fmt" "log" - "net" "os" "github.com/ethereum/go-ethereum/crypto" @@ -38,19 +36,10 @@ func main() { Identity: p2p.NewSimpleClientIdentity("Ethereum(G)", "0.1", "Peer Server Two", marshaled), ListenAddr: ":30301", NAT: p2p.UPNP(), + NoDial: true, } if err := srv.Start(); err != nil { - fmt.Println("could not start server:", err) - os.Exit(1) + log.Fatal("could not start server:", err) } - - // add seed peers - seed, err := net.ResolveTCPAddr("tcp", "poc-8.ethdev.com:30303") - if err != nil { - fmt.Println("couldn't resolve:", err) - } else { - srv.SuggestPeer(seed.IP, seed.Port, nil) - } - select {} } -- cgit v1.2.3 From 36e1e5f15142b37801844a072eb46ea67fbc8868 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 6 Jan 2015 11:15:37 +0100 Subject: cmd/peerserver: add some command line switches --- cmd/peerserver/main.go | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'cmd/peerserver') diff --git a/cmd/peerserver/main.go b/cmd/peerserver/main.go index 7a5d5708e..341c4dbb9 100644 --- a/cmd/peerserver/main.go +++ b/cmd/peerserver/main.go @@ -18,6 +18,7 @@ package main import ( "crypto/elliptic" + "flag" "log" "os" @@ -26,7 +27,19 @@ import ( "github.com/ethereum/go-ethereum/p2p" ) +var ( + natType = flag.String("nat", "", "NAT traversal implementation") + pmpGateway = flag.String("gateway", "", "gateway address for NAT-PMP") + listenAddr = flag.String("addr", ":30301", "listen address") +) + func main() { + flag.Parse() + nat, err := p2p.ParseNAT(*natType, *pmpGateway) + if err != nil { + log.Fatal("invalid nat:", err) + } + logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.InfoLevel)) key, _ := crypto.GenerateKey() marshaled := elliptic.Marshal(crypto.S256(), key.PublicKey.X, key.PublicKey.Y) @@ -34,8 +47,8 @@ func main() { srv := p2p.Server{ MaxPeers: 100, Identity: p2p.NewSimpleClientIdentity("Ethereum(G)", "0.1", "Peer Server Two", marshaled), - ListenAddr: ":30301", - NAT: p2p.UPNP(), + ListenAddr: *listenAddr, + NAT: nat, NoDial: true, } if err := srv.Start(); err != nil { -- cgit v1.2.3