commit b23b83c30701b0df027b6c8672c406dcee0480c9
author QUICHE team <quiche-dev@google.com> Fri Jun 18 15:43:50 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 18 15:44:59 2021 -0700
tree fb68ae704b028e3e72c8d215c8711c69072e12fe
parent 3e6cf91c2f41a1ab3903736bd9c2073de1e32ac1

Removes unused OnReadyToReadDataForStream, and adds nullptr checks to nghttp2 callbacks.

PiperOrigin-RevId: 380278933

http2/adapter/nghttp2_callbacks.cc

diff --git a/http2/adapter/nghttp2_callbacks.cc b/http2/adapter/nghttp2_callbacks.cc
index 5b8a3c5..6bf5455 100644
--- a/http2/adapter/nghttp2_callbacks.cc
+++ b/http2/adapter/nghttp2_callbacks.cc
@@ -22,6 +22,7 @@
                       size_t length,
                       int flags,
                       void* user_data) {
+  QUICHE_CHECK_NE(user_data, nullptr);
   auto* visitor = static_cast<Http2VisitorInterface*>(user_data);
   const ssize_t result = visitor->OnReadyToSend(ToStringView(data, length));
   if (result < 0) {
@@ -36,6 +37,7 @@
 int OnBeginFrame(nghttp2_session* /* session */,
                  const nghttp2_frame_hd* header,
                  void* user_data) {
+  QUICHE_CHECK_NE(user_data, nullptr);
   auto* visitor = static_cast<Http2VisitorInterface*>(user_data);
   visitor->OnFrameHeader(header->stream_id, header->length, header->type,
                          header->flags);
@@ -48,10 +50,9 @@
 int OnFrameReceived(nghttp2_session* /* session */,
                     const nghttp2_frame* frame,
                     void* user_data) {
+  QUICHE_CHECK_NE(user_data, nullptr);
   auto* visitor = static_cast<Http2VisitorInterface*>(user_data);
   const Http2StreamId stream_id = frame->hd.stream_id;
-  QUICHE_VLOG(2) << "Frame " << static_cast<int>(frame->hd.type)
-                 << " for stream " << stream_id;
   switch (frame->hd.type) {
     // The beginning of the DATA frame is handled in OnBeginFrame(), and the
     // beginning of the header block is handled in client/server-specific
@@ -146,6 +147,7 @@
 int OnBeginHeaders(nghttp2_session* /* session */,
                    const nghttp2_frame* frame,
                    void* user_data) {
+  QUICHE_CHECK_NE(user_data, nullptr);
   auto* visitor = static_cast<Http2VisitorInterface*>(user_data);
   visitor->OnBeginHeadersForStream(frame->hd.stream_id);
   return 0;
@@ -157,6 +159,7 @@
              nghttp2_rcbuf* value,
              uint8_t flags,
              void* user_data) {
+  QUICHE_CHECK_NE(user_data, nullptr);
   auto* visitor = static_cast<Http2VisitorInterface*>(user_data);
   visitor->OnHeaderForStream(frame->hd.stream_id, ToStringView(name),
                              ToStringView(value));
@@ -169,6 +172,7 @@
                 const uint8_t* data,
                 size_t len,
                 void* user_data) {
+  QUICHE_CHECK_NE(user_data, nullptr);
   auto* visitor = static_cast<Http2VisitorInterface*>(user_data);
   visitor->OnDataForStream(
       stream_id, absl::string_view(reinterpret_cast<const char*>(data), len));
@@ -179,30 +183,12 @@
                    Http2StreamId stream_id,
                    uint32_t error_code,
                    void* user_data) {
+  QUICHE_CHECK_NE(user_data, nullptr);
   auto* visitor = static_cast<Http2VisitorInterface*>(user_data);
   visitor->OnCloseStream(stream_id, ToHttp2ErrorCode(error_code));
   return 0;
 }
 
-ssize_t OnReadyToReadDataForStream(nghttp2_session* /* session */,
-                                   Http2StreamId stream_id,
-                                   uint8_t* dest_buffer,
-                                   size_t max_length,
-                                   uint32_t* data_flags,
-                                   nghttp2_data_source* source,
-                                   void* user_data) {
-  auto* visitor = static_cast<Http2VisitorInterface*>(source->ptr);
-  ssize_t bytes_to_send = 0;
-  bool end_stream = false;
-  visitor->OnReadyToSendDataForStream(stream_id,
-                                      reinterpret_cast<char*>(dest_buffer),
-                                      max_length, &bytes_to_send, &end_stream);
-  if (bytes_to_send >= 0 && end_stream) {
-    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-  }
-  return bytes_to_send;
-}
-
 nghttp2_session_callbacks_unique_ptr Create() {
   nghttp2_session_callbacks* callbacks;
   nghttp2_session_callbacks_new(&callbacks);