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>
602 lines
24 KiB
C++
602 lines
24 KiB
C++
// Copyright (c) 2009-2014 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include "rpcserver.h"
|
|
|
|
#include "clientversion.h"
|
|
#include "main.h"
|
|
#include "net.h"
|
|
#include "netbase.h"
|
|
#include "protocol.h"
|
|
#include "sync.h"
|
|
#include "timedata.h"
|
|
#include "util.h"
|
|
#include "version.h"
|
|
#include "deprecation.h"
|
|
|
|
#include <boost/foreach.hpp>
|
|
|
|
#include <univalue.h>
|
|
|
|
using namespace std;
|
|
|
|
UniValue getconnectioncount(const UniValue& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() != 0)
|
|
throw runtime_error(
|
|
"getconnectioncount\n"
|
|
"\nReturns the number of connections to other nodes.\n"
|
|
"\nbResult:\n"
|
|
"n (numeric) The connection count\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("getconnectioncount", "")
|
|
+ HelpExampleRpc("getconnectioncount", "")
|
|
);
|
|
|
|
LOCK2(cs_main, cs_vNodes);
|
|
|
|
return (int)vNodes.size();
|
|
}
|
|
|
|
UniValue ping(const UniValue& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() != 0)
|
|
throw runtime_error(
|
|
"ping\n"
|
|
"\nRequests that a ping be sent to all other nodes, to measure ping time.\n"
|
|
"Results provided in getpeerinfo, pingtime and pingwait fields are decimal seconds.\n"
|
|
"Ping command is handled in queue with all other commands, so it measures processing backlog, not just network ping.\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("ping", "")
|
|
+ HelpExampleRpc("ping", "")
|
|
);
|
|
|
|
// Request that each node send a ping during next message processing pass
|
|
LOCK2(cs_main, cs_vNodes);
|
|
|
|
BOOST_FOREACH(CNode* pNode, vNodes) {
|
|
pNode->fPingQueued = true;
|
|
}
|
|
|
|
return NullUniValue;
|
|
}
|
|
|
|
static void CopyNodeStats(std::vector<CNodeStats>& vstats)
|
|
{
|
|
vstats.clear();
|
|
|
|
LOCK(cs_vNodes);
|
|
vstats.reserve(vNodes.size());
|
|
BOOST_FOREACH(CNode* pnode, vNodes) {
|
|
CNodeStats stats;
|
|
pnode->copyStats(stats);
|
|
vstats.push_back(stats);
|
|
}
|
|
}
|
|
|
|
UniValue getpeerinfo(const UniValue& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() != 0)
|
|
throw runtime_error(
|
|
"getpeerinfo\n"
|
|
"\nReturns data about each connected network node as a json array of objects.\n"
|
|
"\nbResult:\n"
|
|
"[\n"
|
|
" {\n"
|
|
" \"id\": n, (numeric) Peer index\n"
|
|
" \"addr\":\"host:port\", (string) The ip address and port of the peer\n"
|
|
" \"addrlocal\":\"ip:port\", (string) local address\n"
|
|
" \"services\":\"xxxxxxxxxxxxxxxx\", (string) The services offered\n"
|
|
" \"lastsend\": ttt, (numeric) The time in seconds since epoch (Jan 1 1970 GMT) of the last send\n"
|
|
" \"lastrecv\": ttt, (numeric) The time in seconds since epoch (Jan 1 1970 GMT) of the last receive\n"
|
|
" \"bytessent\": n, (numeric) The total bytes sent\n"
|
|
" \"bytesrecv\": n, (numeric) The total bytes received\n"
|
|
" \"conntime\": ttt, (numeric) The connection time in seconds since epoch (Jan 1 1970 GMT)\n"
|
|
" \"timeoffset\": ttt, (numeric) The time offset in seconds\n"
|
|
" \"pingtime\": n, (numeric) ping time\n"
|
|
" \"pingwait\": n, (numeric) ping wait\n"
|
|
" \"version\": v, (numeric) The peer version, such as 170002\n"
|
|
" \"subver\": \"/MagicBean:x.y.z[-v]/\", (string) The string version\n"
|
|
" \"inbound\": true|false, (boolean) Inbound (true) or Outbound (false)\n"
|
|
" \"startingheight\": n, (numeric) The starting height (block) of the peer\n"
|
|
" \"banscore\": n, (numeric) The ban score\n"
|
|
" \"synced_headers\": n, (numeric) The last header we have in common with this peer\n"
|
|
" \"synced_blocks\": n, (numeric) The last block we have in common with this peer\n"
|
|
" \"inflight\": [\n"
|
|
" n, (numeric) The heights of blocks we're currently asking from this peer\n"
|
|
" ...\n"
|
|
" ]\n"
|
|
" }\n"
|
|
" ,...\n"
|
|
"]\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("getpeerinfo", "")
|
|
+ HelpExampleRpc("getpeerinfo", "")
|
|
);
|
|
|
|
LOCK(cs_main);
|
|
|
|
vector<CNodeStats> vstats;
|
|
CopyNodeStats(vstats);
|
|
|
|
UniValue ret(UniValue::VARR);
|
|
|
|
BOOST_FOREACH(const CNodeStats& stats, vstats) {
|
|
UniValue obj(UniValue::VOBJ);
|
|
CNodeStateStats statestats;
|
|
bool fStateStats = GetNodeStateStats(stats.nodeid, statestats);
|
|
obj.push_back(Pair("id", stats.nodeid));
|
|
obj.push_back(Pair("addr", stats.addrName));
|
|
if (!(stats.addrLocal.empty()))
|
|
obj.push_back(Pair("addrlocal", stats.addrLocal));
|
|
obj.push_back(Pair("services", strprintf("%016x", stats.nServices)));
|
|
obj.push_back(Pair("lastsend", stats.nLastSend));
|
|
obj.push_back(Pair("lastrecv", stats.nLastRecv));
|
|
obj.push_back(Pair("bytessent", stats.nSendBytes));
|
|
obj.push_back(Pair("bytesrecv", stats.nRecvBytes));
|
|
obj.push_back(Pair("conntime", stats.nTimeConnected));
|
|
obj.push_back(Pair("timeoffset", stats.nTimeOffset));
|
|
obj.push_back(Pair("pingtime", stats.dPingTime));
|
|
if (stats.dPingWait > 0.0)
|
|
obj.push_back(Pair("pingwait", stats.dPingWait));
|
|
obj.push_back(Pair("version", stats.nVersion));
|
|
// Use the sanitized form of subver here, to avoid tricksy remote peers from
|
|
// corrupting or modifying the JSON output by putting special characters in
|
|
// their ver message.
|
|
obj.push_back(Pair("subver", stats.cleanSubVer));
|
|
obj.push_back(Pair("inbound", stats.fInbound));
|
|
obj.push_back(Pair("startingheight", stats.nStartingHeight));
|
|
if (fStateStats) {
|
|
obj.push_back(Pair("banscore", statestats.nMisbehavior));
|
|
obj.push_back(Pair("synced_headers", statestats.nSyncHeight));
|
|
obj.push_back(Pair("synced_blocks", statestats.nCommonHeight));
|
|
UniValue heights(UniValue::VARR);
|
|
BOOST_FOREACH(int height, statestats.vHeightInFlight) {
|
|
heights.push_back(height);
|
|
}
|
|
obj.push_back(Pair("inflight", heights));
|
|
}
|
|
obj.push_back(Pair("whitelisted", stats.fWhitelisted));
|
|
|
|
ret.push_back(obj);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
UniValue addnode(const UniValue& params, bool fHelp)
|
|
{
|
|
string strCommand;
|
|
if (params.size() == 2)
|
|
strCommand = params[1].get_str();
|
|
if (fHelp || params.size() != 2 ||
|
|
(strCommand != "onetry" && strCommand != "add" && strCommand != "remove"))
|
|
throw runtime_error(
|
|
"addnode \"node\" \"add|remove|onetry\"\n"
|
|
"\nAttempts add or remove a node from the addnode list.\n"
|
|
"Or try a connection to a node once.\n"
|
|
"\nArguments:\n"
|
|
"1. \"node\" (string, required) The node (see getpeerinfo for nodes)\n"
|
|
"2. \"command\" (string, required) 'add' to add a node to the list, 'remove' to remove a node from the list, 'onetry' to try a connection to the node once\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("addnode", "\"192.168.0.6:8233\" \"onetry\"")
|
|
+ HelpExampleRpc("addnode", "\"192.168.0.6:8233\", \"onetry\"")
|
|
);
|
|
|
|
string strNode = params[0].get_str();
|
|
|
|
if (strCommand == "onetry")
|
|
{
|
|
CAddress addr;
|
|
OpenNetworkConnection(addr, NULL, strNode.c_str());
|
|
return NullUniValue;
|
|
}
|
|
|
|
LOCK(cs_vAddedNodes);
|
|
vector<string>::iterator it = vAddedNodes.begin();
|
|
for(; it != vAddedNodes.end(); it++)
|
|
if (strNode == *it)
|
|
break;
|
|
|
|
if (strCommand == "add")
|
|
{
|
|
if (it != vAddedNodes.end())
|
|
throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: Node already added");
|
|
vAddedNodes.push_back(strNode);
|
|
}
|
|
else if(strCommand == "remove")
|
|
{
|
|
if (it == vAddedNodes.end())
|
|
throw JSONRPCError(RPC_CLIENT_NODE_NOT_ADDED, "Error: Node has not been added.");
|
|
vAddedNodes.erase(it);
|
|
}
|
|
|
|
return NullUniValue;
|
|
}
|
|
|
|
UniValue disconnectnode(const UniValue& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() != 1)
|
|
throw runtime_error(
|
|
"disconnectnode \"node\" \n"
|
|
"\nImmediately disconnects from the specified node.\n"
|
|
"\nArguments:\n"
|
|
"1. \"node\" (string, required) The node (see getpeerinfo for nodes)\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("disconnectnode", "\"192.168.0.6:8233\"")
|
|
+ HelpExampleRpc("disconnectnode", "\"192.168.0.6:8233\"")
|
|
);
|
|
|
|
CNode* pNode = FindNode(params[0].get_str());
|
|
if (pNode == NULL)
|
|
throw JSONRPCError(RPC_CLIENT_NODE_NOT_CONNECTED, "Node not found in connected nodes");
|
|
|
|
pNode->fDisconnect = true;
|
|
|
|
return NullUniValue;
|
|
}
|
|
|
|
UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() < 1 || params.size() > 2)
|
|
throw runtime_error(
|
|
"getaddednodeinfo dns ( \"node\" )\n"
|
|
"\nReturns information about the given added node, or all added nodes\n"
|
|
"(note that onetry addnodes are not listed here)\n"
|
|
"If dns is false, only a list of added nodes will be provided,\n"
|
|
"otherwise connected information will also be available.\n"
|
|
"\nArguments:\n"
|
|
"1. dns (boolean, required) If false, only a list of added nodes will be provided, otherwise connected information will also be available.\n"
|
|
"2. \"node\" (string, optional) If provided, return information about this specific node, otherwise all nodes are returned.\n"
|
|
"\nResult:\n"
|
|
"[\n"
|
|
" {\n"
|
|
" \"addednode\" : \"192.168.0.201\", (string) The node ip address\n"
|
|
" \"connected\" : true|false, (boolean) If connected\n"
|
|
" \"addresses\" : [\n"
|
|
" {\n"
|
|
" \"address\" : \"192.168.0.201:8233\", (string) The Zcash server host and port\n"
|
|
" \"connected\" : \"outbound\" (string) connection, inbound or outbound\n"
|
|
" }\n"
|
|
" ,...\n"
|
|
" ]\n"
|
|
" }\n"
|
|
" ,...\n"
|
|
"]\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("getaddednodeinfo", "true")
|
|
+ HelpExampleCli("getaddednodeinfo", "true \"192.168.0.201\"")
|
|
+ HelpExampleRpc("getaddednodeinfo", "true, \"192.168.0.201\"")
|
|
);
|
|
|
|
bool fDns = params[0].get_bool();
|
|
|
|
list<string> laddedNodes(0);
|
|
if (params.size() == 1)
|
|
{
|
|
LOCK(cs_vAddedNodes);
|
|
BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
|
|
laddedNodes.push_back(strAddNode);
|
|
}
|
|
else
|
|
{
|
|
string strNode = params[1].get_str();
|
|
LOCK(cs_vAddedNodes);
|
|
BOOST_FOREACH(const std::string& strAddNode, vAddedNodes) {
|
|
if (strAddNode == strNode)
|
|
{
|
|
laddedNodes.push_back(strAddNode);
|
|
break;
|
|
}
|
|
}
|
|
if (laddedNodes.size() == 0)
|
|
throw JSONRPCError(RPC_CLIENT_NODE_NOT_ADDED, "Error: Node has not been added.");
|
|
}
|
|
|
|
UniValue ret(UniValue::VARR);
|
|
if (!fDns)
|
|
{
|
|
BOOST_FOREACH (const std::string& strAddNode, laddedNodes) {
|
|
UniValue obj(UniValue::VOBJ);
|
|
obj.push_back(Pair("addednode", strAddNode));
|
|
ret.push_back(obj);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
list<pair<string, vector<CService> > > laddedAddreses(0);
|
|
BOOST_FOREACH(const std::string& strAddNode, laddedNodes) {
|
|
vector<CService> vservNode(0);
|
|
if(Lookup(strAddNode.c_str(), vservNode, Params().GetDefaultPort(), fNameLookup, 0))
|
|
laddedAddreses.push_back(make_pair(strAddNode, vservNode));
|
|
else
|
|
{
|
|
UniValue obj(UniValue::VOBJ);
|
|
obj.push_back(Pair("addednode", strAddNode));
|
|
obj.push_back(Pair("connected", false));
|
|
UniValue addresses(UniValue::VARR);
|
|
obj.push_back(Pair("addresses", addresses));
|
|
}
|
|
}
|
|
|
|
LOCK(cs_vNodes);
|
|
for (list<pair<string, vector<CService> > >::iterator it = laddedAddreses.begin(); it != laddedAddreses.end(); it++)
|
|
{
|
|
UniValue obj(UniValue::VOBJ);
|
|
obj.push_back(Pair("addednode", it->first));
|
|
|
|
UniValue addresses(UniValue::VARR);
|
|
bool fConnected = false;
|
|
BOOST_FOREACH(const CService& addrNode, it->second) {
|
|
bool fFound = false;
|
|
UniValue node(UniValue::VOBJ);
|
|
node.push_back(Pair("address", addrNode.ToString()));
|
|
BOOST_FOREACH(CNode* pnode, vNodes) {
|
|
if (pnode->addr == addrNode)
|
|
{
|
|
fFound = true;
|
|
fConnected = true;
|
|
node.push_back(Pair("connected", pnode->fInbound ? "inbound" : "outbound"));
|
|
break;
|
|
}
|
|
}
|
|
if (!fFound)
|
|
node.push_back(Pair("connected", "false"));
|
|
addresses.push_back(node);
|
|
}
|
|
obj.push_back(Pair("connected", fConnected));
|
|
obj.push_back(Pair("addresses", addresses));
|
|
ret.push_back(obj);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
UniValue getnettotals(const UniValue& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() > 0)
|
|
throw runtime_error(
|
|
"getnettotals\n"
|
|
"\nReturns information about network traffic, including bytes in, bytes out,\n"
|
|
"and current time.\n"
|
|
"\nResult:\n"
|
|
"{\n"
|
|
" \"totalbytesrecv\": n, (numeric) Total bytes received\n"
|
|
" \"totalbytessent\": n, (numeric) Total bytes sent\n"
|
|
" \"timemillis\": t (numeric) Total cpu time\n"
|
|
"}\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("getnettotals", "")
|
|
+ HelpExampleRpc("getnettotals", "")
|
|
);
|
|
|
|
UniValue obj(UniValue::VOBJ);
|
|
obj.push_back(Pair("totalbytesrecv", CNode::GetTotalBytesRecv()));
|
|
obj.push_back(Pair("totalbytessent", CNode::GetTotalBytesSent()));
|
|
obj.push_back(Pair("timemillis", GetTimeMillis()));
|
|
return obj;
|
|
}
|
|
|
|
static UniValue GetNetworksInfo()
|
|
{
|
|
UniValue networks(UniValue::VARR);
|
|
for(int n=0; n<NET_MAX; ++n)
|
|
{
|
|
enum Network network = static_cast<enum Network>(n);
|
|
if(network == NET_UNROUTABLE)
|
|
continue;
|
|
proxyType proxy;
|
|
UniValue obj(UniValue::VOBJ);
|
|
GetProxy(network, proxy);
|
|
obj.push_back(Pair("name", GetNetworkName(network)));
|
|
obj.push_back(Pair("limited", IsLimited(network)));
|
|
obj.push_back(Pair("reachable", IsReachable(network)));
|
|
obj.push_back(Pair("proxy", proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string()));
|
|
obj.push_back(Pair("proxy_randomize_credentials", proxy.randomize_credentials));
|
|
networks.push_back(obj);
|
|
}
|
|
return networks;
|
|
}
|
|
|
|
UniValue getdeprecationinfo(const UniValue& params, bool fHelp)
|
|
{
|
|
const CChainParams& chainparams = Params();
|
|
if (fHelp || params.size() != 0 || chainparams.NetworkIDString() != "main")
|
|
throw runtime_error(
|
|
"getdeprecationinfo\n"
|
|
"Returns an object containing current version and deprecation block height. Applicable only on mainnet.\n"
|
|
"\nResult:\n"
|
|
"{\n"
|
|
" \"version\": xxxxx, (numeric) the server version\n"
|
|
" \"subversion\": \"/MagicBean:x.y.z[-v]/\", (string) the server subversion string\n"
|
|
" \"deprecationheight\": xxxxx, (numeric) the block height at which this version will deprecate and shut down (unless -disabledeprecation is set)\n"
|
|
"}\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("getdeprecationinfo", "")
|
|
+ HelpExampleRpc("getdeprecationinfo", "")
|
|
);
|
|
|
|
UniValue obj(UniValue::VOBJ);
|
|
obj.push_back(Pair("version", CLIENT_VERSION));
|
|
obj.push_back(Pair("subversion",
|
|
FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<string>())));
|
|
obj.push_back(Pair("deprecationheight", DEPRECATION_HEIGHT));
|
|
|
|
return obj;
|
|
}
|
|
|
|
UniValue getnetworkinfo(const UniValue& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() != 0)
|
|
throw runtime_error(
|
|
"getnetworkinfo\n"
|
|
"Returns an object containing various state info regarding P2P networking.\n"
|
|
"\nResult:\n"
|
|
"{\n"
|
|
" \"version\": xxxxx, (numeric) the server version\n"
|
|
" \"subversion\": \"/MagicBean:x.y.z[-v]/\", (string) the server subversion string\n"
|
|
" \"protocolversion\": xxxxx, (numeric) the protocol version\n"
|
|
" \"localservices\": \"xxxxxxxxxxxxxxxx\", (string) the services we offer to the network\n"
|
|
" \"timeoffset\": xxxxx, (numeric) the time offset\n"
|
|
" \"connections\": xxxxx, (numeric) the number of connections\n"
|
|
" \"networks\": [ (array) information per network\n"
|
|
" {\n"
|
|
" \"name\": \"xxx\", (string) network (ipv4, ipv6 or onion)\n"
|
|
" \"limited\": true|false, (boolean) is the network limited using -onlynet?\n"
|
|
" \"reachable\": true|false, (boolean) is the network reachable?\n"
|
|
" \"proxy\": \"host:port\" (string) the proxy that is used for this network, or empty if none\n"
|
|
" }\n"
|
|
" ,...\n"
|
|
" ],\n"
|
|
" \"relayfee\": x.xxxxxxxx, (numeric) minimum relay fee for non-free transactions in " + CURRENCY_UNIT + "/kB\n"
|
|
" \"localaddresses\": [ (array) list of local addresses\n"
|
|
" {\n"
|
|
" \"address\": \"xxxx\", (string) network address\n"
|
|
" \"port\": xxx, (numeric) network port\n"
|
|
" \"score\": xxx (numeric) relative score\n"
|
|
" }\n"
|
|
" ,...\n"
|
|
" ]\n"
|
|
" \"warnings\": \"...\" (string) any network warnings (such as alert messages) \n"
|
|
"}\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("getnetworkinfo", "")
|
|
+ HelpExampleRpc("getnetworkinfo", "")
|
|
);
|
|
|
|
LOCK(cs_main);
|
|
|
|
UniValue obj(UniValue::VOBJ);
|
|
obj.push_back(Pair("version", CLIENT_VERSION));
|
|
obj.push_back(Pair("subversion",
|
|
FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<string>())));
|
|
obj.push_back(Pair("protocolversion",PROTOCOL_VERSION));
|
|
obj.push_back(Pair("localservices", strprintf("%016x", nLocalServices)));
|
|
obj.push_back(Pair("timeoffset", GetTimeOffset()));
|
|
obj.push_back(Pair("connections", (int)vNodes.size()));
|
|
obj.push_back(Pair("networks", GetNetworksInfo()));
|
|
obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK())));
|
|
UniValue localAddresses(UniValue::VARR);
|
|
{
|
|
LOCK(cs_mapLocalHost);
|
|
BOOST_FOREACH(const PAIRTYPE(CNetAddr, LocalServiceInfo) &item, mapLocalHost)
|
|
{
|
|
UniValue rec(UniValue::VOBJ);
|
|
rec.push_back(Pair("address", item.first.ToString()));
|
|
rec.push_back(Pair("port", item.second.nPort));
|
|
rec.push_back(Pair("score", item.second.nScore));
|
|
localAddresses.push_back(rec);
|
|
}
|
|
}
|
|
obj.push_back(Pair("localaddresses", localAddresses));
|
|
obj.push_back(Pair("warnings", GetWarnings("statusbar")));
|
|
return obj;
|
|
}
|
|
|
|
UniValue setban(const UniValue& params, bool fHelp)
|
|
{
|
|
string strCommand;
|
|
if (params.size() >= 2)
|
|
strCommand = params[1].get_str();
|
|
if (fHelp || params.size() < 2 ||
|
|
(strCommand != "add" && strCommand != "remove"))
|
|
throw runtime_error(
|
|
"setban \"ip(/netmask)\" \"add|remove\" (bantime) (absolute)\n"
|
|
"\nAttempts add or remove a IP/Subnet from the banned list.\n"
|
|
"\nArguments:\n"
|
|
"1. \"ip(/netmask)\" (string, required) The IP/Subnet (see getpeerinfo for nodes ip) with a optional netmask (default is /32 = single ip)\n"
|
|
"2. \"command\" (string, required) 'add' to add a IP/Subnet to the list, 'remove' to remove a IP/Subnet from the list\n"
|
|
"3. \"bantime\" (numeric, optional) time in seconds how long (or until when if [absolute] is set) the ip is banned (0 or empty means using the default time of 24h which can also be overwritten by the -bantime startup argument)\n"
|
|
"4. \"absolute\" (boolean, optional) If set, the bantime must be a absolute timestamp in seconds since epoch (Jan 1 1970 GMT)\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("setban", "\"192.168.0.6\" \"add\" 86400")
|
|
+ HelpExampleCli("setban", "\"192.168.0.0/24\" \"add\"")
|
|
+ HelpExampleRpc("setban", "\"192.168.0.6\", \"add\" 86400")
|
|
);
|
|
|
|
CSubNet subNet;
|
|
CNetAddr netAddr;
|
|
bool isSubnet = false;
|
|
|
|
if (params[0].get_str().find("/") != string::npos)
|
|
isSubnet = true;
|
|
|
|
if (!isSubnet)
|
|
netAddr = CNetAddr(params[0].get_str());
|
|
else
|
|
subNet = CSubNet(params[0].get_str());
|
|
|
|
if (! (isSubnet ? subNet.IsValid() : netAddr.IsValid()) )
|
|
throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: Invalid IP/Subnet");
|
|
|
|
if (strCommand == "add")
|
|
{
|
|
if (isSubnet ? CNode::IsBanned(subNet) : CNode::IsBanned(netAddr))
|
|
throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: IP/Subnet already banned");
|
|
|
|
int64_t banTime = 0; //use standard bantime if not specified
|
|
if (params.size() >= 3 && !params[2].isNull())
|
|
banTime = params[2].get_int64();
|
|
|
|
bool absolute = false;
|
|
if (params.size() == 4 && params[3].isTrue())
|
|
absolute = true;
|
|
|
|
isSubnet ? CNode::Ban(subNet, banTime, absolute) : CNode::Ban(netAddr, banTime, absolute);
|
|
|
|
//disconnect possible nodes
|
|
while(CNode *bannedNode = (isSubnet ? FindNode(subNet) : FindNode(netAddr)))
|
|
bannedNode->fDisconnect = true;
|
|
}
|
|
else if(strCommand == "remove")
|
|
{
|
|
if (!( isSubnet ? CNode::Unban(subNet) : CNode::Unban(netAddr) ))
|
|
throw JSONRPCError(RPC_MISC_ERROR, "Error: Unban failed");
|
|
}
|
|
|
|
return NullUniValue;
|
|
}
|
|
|
|
UniValue listbanned(const UniValue& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() != 0)
|
|
throw runtime_error(
|
|
"listbanned\n"
|
|
"\nList all banned IPs/Subnets.\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("listbanned", "")
|
|
+ HelpExampleRpc("listbanned", "")
|
|
);
|
|
|
|
std::map<CSubNet, int64_t> banMap;
|
|
CNode::GetBanned(banMap);
|
|
|
|
UniValue bannedAddresses(UniValue::VARR);
|
|
for (std::map<CSubNet, int64_t>::iterator it = banMap.begin(); it != banMap.end(); it++)
|
|
{
|
|
UniValue rec(UniValue::VOBJ);
|
|
rec.push_back(Pair("address", (*it).first.ToString()));
|
|
rec.push_back(Pair("banned_until", (*it).second));
|
|
bannedAddresses.push_back(rec);
|
|
}
|
|
|
|
return bannedAddresses;
|
|
}
|
|
|
|
UniValue clearbanned(const UniValue& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() != 0)
|
|
throw runtime_error(
|
|
"clearbanned\n"
|
|
"\nClear all banned IPs.\n"
|
|
"\nExamples:\n"
|
|
+ HelpExampleCli("clearbanned", "")
|
|
+ HelpExampleRpc("clearbanned", "")
|
|
);
|
|
|
|
CNode::ClearBanned();
|
|
|
|
return NullUniValue;
|
|
}
|