diff options
| author | Pieter Wuille <[email protected]> | 2012-01-03 23:33:31 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2012-01-06 18:55:37 +0100 |
| commit | 67a42f929b1434f647c63922fd02dc2b93b28060 (patch) | |
| tree | 9c4313e815bd77e817f2dc5b796347d343458d0e /src/util.cpp | |
| parent | Merge pull request #740 from TheBlueMatt/perf (diff) | |
| download | discoin-67a42f929b1434f647c63922fd02dc2b93b28060.tar.xz discoin-67a42f929b1434f647c63922fd02dc2b93b28060.zip | |
Network stack refactor
This introduces CNetAddr and CService, respectively wrapping an
(IPv6) IP address and an IP+port combination. This functionality used
to be part of CAddress, which also contains network flags and
connection attempt information. These extra fields are however not
always necessary.
These classes, along with logic for creating connections and doing
name lookups, are moved to netbase.{h,cpp}, which does not depend on
headers.h.
Furthermore, CNetAddr is mostly IPv6-ready, though IPv6
functionality is not yet enabled for the application itself.
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util.cpp b/src/util.cpp index 3805e077a..ac7bacb7f 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -948,12 +948,12 @@ int64 GetAdjustedTime() return GetTime() + nTimeOffset; } -void AddTimeData(unsigned int ip, int64 nTime) +void AddTimeData(const CNetAddr& ip, int64 nTime) { int64 nOffsetSample = nTime - GetTime(); // Ignore duplicates - static set<unsigned int> setKnown; + static set<CNetAddr> setKnown; if (!setKnown.insert(ip).second) return; @@ -1008,7 +1008,6 @@ void AddTimeData(unsigned int ip, int64 nTime) - string FormatVersion(int nVersion) { if (nVersion%100 == 0) @@ -1178,3 +1177,4 @@ bool CCriticalSection::TryEnter(const char*, const char*, int) } #endif /* DEBUG_LOCKORDER */ + |