|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r54768 - in branches/release: . libs/asio/doc libs/asio/doc/overview libs/asio/example/icmp
From: chris_at_[hidden]
Date: 2009-07-07 08:46:52
Author: chris_kohlhoff
Date: 2009-07-07 08:46:51 EDT (Tue, 07 Jul 2009)
New Revision: 54768
URL: http://svn.boost.org/trac/boost/changeset/54768
Log:
Merge ping example from trunk.
Added:
branches/release/libs/asio/example/icmp/
- copied from r54767, /trunk/libs/asio/example/icmp/
branches/release/libs/asio/example/icmp/Jamfile
- copied unchanged from r54767, /trunk/libs/asio/example/icmp/Jamfile
branches/release/libs/asio/example/icmp/Jamfile.v2
- copied unchanged from r54767, /trunk/libs/asio/example/icmp/Jamfile.v2
branches/release/libs/asio/example/icmp/icmp_header.hpp
- copied unchanged from r54767, /trunk/libs/asio/example/icmp/icmp_header.hpp
branches/release/libs/asio/example/icmp/ipv4_header.hpp
- copied unchanged from r54767, /trunk/libs/asio/example/icmp/ipv4_header.hpp
branches/release/libs/asio/example/icmp/ping.cpp
- copied unchanged from r54767, /trunk/libs/asio/example/icmp/ping.cpp
Properties modified:
branches/release/ (props changed)
Text files modified:
branches/release/libs/asio/doc/Jamfile.v2 | 5 +++--
branches/release/libs/asio/doc/examples.qbk | 9 +++++++++
branches/release/libs/asio/doc/overview/protocols.qbk | 11 ++++-------
3 files changed, 16 insertions(+), 9 deletions(-)
Modified: branches/release/libs/asio/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/asio/doc/Jamfile.v2 (original)
+++ branches/release/libs/asio/doc/Jamfile.v2 2009-07-07 08:46:51 EDT (Tue, 07 Jul 2009)
@@ -33,8 +33,9 @@
;
local example-names = allocation buffers chat echo http/client http/server
- http/server2 http/server3 invocation iostreams local multicast nonblocking
- porthopper serialization services socks4 ssl timeouts timers windows ;
+ http/server2 http/server3 icmp invocation iostreams local multicast
+ nonblocking porthopper serialization services socks4 ssl timeouts timers
+ windows ;
for local l in $(example-names)
{
Modified: branches/release/libs/asio/doc/examples.qbk
==============================================================================
--- branches/release/libs/asio/doc/examples.qbk (original)
+++ branches/release/libs/asio/doc/examples.qbk 2009-07-07 08:46:51 EDT (Tue, 07 Jul 2009)
@@ -135,6 +135,15 @@
* [@boost_asio/example/http/server3/win_main.cpp]
+[heading ICMP]
+
+This example shows how to use raw sockets with ICMP to ping a remote host.
+
+* [@boost_asio/example/icmp/ping.cpp]
+* [@boost_asio/example/icmp/ipv4_header.hpp]
+* [@boost_asio/example/icmp/icmp_header.hpp]
+
+
[heading Invocation]
This example shows how to customise handler invocation. Completion handlers are
Modified: branches/release/libs/asio/doc/overview/protocols.qbk
==============================================================================
--- branches/release/libs/asio/doc/overview/protocols.qbk (original)
+++ branches/release/libs/asio/doc/overview/protocols.qbk 2009-07-07 08:46:51 EDT (Tue, 07 Jul 2009)
@@ -89,7 +89,7 @@
As with TCP and UDP, ICMP hostname resolution is performed using a resolver:
ip::icmp::resolver resolver(my_io_service);
- ip::icmp::resolver::query query("localhost", "daytime");
+ ip::icmp::resolver::query query("localhost", "");
ip::icmp::resolver::iterator iter = resolver.resolve(query);
...
@@ -106,11 +106,7 @@
boost_asio.reference.basic_raw_socket.async_receive_from async_receive_from()],
[link boost_asio.reference.basic_raw_socket.send_to send_to()] or [link
boost_asio.reference.basic_raw_socket.async_send_to async_send_to()] member
-functions. For a connected ICMP socket, use the [link
-boost_asio.reference.basic_raw_socket.receive receive()], [link
-boost_asio.reference.basic_raw_socket.async_receive async_receive()], [link
-boost_asio.reference.basic_raw_socket.send send()] or [link
-boost_asio.reference.basic_raw_socket.async_send async_send()] member functions.
+functions.
[heading Other Protocols]
@@ -123,6 +119,7 @@
[link boost_asio.reference.ip__tcp ip::tcp],
[link boost_asio.reference.ip__udp ip::udp],
[link boost_asio.reference.ip__icmp ip::icmp],
-[link boost_asio.tutorial.tutdaytime1 daytime protocol tutorials].
+[link boost_asio.tutorial.tutdaytime1 daytime protocol tutorials],
+[link boost_asio.examples.icmp ICMP ping example].
[endsect]
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk