squashme: Extract rapid reset to its own function, invoke prior to h2_kill_req

Author: daghf

bin/varnishd/http2/cache_http2_proto.c

@@ -321,21 +321,15 @@ h2_rx_push_promise(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 /**********************************************************************
  */
 
-static h2_error v_matchproto_(h2_rxframe_f)
-h2_rx_rst_stream(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
+static h2_error
+h2_rapid_reset(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 	vtim_real now;
 	vtim_dur d;
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	ASSERT_RXTHR(h2);
-	CHECK_OBJ_ORNULL(r2, H2_REQ_MAGIC);
-
-	if (h2->rxf_len != 4)			// rfc7540,l,2003,2004
-		return (H2CE_FRAME_SIZE_ERROR);
-	if (r2 == NULL)
-		return (0);
-	h2_kill_req(wrk, h2, r2, h2_streamerror(vbe32dec(h2->rxf_data)));
+	CHECK_OBJ_NOTNULL(r2, H2_REQ_MAGIC);
 
 	if (cache_param->h2_rapid_reset_limit == 0)
 		return (0);
@@ -360,10 +354,27 @@ h2_rx_rst_stream(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 		return (H2CE_RAPID_RESET);
 	}
 	h2->rst_budget -= 1.0;
-
 	return (0);
 }
 
+static h2_error v_matchproto_(h2_rxframe_f)
+h2_rx_rst_stream(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
+{
+	h2_error h2e;
+
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	ASSERT_RXTHR(h2);
+	CHECK_OBJ_ORNULL(r2, H2_REQ_MAGIC);
+
+	if (h2->rxf_len != 4)			// rfc7540,l,2003,2004
+		return (H2CE_FRAME_SIZE_ERROR);
+	if (r2 == NULL)
+		return (0);
+	h2e = h2_rapid_reset(wrk, h2, r2);
+	h2_kill_req(wrk, h2, r2, h2_streamerror(vbe32dec(h2->rxf_data)));
+	return (h2e);
+}
+
 /**********************************************************************
  */