diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-26 15:31:32 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-26 15:31:32 -0400 |
| commit | c698633447b95cd69113676a5cc4d554ba408e14 (patch) | |
| tree | ba40fa7775e7d5cbc4042b0c8d743dfa34554bab /src/netbase.h | |
| parent | bf5b80a8ae67b177e06c7024eb3b7a14097a8814 (diff) | |
| parent | c289d95d6bb3105a67b96a697ddb9dd773cf1033 (diff) | |
| download | bitcoin-c698633447b95cd69113676a5cc4d554ba408e14.tar.xz | |
Merge branch 'master' of github.com:bitcoin/bitcoin
Diffstat (limited to 'src/netbase.h')
| -rw-r--r-- | src/netbase.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/netbase.h b/src/netbase.h index e65e138ef5..b5f9d5fad9 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -30,7 +30,7 @@ extern int nConnectTimeout; -// IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96)) +/** IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96)) */ class CNetAddr { protected: @@ -81,6 +81,7 @@ class CNetAddr ) }; +/** A combnation of a network address (CNetAddr) and a (TCP) port */ class CService : public CNetAddr { protected: |