diff --git a/AUTHORS b/AUTHORS index cbb4f02e9..f5c305c30 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -Written by Arvid Norberg. Copyright (c) 2003-2016 +Written by Arvid Norberg. Copyright (c) 2003-2018 Contributions by: Andrei Kurushin diff --git a/COPYING b/COPYING index d20e56942..e666c6d6a 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/LICENSE b/LICENSE index 80aa2da68..941f5fa8e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/index.rst b/docs/index.rst index 5bfd6e24a..bfef5cc01 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -183,7 +183,7 @@ list or posted to the `bug tracker`_. Acknowledgements ================ -Written by Arvid Norberg. Copyright |copy| 2003-2016 +Written by Arvid Norberg. Copyright |copy| 2003-2018 Contributions by Steven Siloti, Alden Torres, Magnus Jonsson, Daniel Wallin and Cory Nelson diff --git a/include/libtorrent/add_torrent_params.hpp b/include/libtorrent/add_torrent_params.hpp index 09db2d613..6aa2ab25a 100644 --- a/include/libtorrent/add_torrent_params.hpp +++ b/include/libtorrent/add_torrent_params.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/address.hpp b/include/libtorrent/address.hpp index ba32cbd1a..9da9f1c01 100644 --- a/include/libtorrent/address.hpp +++ b/include/libtorrent/address.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/alert.hpp b/include/libtorrent/alert.hpp index a32d549d3..54cb2d669 100644 --- a/include/libtorrent/alert.hpp +++ b/include/libtorrent/alert.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg, Daniel Wallin +Copyright (c) 2003-2018, Arvid Norberg, Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/alert_manager.hpp b/include/libtorrent/alert_manager.hpp index 32056c414..80a3f65b7 100644 --- a/include/libtorrent/alert_manager.hpp +++ b/include/libtorrent/alert_manager.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg, Daniel Wallin +Copyright (c) 2003-2018, Arvid Norberg, Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/alert_types.hpp b/include/libtorrent/alert_types.hpp index b37049062..8d558a50a 100644 --- a/include/libtorrent/alert_types.hpp +++ b/include/libtorrent/alert_types.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/allocator.hpp b/include/libtorrent/allocator.hpp index 84db80176..159075240 100644 --- a/include/libtorrent/allocator.hpp +++ b/include/libtorrent/allocator.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/announce_entry.hpp b/include/libtorrent/announce_entry.hpp index 7c9b6b038..da9fce2be 100644 --- a/include/libtorrent/announce_entry.hpp +++ b/include/libtorrent/announce_entry.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/assert.hpp b/include/libtorrent/assert.hpp index b2b7adf53..5e02d8b1e 100644 --- a/include/libtorrent/assert.hpp +++ b/include/libtorrent/assert.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/aux_/array.hpp b/include/libtorrent/aux_/array.hpp index d0d4c9e04..5054c8bb7 100644 --- a/include/libtorrent/aux_/array.hpp +++ b/include/libtorrent/aux_/array.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2017, Arvid Norberg, Alden Torres +Copyright (c) 2017-2018, Arvid Norberg, Alden Torres All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/aux_/socket_type.hpp b/include/libtorrent/aux_/socket_type.hpp index 0432fc268..018642bb0 100644 --- a/include/libtorrent/aux_/socket_type.hpp +++ b/include/libtorrent/aux_/socket_type.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/aux_/storage_piece_set.hpp b/include/libtorrent/aux_/storage_piece_set.hpp index 4727033d7..9073d95aa 100644 --- a/include/libtorrent/aux_/storage_piece_set.hpp +++ b/include/libtorrent/aux_/storage_piece_set.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/aux_/throw.hpp b/include/libtorrent/aux_/throw.hpp index f43f954f2..cfa5b05d5 100644 --- a/include/libtorrent/aux_/throw.hpp +++ b/include/libtorrent/aux_/throw.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2017, Arvid Norberg +Copyright (c) 2017-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/aux_/win_util.hpp b/include/libtorrent/aux_/win_util.hpp index 9cd76d426..f5c1be950 100644 --- a/include/libtorrent/aux_/win_util.hpp +++ b/include/libtorrent/aux_/win_util.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2016, Arvid Norberg +Copyright (c) 2016-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/bandwidth_limit.hpp b/include/libtorrent/bandwidth_limit.hpp index 8d187a220..473371f6b 100644 --- a/include/libtorrent/bandwidth_limit.hpp +++ b/include/libtorrent/bandwidth_limit.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/bandwidth_manager.hpp b/include/libtorrent/bandwidth_manager.hpp index e840237ca..1fd2e9c16 100644 --- a/include/libtorrent/bandwidth_manager.hpp +++ b/include/libtorrent/bandwidth_manager.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/bandwidth_queue_entry.hpp b/include/libtorrent/bandwidth_queue_entry.hpp index d5bf698ed..5db1dbd6b 100644 --- a/include/libtorrent/bandwidth_queue_entry.hpp +++ b/include/libtorrent/bandwidth_queue_entry.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/bandwidth_socket.hpp b/include/libtorrent/bandwidth_socket.hpp index 510f10ee1..72fc81e41 100644 --- a/include/libtorrent/bandwidth_socket.hpp +++ b/include/libtorrent/bandwidth_socket.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/bdecode.hpp b/include/libtorrent/bdecode.hpp index cc07b3193..690ebd5ed 100644 --- a/include/libtorrent/bdecode.hpp +++ b/include/libtorrent/bdecode.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/bencode.hpp b/include/libtorrent/bencode.hpp index 98d5813a3..5627c6512 100644 --- a/include/libtorrent/bencode.hpp +++ b/include/libtorrent/bencode.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/bitfield.hpp b/include/libtorrent/bitfield.hpp index 9742e8d37..bccfda3dd 100644 --- a/include/libtorrent/bitfield.hpp +++ b/include/libtorrent/bitfield.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/block_cache.hpp b/include/libtorrent/block_cache.hpp index dc8fee7e7..6a6b78fae 100644 --- a/include/libtorrent/block_cache.hpp +++ b/include/libtorrent/block_cache.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/bloom_filter.hpp b/include/libtorrent/bloom_filter.hpp index 7c2b49c24..d1dcec9eb 100644 --- a/include/libtorrent/bloom_filter.hpp +++ b/include/libtorrent/bloom_filter.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/broadcast_socket.hpp b/include/libtorrent/broadcast_socket.hpp index d14d6e26f..3637356f6 100644 --- a/include/libtorrent/broadcast_socket.hpp +++ b/include/libtorrent/broadcast_socket.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/bt_peer_connection.hpp b/include/libtorrent/bt_peer_connection.hpp index d80ae8e52..23a2448cf 100644 --- a/include/libtorrent/bt_peer_connection.hpp +++ b/include/libtorrent/bt_peer_connection.hpp @@ -1,7 +1,7 @@ /* -Copyright (c) 2003-2016, Arvid Norberg -Copyright (c) 2007-2016, Arvid Norberg, Un Shyam +Copyright (c) 2003-2018, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg, Un Shyam All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/buffer.hpp b/include/libtorrent/buffer.hpp index ffed302a5..7c7e2d979 100644 --- a/include/libtorrent/buffer.hpp +++ b/include/libtorrent/buffer.hpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/build_config.hpp b/include/libtorrent/build_config.hpp index 47b208581..b024c9ffb 100644 --- a/include/libtorrent/build_config.hpp +++ b/include/libtorrent/build_config.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/chained_buffer.hpp b/include/libtorrent/chained_buffer.hpp index b2835082a..bfb31ccb4 100644 --- a/include/libtorrent/chained_buffer.hpp +++ b/include/libtorrent/chained_buffer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/choker.hpp b/include/libtorrent/choker.hpp index 1e5016e85..e8f030b6a 100644 --- a/include/libtorrent/choker.hpp +++ b/include/libtorrent/choker.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg +Copyright (c) 2014-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/close_reason.hpp b/include/libtorrent/close_reason.hpp index 620459afb..a991f8ad8 100644 --- a/include/libtorrent/close_reason.hpp +++ b/include/libtorrent/close_reason.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp index f53e27146..f380ce233 100644 --- a/include/libtorrent/config.hpp +++ b/include/libtorrent/config.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2005-2016, Arvid Norberg +Copyright (c) 2005-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/copy_ptr.hpp b/include/libtorrent/copy_ptr.hpp index e02c33577..9b7a6ca31 100644 --- a/include/libtorrent/copy_ptr.hpp +++ b/include/libtorrent/copy_ptr.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/crc32c.hpp b/include/libtorrent/crc32c.hpp index 1e263d557..c4f10ed85 100644 --- a/include/libtorrent/crc32c.hpp +++ b/include/libtorrent/crc32c.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg +Copyright (c) 2014-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/create_torrent.hpp b/include/libtorrent/create_torrent.hpp index ed53b3462..ff52a83eb 100644 --- a/include/libtorrent/create_torrent.hpp +++ b/include/libtorrent/create_torrent.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/deadline_timer.hpp b/include/libtorrent/deadline_timer.hpp index b8a94216a..8e33c7056 100644 --- a/include/libtorrent/deadline_timer.hpp +++ b/include/libtorrent/deadline_timer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/debug.hpp b/include/libtorrent/debug.hpp index fce6ecd86..e03644cc7 100644 --- a/include/libtorrent/debug.hpp +++ b/include/libtorrent/debug.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/disk_buffer_holder.hpp b/include/libtorrent/disk_buffer_holder.hpp index 6d2b879bb..b03bbe16d 100644 --- a/include/libtorrent/disk_buffer_holder.hpp +++ b/include/libtorrent/disk_buffer_holder.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/disk_buffer_pool.hpp b/include/libtorrent/disk_buffer_pool.hpp index fe2113f8b..fda02a3a3 100644 --- a/include/libtorrent/disk_buffer_pool.hpp +++ b/include/libtorrent/disk_buffer_pool.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/disk_interface.hpp b/include/libtorrent/disk_interface.hpp index 987f6d031..20c438b8f 100644 --- a/include/libtorrent/disk_interface.hpp +++ b/include/libtorrent/disk_interface.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/disk_io_job.hpp b/include/libtorrent/disk_io_job.hpp index 51446db6c..94839e556 100644 --- a/include/libtorrent/disk_io_job.hpp +++ b/include/libtorrent/disk_io_job.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/disk_io_thread.hpp b/include/libtorrent/disk_io_thread.hpp index 8ebde42ad..56e230524 100644 --- a/include/libtorrent/disk_io_thread.hpp +++ b/include/libtorrent/disk_io_thread.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg, Steven Siloti +Copyright (c) 2007-2018, Arvid Norberg, Steven Siloti All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/disk_job_pool.hpp b/include/libtorrent/disk_job_pool.hpp index 5a4b3967c..232f989b6 100644 --- a/include/libtorrent/disk_job_pool.hpp +++ b/include/libtorrent/disk_job_pool.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/disk_observer.hpp b/include/libtorrent/disk_observer.hpp index c0b4e210b..e2c351ca1 100644 --- a/include/libtorrent/disk_observer.hpp +++ b/include/libtorrent/disk_observer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/entry.hpp b/include/libtorrent/entry.hpp index 1ead27943..43fceb007 100644 --- a/include/libtorrent/entry.hpp +++ b/include/libtorrent/entry.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/enum_net.hpp b/include/libtorrent/enum_net.hpp index 40a836d34..cbfe0bbaa 100644 --- a/include/libtorrent/enum_net.hpp +++ b/include/libtorrent/enum_net.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/error.hpp b/include/libtorrent/error.hpp index d9a56f783..0403c64bf 100644 --- a/include/libtorrent/error.hpp +++ b/include/libtorrent/error.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/error_code.hpp b/include/libtorrent/error_code.hpp index 6bbf749d7..a0992e6a4 100644 --- a/include/libtorrent/error_code.hpp +++ b/include/libtorrent/error_code.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/export.hpp b/include/libtorrent/export.hpp index 503afe27a..478e684cc 100644 --- a/include/libtorrent/export.hpp +++ b/include/libtorrent/export.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2005-2016, Arvid Norberg +Copyright (c) 2005-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/extensions.hpp b/include/libtorrent/extensions.hpp index d39d110f7..f09eec071 100644 --- a/include/libtorrent/extensions.hpp +++ b/include/libtorrent/extensions.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/extensions/smart_ban.hpp b/include/libtorrent/extensions/smart_ban.hpp index 0f04ca0b2..f50bc185e 100644 --- a/include/libtorrent/extensions/smart_ban.hpp +++ b/include/libtorrent/extensions/smart_ban.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/extensions/ut_metadata.hpp b/include/libtorrent/extensions/ut_metadata.hpp index 635c0b6f9..3fc9a97c7 100644 --- a/include/libtorrent/extensions/ut_metadata.hpp +++ b/include/libtorrent/extensions/ut_metadata.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/file.hpp b/include/libtorrent/file.hpp index d741399b2..07afd7fbd 100644 --- a/include/libtorrent/file.hpp +++ b/include/libtorrent/file.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/file_pool.hpp b/include/libtorrent/file_pool.hpp index 0bd8e08eb..92c202d51 100644 --- a/include/libtorrent/file_pool.hpp +++ b/include/libtorrent/file_pool.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/file_storage.hpp b/include/libtorrent/file_storage.hpp index 34f20126a..215cb6c09 100644 --- a/include/libtorrent/file_storage.hpp +++ b/include/libtorrent/file_storage.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/fingerprint.hpp b/include/libtorrent/fingerprint.hpp index 9b14748dc..cb95417df 100644 --- a/include/libtorrent/fingerprint.hpp +++ b/include/libtorrent/fingerprint.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/fwd.hpp b/include/libtorrent/fwd.hpp index bb6c556b8..269c1d0ae 100644 --- a/include/libtorrent/fwd.hpp +++ b/include/libtorrent/fwd.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2017, Arvid Norberg +Copyright (c) 2017-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/gzip.hpp b/include/libtorrent/gzip.hpp index 621d29b60..bbebfd4cb 100644 --- a/include/libtorrent/gzip.hpp +++ b/include/libtorrent/gzip.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/hasher.hpp b/include/libtorrent/hasher.hpp index bf93b6ced..3d6af004e 100644 --- a/include/libtorrent/hasher.hpp +++ b/include/libtorrent/hasher.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/heterogeneous_queue.hpp b/include/libtorrent/heterogeneous_queue.hpp index ebf18dac5..87602cc5e 100644 --- a/include/libtorrent/heterogeneous_queue.hpp +++ b/include/libtorrent/heterogeneous_queue.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/hex.hpp b/include/libtorrent/hex.hpp index cf7dc3aab..dcdd33eeb 100644 --- a/include/libtorrent/hex.hpp +++ b/include/libtorrent/hex.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/http_connection.hpp b/include/libtorrent/http_connection.hpp index acb102421..aee584608 100644 --- a/include/libtorrent/http_connection.hpp +++ b/include/libtorrent/http_connection.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/http_parser.hpp b/include/libtorrent/http_parser.hpp index f1710a874..2c81a63f3 100644 --- a/include/libtorrent/http_parser.hpp +++ b/include/libtorrent/http_parser.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/http_seed_connection.hpp b/include/libtorrent/http_seed_connection.hpp index 472b3880c..14c3352e5 100644 --- a/include/libtorrent/http_seed_connection.hpp +++ b/include/libtorrent/http_seed_connection.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/http_stream.hpp b/include/libtorrent/http_stream.hpp index e7ec3af2e..1c5eddf77 100644 --- a/include/libtorrent/http_stream.hpp +++ b/include/libtorrent/http_stream.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/http_tracker_connection.hpp b/include/libtorrent/http_tracker_connection.hpp index d4ac2e103..eb84aaea1 100644 --- a/include/libtorrent/http_tracker_connection.hpp +++ b/include/libtorrent/http_tracker_connection.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/i2p_stream.hpp b/include/libtorrent/i2p_stream.hpp index 27c23f2e9..2e7aab540 100644 --- a/include/libtorrent/i2p_stream.hpp +++ b/include/libtorrent/i2p_stream.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/identify_client.hpp b/include/libtorrent/identify_client.hpp index 727aefad0..f1f133ff7 100644 --- a/include/libtorrent/identify_client.hpp +++ b/include/libtorrent/identify_client.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/instantiate_connection.hpp b/include/libtorrent/instantiate_connection.hpp index 0ea23b575..4348bfb79 100644 --- a/include/libtorrent/instantiate_connection.hpp +++ b/include/libtorrent/instantiate_connection.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/io.hpp b/include/libtorrent/io.hpp index b33af1f9c..7428e6d5b 100644 --- a/include/libtorrent/io.hpp +++ b/include/libtorrent/io.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/io_service.hpp b/include/libtorrent/io_service.hpp index b19853515..123274019 100644 --- a/include/libtorrent/io_service.hpp +++ b/include/libtorrent/io_service.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/io_service_fwd.hpp b/include/libtorrent/io_service_fwd.hpp index 615970be5..0f30d4d22 100644 --- a/include/libtorrent/io_service_fwd.hpp +++ b/include/libtorrent/io_service_fwd.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/ip_filter.hpp b/include/libtorrent/ip_filter.hpp index 1db9e77d5..c0af59277 100644 --- a/include/libtorrent/ip_filter.hpp +++ b/include/libtorrent/ip_filter.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2005-2016, Arvid Norberg +Copyright (c) 2005-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/ip_voter.hpp b/include/libtorrent/ip_voter.hpp index 1202d6295..dbf3d1bd4 100644 --- a/include/libtorrent/ip_voter.hpp +++ b/include/libtorrent/ip_voter.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013-2016, Arvid Norberg +Copyright (c) 2013-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/dht_observer.hpp b/include/libtorrent/kademlia/dht_observer.hpp index d4d096b51..7ef90826a 100644 --- a/include/libtorrent/kademlia/dht_observer.hpp +++ b/include/libtorrent/kademlia/dht_observer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/dht_storage.hpp b/include/libtorrent/kademlia/dht_storage.hpp index 8b4fa4403..26985e54d 100644 --- a/include/libtorrent/kademlia/dht_storage.hpp +++ b/include/libtorrent/kademlia/dht_storage.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg, Alden Torres +Copyright (c) 2012-2018, Arvid Norberg, Alden Torres All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/dht_tracker.hpp b/include/libtorrent/kademlia/dht_tracker.hpp index da9517ca2..de0f8aa3e 100644 --- a/include/libtorrent/kademlia/dht_tracker.hpp +++ b/include/libtorrent/kademlia/dht_tracker.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/dos_blocker.hpp b/include/libtorrent/kademlia/dos_blocker.hpp index 3a15e1e17..1407ad147 100644 --- a/include/libtorrent/kademlia/dos_blocker.hpp +++ b/include/libtorrent/kademlia/dos_blocker.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/find_data.hpp b/include/libtorrent/kademlia/find_data.hpp index 770285660..3428f11f5 100644 --- a/include/libtorrent/kademlia/find_data.hpp +++ b/include/libtorrent/kademlia/find_data.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg & Daniel Wallin +Copyright (c) 2006-2018, Arvid Norberg & Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/get_peers.hpp b/include/libtorrent/kademlia/get_peers.hpp index a540b4536..2ee452767 100644 --- a/include/libtorrent/kademlia/get_peers.hpp +++ b/include/libtorrent/kademlia/get_peers.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg & Daniel Wallin +Copyright (c) 2006-2018, Arvid Norberg & Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/msg.hpp b/include/libtorrent/kademlia/msg.hpp index 88accd722..7c011c027 100644 --- a/include/libtorrent/kademlia/msg.hpp +++ b/include/libtorrent/kademlia/msg.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/node.hpp b/include/libtorrent/kademlia/node.hpp index f6cd2c27d..fd5325e68 100644 --- a/include/libtorrent/kademlia/node.hpp +++ b/include/libtorrent/kademlia/node.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/node_entry.hpp b/include/libtorrent/kademlia/node_entry.hpp index 061d0554f..323b41446 100644 --- a/include/libtorrent/kademlia/node_entry.hpp +++ b/include/libtorrent/kademlia/node_entry.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/node_id.hpp b/include/libtorrent/kademlia/node_id.hpp index 34febe04d..f470f4159 100644 --- a/include/libtorrent/kademlia/node_id.hpp +++ b/include/libtorrent/kademlia/node_id.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/observer.hpp b/include/libtorrent/kademlia/observer.hpp index 6d0d31f48..8afa450eb 100644 --- a/include/libtorrent/kademlia/observer.hpp +++ b/include/libtorrent/kademlia/observer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/put_data.hpp b/include/libtorrent/kademlia/put_data.hpp index 9c62e9264..a21502a7f 100644 --- a/include/libtorrent/kademlia/put_data.hpp +++ b/include/libtorrent/kademlia/put_data.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg, Thomas Yuan +Copyright (c) 2006-2018, Arvid Norberg, Thomas Yuan All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/refresh.hpp b/include/libtorrent/kademlia/refresh.hpp index 5e5f2f8c3..38200ec0f 100644 --- a/include/libtorrent/kademlia/refresh.hpp +++ b/include/libtorrent/kademlia/refresh.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg & Daniel Wallin +Copyright (c) 2006-2018, Arvid Norberg & Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/routing_table.hpp b/include/libtorrent/kademlia/routing_table.hpp index 6cbd5329f..f57fdd820 100644 --- a/include/libtorrent/kademlia/routing_table.hpp +++ b/include/libtorrent/kademlia/routing_table.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/rpc_manager.hpp b/include/libtorrent/kademlia/rpc_manager.hpp index f85d6729a..559e92095 100644 --- a/include/libtorrent/kademlia/rpc_manager.hpp +++ b/include/libtorrent/kademlia/rpc_manager.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/kademlia/traversal_algorithm.hpp b/include/libtorrent/kademlia/traversal_algorithm.hpp index 5ec98ef04..c7acadaef 100644 --- a/include/libtorrent/kademlia/traversal_algorithm.hpp +++ b/include/libtorrent/kademlia/traversal_algorithm.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg & Daniel Wallin +Copyright (c) 2006-2018, Arvid Norberg & Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/lazy_entry.hpp b/include/libtorrent/lazy_entry.hpp index a0cc5b254..37397e30d 100644 --- a/include/libtorrent/lazy_entry.hpp +++ b/include/libtorrent/lazy_entry.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/link.hpp b/include/libtorrent/link.hpp index 4d91a9c13..e5e1d249c 100644 --- a/include/libtorrent/link.hpp +++ b/include/libtorrent/link.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2011-2016, Arvid Norberg +Copyright (c) 2011-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/linked_list.hpp b/include/libtorrent/linked_list.hpp index 663948335..fc870424c 100644 --- a/include/libtorrent/linked_list.hpp +++ b/include/libtorrent/linked_list.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/lsd.hpp b/include/libtorrent/lsd.hpp index d71081eb2..16fc38820 100644 --- a/include/libtorrent/lsd.hpp +++ b/include/libtorrent/lsd.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/magnet_uri.hpp b/include/libtorrent/magnet_uri.hpp index bdedf71ff..fa54730b9 100644 --- a/include/libtorrent/magnet_uri.hpp +++ b/include/libtorrent/magnet_uri.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/natpmp.hpp b/include/libtorrent/natpmp.hpp index 1cb204501..e78e87fec 100644 --- a/include/libtorrent/natpmp.hpp +++ b/include/libtorrent/natpmp.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/operations.hpp b/include/libtorrent/operations.hpp index 5b6fd64d6..082468d20 100644 --- a/include/libtorrent/operations.hpp +++ b/include/libtorrent/operations.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/optional.hpp b/include/libtorrent/optional.hpp index 143e14193..81f193dd4 100644 --- a/include/libtorrent/optional.hpp +++ b/include/libtorrent/optional.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2017, Arvid Norberg +Copyright (c) 2017-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/packet_buffer.hpp b/include/libtorrent/packet_buffer.hpp index 932689326..f00583e4f 100644 --- a/include/libtorrent/packet_buffer.hpp +++ b/include/libtorrent/packet_buffer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg, Daniel Wallin. +Copyright (c) 2010-2018, Arvid Norberg, Daniel Wallin. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/parse_url.hpp b/include/libtorrent/parse_url.hpp index e120434bb..6a48fa1d8 100644 --- a/include/libtorrent/parse_url.hpp +++ b/include/libtorrent/parse_url.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/part_file.hpp b/include/libtorrent/part_file.hpp index ab6d6ac47..9ebd6acc4 100644 --- a/include/libtorrent/part_file.hpp +++ b/include/libtorrent/part_file.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/pe_crypto.hpp b/include/libtorrent/pe_crypto.hpp index 70f51e410..34774374f 100644 --- a/include/libtorrent/pe_crypto.hpp +++ b/include/libtorrent/pe_crypto.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Un Shyam & Arvid Norberg +Copyright (c) 2007-2018, Un Shyam & Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer.hpp b/include/libtorrent/peer.hpp index e033f6247..21799a3ea 100644 --- a/include/libtorrent/peer.hpp +++ b/include/libtorrent/peer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_class.hpp b/include/libtorrent/peer_class.hpp index fe70baf1d..778a1f699 100644 --- a/include/libtorrent/peer_class.hpp +++ b/include/libtorrent/peer_class.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2011-2016, Arvid Norberg +Copyright (c) 2011-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_class_set.hpp b/include/libtorrent/peer_class_set.hpp index ad2a17a45..1d0fa8226 100644 --- a/include/libtorrent/peer_class_set.hpp +++ b/include/libtorrent/peer_class_set.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2011-2016, Arvid Norberg +Copyright (c) 2011-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_class_type_filter.hpp b/include/libtorrent/peer_class_type_filter.hpp index 8a3af808b..bcf1b92fc 100644 --- a/include/libtorrent/peer_class_type_filter.hpp +++ b/include/libtorrent/peer_class_type_filter.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_connection.hpp b/include/libtorrent/peer_connection.hpp index 8b9bdb994..c06de0474 100644 --- a/include/libtorrent/peer_connection.hpp +++ b/include/libtorrent/peer_connection.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_connection_handle.hpp b/include/libtorrent/peer_connection_handle.hpp index 261499905..f5ab27fc0 100644 --- a/include/libtorrent/peer_connection_handle.hpp +++ b/include/libtorrent/peer_connection_handle.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg, Steven Siloti +Copyright (c) 2015-2018, Arvid Norberg, Steven Siloti All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_connection_interface.hpp b/include/libtorrent/peer_connection_interface.hpp index 45b61681b..fb21417bd 100644 --- a/include/libtorrent/peer_connection_interface.hpp +++ b/include/libtorrent/peer_connection_interface.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013-2016, Arvid Norberg +Copyright (c) 2013-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_id.hpp b/include/libtorrent/peer_id.hpp index 9126e6825..1227b2722 100644 --- a/include/libtorrent/peer_id.hpp +++ b/include/libtorrent/peer_id.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_info.hpp b/include/libtorrent/peer_info.hpp index 8dffe57fc..31c2fcc0e 100644 --- a/include/libtorrent/peer_info.hpp +++ b/include/libtorrent/peer_info.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_list.hpp b/include/libtorrent/peer_list.hpp index 9a7256730..1928b0e79 100644 --- a/include/libtorrent/peer_list.hpp +++ b/include/libtorrent/peer_list.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/peer_request.hpp b/include/libtorrent/peer_request.hpp index ed2c67a47..f31e7d8ef 100644 --- a/include/libtorrent/peer_request.hpp +++ b/include/libtorrent/peer_request.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/performance_counters.hpp b/include/libtorrent/performance_counters.hpp index 757379871..04646de4c 100644 --- a/include/libtorrent/performance_counters.hpp +++ b/include/libtorrent/performance_counters.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013-2016, Arvid Norberg +Copyright (c) 2013-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/piece_block_progress.hpp b/include/libtorrent/piece_block_progress.hpp index d2b48ae73..71bbb2471 100644 --- a/include/libtorrent/piece_block_progress.hpp +++ b/include/libtorrent/piece_block_progress.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/piece_picker.hpp b/include/libtorrent/piece_picker.hpp index d8f6ff71c..742e8ea2f 100644 --- a/include/libtorrent/piece_picker.hpp +++ b/include/libtorrent/piece_picker.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/proxy_base.hpp b/include/libtorrent/proxy_base.hpp index 60dcc81b5..344c23097 100644 --- a/include/libtorrent/proxy_base.hpp +++ b/include/libtorrent/proxy_base.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/random.hpp b/include/libtorrent/random.hpp index c9aa71770..365d9a2e9 100644 --- a/include/libtorrent/random.hpp +++ b/include/libtorrent/random.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2011-2016, Arvid Norberg +Copyright (c) 2011-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/receive_buffer.hpp b/include/libtorrent/receive_buffer.hpp index ebfa77391..16f327716 100644 --- a/include/libtorrent/receive_buffer.hpp +++ b/include/libtorrent/receive_buffer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg, Steven Siloti +Copyright (c) 2014-2018, Arvid Norberg, Steven Siloti All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/request_blocks.hpp b/include/libtorrent/request_blocks.hpp index 7dc90ac44..0470b76c2 100644 --- a/include/libtorrent/request_blocks.hpp +++ b/include/libtorrent/request_blocks.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/resolve_links.hpp b/include/libtorrent/resolve_links.hpp index 0e62d2393..77036c12b 100644 --- a/include/libtorrent/resolve_links.hpp +++ b/include/libtorrent/resolve_links.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg +Copyright (c) 2014-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/resolver.hpp b/include/libtorrent/resolver.hpp index e3868230d..24eaa00bc 100644 --- a/include/libtorrent/resolver.hpp +++ b/include/libtorrent/resolver.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013-2016, Arvid Norberg +Copyright (c) 2013-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/resolver_interface.hpp b/include/libtorrent/resolver_interface.hpp index 509bcdd0b..45544e8e3 100644 --- a/include/libtorrent/resolver_interface.hpp +++ b/include/libtorrent/resolver_interface.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013-2016, Arvid Norberg +Copyright (c) 2013-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/session.hpp b/include/libtorrent/session.hpp index 940731253..a9bbf7ebc 100644 --- a/include/libtorrent/session.hpp +++ b/include/libtorrent/session.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/session_handle.hpp b/include/libtorrent/session_handle.hpp index 72484f229..cd713c62e 100644 --- a/include/libtorrent/session_handle.hpp +++ b/include/libtorrent/session_handle.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/session_settings.hpp b/include/libtorrent/session_settings.hpp index fa14c5309..db248f452 100644 --- a/include/libtorrent/session_settings.hpp +++ b/include/libtorrent/session_settings.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/session_stats.hpp b/include/libtorrent/session_stats.hpp index dccd50899..f132c4c81 100644 --- a/include/libtorrent/session_stats.hpp +++ b/include/libtorrent/session_stats.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/session_status.hpp b/include/libtorrent/session_status.hpp index 40432ec52..26493aa2b 100644 --- a/include/libtorrent/session_status.hpp +++ b/include/libtorrent/session_status.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/settings_pack.hpp b/include/libtorrent/settings_pack.hpp index 47961a909..581d9a09a 100644 --- a/include/libtorrent/settings_pack.hpp +++ b/include/libtorrent/settings_pack.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/sha1_hash.hpp b/include/libtorrent/sha1_hash.hpp index ba479ecef..e6dfcf874 100644 --- a/include/libtorrent/sha1_hash.hpp +++ b/include/libtorrent/sha1_hash.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/sliding_average.hpp b/include/libtorrent/sliding_average.hpp index 068b27813..6fd6f9d4d 100644 --- a/include/libtorrent/sliding_average.hpp +++ b/include/libtorrent/sliding_average.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/socket.hpp b/include/libtorrent/socket.hpp index 983f944c3..8ad12b3c3 100644 --- a/include/libtorrent/socket.hpp +++ b/include/libtorrent/socket.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/socket_io.hpp b/include/libtorrent/socket_io.hpp index 690e4827d..20131df7e 100644 --- a/include/libtorrent/socket_io.hpp +++ b/include/libtorrent/socket_io.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/socks5_stream.hpp b/include/libtorrent/socks5_stream.hpp index a7380e2bd..0f2b76da2 100644 --- a/include/libtorrent/socks5_stream.hpp +++ b/include/libtorrent/socks5_stream.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/ssl_stream.hpp b/include/libtorrent/ssl_stream.hpp index 9a5f11cff..8acec53d8 100644 --- a/include/libtorrent/ssl_stream.hpp +++ b/include/libtorrent/ssl_stream.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/stack_allocator.hpp b/include/libtorrent/stack_allocator.hpp index d48d644a5..9e83ac52e 100644 --- a/include/libtorrent/stack_allocator.hpp +++ b/include/libtorrent/stack_allocator.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/stat.hpp b/include/libtorrent/stat.hpp index fe908cd3d..f83c6b5a4 100644 --- a/include/libtorrent/stat.hpp +++ b/include/libtorrent/stat.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/stat_cache.hpp b/include/libtorrent/stat_cache.hpp index 1ca33b161..43d33a910 100644 --- a/include/libtorrent/stat_cache.hpp +++ b/include/libtorrent/stat_cache.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg, Daniel Wallin +Copyright (c) 2012-2018, Arvid Norberg, Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/storage.hpp b/include/libtorrent/storage.hpp index 95e0bd2dc..2760fb6d6 100644 --- a/include/libtorrent/storage.hpp +++ b/include/libtorrent/storage.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/storage_defs.hpp b/include/libtorrent/storage_defs.hpp index f06c1c595..f28910db0 100644 --- a/include/libtorrent/storage_defs.hpp +++ b/include/libtorrent/storage_defs.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/string_util.hpp b/include/libtorrent/string_util.hpp index 80d6a00b7..c7c339fee 100644 --- a/include/libtorrent/string_util.hpp +++ b/include/libtorrent/string_util.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/string_view.hpp b/include/libtorrent/string_view.hpp index 0df020475..849ba3c7a 100644 --- a/include/libtorrent/string_view.hpp +++ b/include/libtorrent/string_view.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2016, Arvid Norberg +Copyright (c) 2016-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/tailqueue.hpp b/include/libtorrent/tailqueue.hpp index acdbaea8f..07dca2168 100644 --- a/include/libtorrent/tailqueue.hpp +++ b/include/libtorrent/tailqueue.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2011-2016, Arvid Norberg +Copyright (c) 2011-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/time.hpp b/include/libtorrent/time.hpp index effb98123..4fcb438a8 100644 --- a/include/libtorrent/time.hpp +++ b/include/libtorrent/time.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/timestamp_history.hpp b/include/libtorrent/timestamp_history.hpp index 4b92fdcfa..a78e7be7b 100644 --- a/include/libtorrent/timestamp_history.hpp +++ b/include/libtorrent/timestamp_history.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp index ec74b6b24..28a137471 100644 --- a/include/libtorrent/torrent.hpp +++ b/include/libtorrent/torrent.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/torrent_handle.hpp b/include/libtorrent/torrent_handle.hpp index 4a641709f..3ea210821 100644 --- a/include/libtorrent/torrent_handle.hpp +++ b/include/libtorrent/torrent_handle.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/torrent_info.hpp b/include/libtorrent/torrent_info.hpp index 06690fb4e..c0256732c 100644 --- a/include/libtorrent/torrent_info.hpp +++ b/include/libtorrent/torrent_info.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/torrent_peer.hpp b/include/libtorrent/torrent_peer.hpp index bc8dafc25..c0a035ce4 100644 --- a/include/libtorrent/torrent_peer.hpp +++ b/include/libtorrent/torrent_peer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/torrent_peer_allocator.hpp b/include/libtorrent/torrent_peer_allocator.hpp index dd8dfa34c..30058e8ce 100644 --- a/include/libtorrent/torrent_peer_allocator.hpp +++ b/include/libtorrent/torrent_peer_allocator.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/torrent_status.hpp b/include/libtorrent/torrent_status.hpp index 734a2133a..ade2c38ff 100644 --- a/include/libtorrent/torrent_status.hpp +++ b/include/libtorrent/torrent_status.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/tracker_manager.hpp b/include/libtorrent/tracker_manager.hpp index 0f1543365..ba4001afa 100644 --- a/include/libtorrent/tracker_manager.hpp +++ b/include/libtorrent/tracker_manager.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/udp_socket.hpp b/include/libtorrent/udp_socket.hpp index b684ca435..bea504187 100644 --- a/include/libtorrent/udp_socket.hpp +++ b/include/libtorrent/udp_socket.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/udp_tracker_connection.hpp b/include/libtorrent/udp_tracker_connection.hpp index 6ba8c0326..a6e3ca74c 100644 --- a/include/libtorrent/udp_tracker_connection.hpp +++ b/include/libtorrent/udp_tracker_connection.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/union_endpoint.hpp b/include/libtorrent/union_endpoint.hpp index 3410d15a1..9dbe40661 100644 --- a/include/libtorrent/union_endpoint.hpp +++ b/include/libtorrent/union_endpoint.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/upnp.hpp b/include/libtorrent/upnp.hpp index cab16a5cc..923df10d3 100644 --- a/include/libtorrent/upnp.hpp +++ b/include/libtorrent/upnp.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/utf8.hpp b/include/libtorrent/utf8.hpp index 8fafc12ee..a2f546c0c 100644 --- a/include/libtorrent/utf8.hpp +++ b/include/libtorrent/utf8.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/utp_socket_manager.hpp b/include/libtorrent/utp_socket_manager.hpp index e2860c1f8..0dc852d67 100644 --- a/include/libtorrent/utp_socket_manager.hpp +++ b/include/libtorrent/utp_socket_manager.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/utp_stream.hpp b/include/libtorrent/utp_stream.hpp index c47d40cb4..2bc05972e 100644 --- a/include/libtorrent/utp_stream.hpp +++ b/include/libtorrent/utp_stream.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/vector_utils.hpp b/include/libtorrent/vector_utils.hpp index bd4bdba21..c1bc5f353 100644 --- a/include/libtorrent/vector_utils.hpp +++ b/include/libtorrent/vector_utils.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index 3def1fb5e..0e590565b 100644 --- a/include/libtorrent/version.hpp +++ b/include/libtorrent/version.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/web_connection_base.hpp b/include/libtorrent/web_connection_base.hpp index ac53a65f5..7d91c404d 100644 --- a/include/libtorrent/web_connection_base.hpp +++ b/include/libtorrent/web_connection_base.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/web_peer_connection.hpp b/include/libtorrent/web_peer_connection.hpp index 0eeaf1597..0dcab4ef3 100644 --- a/include/libtorrent/web_peer_connection.hpp +++ b/include/libtorrent/web_peer_connection.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/write_resume_data.hpp b/include/libtorrent/write_resume_data.hpp index 87b1810e7..2d1c4ead1 100644 --- a/include/libtorrent/write_resume_data.hpp +++ b/include/libtorrent/write_resume_data.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2017, Arvid Norberg +Copyright (c) 2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/libtorrent/xml_parse.hpp b/include/libtorrent/xml_parse.hpp index 44ace5734..be0a12cdd 100644 --- a/include/libtorrent/xml_parse.hpp +++ b/include/libtorrent/xml_parse.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/alert.cpp b/src/alert.cpp index 415cbb35b..5c2ebc599 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg, Daniel Wallin +Copyright (c) 2003-2018, Arvid Norberg, Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/alert_manager.cpp b/src/alert_manager.cpp index 26fc6730c..3f34b9486 100644 --- a/src/alert_manager.cpp +++ b/src/alert_manager.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg, Daniel Wallin +Copyright (c) 2003-2018, Arvid Norberg, Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/allocator.cpp b/src/allocator.cpp index e07741c6c..e338f553f 100644 --- a/src/allocator.cpp +++ b/src/allocator.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/announce_entry.cpp b/src/announce_entry.cpp index a42ed4ad6..8dde2df9a 100644 --- a/src/announce_entry.cpp +++ b/src/announce_entry.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/assert.cpp b/src/assert.cpp index 5c4fc9a7a..d8223e7b8 100644 --- a/src/assert.cpp +++ b/src/assert.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/bandwidth_limit.cpp b/src/bandwidth_limit.cpp index f9a758e1b..c7b905bc1 100644 --- a/src/bandwidth_limit.cpp +++ b/src/bandwidth_limit.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/bandwidth_manager.cpp b/src/bandwidth_manager.cpp index f7ada6fc7..8fa6286ef 100644 --- a/src/bandwidth_manager.cpp +++ b/src/bandwidth_manager.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/bandwidth_queue_entry.cpp b/src/bandwidth_queue_entry.cpp index 8773b5345..1dde60246 100644 --- a/src/bandwidth_queue_entry.cpp +++ b/src/bandwidth_queue_entry.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/bdecode.cpp b/src/bdecode.cpp index 57278b6bd..b4793095b 100644 --- a/src/bdecode.cpp +++ b/src/bdecode.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/bitfield.cpp b/src/bitfield.cpp index 70a00b8b7..de0cb03b4 100644 --- a/src/bitfield.cpp +++ b/src/bitfield.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/block_cache.cpp b/src/block_cache.cpp index aabab2387..e600dcdfd 100644 --- a/src/block_cache.cpp +++ b/src/block_cache.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/bloom_filter.cpp b/src/bloom_filter.cpp index 05f886c52..021a2a841 100644 --- a/src/bloom_filter.cpp +++ b/src/bloom_filter.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/broadcast_socket.cpp b/src/broadcast_socket.cpp index 321db9412..8a7feb69f 100644 --- a/src/broadcast_socket.cpp +++ b/src/broadcast_socket.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/bt_peer_connection.cpp b/src/bt_peer_connection.cpp index 1a938b939..bcebf87d6 100644 --- a/src/bt_peer_connection.cpp +++ b/src/bt_peer_connection.cpp @@ -1,7 +1,7 @@ /* -Copyright (c) 2003-2016, Arvid Norberg -Copyright (c) 2007-2016, Arvid Norberg, Un Shyam +Copyright (c) 2003-2018, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg, Un Shyam All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/chained_buffer.cpp b/src/chained_buffer.cpp index 0edec88d2..b2f45ca9c 100644 --- a/src/chained_buffer.cpp +++ b/src/chained_buffer.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/choker.cpp b/src/choker.cpp index 517ffcf60..2bec2325d 100644 --- a/src/choker.cpp +++ b/src/choker.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg +Copyright (c) 2014-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/close_reason.cpp b/src/close_reason.cpp index 70b262593..c64768dcd 100644 --- a/src/close_reason.cpp +++ b/src/close_reason.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/cpuid.cpp b/src/cpuid.cpp index 23071098e..493cef286 100644 --- a/src/cpuid.cpp +++ b/src/cpuid.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg +Copyright (c) 2014-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/crc32c.cpp b/src/crc32c.cpp index c821a7345..eb3f046f0 100644 --- a/src/crc32c.cpp +++ b/src/crc32c.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg +Copyright (c) 2014-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/create_torrent.cpp b/src/create_torrent.cpp index 7a1be4fac..4d0241894 100644 --- a/src/create_torrent.cpp +++ b/src/create_torrent.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/disk_buffer_holder.cpp b/src/disk_buffer_holder.cpp index 74bfbbbd4..bb95d7f79 100644 --- a/src/disk_buffer_holder.cpp +++ b/src/disk_buffer_holder.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/disk_buffer_pool.cpp b/src/disk_buffer_pool.cpp index 73c01c8dd..75f7a64b0 100644 --- a/src/disk_buffer_pool.cpp +++ b/src/disk_buffer_pool.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/disk_io_job.cpp b/src/disk_io_job.cpp index 1ddbe3b5a..c312aea17 100644 --- a/src/disk_io_job.cpp +++ b/src/disk_io_job.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2011-2016, Arvid Norberg +Copyright (c) 2011-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/disk_io_thread.cpp b/src/disk_io_thread.cpp index 2878dd0e9..be409067c 100644 --- a/src/disk_io_thread.cpp +++ b/src/disk_io_thread.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg, Steven Siloti +Copyright (c) 2007-2018, Arvid Norberg, Steven Siloti All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/disk_job_pool.cpp b/src/disk_job_pool.cpp index 6262c2468..49e23dfbf 100644 --- a/src/disk_job_pool.cpp +++ b/src/disk_job_pool.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/entry.cpp b/src/entry.cpp index 7edea630f..0e2491b9a 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/enum_net.cpp b/src/enum_net.cpp index 4beaeb642..4e17ff5eb 100644 --- a/src/enum_net.cpp +++ b/src/enum_net.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/error_code.cpp b/src/error_code.cpp index ed02447de..5884ec607 100644 --- a/src/error_code.cpp +++ b/src/error_code.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/escape_string.cpp b/src/escape_string.cpp index 48da53ead..a6faeec93 100644 --- a/src/escape_string.cpp +++ b/src/escape_string.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/file.cpp b/src/file.cpp index cbda08dfb..0b0509fad 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/file_pool.cpp b/src/file_pool.cpp index 9cb75d5b0..b49431d20 100644 --- a/src/file_pool.cpp +++ b/src/file_pool.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/file_progress.cpp b/src/file_progress.cpp index 7fe6f1aae..371273e58 100644 --- a/src/file_progress.cpp +++ b/src/file_progress.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/file_storage.cpp b/src/file_storage.cpp index 6af673c14..b0ad0e68f 100644 --- a/src/file_storage.cpp +++ b/src/file_storage.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/fingerprint.cpp b/src/fingerprint.cpp index aacfb9eaf..60e7daec7 100644 --- a/src/fingerprint.cpp +++ b/src/fingerprint.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2016, Arvid Norberg +Copyright (c) 2016-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/gzip.cpp b/src/gzip.cpp index 955a9c54f..8d83102b3 100644 --- a/src/gzip.cpp +++ b/src/gzip.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/hasher.cpp b/src/hasher.cpp index 16c984733..f0d04912a 100644 --- a/src/hasher.cpp +++ b/src/hasher.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/hex.cpp b/src/hex.cpp index 0f71f6523..d2d7d2e6d 100644 --- a/src/hex.cpp +++ b/src/hex.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/http_connection.cpp b/src/http_connection.cpp index b454cab0e..9e0fc95fb 100644 --- a/src/http_connection.cpp +++ b/src/http_connection.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/http_parser.cpp b/src/http_parser.cpp index 55b9ca835..f903db5f2 100644 --- a/src/http_parser.cpp +++ b/src/http_parser.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without @@ -284,7 +284,8 @@ restart_response: if (name == "content-length") { m_content_length = std::strtoll(value.c_str(), nullptr, 10); - if (m_content_length < 0) + if (m_content_length < 0 + || m_content_length == std::numeric_limits::max()) { m_state = error_state; error = true; @@ -307,7 +308,8 @@ restart_response: if (string_begins_no_case("bytes ", ptr)) ptr += 6; char* end; m_range_start = std::strtoll(ptr, &end, 10); - if (m_range_start < 0) + if (m_range_start < 0 + || m_range_start == std::numeric_limits::max()) { m_state = error_state; error = true; @@ -319,7 +321,8 @@ restart_response: { ptr = end + 1; m_range_end = std::strtoll(ptr, &end, 10); - if (m_range_end < 0) + if (m_range_end < 0 + || m_range_end == std::numeric_limits::max()) { m_state = error_state; error = true; diff --git a/src/http_seed_connection.cpp b/src/http_seed_connection.cpp index b7d54fbff..47378078b 100644 --- a/src/http_seed_connection.cpp +++ b/src/http_seed_connection.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/http_stream.cpp b/src/http_stream.cpp index de239b5e5..936d6debd 100644 --- a/src/http_stream.cpp +++ b/src/http_stream.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/http_tracker_connection.cpp b/src/http_tracker_connection.cpp index d41306445..0fad224c2 100644 --- a/src/http_tracker_connection.cpp +++ b/src/http_tracker_connection.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/i2p_stream.cpp b/src/i2p_stream.cpp index 549f65c72..349e3a505 100644 --- a/src/i2p_stream.cpp +++ b/src/i2p_stream.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/identify_client.cpp b/src/identify_client.cpp index fb7031386..df7932653 100644 --- a/src/identify_client.cpp +++ b/src/identify_client.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/instantiate_connection.cpp b/src/instantiate_connection.cpp index 6a9110680..6143adc8c 100644 --- a/src/instantiate_connection.cpp +++ b/src/instantiate_connection.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/ip_filter.cpp b/src/ip_filter.cpp index c42fab29a..466e68563 100644 --- a/src/ip_filter.cpp +++ b/src/ip_filter.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2005-2016, Arvid Norberg +Copyright (c) 2005-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/ip_voter.cpp b/src/ip_voter.cpp index f78ea35bf..2dfd16930 100644 --- a/src/ip_voter.cpp +++ b/src/ip_voter.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013-2016, Arvid Norberg +Copyright (c) 2013-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/dht_storage.cpp b/src/kademlia/dht_storage.cpp index 75e8ea23c..8f734eef4 100644 --- a/src/kademlia/dht_storage.cpp +++ b/src/kademlia/dht_storage.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg, Alden Torres +Copyright (c) 2012-2018, Arvid Norberg, Alden Torres All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp index 59060cc83..41812381e 100644 --- a/src/kademlia/dht_tracker.cpp +++ b/src/kademlia/dht_tracker.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/dos_blocker.cpp b/src/kademlia/dos_blocker.cpp index 48592e1ce..51d115452 100644 --- a/src/kademlia/dos_blocker.cpp +++ b/src/kademlia/dos_blocker.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/find_data.cpp b/src/kademlia/find_data.cpp index 585aca7dd..4c4b0fcc8 100644 --- a/src/kademlia/find_data.cpp +++ b/src/kademlia/find_data.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg & Daniel Wallin +Copyright (c) 2006-2018, Arvid Norberg & Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/get_peers.cpp b/src/kademlia/get_peers.cpp index 7b1a3f1a6..9bdcc51f0 100644 --- a/src/kademlia/get_peers.cpp +++ b/src/kademlia/get_peers.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg & Daniel Wallin +Copyright (c) 2006-2018, Arvid Norberg & Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/msg.cpp b/src/kademlia/msg.cpp index 405f1154d..3f57f4060 100644 --- a/src/kademlia/msg.cpp +++ b/src/kademlia/msg.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/node.cpp b/src/kademlia/node.cpp index d28760a14..89d3e00aa 100644 --- a/src/kademlia/node.cpp +++ b/src/kademlia/node.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/node_entry.cpp b/src/kademlia/node_entry.cpp index fcc0cafce..1158fd151 100644 --- a/src/kademlia/node_entry.cpp +++ b/src/kademlia/node_entry.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/node_id.cpp b/src/kademlia/node_id.cpp index 8a89de616..10344dbb7 100644 --- a/src/kademlia/node_id.cpp +++ b/src/kademlia/node_id.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/put_data.cpp b/src/kademlia/put_data.cpp index 0798c527d..b137a1202 100644 --- a/src/kademlia/put_data.cpp +++ b/src/kademlia/put_data.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg & Daniel Wallin +Copyright (c) 2006-2018, Arvid Norberg & Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/refresh.cpp b/src/kademlia/refresh.cpp index 11aa36b76..efc225160 100644 --- a/src/kademlia/refresh.cpp +++ b/src/kademlia/refresh.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg & Daniel Wallin +Copyright (c) 2006-2018, Arvid Norberg & Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/routing_table.cpp b/src/kademlia/routing_table.cpp index d5f670c15..30396806f 100644 --- a/src/kademlia/routing_table.cpp +++ b/src/kademlia/routing_table.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/rpc_manager.cpp b/src/kademlia/rpc_manager.cpp index d76354668..4079e3c4a 100644 --- a/src/kademlia/rpc_manager.cpp +++ b/src/kademlia/rpc_manager.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg +Copyright (c) 2006-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/kademlia/traversal_algorithm.cpp b/src/kademlia/traversal_algorithm.cpp index d9f96180c..d1578658a 100644 --- a/src/kademlia/traversal_algorithm.cpp +++ b/src/kademlia/traversal_algorithm.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg & Daniel Wallin +Copyright (c) 2006-2018, Arvid Norberg & Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/lazy_bdecode.cpp b/src/lazy_bdecode.cpp index 7e8ec8f5a..6f1aebbdd 100644 --- a/src/lazy_bdecode.cpp +++ b/src/lazy_bdecode.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/lsd.cpp b/src/lsd.cpp index 52dcde289..d009099fc 100644 --- a/src/lsd.cpp +++ b/src/lsd.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/magnet_uri.cpp b/src/magnet_uri.cpp index 9908cfdda..64fa19e4b 100644 --- a/src/magnet_uri.cpp +++ b/src/magnet_uri.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/merkle.cpp b/src/merkle.cpp index d48b7e97b..215cf4891 100644 --- a/src/merkle.cpp +++ b/src/merkle.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/natpmp.cpp b/src/natpmp.cpp index eb518faae..39cf384da 100644 --- a/src/natpmp.cpp +++ b/src/natpmp.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/packet_buffer.cpp b/src/packet_buffer.cpp index 09d678fb7..b31d90a6e 100644 --- a/src/packet_buffer.cpp +++ b/src/packet_buffer.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2010-2016, Arvid Norberg +Copyright (c) 2010-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/parse_url.cpp b/src/parse_url.cpp index 5ba852b12..8855f9d1d 100644 --- a/src/parse_url.cpp +++ b/src/parse_url.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2008-2016, Arvid Norberg +Copyright (c) 2008-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/part_file.cpp b/src/part_file.cpp index 56c2f052f..4f6cb1d33 100644 --- a/src/part_file.cpp +++ b/src/part_file.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/pe_crypto.cpp b/src/pe_crypto.cpp index e2193428f..e55a4b800 100644 --- a/src/pe_crypto.cpp +++ b/src/pe_crypto.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Un Shyam, Arvid Norberg, Steven Siloti +Copyright (c) 2007-2018, Un Shyam, Arvid Norberg, Steven Siloti All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/peer_class.cpp b/src/peer_class.cpp index 21994cc8a..6055c3d9a 100644 --- a/src/peer_class.cpp +++ b/src/peer_class.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2011-2016, Arvid Norberg +Copyright (c) 2011-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/peer_class_set.cpp b/src/peer_class_set.cpp index da9e49088..ec6eca752 100644 --- a/src/peer_class_set.cpp +++ b/src/peer_class_set.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp index 2fc1e2c58..fce737d3b 100644 --- a/src/peer_connection.cpp +++ b/src/peer_connection.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without @@ -392,7 +392,7 @@ namespace libtorrent { return; } - tcp::endpoint bound_ip = m_ses.bind_outgoing_socket(*m_socket + tcp::endpoint const bound_ip = m_ses.bind_outgoing_socket(*m_socket , m_remote.address(), ec); #ifndef TORRENT_DISABLE_LOGGING if (should_log(peer_log_alert::outgoing)) @@ -2245,6 +2245,7 @@ namespace libtorrent { std::shared_ptr t = m_torrent.lock(); TORRENT_ASSERT(t); + torrent_info const& ti = t->torrent_file(); m_counters.inc_stats_counter(counters::piece_requests); @@ -2378,9 +2379,9 @@ namespace libtorrent { && !t->is_predictive_piece(r.piece) && !t->seed_mode()) || r.start < 0 - || r.start >= t->torrent_file().piece_size(r.piece) + || r.start >= ti.piece_size(r.piece) || r.length <= 0 - || r.length + r.start > t->torrent_file().piece_size(r.piece) + || r.length + r.start > ti.piece_size(r.piece) || r.length > t->block_size()) { m_counters.inc_stats_counter(counters::invalid_piece_requests); @@ -2393,7 +2394,7 @@ namespace libtorrent { , m_peer_interested , valid_piece_index ? t->torrent_file().piece_size(r.piece) : -1 - , t->torrent_file().num_pieces() + , ti.num_pieces() , t->has_piece_passed(r.piece) , t->block_size()); } @@ -2440,8 +2441,8 @@ namespace libtorrent { // if we have choked the client // ignore the request - const int blocks_per_piece = - (t->torrent_file().piece_length() + t->block_size() - 1) / t->block_size(); + int const blocks_per_piece = + (ti.piece_length() + t->block_size() - 1) / t->block_size(); // disconnect peers that downloads more than foo times an allowed // fast piece @@ -5278,11 +5279,8 @@ namespace libtorrent { peer_log(peer_log_alert::info, "SEED_MODE_FILE_HASH" , "piece: %d passed", static_cast(piece)); #endif - if (t) - { - if (t->seed_mode() && t->all_verified()) - t->leave_seed_mode(true); - } + if (t->seed_mode() && t->all_verified()) + t->leave_seed_mode(true); } // try to service the requests again, now that the piece diff --git a/src/peer_connection_handle.cpp b/src/peer_connection_handle.cpp index 3748509d8..7dbc1126a 100644 --- a/src/peer_connection_handle.cpp +++ b/src/peer_connection_handle.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg, Steven Siloti +Copyright (c) 2015-2018, Arvid Norberg, Steven Siloti All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/peer_list.cpp b/src/peer_list.cpp index 4af6aa6e2..d174759ab 100644 --- a/src/peer_list.cpp +++ b/src/peer_list.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/performance_counters.cpp b/src/performance_counters.cpp index 0176009d3..ab684ec6c 100644 --- a/src/performance_counters.cpp +++ b/src/performance_counters.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013-2016, Arvid Norberg +Copyright (c) 2013-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/piece_picker.cpp b/src/piece_picker.cpp index 045d6d53a..6a96b82c1 100644 --- a/src/piece_picker.cpp +++ b/src/piece_picker.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/platform_util.cpp b/src/platform_util.cpp index d73ac85a6..546957351 100644 --- a/src/platform_util.cpp +++ b/src/platform_util.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/proxy_base.cpp b/src/proxy_base.cpp index 4b11a64ce..c3b37bf10 100644 --- a/src/proxy_base.cpp +++ b/src/proxy_base.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/proxy_settings.cpp b/src/proxy_settings.cpp index c1ed50ef3..8990bc8e3 100644 --- a/src/proxy_settings.cpp +++ b/src/proxy_settings.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/random.cpp b/src/random.cpp index 5a14116d8..d322196fc 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2011-2016, Arvid Norberg +Copyright (c) 2011-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/receive_buffer.cpp b/src/receive_buffer.cpp index 9500d25b9..e15620e05 100644 --- a/src/receive_buffer.cpp +++ b/src/receive_buffer.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg, Steven Siloti +Copyright (c) 2014-2018, Arvid Norberg, Steven Siloti All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/request_blocks.cpp b/src/request_blocks.cpp index 8b700a917..eda95362a 100644 --- a/src/request_blocks.cpp +++ b/src/request_blocks.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/resolve_links.cpp b/src/resolve_links.cpp index ef9d5f630..459b19dc5 100644 --- a/src/resolve_links.cpp +++ b/src/resolve_links.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg +Copyright (c) 2014-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/resolver.cpp b/src/resolver.cpp index 3e878a635..57e73faa4 100644 --- a/src/resolver.cpp +++ b/src/resolver.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013-2016, Arvid Norberg +Copyright (c) 2013-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/session.cpp b/src/session.cpp index 922dc91ee..c88b2ee90 100644 --- a/src/session.cpp +++ b/src/session.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg, Magnus Jonsson +Copyright (c) 2006-2018, Arvid Norberg, Magnus Jonsson All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/session_call.cpp b/src/session_call.cpp index 783e99724..f0658afc5 100644 --- a/src/session_call.cpp +++ b/src/session_call.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014-2016, Arvid Norberg, Steven Siloti +Copyright (c) 2014-2018, Arvid Norberg, Steven Siloti All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/session_handle.cpp b/src/session_handle.cpp index 01353ba2d..133b2e81e 100644 --- a/src/session_handle.cpp +++ b/src/session_handle.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/session_impl.cpp b/src/session_impl.cpp index b19dbfe81..713170028 100644 --- a/src/session_impl.cpp +++ b/src/session_impl.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, Arvid Norberg, Magnus Jonsson +Copyright (c) 2006-2018, Arvid Norberg, Magnus Jonsson All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/session_settings.cpp b/src/session_settings.cpp index f4c7b8917..43eb97679 100644 --- a/src/session_settings.cpp +++ b/src/session_settings.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/session_stats.cpp b/src/session_stats.cpp index d8b95bbd6..2f642dc7b 100644 --- a/src/session_stats.cpp +++ b/src/session_stats.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index 5f85d42a1..90124d800 100644 --- a/src/settings_pack.cpp +++ b/src/settings_pack.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/smart_ban.cpp b/src/smart_ban.cpp index 71ec0d237..39f1ee9b3 100644 --- a/src/smart_ban.cpp +++ b/src/smart_ban.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/socket_io.cpp b/src/socket_io.cpp index 1d16c92c1..c89aadd62 100644 --- a/src/socket_io.cpp +++ b/src/socket_io.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/socket_type.cpp b/src/socket_type.cpp index bf0b62b2c..e15218bc6 100644 --- a/src/socket_type.cpp +++ b/src/socket_type.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/socks5_stream.cpp b/src/socks5_stream.cpp index f92370686..0a80aba1d 100644 --- a/src/socks5_stream.cpp +++ b/src/socks5_stream.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/stat.cpp b/src/stat.cpp index 72e8df05b..9d49218f1 100644 --- a/src/stat.cpp +++ b/src/stat.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/stat_cache.cpp b/src/stat_cache.cpp index 14a937cc9..d1df6b338 100644 --- a/src/stat_cache.cpp +++ b/src/stat_cache.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg, Daniel Wallin +Copyright (c) 2012-2018, Arvid Norberg, Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/storage.cpp b/src/storage.cpp index e3b86d838..90acf6cb6 100644 --- a/src/storage.cpp +++ b/src/storage.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg, Daniel Wallin +Copyright (c) 2003-2018, Arvid Norberg, Daniel Wallin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/string_util.cpp b/src/string_util.cpp index 26b36fe9b..870c48651 100644 --- a/src/string_util.cpp +++ b/src/string_util.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/time.cpp b/src/time.cpp index d12f27592..06efeedbd 100644 --- a/src/time.cpp +++ b/src/time.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/timestamp_history.cpp b/src/timestamp_history.cpp index f335682ab..609ef55a0 100644 --- a/src/timestamp_history.cpp +++ b/src/timestamp_history.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/torrent.cpp b/src/torrent.cpp index 64b3dbf92..2ac3cc6f0 100644 --- a/src/torrent.cpp +++ b/src/torrent.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without @@ -4060,9 +4060,6 @@ bool is_downloading_state(int const st) inc_stats_counter(counters::num_piece_failed); - if (m_ses.alerts().should_post()) - m_ses.alerts().emplace_alert(get_handle(), index); - auto const it = std::lower_bound(m_predictive_pieces.begin() , m_predictive_pieces.end(), index); if (it != m_predictive_pieces.end() && *it == index) @@ -4252,6 +4249,9 @@ bool is_downloading_state(int const st) // ever downloaded for it. m_picker->restore_piece(piece); + if (m_ses.alerts().should_post()) + m_ses.alerts().emplace_alert(get_handle(), piece); + // we have to let the piece_picker know that // this piece failed the check as it can restore it // and mark it as being interesting for download diff --git a/src/torrent_handle.cpp b/src/torrent_handle.cpp index 6320a7e57..0867b422a 100644 --- a/src/torrent_handle.cpp +++ b/src/torrent_handle.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/torrent_info.cpp b/src/torrent_info.cpp index c3648c1d8..6c3312372 100644 --- a/src/torrent_info.cpp +++ b/src/torrent_info.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/torrent_peer.cpp b/src/torrent_peer.cpp index aa9958b04..f594baeab 100644 --- a/src/torrent_peer.cpp +++ b/src/torrent_peer.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/torrent_peer_allocator.cpp b/src/torrent_peer_allocator.cpp index f71ded2db..65216ebd9 100644 --- a/src/torrent_peer_allocator.cpp +++ b/src/torrent_peer_allocator.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/torrent_status.cpp b/src/torrent_status.cpp index dfd623a8a..8d10db3ac 100644 --- a/src/torrent_status.cpp +++ b/src/torrent_status.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/tracker_manager.cpp b/src/tracker_manager.cpp index 62d544316..75d90964c 100644 --- a/src/tracker_manager.cpp +++ b/src/tracker_manager.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/udp_socket.cpp b/src/udp_socket.cpp index 20985ad52..a0b79ff8d 100644 --- a/src/udp_socket.cpp +++ b/src/udp_socket.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/udp_tracker_connection.cpp b/src/udp_tracker_connection.cpp index d7a249655..0e6ac75de 100644 --- a/src/udp_tracker_connection.cpp +++ b/src/udp_tracker_connection.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/upnp.cpp b/src/upnp.cpp index 069ca5284..392bc5298 100644 --- a/src/upnp.cpp +++ b/src/upnp.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/ut_metadata.cpp b/src/ut_metadata.cpp index 020786dc1..b5e1ab59f 100644 --- a/src/ut_metadata.cpp +++ b/src/ut_metadata.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/ut_pex.cpp b/src/ut_pex.cpp index ae256728c..b3ba0e7d4 100644 --- a/src/ut_pex.cpp +++ b/src/ut_pex.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2006-2016, MassaRoddel, Arvid Norberg +Copyright (c) 2006-2018, MassaRoddel, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/utf8.cpp b/src/utf8.cpp index eb46b0448..f7938742e 100644 --- a/src/utf8.cpp +++ b/src/utf8.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2012-2016, Arvid Norberg +Copyright (c) 2012-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/utp_socket_manager.cpp b/src/utp_socket_manager.cpp index e46ee84fe..e73f64839 100644 --- a/src/utp_socket_manager.cpp +++ b/src/utp_socket_manager.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/utp_stream.cpp b/src/utp_stream.cpp index 7d53fa562..d3dee26dc 100644 --- a/src/utp_stream.cpp +++ b/src/utp_stream.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2009-2016, Arvid Norberg +Copyright (c) 2009-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without @@ -137,9 +137,6 @@ enum { ACK_MASK = 0xffff, - // the number of packets that'll fit in the reorder buffer - max_packets_reorder = 512, - // if a packet receives more than this number of // duplicate acks, we'll trigger a fast re-send dup_ack_limit = 3, @@ -459,7 +456,7 @@ public: std::int32_t m_read_buffer_size = 0; // max number of bytes to allocate for receive buffer - std::int32_t m_in_buf_size = 1024 * 1024; + std::int32_t m_receive_buffer_capacity = 1024 * 1024; // this holds the 3 last delay measurements, // these are the actual corrected delay measurements. @@ -1708,17 +1705,6 @@ bool utp_socket_impl::send_pkt(int const flags) m_fast_resend_seq_nr = (m_fast_resend_seq_nr + 1) & ACK_MASK; } - int sack = 0; - if (m_inbuf.size()) - { - // the SACK bitfield should ideally fit all - // the pieces we have successfully received - sack = (m_inbuf.span() + 7) / 8; - if (sack > 32) sack = 32; - } - - std::uint32_t const close_reason = static_cast(m_close_reason); - // MTU DISCOVERY // under these conditions, the next packet we send should be an MTU probe. @@ -1731,13 +1717,30 @@ bool utp_socket_impl::send_pkt(int const flags) && m_write_buffer_size >= m_mtu_floor * 3 && m_seq_nr != 0 && (m_cwnd >> 16) > m_mtu_floor * 3); + // for non MTU-probes, use the conservative packet size + int const effective_mtu = mtu_probe ? m_mtu : m_mtu_floor; + + std::uint32_t const close_reason = static_cast(m_close_reason); + + int sack = 0; + if (m_inbuf.size()) + { + const int max_sack_size = effective_mtu + - int(sizeof(utp_header)) + - 2 // for sack padding/header + - (close_reason ? 6 : 0); + + // the SACK bitfield should ideally fit all + // the pieces we have successfully received + sack = (m_inbuf.span() + 7) / 8; + if (sack > max_sack_size) sack = max_sack_size; + } int const header_size = int(sizeof(utp_header)) + (sack ? sack + 2 : 0) + (close_reason ? 6 : 0); // for non MTU-probes, use the conservative packet size - int const effective_mtu = mtu_probe ? m_mtu : m_mtu_floor; int payload_size = std::min(m_write_buffer_size , effective_mtu - header_size); TORRENT_ASSERT(payload_size >= 0); @@ -1746,7 +1749,7 @@ bool utp_socket_impl::send_pkt(int const flags) // congestion window and the advertised receive window from // the other end. if (m_bytes_in_flight + payload_size > std::min(int(m_cwnd >> 16) - , int(m_adv_wnd) - m_bytes_in_flight)) + , int(m_adv_wnd))) { // this means there's not enough room in the send window for // another packet. We have to hold off sending this data. @@ -1936,7 +1939,8 @@ bool utp_socket_impl::send_pkt(int const flags) } h->timestamp_difference_microseconds = m_reply_micro; - h->wnd_size = aux::numeric_cast(std::max(m_in_buf_size - m_buffered_incoming_bytes + h->wnd_size = static_cast(std::max( + m_receive_buffer_capacity - m_buffered_incoming_bytes - m_receive_buffer_size, 0)); h->ack_nr = m_ack_nr; @@ -2439,7 +2443,7 @@ bool utp_socket_impl::consume_incoming_data( } if (m_read_buffer_size == 0 - && m_receive_buffer_size >= m_in_buf_size - m_buffered_incoming_bytes) + && m_receive_buffer_size >= m_receive_buffer_capacity - m_buffered_incoming_bytes) { // if we don't have a buffer from the upper layer, and the // number of queued up bytes, waiting for the upper layer, @@ -2447,7 +2451,7 @@ bool utp_socket_impl::consume_incoming_data( // more data packets UTP_LOG("%8p: ERROR: our advertized window is not honored. " "recv_buf: %d buffered_in: %d max_size: %d\n" - , static_cast(this), m_receive_buffer_size, m_buffered_incoming_bytes, m_in_buf_size); + , static_cast(this), m_receive_buffer_size, m_buffered_incoming_bytes, m_receive_buffer_capacity); return false; } @@ -2455,7 +2459,7 @@ bool utp_socket_impl::consume_incoming_data( { TORRENT_ASSERT(m_inbuf.at(m_ack_nr) == nullptr); - if (m_buffered_incoming_bytes + m_receive_buffer_size + payload_size > m_in_buf_size) + if (m_buffered_incoming_bytes + m_receive_buffer_size + payload_size > m_receive_buffer_capacity) { UTP_LOGV("%8p: other end is not honoring our advertised window, dropping packet\n" , static_cast(this)); @@ -2514,7 +2518,7 @@ bool utp_socket_impl::consume_incoming_data( return true; } - if (m_buffered_incoming_bytes + m_receive_buffer_size + payload_size > m_in_buf_size) + if (m_buffered_incoming_bytes + m_receive_buffer_size + payload_size > m_receive_buffer_capacity) { UTP_LOGV("%8p: other end is not honoring our advertised window, dropping packet %d\n" , static_cast(this), int(ph->seq_nr)); @@ -2753,6 +2757,10 @@ bool utp_socket_impl::incoming_packet(span buf if (ph->get_type() == ST_DATA) m_sm.inc_stats_counter(counters::utp_payload_pkts_in); + // the number of packets that'll fit in the reorder buffer + std::uint32_t const max_packets_reorder + = static_cast(std::max(16, m_receive_buffer_capacity / 1100)); + if (m_state != UTP_STATE_NONE && m_state != UTP_STATE_SYN_SENT && compare_less_wrap((m_ack_nr + max_packets_reorder) & ACK_MASK, ph->seq_nr, ACK_MASK)) diff --git a/src/version.cpp b/src/version.cpp index 6b0c1fe40..2cf272b74 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015-2016, Arvid Norberg +Copyright (c) 2015-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/web_connection_base.cpp b/src/web_connection_base.cpp index 1b62de42e..b9a5fe504 100644 --- a/src/web_connection_base.cpp +++ b/src/web_connection_base.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/web_peer_connection.cpp b/src/web_peer_connection.cpp index bd85e74d7..298372e68 100644 --- a/src/web_peer_connection.cpp +++ b/src/web_peer_connection.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2003-2016, Arvid Norberg +Copyright (c) 2003-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/xml_parse.cpp b/src/xml_parse.cpp index e6b8a9491..ad24a7b20 100644 --- a/src/xml_parse.cpp +++ b/src/xml_parse.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2016, Arvid Norberg +Copyright (c) 2007-2018, Arvid Norberg All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/test/test_http_parser.cpp b/test/test_http_parser.cpp index d7813b198..d5db70ef3 100644 --- a/test/test_http_parser.cpp +++ b/test/test_http_parser.cpp @@ -588,6 +588,48 @@ TORRENT_TEST(invalid_content_range_end) TEST_CHECK(std::get<2>(received) == true); } +TORRENT_TEST(overflow_content_length) +{ + char const* chunked_input = + "HTTP/1.1 200 OK\r\n" + "Content-Length: 9999999999999999999999999999\r\n" + "\r\n"; + + http_parser parser; + std::tuple const received + = feed_bytes(parser, chunked_input); + + TEST_CHECK(std::get<2>(received) == true); +} + +TORRENT_TEST(overflow_content_range_end) +{ + char const* chunked_input = + "HTTP/1.1 206 OK\n" + "Content-Range: bytes 0-999999999999999999999999\n" + "\n"; + + http_parser parser; + std::tuple const received + = feed_bytes(parser, chunked_input); + + TEST_CHECK(std::get<2>(received) == true); +} + +TORRENT_TEST(overflow_content_range_begin) +{ + char const* chunked_input = + "HTTP/1.1 206 OK\n" + "Content-Range: bytes 999999999999999999999999-0\n" + "\n"; + + http_parser parser; + std::tuple const received + = feed_bytes(parser, chunked_input); + + TEST_CHECK(std::get<2>(received) == true); +} + TORRENT_TEST(missing_chunked_header) { char const input[] =