From 89554179f6870edd8c6d7f7c64d17115d5a2d9aa Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Fri, 2 Mar 2012 19:30:57 +0000 Subject: [PATCH] regenerate html --- docs/dht_sec.html | 4 ++-- docs/manual.html | 59 ++++++++++++++++++++++++++++++++++++---------- docs/projects.html | 4 ++-- 3 files changed, 50 insertions(+), 17 deletions(-) diff --git a/docs/dht_sec.html b/docs/dht_sec.html index 627575fca..c5cc3118f 100644 --- a/docs/dht_sec.html +++ b/docs/dht_sec.html @@ -135,7 +135,7 @@ uint32_t seed = rand & 0x7; int mod_shift = 6 * 4 / num_octets; // 6 or 3, depending on IPv4 and IPv6 while (num_octets) { - seed = (uint64_t(seed) * ip[num_octets]) & (modulus-1); + seed = (uint64_t(seed) * ip[num_octets-1]) & (modulus-1); modulus <<= mod_shift; --num_octets; } @@ -159,7 +159,7 @@ uint32_t seed = node_id[19] & 0x7; int mod_shift = 6 * 4 / num_octets; // 6 or 3, depending on IPv4 and IPv6 while (num_octets) { - seed = (uint64_t(seed) * ip[num_octets]) & (modulus-1); + seed = (uint64_t(seed) * ip[num_octets-1]) & (modulus-1); modulus <<= mod_shift; --num_octets; } diff --git a/docs/manual.html b/docs/manual.html index 5bda8f508..8c2b3676b 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -1392,6 +1392,7 @@ struct feed_settings std::string url; bool auto_download; + bool auto_map_handles; int default_ttl; add_torrent_params add_args; }; @@ -1401,10 +1402,17 @@ the feed will be downloaded. Set this to false in order to manually add torrents to the session. You may react to the rss_alert when a feed has been updated to poll it for the new items in the feed when adding torrents manually. When torrents are added automatically, -you have to call session::get_torrents() to get the handles to -the new torrents.

+an add_torrent_alert is posted which includes the torrent handle +as well as the error code if it failed to be added. You may also call +session::get_torrents() to get the handles to the new torrents.

Before adding the feed, you must set the url field to the feed's url. It may point to an RSS or an atom feed.

+

auto_map_handles defaults to true and determines whether or +not to set the handle field in the feed_item, returned +as the feed status. If auto-download is enabled, this setting +is ignored. If auto-download is not set, setting this to false +will save one pass through all the feed items trying to find +corresponding torrents in the session.

The default_ttl is the default interval for refreshing a feed. This may be overridden by the feed itself (by specifying the <ttl> tag) and defaults to 30 minutes. The field specifies the number of @@ -2466,7 +2474,6 @@ struct torrent_handle void rename_file(int index, boost::filesystem::wpath) const; storage_interface* get_storage_impl() const; - bool super_seeding() const; void super_seeding(bool on) const; enum flags_t { overwrite_existing = 1 }; @@ -2676,13 +2683,11 @@ storage contructor function that was passed to super_seeding() 

-bool super_seeding() const;
 void super_seeding(bool on) const;

Enables or disabled super seeding/initial seeding for this torrent. The torrent -needs to be a seed for this to take effect. The overload that returns a bool -tells you of super seeding is enabled or not.

+needs to be a seed for this to take effect.

add_piece()

@@ -3532,6 +3537,7 @@ struct torrent_status bool seed_mode; bool upload_mode; bool share_mode; + bool super_seeding; int priority; @@ -3765,6 +3771,7 @@ take it out of the upload mode by calling torrent_handle.

share_mode is true if the torrent is currently in share-mode, i.e. not downloading the torrent, but just helping the swarm out.

+

super_seeding is true if the torrent is in super seeding mode.

added_time is the posix-time when this torrent was added. i.e. what time(NULL) returned at the time.

completed_time is the posix-time when this torrent was finished. If @@ -4819,6 +4826,14 @@ used to bind outgoing sockets to. This may be useful for users whose router allows them to assign QoS classes to traffic based on its local port. It is a range instead of a single port because of the problems with failing to reconnect to peers if a previous socket to that peer and port is in TIME_WAIT state.

+
+

Warning

+

setting outgoing ports will limit the ability to keep multiple +connections to the same client, even for different torrents. It is not +recommended to change this setting. Its main purpose is to use as an +escape hatch for cheap routers with QoS capability but can only classify +flows based on port numbers.

+

peer_tos determines the TOS byte set in the IP header of every packet sent to peers (including web seeds). The default value for this is 0x0 (no marking). One potentially useful TOS mark is 0x20, this represents @@ -6466,7 +6481,7 @@ struct peer_disconnected_alert: peer_alert

invalid_request_alert

This is a debug alert that is generated by an incoming invalid piece request. -Ïp is the address of the peer and the request is the actual incoming +ìp is the address of the peer and the request is the actual incoming request from the peer.

 struct invalid_request_alert: peer_alert
@@ -6721,6 +6736,24 @@ torrent-less download, with the metadata extension provided by libtorrent.

 can start downloading. It is not generated on torrents that are started with metadata, but
 only those that needs to download it from peers (when utilizing the libtorrent extension).

 
There are no additional data members in this alert.

+
Typically, when receiving this alert, you would want to save the torrent file in order
+to load it back up again when the session is restarted. Here's an example snippet of
+code to do that:

+
+torrent_handle h = alert->handle();
+if (h.is_valid()) {
+        torrent_info const& ti = h.get_torrent_info();
+        create_torrent ct(ti);
+        entry te = ct.generate();
+        std::vector<char> buffer;
+        bencode(std::back_inserter(buffer), te);
+        FILE* f = fopen((to_hex(ti.info_hash().to_string()) + ".torrent").c_str(), "w+");
+        if (f) {
+                fwrite(&buffer[0], 1, buffer.size(), f);
+                fclose(f);
+        }
+}
+

fastresume_rejected_alert

@@ -8029,13 +8062,13 @@ std::string error_code_to_string(boost::system::error_code const& ec) static const char const* swedish[] = { "inget fel", - "en fil i torrenten kolliderar med en fil frÂn en annan torrent", + "en fil i torrenten kolliderar med en fil från en annan torrent", "hash check misslyckades", - "torrent filen ‰r inte en dictionary", - "'info'-nyckeln saknas eller ‰r korrupt i torrentfilen", - "'info'-f‰ltet ‰r inte en dictionary", - "'piece length' f‰ltet saknas eller ‰r korrupt i torrentfilen", - "torrentfilen saknar namnf‰ltet", + "torrent filen är inte en dictionary", + "'info'-nyckeln saknas eller är korrupt i torrentfilen", + "'info'-fältet är inte en dictionary", + "'piece length' fältet saknas eller är korrupt i torrentfilen", + "torrentfilen saknar namnfältet", "ogiltigt namn i torrentfilen (kan vara en attack)", // ... more strings here }; diff --git a/docs/projects.html b/docs/projects.html index d8810f6f0..e96eda252 100644 --- a/docs/projects.html +++ b/docs/projects.html @@ -110,13 +110,13 @@ connects to the daemon. One GUI (ncurses) and one web interface (accessable through a web browser). Written by Michael Wojciechowski -and Johan Strˆm.

+and Johan Ström.

tvblob.jpg

tvblob

The BLOBbox represents the ability to harness all of the content available -on the web, without any filtering or pre-selection by a third party ø just +on the web, without any filtering or pre-selection by a third party ¿ just like surfing the web.

This means that anyone will have the ability to reach viewers via the Internet directly on TV, without them having to connect a PC.