examples: Add less complicated asio client example

examples/Makefile.am

@@ -58,7 +58,7 @@ endif # ENABLE_TINY_NGHTTPD
 
 if ENABLE_ASIO_LIB
 
-noinst_PROGRAMS += asio-sv asio-sv2 asio-cl
+noinst_PROGRAMS += asio-sv asio-sv2 asio-cl asio-cl2
 
 ASIOCPPFLAGS = ${BOOST_CPPFLAGS} ${AM_CPPFLAGS}
 ASIOLDADD = $(top_builddir)/lib/libnghttp2.la \
@@ -83,6 +83,10 @@ asio_cl_SOURCES = asio-cl.cc
 asio_cl_CPPFLAGS = ${ASIOCPPFLAGS}
 asio_cl_LDADD = ${ASIOLDADD}
 
+asio_cl2_SOURCES = asio-cl2.cc
+asio_cl2_CPPFLAGS = ${ASIOCPPFLAGS}
+asio_cl2_LDADD = ${ASIOLDADD}
+
 endif # ENABLE_ASIO_LIB
 
 endif # ENABLE_EXAMPLES

examples/asio-cl.cc

@@ -24,7 +24,6 @@
  */
 
 #include <iostream>
-#include <string>
 
 #include <nghttp2/asio_http2_client.h>
 
@@ -33,29 +32,6 @@ using boost::asio::ip::tcp;
 using namespace nghttp2::asio_http2;
 using namespace nghttp2::asio_http2::client;
 
-void print_header(const header_map &h) {
-  for (auto &kv : h) {
-    std::cerr << kv.first << ": " << kv.second.value << "\n";
-  }
-  std::cerr << std::endl;
-}
-
-void print_header(const response &res) {
-  std::cerr << "HTTP/2 " << res.status_code() << "\n";
-  print_header(res.header());
-}
-
-void print_header(const request &req) {
-  auto &uri = req.uri();
-  std::cerr << req.method() << " " << uri.scheme << "://" << uri.host
-            << uri.path;
-  if (!uri.raw_query.empty()) {
-    std::cerr << "?" << uri.raw_query;
-  }
-  std::cerr << " HTTP/2\n";
-  print_header(req.header());
-}
-
 int main(int argc, char *argv[]) {
   try {
     boost::asio::io_service io_service;
@@ -68,43 +44,31 @@ int main(int argc, char *argv[]) {
 
     session sess(io_service, tls_ctx, "localhost", "3000");
     sess.on_connect([&sess](tcp::resolver::iterator endpoint_it) {
-      std::cerr << "connected to " << (*endpoint_it).endpoint() << std::endl;
       boost::system::error_code ec;
-      auto req = sess.submit(ec, "GET", "https://localhost:3000/",
+      auto req = sess.submit(ec, "GET", "https://localhost:3000/");
-                             {{"cookie", {"foo=bar", true}}});
+
       if (ec) {
         std::cerr << "error: " << ec.message() << std::endl;
         return;
       }
 
       req->on_response([&sess, req](const response &res) {
-        std::cerr << "response header was received" << std::endl;
+        std::cerr << "HTTP/2 " << res.status_code() << std::endl;
-        print_header(res);
+        for (auto &kv : res.header()) {
+          std::cerr << kv.first << ": " << kv.second.value << "\n";
+        }
+        std::cerr << std::endl;
 
         res.on_data([&sess](const uint8_t *data, std::size_t len) {
+          if (len == 0) {
+            // eof
+            sess.shutdown();
+            return;
+          }
           std::cerr.write(reinterpret_cast<const char *>(data), len);
           std::cerr << std::endl;
         });
       });
-
-      req->on_close([&sess](uint32_t error_code) {
-        std::cerr << "request done with error_code=" << error_code << std::endl;
-      });
-
-      req->on_push([](const request &push_req) {
-        std::cerr << "push request was received" << std::endl;
-
-        print_header(push_req);
-
-        push_req.on_response([](const response &res) {
-          std::cerr << "push response header was received" << std::endl;
-
-          res.on_data([](const uint8_t *data, std::size_t len) {
-            std::cerr.write(reinterpret_cast<const char *>(data), len);
-            std::cerr << std::endl;
-          });
-        });
-      });
     });
 
     sess.on_error([](const boost::system::error_code &ec) {

examples/asio-cl2.cc

@@ -0,0 +1,120 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2015 Tatsuhiro Tsujikawa
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <iostream>
+#include <string>
+
+#include <nghttp2/asio_http2_client.h>
+
+using boost::asio::ip::tcp;
+
+using namespace nghttp2::asio_http2;
+using namespace nghttp2::asio_http2::client;
+
+void print_header(const header_map &h) {
+  for (auto &kv : h) {
+    std::cerr << kv.first << ": " << kv.second.value << "\n";
+  }
+  std::cerr << std::endl;
+}
+
+void print_header(const response &res) {
+  std::cerr << "HTTP/2 " << res.status_code() << "\n";
+  print_header(res.header());
+}
+
+void print_header(const request &req) {
+  auto &uri = req.uri();
+  std::cerr << req.method() << " " << uri.scheme << "://" << uri.host
+            << uri.path;
+  if (!uri.raw_query.empty()) {
+    std::cerr << "?" << uri.raw_query;
+  }
+  std::cerr << " HTTP/2\n";
+  print_header(req.header());
+}
+
+int main(int argc, char *argv[]) {
+  try {
+    boost::asio::io_service io_service;
+
+    boost::asio::ssl::context tls_ctx(boost::asio::ssl::context::sslv23);
+    tls_ctx.set_default_verify_paths();
+    // disabled to make development easier...
+    // tls_ctx.set_verify_mode(boost::asio::ssl::verify_peer);
+    configure_tls_context(tls_ctx);
+
+    session sess(io_service, tls_ctx, "localhost", "3000");
+    sess.on_connect([&sess](tcp::resolver::iterator endpoint_it) {
+      std::cerr << "connected to " << (*endpoint_it).endpoint() << std::endl;
+      boost::system::error_code ec;
+      auto req = sess.submit(ec, "GET", "https://localhost:3000/",
+                             {{"cookie", {"foo=bar", true}}});
+      if (ec) {
+        std::cerr << "error: " << ec.message() << std::endl;
+        return;
+      }
+
+      req->on_response([&sess, req](const response &res) {
+        std::cerr << "response header was received" << std::endl;
+        print_header(res);
+
+        res.on_data([&sess](const uint8_t *data, std::size_t len) {
+          std::cerr.write(reinterpret_cast<const char *>(data), len);
+          std::cerr << std::endl;
+        });
+      });
+
+      req->on_close([&sess](uint32_t error_code) {
+        std::cerr << "request done with error_code=" << error_code << std::endl;
+      });
+
+      req->on_push([](const request &push_req) {
+        std::cerr << "push request was received" << std::endl;
+
+        print_header(push_req);
+
+        push_req.on_response([](const response &res) {
+          std::cerr << "push response header was received" << std::endl;
+
+          res.on_data([](const uint8_t *data, std::size_t len) {
+            std::cerr.write(reinterpret_cast<const char *>(data), len);
+            std::cerr << std::endl;
+          });
+        });
+      });
+    });
+
+    sess.on_error([](const boost::system::error_code &ec) {
+      std::cerr << "error: " << ec.message() << std::endl;
+    });
+
+    io_service.run();
+  } catch (std::exception &e) {
+    std::cerr << "exception: " << e.what() << "\n";
+  }
+
+  return 0;
+}