added --disable-advertise option to disable advertising local IP address for incoming...

diff --git a/p2pool/main.py b/p2pool/main.py
index fdd3d65..5a8c79f 100644 (file)
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -178,6 +178,7 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
             addr_store=addrs,
             connect_addrs=connect_addrs,
             desired_outgoing_conns=args.p2pool_outgoing_conns,
+            advertise_ip=args.advertise_ip,
         )
         node.p2p_node.start()
         
@@ -413,6 +414,9 @@ def run():
     p2pool_group.add_argument('--outgoing-conns', metavar='CONNS',
         help='outgoing connections (default: 6)',
         type=int, action='store', default=6, dest='p2pool_outgoing_conns')
+    parser.add_argument('--disable-advertise',
+        help='''don't advertise local IP address as being available for incoming connections. useful for running a dark node, along with multiple -n ADDR's and --outgoing-conns 0''',
+        action='store_false', default=True, dest='advertise_ip')
     
     worker_group = parser.add_argument_group('worker interface')
     worker_group.add_argument('-w', '--worker-port', metavar='PORT or ADDR:PORT',

diff --git a/p2pool/p2p.py b/p2pool/p2p.py
index f11d2d6..707d346 100644 (file)
--- a/p2pool/p2p.py
+++ b/p2pool/p2p.py
@@ -152,9 +152,10 @@ class Protocol(p2protocol.Protocol):
             self.send_ping(),
         random.expovariate(1/100)][-1])
         
-        self._stop_thread2 = deferral.run_repeatedly(lambda: [
-            self.send_addrme(port=self.node.serverfactory.listen_port.getHost().port) if self.node.serverfactory.listen_port is not None else None,
-        random.expovariate(1/(100*len(self.node.peers) + 1))][-1])
+        if self.node.advertise_ip:
+            self._stop_thread2 = deferral.run_repeatedly(lambda: [
+                self.send_addrme(port=self.node.serverfactory.listen_port.getHost().port) if self.node.serverfactory.listen_port is not None else None,
+            random.expovariate(1/(100*len(self.node.peers) + 1))][-1])
         
         if best_share_hash is not None:
             self.node.handle_share_hashes([best_share_hash], self)
@@ -424,7 +425,8 @@ class Protocol(p2protocol.Protocol):
         if self.connected2:
             self.factory.proto_disconnected(self, reason)
             self._stop_thread()
-            self._stop_thread2()
+            if self.node.advertise_ip:
+                self._stop_thread2()
             self.connected2 = False
         self.factory.proto_lost_connection(self, reason)
         if p2pool.DEBUG:
@@ -581,7 +583,7 @@ class SingleClientFactory(protocol.ReconnectingClientFactory):
         self.node.lost_conn(proto, reason)
 
 class Node(object):
-    def __init__(self, best_share_hash_func, port, net, addr_store={}, connect_addrs=set(), desired_outgoing_conns=10, max_outgoing_attempts=30, max_incoming_conns=50, preferred_storage=1000, known_txs_var=variable.Variable({}), mining_txs_var=variable.Variable({})):
+    def __init__(self, best_share_hash_func, port, net, addr_store={}, connect_addrs=set(), desired_outgoing_conns=10, max_outgoing_attempts=30, max_incoming_conns=50, preferred_storage=1000, known_txs_var=variable.Variable({}), mining_txs_var=variable.Variable({}), advertise_ip=True):
         self.best_share_hash_func = best_share_hash_func
         self.port = port
         self.net = net
@@ -590,6 +592,7 @@ class Node(object):
         self.preferred_storage = preferred_storage
         self.known_txs_var = known_txs_var
         self.mining_txs_var = mining_txs_var
+        self.advertise_ip = advertise_ip
         
         self.traffic_happened = variable.Event()
         self.nonce = random.randrange(2**64)