aboutsummaryrefslogtreecommitdiffstats
path: root/eth/backend.go
diff options
context:
space:
mode:
Diffstat (limited to 'eth/backend.go')
-rw-r--r--eth/backend.go10
1 files changed, 3 insertions, 7 deletions
diff --git a/eth/backend.go b/eth/backend.go
index 02d3dc942..ad0486309 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -134,24 +134,20 @@ func New(config *Config) (*Ethereum, error) {
eth.blockPool = NewBlockPool(hasBlock, insertChain, ezp.Verify)
ethProto := EthProtocol(eth.txPool, eth.chainManager, eth.blockPool)
- protocols := []p2p.Protocol{ethProto}
-
- if config.Shh {
- eth.whisper = whisper.New()
- protocols = append(protocols, eth.whisper.Protocol())
- }
+ protocols := []p2p.Protocol{ethProto, eth.whisper.Protocol()}
nat, err := p2p.ParseNAT(config.NATType, config.PMPGateway)
if err != nil {
return nil, err
}
+ fmt.Println(nat)
eth.net = &p2p.Server{
Identity: clientId,
MaxPeers: config.MaxPeers,
Protocols: protocols,
Blacklist: eth.blacklist,
- NAT: nat,
+ NAT: p2p.UPNP(),
NoDial: !config.Dial,
}
n class='insertions'>+3 * update to 8.35 [1], which includes a fix for JIT character range checks [2]bf2014-08-252-4/+3 * devel/pcre: Fix build with LIBEDIT option selectedmarino2014-08-071-0/+5 * Convert the pcretest command-line editing support into non-default optionsbf2014-07-301-5/+9 * Add DOCS to OPTIONS_DEFINE to ports that check for PORT_OPTIONS:MDOCS.adamw2014-07-151-1/+1 * Fix build with readline from portsbapt2014-07-011-1/+1 * - USES=libtool:oldver tar:bzip2.tijl2014-05-071-10/+4 * Disable the pcre jit on mips64*bf2014-03-031-1/+1 * Update to 8.34bf2014-02-062-3/+9 * Use staging; update LICENSE; strip libraries; remove some outdated materialbf2014-02-032-119/+107 * Add NO_STAGE all over the place in preparation for the staging support (cat: ...bapt2013-09-211-0/+1 * update to 8.33; add an option and some knobs to help usersbf2013-06-042-10/+47 * attempt to prevent the pcre tests from triggering a file-systembf2013-03-231-2/+8 * This changes almost all the "gnomehack" only USE_GNOME cases to USES= pathfix.eadler2013-03-191-1/+1 * Add Sourceforge mirrors [1]; remove NOPORTDOCS; trim Makefile headerbf2013-01-171-7/+4 * Adopt.bf2012-12-131-1/+1 * Give up maintainership on devel/pcremm2012-12-131-1/+1 * Fix pcre CONFIGURE_ARGS and add plist files for pcre32mm2012-12-112-1/+6 * Update PCRE to 8.32mm2012-12-113-7/+37 * Always build with JIT supportmm2012-09-171-5/+2 * Fix libedit dependency to >= 803000mm2012-07-181-2/+2 * Update to 8.31mm2012-07-184-146/+13 * Add patch for exim bug #1236 (vendor svn revision 963)mm2012-04-282-1/+26 * Additional autotools fix for building WITH_LIBEDITmm2012-02-171-1/+2 * Enable build of libpcre16mm2012-02-162-1/+8 * Fix build with WITH_LIBEDITmm2012-02-151-1/+3 * Update PCRE to 8.30mm2012-02-145-58/+193 * Add patch to fix upstream bug #1187mm2012-01-082-0/+35 * Update to 8.21mm2011-12-212-3/+3 * - Remove WITH_FBSD10_FIX, is no longer neededmiwi2011-11-091-1/+0 * Disable JIT on sparc64.mm2011-11-021-1/+1 * Apply FreeBSD 10 workaround for some high profile ports toerwin2011-10-271-0/+1 * Update to 8.20mm2011-10-263-41/+26 * Add patch for upstream bug #1136 (upstream SVN changeset 661)mm2011-08-222-0/+30 * Update to 8.13mm2011-08-172-3/+3 * - Add LICENSE knob(s)mm2011-03-231-0/+3 * Update to 8.12mm2011-01-172-3/+3 * - Update to 8.11mm2010-12-292-4/+3 * Over to new volunteer.linimon2010-12-281-1/+1 * Reset krion@FreeBSD.org due to 6 months of inactivity and maintainer-linimon2010-12-281-1/+1 * Hide a sed line.kwm2010-10-291-1/+3 * Update to 8.10mm2010-08-062-4/+4 * - Update to 8.02mm2010-04-212-4/+4 * Update to 8.00krion2009-10-223-4/+5 * Update to 7.9krion2009-04-122-5/+11 * Update to 7.8krion2008-10-044-33/+6 * Update CONFIGURE_ARGS for how we pass CONFIGURE_TARGET to configure script.rafan2008-08-211-1/+0 * Fix a heap overflow condition when compiling certain regularkrion2008-08-122-0/+15 * Update to 7.7krion2008-05-14