Commit Graph

115 Commits

Author SHA1 Message Date
Kris Nuttycombe 3cec519ce4 scripted-diff: Update Zcash copyrights to 2023
-BEGIN VERIFY SCRIPT-
for party in "The Zcash developers" "The Bitcoin Core developers" "Bitcoin Developers"; do
  sed -i"" -e "s#Copyright (c) \([0-9]\{4\}\)\(-[0-9]\{4\}\)\? $party#Copyright (c) \1-2023 $party#" COPYING
  sed -i"" -e "s#\(.*\)\([0-9]\{4\}\)\(-[0-9]\{4\}\)\, $party#\1\2-2023, $party#" contrib/debian/copyright
done

sed -i"" -e "s/define(_COPYRIGHT_YEAR, [0-9]\{4\})/define(_COPYRIGHT_YEAR, 2023)/" configure.ac
sed -i"" -e "s/#define COPYRIGHT_YEAR [0-9]\{4\}/#define COPYRIGHT_YEAR 2023/" src/clientversion.h

git grep "^// Copyright (c) .* The Zcash developers" \
  | awk -F ':' '{print $1}' \
  | xargs -I {} sed -i"" -e "s#// Copyright (c) \([0-9]\{4\}\)\(-[0-9]\{4\}\)\? The Zcash developers#// Copyright (c) \1-2023 The Zcash developers#" {}
-END VERIFY SCRIPT-
2023-01-23 11:31:54 -07:00
Jim Posen 9a7e2c153d scripted-diff: Move util files to separate directory.
-BEGIN VERIFY SCRIPT-
mkdir -p src/util
git mv src/util.h src/util/system.h
git mv src/util.cpp src/util/system.cpp
git mv src/utilmoneystr.h src/util/moneystr.h
git mv src/utilmoneystr.cpp src/util/moneystr.cpp
git mv src/utilstrencodings.h src/util/strencodings.h
git mv src/utilstrencodings.cpp src/util/strencodings.cpp
git mv src/utiltime.h src/util/time.h
git mv src/utiltime.cpp src/util/time.cpp

sed -i -e 's/"util\.h"/"util\/system\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
git checkout HEAD -- src/secp256k1 # exclude secp256k1, which has its own "util.h"
sed -i -e 's/"utilmoneystr\.h"/"util\/moneystr\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/"utilstrencodings\.h"/"util\/strencodings\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/<utilstrencodings\.h>/<util\/strencodings\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/"utiltime\.h"/"util\/time\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')

sed -i -e 's/BITCOIN_UTIL_H/BITCOIN_UTIL_SYSTEM_H/g' src/util/system.h
sed -i -e 's/BITCOIN_UTILMONEYSTR_H/BITCOIN_UTIL_MONEYSTR_H/g' src/util/moneystr.h
sed -i -e 's/BITCOIN_UTILSTRENCODINGS_H/BITCOIN_UTIL_STRENCODINGS_H/g' src/util/strencodings.h
sed -i -e 's/BITCOIN_UTILTIME_H/BITCOIN_UTIL_TIME_H/g' src/util/time.h

sed -i -e 's/ util\.\(h\|cpp\)/ util\/system\.\1/g' src/Makefile.am
sed -i -e 's/utilmoneystr\.\(h\|cpp\)/util\/moneystr\.\1/g' src/Makefile.am
sed -i -e 's/utilstrencodings\.\(h\|cpp\)/util\/strencodings\.\1/g' src/Makefile.am
sed -i -e 's/utiltime\.\(h\|cpp\)/util\/time\.\1/g' src/Makefile.am

sed -i -e 's/src\/util\.cpp/src\/util\/system\.cpp/g' test/lint/lint-locale-dependence.sh
sed -i -e 's/src\/utilmoneystr\.cpp/src\/util\/moneystr\.cpp/g' test/lint/lint-locale-dependence.sh
sed -i -e 's/src\/utilstrencodings\.\(h\|cpp\)/src\/util\/strencodings\.\1/g' test/lint/lint-locale-dependence.sh
-END VERIFY SCRIPT-
2022-07-01 17:50:09 -06:00
Kris Nuttycombe d9aeefc54a scripted-diff: Add 2017-2022 copyright headers for files added/modified in 2017
-BEGIN VERIFY SCRIPT-
grep -l "Copyright" $(grep -L "The Zcash developers" $(git diff --name-only --diff-filter=ACM 94f427a211bb337200c29a1e19be0f5ad2f171b0..b2a114a8c99947b66d1fbdc70278f13e7a415d2a -- src/ test/ zcutil/ qa/)) | xargs -I {} sed -i"" -e "s#\(\(.*\)Copyright (c) .* The Bitcoin Core developers\)#\1\n\2Copyright (c) 2017-2022 The Zcash developers#" {}
-END VERIFY SCRIPT-
2022-05-11 17:25:51 -06:00
Ben Woosley 89d322abed Drop defunct Windows compat fixes
"The AI_ADDRCONFIG flag is defined on the Windows SDK for Windows Vista
and later. The AI_ADDRCONFIG flag is supported on Windows Vista and
later."
https://docs.microsoft.com/en-us/windows/desktop/api/ws2tcpip/nf-ws2tcpip-getaddrinfo

However, the version of MinGW we use on Travis is not current and does
not carry the relevant definition, as such I defined it in compat.
https://github.com/wine-mirror/wine/blob/master/include/ws2tcpip.h

Testing confirms that the PROTECTION_LEVEL_UNRESTRICTED,
IPV6_PROTECTION_LEVEL, PROCESS_DEP_ENABLE, AI_ADDRCONFIG, are now
supported by the version of Windows that we test against, so can be
removed.
https://travis-ci.org/bitcoin/bitcoin/jobs/483255439
https://travis-ci.org/Empact/bitcoin/jobs/484123087

(cherry picked from commit d0522ec94ebbaa564f5f6b31236d4df032664411)
2021-06-05 14:51:00 +01:00
Wladimir J. van der Laan 48ffe79511 net: Fix CIDR notation in ToString()
Only use CIDR notation if the netmask can be represented as such.
2021-02-16 18:02:25 +00:00
Jonas Schnelli f8bf7b146c net: use CIDR notation in CSubNet::ToString() 2021-02-16 18:02:25 +00:00
Jonas Schnelli a1f8683066 Adding CSubNet constructor over a single CNetAddr 2021-02-16 18:02:24 +00:00
Wladimir J. van der Laan 957e5d216f Kill insecure_random and associated global state
There are only a few uses of `insecure_random` outside the tests.
This PR replaces uses of insecure_random (and its accompanying global
state) in the core code with an FastRandomContext that is automatically
seeded on creation.

This is meant to be used for inner loops. The FastRandomContext
can be in the outer scope, or the class itself, then rand32() is used
inside the loop. Useful e.g. for pushing addresses in CNode or the fee
rounding, or randomization for coin selection.

As a context is created per purpose, thus it gets rid of
cross-thread unprotected shared usage of a single set of globals, this
should also get rid of the potential race conditions.

- I'd say TxMempool::check is not called enough to warrant using a special
  fast random context, this is switched to GetRand() (open for
  discussion...)

- The use of `insecure_rand` in ConnectThroughProxy has been replaced by
  an atomic integer counter. The only goal here is to have a different
  credentials pair for each connection to go on a different Tor circuit,
  it does not need to be random nor unpredictable.

- To avoid having a FastRandomContext on every CNode, the context is
  passed into PushAddress as appropriate.

There remains an insecure_random for test usage in `test_random.h`.

Zcash: Resolved conflicts with the following files

	src/addrman.cpp
	src/main.cpp
	src/net.cpp
	src/net.h
	src/policy/fees.cpp
	src/policy/fees.h
	src/random.cpp
	src/test/merkle_tests.cpp
	src/test/net_tests.cpp
	src/test/prevector_tests.cpp
	src/test/sighash_tests.cpp
	src/test/skiplist_tests.cpp
	src/test/test_bitcoin.cpp
	src/test/versionbits_tests.cpp
	src/wallet/test/crypto_tests.cpp
2020-01-22 21:41:26 +00:00
MarcoFalke e11e1ea58e
[trivial] Reuse translation and cleanup DEFAULT_* values
* DEFAULT_DISABLE_SAFEMODE = false
* Use DEFAULT_* constants for extern bools
2019-12-04 17:18:41 +00:00
Luke Dashjr 2e02bb21f7
Constrain constant values to a single location in code 2019-12-04 17:18:39 +00:00
Jack Grigg 8f170cf033
Cast uint8* in InterruptibleRecv to char* for recv
Fixes a Windows-specific compile bug introduced in #4212.
Closes #4214.
2019-11-11 09:47:38 +00:00
Sean Bowe 812d0ac44b
Fix of CVE-2017-18350
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan.

Co-Authored-By: Jack Grigg <jack@electriccoin.co>
Co-Authored-By: Daira Hopwood <daira@electriccoin.co>
2019-11-08 09:26:17 -07:00
Daira Hopwood bc909a7a7f Replace http with https: in links to the MIT license.
Also change MIT/X11 to just MIT, since no distinction was intended.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-18 15:26:01 +01:00
Daira Hopwood c938fb1f17 Squashed commit of the following:
commit 5e7222e4bc0401ef8c6d8049b12a62d4854ac85c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:20:51 2018 +0200

    Cleanup

commit 2e1bc7a7cd6c72e7c3d2ff74cb30f7a56515006c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:19:53 2018 +0200

    Cleanup

commit edd7fa87fb2c839c17457ff004d258a049df832f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:18:57 2018 +0200

    Cleanup

commit ee34e1433806655a7123f0617802aa4771507dff
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:18:10 2018 +0200

    Cleanup

commit 20779e4021b8ab95a87289d2741ad2f0fbc7fb39
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:16:52 2018 +0200

    Cleanup

commit 084e1aa563807f5625ad3aaff376b598e139f2a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 18:42:49 2018 +0200

    Fix typo

commit c61a7c2319d3b9b96d1b5ad52ecf9d4f2fd92658
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 18:37:43 2018 +0200

    Cleanup

commit e435c0229b0cbe3f4a77f43b01ca87ed0552d405
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 18:17:58 2018 +0200

    Fix typos

commit e05bff3fea8915e95a473fe3266b2b1f727deca0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:59:32 2018 +0200

    Fix typo

commit 8c55c7840232cef7fa4389a12f6f220e86f5f581
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:46:33 2018 +0200

    Fix typos

commit a1edfcc5cc29d815ba7e8c4baaf14c23ef93af64
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:39:41 2018 +0200

    Fix typos

commit 2ce2c4d180e936ccc5c10745a6430fda5de38a9b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:14:10 2018 +0200

    Fix typo

commit 5bdc6cd5bc9cff93aa48fbdeda36d4d9774bfa18
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:12:14 2018 +0200

    Fix typo

commit d08749f549575efc6f44a7f80850bc439c12ad5c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:54:06 2018 +0200

    Revert one change

commit a734bb1191c692f09f58bcc8e85160ce7c839905
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:52:45 2018 +0200

    Fix typo

commit 95fbc8d94bbefc0db989c83d0f053111bfed45e7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:51:33 2018 +0200

    Fix typos

commit d17d540a83d035cf9a200f9a8b19f0fab6084728
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:49:36 2018 +0200

    Fix typo

commit c4bf4402210bcb926ccfb3928afeb3a8a7490b42
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:48:09 2018 +0200

    Fix typo

commit 25e7990848a1d723702e2d041c04bc68a6c1275f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:47:01 2018 +0200

    Fix typo

commit d72ffb5b0253e0d7b992ffe13c40695421378dc3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:45:20 2018 +0200

    Fix typo

commit 705e6f271192a575cc99d794545b0efe75d964c4
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:41:19 2018 +0200

    Revert one change

commit 4fd26cd29e21c42b027e37da2616761ebc399d16
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:39:41 2018 +0200

    Revert commit

commit 8a5cc627b1048368fe8807973d1f542bab2e045f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:28:56 2018 +0200

    Fix typo

commit 0a24baa7258c0ae0f244d82af8d0831b148ab012
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:15:45 2018 +0200

    Fix typo

commit 38f93ecd90171fb881243f0de55b3452daccff20
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 15:56:49 2018 +0200

    Fix typos

commit 15446fd62400c36c2a51f7e6f13725cc8adfd924
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 15:48:00 2018 +0200

    Fix typos

commit 76533b41986bbc5826070a1e644215a74757c1db
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 15:04:38 2018 +0200

    Fix typo

commit aea330c2b0bf76975ec69142a732288cc8b192bd
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 14:46:29 2018 +0200

    Fix typo

commit 8b1b1d0be1dc44f36c22c54d1a3d56d84d456b92
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 14:40:23 2018 +0200

    Fix typo

commit 46ea76785a26cf20a664ed211c8f3fb9a283e127
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 14:14:17 2018 +0200

    Fix typo

commit e0d7c5748545dd0975507ad603623072fcc6bdea
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 14:08:24 2018 +0200

    Fix typo

commit 604d5a244323b17ba596b12d245407e1cf63a375
Merge: 6c081ca 1c65b2b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:03:23 2018 +0200

    Merge pull request #36 from rex4539/patch-36

    Fix typo

commit 6c081caf28b7cef9e62ed523284dff90e4add16d
Merge: 899e5d2 88fa2d9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:02:49 2018 +0200

    Merge pull request #35 from rex4539/patch-35

    Fix typo

commit 899e5d2c343ac7ea5069b8548e5df86c8e963e21
Merge: 6380c7f 40e73e2
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:02:16 2018 +0200

    Merge pull request #34 from rex4539/patch-34

    Fix typo

commit 6380c7f740246474c69d8145bde61688551efe83
Merge: f592274 4567667
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:01:47 2018 +0200

    Merge pull request #33 from rex4539/patch-33

    Fix typos

commit f592274a713162da0083bd6d22fb47cb1afcdba9
Merge: d86ef7e 4aeaa3a
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:01:14 2018 +0200

    Merge pull request #32 from rex4539/patch-32

    Fix typo

commit d86ef7e5e4f7e9c2014358ec5b647d1815eb304d
Merge: fe0b432 5cdd1b2
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:00:41 2018 +0200

    Merge pull request #31 from rex4539/patch-31

    Fix typo

commit fe0b432ee125ae0b876af2c26139dfc979005a3b
Merge: 6fd6d0d 70130d0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:00:12 2018 +0200

    Merge pull request #30 from rex4539/patch-30

    Fix typos

commit 6fd6d0dcf3714118a623c0d8d84aabb4578410a8
Merge: 389660f 3377426
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:59:42 2018 +0200

    Merge pull request #29 from rex4539/patch-29

    Fix typo

commit 389660f856cb60ff475a8757aad3873b99213cc0
Merge: a0b85ce 40643eb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:59:15 2018 +0200

    Merge pull request #28 from rex4539/patch-28

    Fix typo

commit a0b85ce3b4d2e6596da0727e05c1fe15c289b1e7
Merge: 6f9a1c7 23ead80
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:58:42 2018 +0200

    Merge pull request #27 from rex4539/patch-27

    Fix typo

commit 6f9a1c71a680bb3ed1c249dd42bf0a54663d0af3
Merge: b880547 3612eab
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:58:06 2018 +0200

    Merge pull request #26 from rex4539/patch-26

    Patch 26

commit b880547415afeae36bd19867388e60a3040a15ca
Merge: a3b7da2 5c3177f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:57:24 2018 +0200

    Merge pull request #25 from rex4539/patch-25

    Fix typo

commit a3b7da2c6d6691f38751292e1aea63498a325788
Merge: edd8586 60026ef
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:56:52 2018 +0200

    Merge pull request #24 from rex4539/patch-24

    Fix typo

commit edd8586fdf8c112f4c513804610c237d7e2e80ef
Merge: 0c28eb7 f979c00
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:56:12 2018 +0200

    Merge pull request #23 from rex4539/patch-23

    Fix typo

commit 0c28eb7717821b1d68016f40911d07f2a7231b4f
Merge: 775beb6 c900722
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:55:42 2018 +0200

    Merge pull request #22 from rex4539/patch-22

    Fix typo

commit 775beb625beb1fc5f72388c076b295de4b8ff039
Merge: a0cf889 1027543
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:55:16 2018 +0200

    Merge pull request #21 from rex4539/patch-21

    Fix typo

commit a0cf88971e756c37c406bab3066c11d6fc7f6d74
Merge: 4504b48 f3fa89b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:54:44 2018 +0200

    Merge pull request #20 from rex4539/patch-20

    Fix typo

commit 4504b4824b3438e931ca8d24a56b1887657e87cd
Merge: dd0bcbf 2699eca
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:54:20 2018 +0200

    Merge pull request #19 from rex4539/patch-19

    Fix typo

commit dd0bcbfc89293e9760156d5534f3a558451e1f29
Merge: abfb65a f02ef2e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:53:46 2018 +0200

    Merge pull request #18 from rex4539/patch-18

    Fix typos

commit abfb65afaed49c34b9875df79f6fe6eb2b7bf769
Merge: 68b46b7 6485c90
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:53:08 2018 +0200

    Merge pull request #17 from rex4539/patch-17

    Fix typo

commit 68b46b75d2e5b7ae97e83fc5541c46b4907a7899
Merge: a131e84 fcc0828
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:52:39 2018 +0200

    Merge pull request #16 from rex4539/patch-16

    Fix typo

commit a131e844652e58aff78fa8952e7547a9ba82b8a1
Merge: 8487c0e 8a688ff
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:51:54 2018 +0200

    Merge pull request #15 from rex4539/patch-15

    Fix typo

commit 8487c0e39092b74e977c7a60f4a07a27606756a8
Merge: bcc4cb4 bb60b83
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:51:28 2018 +0200

    Merge pull request #14 from rex4539/patch-14

    Fix typos

commit bcc4cb46130e789faa9adae9b159ca818f67ec52
Merge: 23e66e9 53539bb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:51:00 2018 +0200

    Merge pull request #13 from rex4539/patch-13

    Fix typos

commit 23e66e956bff2d6935c7a4dd570d457294018a77
Merge: 56956cf 0808445
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:50:27 2018 +0200

    Merge pull request #12 from rex4539/patch-12

    Fix typo

commit 56956cf23ba1208aa39cb3ab1ef60375c6630263
Merge: 77007d4 7a4f064
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:49:59 2018 +0200

    Merge pull request #11 from rex4539/patch-11

    Fix typo

commit 77007d49fa1d8cb80aef02bea1dd15e522a47c90
Merge: e78ad0c 48c33fb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:49:16 2018 +0200

    Merge pull request #10 from rex4539/patch-10

    Fix typo

commit e78ad0cf0d91955a848f5e953a042eabdcdac198
Merge: 38a3e08 809f01c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:48:33 2018 +0200

    Merge pull request #9 from rex4539/patch-9

    Fix typo

commit 38a3e08699fe4c4ec715b1783dba18bff6b829fb
Merge: eee3c28 fec279c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:48:05 2018 +0200

    Merge pull request #8 from rex4539/patch-8

    Fix typo

commit eee3c286eb84f994310142a9e7fdbd36a671e593
Merge: 702635b cf81b4e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:47:33 2018 +0200

    Merge pull request #7 from rex4539/patch-7

    Fix typo

commit 702635bb34abb2f83ded27ae95deefd5b6e7df93
Merge: d7497ea 3bbcc3d
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:47:01 2018 +0200

    Merge pull request #6 from rex4539/patch-6

    Fix typo

commit d7497ea070e03380cf1d4f533b7dc4b881f724f8
Merge: bfcc1e8 f639727
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:45:33 2018 +0200

    Merge pull request #5 from rex4539/patch-5

    Fix typos

commit bfcc1e8ae2094ca4e9837f623999705f538aff04
Merge: f4440ec 55262fe
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:45:05 2018 +0200

    Merge pull request #4 from rex4539/patch-4

    Remove space for word "backup"

commit f4440ecd4a7367e6bc4a5f75bea112290017ed2b
Merge: f8b487f 61d5279
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:44:31 2018 +0200

    Merge pull request #3 from rex4539/patch-3

    Fix typos in zmq.md

commit f8b487f5699990fabc7fc383d02bc728db3cb9aa
Merge: 60104a7 f2ce50f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:42:51 2018 +0200

    Merge pull request #2 from rex4539/patch-2

    Fix typo in security-warnings.md

commit 60104a7034f55284afb814e81a1430a8b2b0d8d1
Merge: be262f0 af7dfe0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:41:48 2018 +0200

    Merge pull request #1 from rex4539/patch-1

    Fix typos

commit 1c65b2bd0c49f7f392d0e3a2db14ce1366a87171
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 07:35:26 2018 +0200

    Fix typo

commit 88fa2d966a3b462ed34a9a4659fc390711cc0276
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 07:21:00 2018 +0200

    Fix typo

commit 40e73e258671f21d2b2205509e9cae1f50294752
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 07:14:21 2018 +0200

    Fix typo

commit 4567667fcc8b4197dfd51da34fe82b0f2fb78127
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 06:44:40 2018 +0200

    Fix typos

commit 4aeaa3a3d6335302c53c0f5f4ef81de05e266479
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 05:55:25 2018 +0200

    Fix typo

commit 5cdd1b29b4c90492aa15fed7940984e1d675052f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 05:36:46 2018 +0200

    Fix typo

commit 70130d05f1646c8b9fb1f33c4efbe2a5fcf7138b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 05:28:21 2018 +0200

    Fix typos

commit 33774261b1c63e5640aa1dd251edb67892ed7a5b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 05:00:56 2018 +0200

    Fix typo

commit 40643ebfcd85ee257a4576e85d2fb6c73dad17b5
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:51:57 2018 +0200

    Fix typo

commit 23ead80e05116ebfeaac0a00d5bd4a158fbeb54e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:29:53 2018 +0200

    Fix typo

commit 3612eaba2dcf273e94cac9ad889723776ce55108
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:19:36 2018 +0200

    Fix typos

commit 5c3177f5d191d1f4e4d9f78ae4b75381010f7768
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:13:03 2018 +0200

    Fix typo

commit 60026efe27a39300e428879ad8dba94f19934870
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:08:09 2018 +0200

    Fix typo

commit f979c0074efd66804f229c8b3cc6e812d7f26406
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:01:44 2018 +0200

    Fix typo

commit c9007220a8a727c1cfe3b25b453c178eacd431f3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:52:33 2018 +0200

    Fix typo

commit 1027543bd30701c4b09aa66226281a10563db910
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:36:19 2018 +0200

    Fix typo

commit f3fa89bcd30e0cb45ff4391e78d02452c9227be0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:34:37 2018 +0200

    Fix typo

commit 2699eca938f1e413a29d4408a271aaafd27969cc
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:30:29 2018 +0200

    Fix typo

commit f02ef2e495fe43142d305f5c4f40dcfa3d2cb423
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:22:36 2018 +0200

    Fix typos

commit 6485c908433bb91fd70d7e18cf3611c9a96115a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:10:06 2018 +0200

    Fix typo

commit fcc082850564b14b86b1932dfc5a099816c72ef1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:06:26 2018 +0200

    Fix typo

commit 8a688ff7405d67bd4c77b0aa0ebdd4b4a8a9a6a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:02:50 2018 +0200

    Fix typo

commit bb60b83853ed0a82ca47dd58d55f1849ddcf23ab
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 02:59:25 2018 +0200

    Fix typos

commit 53539bb720c7676b9d37e25dde3423db3aa7bfa1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 02:50:55 2018 +0200

    Fix typos

commit 080844581d6488ab797ac188acae9c4b2e1d0c59
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 01:05:54 2018 +0200

    Fix typo

commit 7a4f0649ac5e71f39f0bef7f2e1fcb6fafad0291
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 00:16:31 2018 +0200

    Fix typo

commit 48c33fb3f9ab1ad287987d147ee4bbe186f7ade1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 00:07:42 2018 +0200

    Fix typo

commit 809f01ca4f785a7b5bc9cc2c388e0ae814ecaa95
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 00:02:34 2018 +0200

    Fix typo

commit fec279cac89aa917be929447c81177811728361a
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 23:55:27 2018 +0200

    Fix typo

commit cf81b4e12399570545372d4c9daceca8e70142d5
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 23:48:43 2018 +0200

    Fix typo

commit 3bbcc3d9986caf8df99bec5d8a18d0f0c8990e06
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 23:28:52 2018 +0200

    Fix typo

commit f639727525dbd23f5f2d0f89e7be13d868e984c3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 23:13:12 2018 +0200

    Fix typos

commit 55262fe9c5e1e127c6b817a0c2ab3f9db3ac35b9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 22:46:52 2018 +0200

    Remove space for word "backup"

commit 61d52797d4d26a90dcc15e2bcd6f19a5f36faac3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 22:23:31 2018 +0200

    Fix typos in zmq.md

commit f2ce50f10e67b4265e559a432681bc44828ae59b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 22:12:58 2018 +0200

    Fix typo in security-warnings.md

commit af7dfe046c12109e44ddc18dff07ede8755cf4f9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 21:59:24 2018 +0200

    Fix typos

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2018-03-02 11:45:05 +00:00
Wladimir J. van der Laan eb5f63fe58
net: Automatically create hidden service, listen on Tor
Starting with Tor version 0.2.7.1 it is possible, through Tor's control socket
API, to create and destroy 'ephemeral' hidden services programmatically.
https://stem.torproject.org/api/control.html#stem.control.Controller.create_ephemeral_hidden_service

This means that if Tor is running (and proper authorization is available),
bitcoin automatically creates a hidden service to listen on, without user
manual configuration. This will positively affect the number of available
.onion nodes.

- When the node is started, connect to Tor through control socket
- Send `ADD_ONION` command
- First time:
    - Make it create a hidden service key
    - Save the key in the data directory for later usage
- Make it redirect port 8333 to the local port 8333 (or whatever port we're listening on).
- Keep control socket connection open for as long node is running. The hidden service will
  (by default) automatically go away when the connection is closed.
2017-03-25 20:22:09 +13:00
Jonas Schnelli 171b4de8d9
fix CSubNet comparison operator 2017-03-02 13:23:03 -08:00
Jonas Schnelli e521939942
[RPC] extend setban to allow subnets 2017-03-02 13:23:03 -08:00
Gregory Maxwell 95a50390e1
Set TCP_NODELAY on P2P sockets.
Nagle appears to be a significant contributor to latency now that the static
 sleeps are gone.  Most of our messages are relatively large compared to
 IP + TCP so I do not expect this to create enormous overhead.

This may also reduce traffic burstyness somewhat.

Conflicts:
	src/net.cpp

Rebased-From: a4e28b3d1e5c95eb0c87f144851cd65048c3e0bc
Github-Pull: #6867
2015-10-23 10:02:53 +02:00
Wladimir J. van der Laan 1cd7952dde
Merge pull request #6703
45bfa13 PARTIAL: typofixes (found by misspell_fixer) (Veres Lajos)
21c406e add support for miniupnpc api version 14 (Pavel Vasin)
13bd5a7 rpc-tests: re-enable rpc-tests for Windows (Cory Fields)
ccc4ad6 net: Set SO_REUSEADDR for Windows too (Cory Fields)
1f6772e add unit test for CNetAddr::GetGroup. (Alex Morcos)
13642a5 Fix masking of irrelevant bits in address groups. (Alex Morcos)
6b51b9b Replace boost::reverse_lock with our own. (Casey Rodarmor)
626c5e6 Make sure we re-acquire lock if a task throws (Casey Rodarmor)
4877053 Add missing files to files.md (fanquake)
f171fee Handle leveldb::DestroyDB() errors on wipe failure (Adam Weiss)
c5b89fe Fix race condition on test node shutdown (Casey Rodarmor)
4a37410 Handle no chain tip available in InvalidChainFound() (Ross Nicoll)
f6d29a6 Use unique name for AlertNotify tempfile (Casey Rodarmor)
e6adac7 Delay initial pruning until after wallet init (Adam Weiss)
e0020d4 Make sure LogPrint strings are line-terminated (J Ross Nicoll)
7ff9d12 Make sure LogPrintf strings are line-terminated (Wladimir J. van der Laan)
5a39133 build: fix libressl detection (Cory Fields)
f6355e6 Avoid leaking file descriptors in RegisterLoad (Casey Rodarmor)
60457d3 locking: fix a few small issues uncovered by -Wthread-safety (Cory Fields)
a496e11 Remove bash test note from rpc-tests readme (fanquake)
49c6a64 tests: Remove old sh-based test framework (Wladimir J. van der Laan)
a37567d Add autogen.sh to source tarball. (randy-waterhouse)
1f4d7cf travis: for travis generating an extra build (Cory Fields)
2015-09-23 14:12:55 +02:00
Veres Lajos 45bfa137ef PARTIAL: typofixes (found by misspell_fixer)
Upstream: 9f68ed6b6d1a9c6436ce37913666165f2b180ee3 (PR #6539)
2015-09-22 00:43:15 +00:00
Alex Morcos 13642a50eb Fix masking of irrelevant bits in address groups. 2015-09-22 00:43:14 +00:00
Pieter Wuille 0095b9a1ff
Test whether created sockets are select()able
Conflicts:
	src/net.cpp

Rebased-From: d422f9b1fdb42a51aadaa1bbc157542dca2feb17
2015-07-20 16:57:37 +02:00
Philip Kaufmann d6922aad2c [net, trivial] remove using namespace std pollution in netbase.cpp 2015-05-31 15:48:23 +02:00
Wladimir J. van der Laan b45c50ce51 Fix two problems in CSubNet parsing
Fix two CSubNet constructor problems:

- The use of `/x` where 8 does not divide x was broken, due to a
  bit-order issue

- The use of e.g. `1.2.3.4/24` where the netmasked bits in the network
  are not 0 was broken. Fix this by explicitly normalizing the netwok
  according to the bitmask.

Also add tests for these cases.

Fixes #6179. Thanks to @jonasschnelli for reporting and initial fix.
2015-05-26 08:59:59 +02:00
Wladimir J. van der Laan 19e8d7be42 Simplify code for CSubnet
Simplify the code by using CAddress.ip directly, instead of the reversed
GetByte() semantics.
2015-05-26 08:59:13 +02:00
Philip Kaufmann d1af89e655 use const reference as param in ConnectThroughProxy/Socks5
- also ensure code style conformance by replacing bool static with static bool
2015-04-28 14:44:56 +02:00
Wladimir J. van der Laan 67a7949397 privacy: Stream isolation for Tor
According to Tor's extensions to the SOCKS protocol
(https://gitweb.torproject.org/torspec.git/tree/socks-extensions.txt)
it is possible to perform stream isolation by providing authentication
to the proxy. Each set of credentials will create a new circuit,
which makes it harder to correlate connections.

This patch adds an option, `-proxyrandomize` (on by default) that randomizes
credentials for every outgoing connection, thus creating a new circuit.

    2015-03-16 15:29:59 SOCKS5 Sending proxy authentication 3842137544:3256031132
2015-04-17 13:26:47 +02:00
sandakersmann f914f1a746
Added "Core" to copyright headers
Github-Pull: #5494
Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
2014-12-19 19:55:32 +01:00
Michael Ford 78253fcbad Remove references to X11 licence 2014-12-16 15:56:50 +08:00
Wladimir J. van der Laan 35e408f8a4 Regard connection failures as attempt for addrman
This avoids connecting to them again too soon in ThreadOpenConnections.

Make an exception for connection failures to the proxy as these
shouldn't affect the status of specific nodes.
2014-12-02 17:54:16 +01:00
Pavel Janík a53d16ac0c Use complete path to include bitcoin-config.h. 2014-11-26 10:37:49 +01:00
Matt Corallo 2d06c0febf Add missing reserved address spaces. 2014-10-28 23:54:39 -07:00
Philip Kaufmann de10efd154 add -timeout default as constant and use them
- update help message text
- simplify code in init to check for -timeout
2014-10-06 13:13:25 +02:00
Wladimir J. van der Laan 6050ab6855 netbase: Make SOCKS5 negotiation interruptible
Avoids that SOCKS5 negotiation will hold up the shutdown process.

- Sockets can stay in non-blocking mode, no need to switch it on/off
  anymore
- Adds a timeout (20 seconds) on SOCK5 negotiation. This should be
  enough for even Tor to get a connection to a hidden service, and
  avoids blocking the opencon thread indefinitely on a hanging proxy.

Fixes #2954.
2014-09-10 11:33:13 +02:00
Wladimir J. van der Laan f7d0a86bf6 netbase: Use .data() instead of .c_str() on binary string
`.c_str()` is only guaranteed to return the data up to the first NUL
character.
2014-09-08 12:20:50 +02:00
Wladimir J. van der Laan ad49c256c3 Split up util.cpp/h
Split up util.cpp/h into:

- string utilities (hex, base32, base64): no internal dependencies, no dependency on boost (apart from foreach)
- money utilities (parsesmoney, formatmoney)
- time utilities (gettime*, sleep, format date):
- and the rest (logging, argument parsing, config file parsing)

The latter is basically the environment and OS handling,
and is stripped of all utility functions, so we may want to
rename it to something else than util.cpp/h for clarity (Matt suggested
osinterface).

Breaks dependency of sha256.cpp on all the things pulled in by util.
2014-08-26 13:25:22 +02:00
Wladimir J. van der Laan 3802224110 Remove all other print() methods
All unused.
2014-08-20 20:54:27 +02:00
Wladimir J. van der Laan 04d6c7d10c
Merge pull request #4605
aa82795 Add detailed network info to getnetworkinfo RPC (Wladimir J. van der Laan)
075cf49 Add GetNetworkName function (Wladimir J. van der Laan)
c91a947 Add IsReachable(net) function (Wladimir J. van der Laan)
60dc8e4 Allow -onlynet=onion to be used (Wladimir J. van der Laan)
2014-08-18 13:37:54 +02:00
Philip Kaufmann efd6b87811 small net cleanup
- add comment for disabling sigpipe
- add closing comment in compat.h
- remove redundant check in net.h
2014-08-08 07:40:45 +02:00
Wladimir J. van der Laan 075cf49e59 Add GetNetworkName function
Returns the network name for an Network enum.
2014-07-30 15:41:17 +02:00
Wladimir J. van der Laan 60dc8e4208 Allow -onlynet=onion to be used
Just an alias for onlynet=tor, but matches the new name
of the proxy option -onion= better.
2014-07-30 15:38:58 +02:00
Philip Kaufmann eaedb59e05 net: add SetSocketNonBlocking() as OS independent wrapper 2014-07-17 22:12:44 +02:00
Wladimir J. van der Laan 43f510d37d Convert closesocket 'compat wrapper' to function in netbase
Simpler alternative to #4348.

The current setup with closesocket() is strange. It poses
as a compatibility wrapper but adds functionality.

Rename it and make it a documented utility function in netbase.

Code movement only, zero effect on the functionality.
2014-07-17 15:46:25 +02:00
Wladimir J. van der Laan 418d4ad110
Merge pull request #4479
109849e Bugfix: strerror_r can return an error, and if it does, POSIX does not specify the content of the buffer (Luke Dashjr)
2014-07-08 13:35:56 +02:00
Luke Dashjr 109849e204 Bugfix: strerror_r can return an error, and if it does, POSIX does not specify the content of the buffer 2014-07-07 15:34:00 +00:00
Wladimir J. van der Laan afe380ef0f
Fix the build for windows
Problem introduced in caf6150. Thanks to @drak for noticing. Fixes #4473.
2014-07-07 12:48:56 +02:00
Philip Kaufmann 0127a9be14 remove SOCKS4 support from core and GUI
- now we support SOCKS5 only
2014-07-07 08:15:14 +02:00
Huang Le caf6150e97 Use async name resolving to improve net thread responsiveness
In the LookupIntern(), things changed are:

  1. Call getaddrinfo_a() instead of getaddrinfo() if available, the former is a sync version of the latter;
  2. Try using inet_pton()/inet_addr() to convert the input text to a network addr structure at first, if success the extra name resolving thread inside getaddrinfo_a() could be avoided;
  3.  An interruption point added in the waiting loop for return from getaddrinfo_a(), which completes the improve for thread responsiveness.

A easy way to see the effect is to kick off a 'bitcoind stop' immediately after 'bitcoind -daemon', before the change it would take several, or even tens of, minutes on a bad network situation to wait for the running bitcoind to exit, now it costs only seconds.

Signed-off-by: Huang Le <4tarhl@gmail.com>
2014-06-27 02:55:39 +08:00
Philip Kaufmann 6dc90ed8fa replace 3 separate calls to WSAGetLastError() with 1 2014-06-24 08:46:12 +02:00
Wladimir J. van der Laan 0f1040ba52
Merge pull request #4183
f40dbee remove CPubKey::VerifyCompact( ) which is never used (Kamil Domanski)
28b6c1d remove GetMedianTime( ) which is never used (Kamil Domanski)
5bd4adc remove LookupHostNumeric( ) which is never used (Kamil Domanski)
595f691 remove LogException( ) which is never used (Kamil Domanski)
f4057cb remove CTransaction::IsNewerThan which is never used (Kamil Domanski)
0e31e56 remove CWallet::AddReserveKey which is never used (Kamil Domanski)
2014-05-25 16:19:54 +02:00