examples: Adopt nghttp3_recv_settings2

tatsuhiro-t · tatsuhiro-t · commit b5ad1957d096 · 2025-12-04T20:56:16.000+09:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -148,7 +148,7 @@ if(ENABLE_JEMALLOC)
 endif()
 if(NOT ENABLE_LIB_ONLY)
   find_package(Libev 4.11)
-  find_package(Libnghttp3 1.12.0)
+  find_package(Libnghttp3 1.14.0)
   find_package(Libbrotlienc 1.0.9)
   find_package(Libbrotlidec 1.0.9)
 endif()
diff --git a/configure.ac b/configure.ac
@@ -448,7 +448,7 @@ AM_CONDITIONAL([HAVE_CRYPTO], [ test "x${have_crypto}" = "xyes" ])
 # libnghttp3 (required for examples)
 have_libnghttp3=no
 if test "x${request_libnghttp3}" != "xno"; then
-  PKG_CHECK_MODULES([LIBNGHTTP3], [libnghttp3 >= 1.12.0],
+  PKG_CHECK_MODULES([LIBNGHTTP3], [libnghttp3 >= 1.14.0],
                     [have_libnghttp3=yes], [have_libnghttp3=no])
   if test "${have_libnghttp3}" = "xno"; then
     AC_MSG_NOTICE($LIBNGHTTP3_PKG_ERRORS)
diff --git a/examples/client.cc b/examples/client.cc
@@ -2148,7 +2148,8 @@ void Client::http_stream_close(int64_t stream_id, uint64_t app_error_code) {
 }
 
 namespace {
-int http_recv_settings(nghttp3_conn *conn, const nghttp3_settings *settings,
+int http_recv_settings(nghttp3_conn *conn,
+                       const nghttp3_proto_settings *settings,
                        void *conn_user_data) {
   if (!config.quiet) {
     debug::print_http_settings(settings);
@@ -2201,10 +2202,10 @@ int Client::setup_httpconn() {
     .end_trailers = ::http_end_trailers,
     .stop_sending = ::http_stop_sending,
     .reset_stream = ::http_reset_stream,
-    .recv_settings = ::http_recv_settings,
     .recv_origin = ::http_recv_origin,
     .end_origin = ::http_end_origin,
     .rand = rand_bytes,
+    .recv_settings2 = ::http_recv_settings,
   };
   nghttp3_settings settings;
   nghttp3_settings_default(&settings);
diff --git a/examples/debug.cc b/examples/debug.cc
@@ -283,7 +283,7 @@ void print_http_response_headers(int64_t stream_id, const nghttp3_nv *nva,
   }
 }
 
-void print_http_settings(const nghttp3_settings *settings) {
+void print_http_settings(const nghttp3_proto_settings *settings) {
   fprintf(outfile,
           "http: remote settings\n"
           "http: SETTINGS_MAX_FIELD_SECTION_SIZE=%" PRIu64 "\n"
diff --git a/examples/debug.h b/examples/debug.h
@@ -116,7 +116,7 @@ void print_http_request_headers(int64_t stream_id, const nghttp3_nv *nva,
 void print_http_response_headers(int64_t stream_id, const nghttp3_nv *nva,
                                  size_t nvlen);
 
-void print_http_settings(const nghttp3_settings *settings);
+void print_http_settings(const nghttp3_proto_settings *settings);
 
 void print_http_origin(const uint8_t *origin, size_t originlen);
 
diff --git a/examples/server.cc b/examples/server.cc
@@ -1198,7 +1198,8 @@ int Handler::http_reset_stream(int64_t stream_id, uint64_t app_error_code) {
 }
 
 namespace {
-int http_recv_settings(nghttp3_conn *conn, const nghttp3_settings *settings,
+int http_recv_settings(nghttp3_conn *conn,
+                       const nghttp3_proto_settings *settings,
                        void *conn_user_data) {
   if (!config.quiet) {
     debug::print_http_settings(settings);
@@ -1229,8 +1230,8 @@ int Handler::setup_httpconn() {
     .stop_sending = ::http_stop_sending,
     .end_stream = ::http_end_stream,
     .reset_stream = ::http_reset_stream,
-    .recv_settings = ::http_recv_settings,
     .rand = rand_bytes,
+    .recv_settings2 = ::http_recv_settings,
   };
   nghttp3_settings settings;
   nghttp3_settings_default(&settings);

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ void print_http_response_headers(int64_t stream_id, const nghttp3_nv *nva,`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
`286`		`-void print_http_settings(const nghttp3_settings *settings) {`
	`286`	`+void print_http_settings(const nghttp3_proto_settings *settings) {`
`287`	`287`	`fprintf(outfile,`
`288`	`288`	`"http: remote settings\n"`
`289`	`289`	`"http: SETTINGS_MAX_FIELD_SECTION_SIZE=%" PRIu64 "\n"`