From 88cab1e4a32febe9cd4633f03cdaff830110f2d1 Mon Sep 17 00:00:00 2001
From: Eric Hosmer <EricJ2190@gmail.com>
Date: Fri, 15 Jul 2011 23:38:46 -0400
Subject: Added crypter to makefile.vc.

---
 src/makefile.vc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/makefile.vc b/src/makefile.vc
index b25ba60c50..c050deb6ed 100644
--- a/src/makefile.vc
+++ b/src/makefile.vc
@@ -41,12 +41,12 @@ DEFS=$(DEFS) /DUSE_UPNP=$(USE_UPNP)
 !ENDIF
 
 LIBS=$(LIBS) \
-  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib ws2_32.lib shlwapi.lib
+  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib ws2_32.lib shlwapi.lib iphlpapi.lib
 
 DEBUGFLAGS=/Os
 CFLAGS=/MD /c /nologo /EHsc /GR /Zm300 $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
 HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
-    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h wallet.h keystore.h
+    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h wallet.h keystore.h crypter.h
 
 OBJS= \
     obj\util.obj \
@@ -58,7 +58,8 @@ OBJS= \
     obj\main.obj \
 	obj\wallet.obj \
     obj\rpc.obj \
-    obj\init.obj
+    obj\init.obj \
+	obj\crypter.obj
 
 CRYPTOPP_OBJS= \
     cryptopp\obj\sha.obj \
@@ -93,6 +94,8 @@ obj\rpc.obj: $(HEADERS)
 
 obj\init.obj: $(HEADERS)
 
+obj\crypter.obj: $(HEADERS)
+
 obj\ui.obj: $(HEADERS)
 
 obj\uibase.obj: $(HEADERS)
-- 
cgit v1.2.3


From 643160f6e7e5e8ca84bc7d2c1a0f37d9cf43a6e1 Mon Sep 17 00:00:00 2001
From: Matt Corallo <matt@bluematt.me>
Date: Thu, 21 Jul 2011 22:06:20 +0200
Subject: Actually use mapAlreadyAskedFor.

Previously, mapAlreadyAskedFor was read from, but never added to.
The original intent was to use mapAlreadyAskedFor to keep track
of the time an item was requested and "Each retry is 2 minutes
after the last".
This implements that intent.
---
 src/main.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/main.cpp b/src/main.cpp
index e3ad35044e..8697c6f2a7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2570,6 +2570,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
                     vGetData.clear();
                 }
             }
+            mapAlreadyAskedFor[inv] = nNow;
             pto->mapAskFor.erase(pto->mapAskFor.begin());
         }
         if (!vGetData.empty())
-- 
cgit v1.2.3