Christopher Franko
efc04c3cbd
Merge branch 'rebase-1.5.9'
2017-03-29 19:39:05 -04:00
Christopher Franko
a85150f0b4
upstream merge continued
2017-03-26 12:08:39 -04:00
Christopher Franko
5822644626
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.5.9
2017-03-26 11:40:56 -04:00
Christopher Franko
85d410d34e
move all the deps to the latest repo
...
This was over looked for so long because it was already taken care of in
the newer branches.
2017-03-20 09:11:55 -04:00
Felix Lange
96ae35e2ac
p2p, p2p/discover, p2p/nat: rework logging using context keys
2017-02-28 10:20:29 +01:00
Péter Szilágyi
d4fd06c3dc
all: blidly swap out glog to our log15, logs need rework
2017-02-23 12:16:44 +02:00
Péter Szilágyi
189dee26c6
p2p: remove trailing newlines from log messages
2017-02-23 12:00:04 +02:00
Christopher Franko
57638f70e6
Merge https://github.com/ethereum/go-ethereum into rebase-1.5.9
2017-02-15 13:21:31 -05:00
Felix Lange
35a7dcb162
all: gofmt -w -s
2017-01-06 15:52:03 +01:00
Péter Szilágyi
21fd9f037e
p2p/nat: fix a bytes based net.IP comparison
2016-12-15 16:28:31 +02:00
Felix Lange
44bc2e80dd
Merge pull request #2914 from fjl/node-coinhabit
...
cmd/utils, node: make datadir reusable for bzzd
2016-09-29 14:24:37 +02:00
ken10100147
afecb93e2e
p2p/nat: fix parameter order for AddMapping
2016-09-28 12:11:58 +02:00
Felix Lange
f5c432bcab
p2p/nat: delay auto discovery until first use
...
Port mapper auto discovery used to run immediately after parsing the
--nat flag, giving it a slight performance boost. But this is becoming
inconvenient because we create node.Node for all geth operations
including account management and bare chain interaction. Delay
autodiscovery until the first use instead, which avoids any network
interaction until the node is actually started.
2016-09-16 11:06:52 +02:00
Christopher Franko
87272925b9
Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4
2016-05-17 17:41:14 -04:00
Felix Lange
6fdd0893c3
all: fix go vet warnings
2016-04-15 11:17:27 +02:00
Péter Szilágyi
64c8e2f2ca
p2p/nat: fix #2291 , NAT discovery did't abort on failure
2016-03-14 17:08:15 +02:00
Christopher Franko
9cdd178759
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.1
...
Conflicts:
Godeps/Godeps.json
Godeps/_workspace/src/github.com/expanse-project/ethash/ethash_test.go
Makefile
VERSION
cmd/gexp/blocktestcmd.go
cmd/gexp/js.go
cmd/gexp/js_test.go
cmd/gexp/main.go
cmd/utils/cmd.go
cmd/utils/flags.go
common/natspec/natspec.go
common/natspec/natspec_e2e_test.go
common/natspec/natspec_e2e_test.go.orig
common/path.go
common/registrar/registrar.go
core/block_processor.go
core/block_processor_test.go
core/chain_manager.go
core/chain_manager_test.go
core/chain_util_test.go
core/events.go
core/execution.go
core/filter.go
core/state/errors.go
core/state/statedb.go
core/state_transition.go
core/transaction_util.go
core/types/bloom9.go
core/types/common.go
core/types/derive_sha.go
core/types/receipt.go
core/vm/common.go
core/vm/environment.go
core/vm/instructions.go
core/vm/jit.go
core/vm/jit_test.go
core/vm/vm.go
docker/Dockerfile
docker/supervisord.conf
eth/downloader/modes.go
event/filter/eth_filter.go
exp/backend.go
exp/downloader/downloader.go
exp/downloader/downloader_test.go
exp/downloader/peer.go
exp/downloader/queue.go
exp/gasprice.go
exp/handler.go
exp/sync.go
miner/worker.go
rpc/api/admin.go
rpc/api/debug.go
rpc/api/eth.go
rpc/api/eth_args.go
rpc/api/miner.go
rpc/api/personal.go
rpc/comms/ipc.go
rpc/comms/ipc_unix.go
rpc/comms/ipc_windows.go
tests/block_test_util.go
tests/files/BlockchainTests/bcUncleTest.json
trie/cache.go
trie/fullnode.go
trie/hashnode.go
trie/secure_trie.go
trie/shortnode.go
trie/trie.go
trie/trie_test.go
trie/valuenode.go
xeth/xeth.go
2015-11-03 18:25:50 -05:00
Felix Lange
f570b68ed1
p2p/nat: add docs for discover
2015-10-29 22:54:44 +01:00
Felix Lange
bf11a47f22
Godeps: upgrade github.com/huin/goupnp to 90f71cb5
2015-10-29 22:53:59 +01:00
Christopher Franko
9d6221444c
test change lol
2015-09-01 18:24:03 -04:00
Felix Lange
6ee908848c
p2p/nat: disable UPnP test on windows
2015-08-06 17:18:59 +02:00
Felix Lange
bfbcfbe4a9
all: fix license headers one more time
...
I forgot to update one instance of "go-ethereum" in commit 3f047be5a
2015-07-23 18:35:11 +02:00
Felix Lange
3f047be5aa
all: update license headers to distiguish GPL/LGPL
...
All code outside of cmd/ is licensed as LGPL. The headers
now reflect this by calling the whole work "the go-ethereum library".
2015-07-22 18:51:45 +02:00
Felix Lange
bdae4fd573
all: add some godoc synopsis comments
2015-07-07 14:12:45 +02:00
Felix Lange
ea54283b30
all: update license information
2015-07-07 14:12:44 +02:00
Felix Lange
fc6a5ae3ec
p2p/nat: add timeout for UPnP SOAP requests
2015-06-04 22:25:43 +02:00
Felix Lange
8e4512a5e7
p2p/nat: bump timeout in TestAutoDiscRace
2015-05-28 01:09:26 +02:00
Felix Lange
c14de2e973
p2p/nat: tweak port mapping log messages and levels
...
People stil get confused about the messages. This commit changes
the levels so that the only thing printed at the default level (info)
is a successful mapping.
2015-05-14 12:54:59 +02:00
Felix Lange
663d4e0aff
p2p/nat: add test for UPnP auto discovery via SSDP
...
The test listens for multicast UDP packets on the default interface
because I couldn't get it to work reliably on loopback without massive
changes to goupnp. This means that the test might fail when there is a
UPnP-enabled router attached on that interface. I checked that locally
by looping the test and it passes reliably because the local SSDP server
always responds faster.
2015-05-14 12:13:19 +02:00
Felix Lange
983f5a717a
p2p/nat: fix concurrent access to autodisc Interface
...
Concurrent calls to Interface methods on autodisc could return a "not
discovered" error if the discovery did not finish before the call.
autodisc.wait expected the done channel to carry the found Interface
but it was closed instead.
The fix is to use sync.Once for now, which is easier to get right.
And there is a test. Finally.
This will have to change again when we introduce re-discovery.
2015-05-14 03:53:11 +02:00
Felix Lange
fd4b75cfa8
p2p/nat: less confusing error logging
2015-05-06 22:58:03 +02:00
obscuren
688d118c7e
Updated logging
2015-04-07 14:57:04 +02:00
Felix Lange
f965f41b6e
p2p/nat: switch to github.com/huin/goupnp
...
My temporary fix was merged upstream.
2015-02-17 13:10:11 +01:00
Felix Lange
1543833ca0
p2p/nat: new package for port mapping stuff
...
I have verified that UPnP and NAT-PMP work against an older version of
the MiniUPnP daemon running on pfSense. This code is kind of hard to
test automatically.
2015-02-13 11:39:31 +01:00
