automatically change displayed address whenever it receives anything,v0.2.10

added help and -? for daemon command line rpc commands,
only relay addr messages to 5 random nodes to save bandwidth,
started setting wtx.fFromMe flag,
trickle out tx inventory messages to protect privacy
 -- version 0.2.10

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@81 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 7 insertions, 3 deletions

diff --git a/net.h b/net.h
index 46344ed928..9ce848f636 100644
--- a/net.h
+++ b/net.h
@@ -12,7 +12,7 @@ extern int nBestHeight;
 

 

 

-static const unsigned short DEFAULT_PORT = htons(8333);

+#define DEFAULT_PORT    htons(8333)

 static const unsigned int PUBLISH_HOPS = 5;

 enum

 {

@@ -522,7 +522,6 @@ public:
     vector<CInv> vInventoryToSend;

     CCriticalSection cs_inventory;

     multimap<int64, CInv> mapAskFor;

-    int64 nNextSendTxInv;

 

     // publish and subscription

     vector<char> vfSubscribe;

@@ -536,6 +535,12 @@ public:
         vSend.SetVersion(0);

         vRecv.SetType(SER_NETWORK);

         vRecv.SetVersion(0);

+        // Version 0.2 obsoletes 20 Feb 2012

+        if (GetTime() > 1329696000)

+        {

+            vSend.SetVersion(209);

+            vRecv.SetVersion(209);

+        }

         nLastSend = 0;

         nLastRecv = 0;

         nLastSendEmpty = GetTime();

@@ -556,7 +561,6 @@ public:
         hashLastGetBlocksEnd = 0;

         nStartingHeight = -1;

         fGetAddr = false;

-        nNextSendTxInv = 0;

         vfSubscribe.assign(256, false);

 

         // Push a version message