h2-fixes

Author: lws-team

lib/core-net/private-lib-core-net.h

@@ -1537,7 +1537,7 @@ lws_prepare_access_log_info(struct lws *wsi, char *uri_ptr, int len, int meth);
 
 #if defined(_DEBUG)
 void
-lws_wsi_txc_describe(struct lws_tx_credit *txc, const char *at, uint32_t sid);
+lws_wsi_txc_describe(struct lws_tx_credit *txc, const char *at, uint64_t sid);
 #else
 #define lws_wsi_txc_describe(x, y, z) { (void)x; }
 #endif

lib/core-net/wsi.c

@@ -1650,9 +1650,9 @@ int lws_wsi_txc_check_skint(struct lws_tx_credit *txc, int32_t tx_cr) {
 
 #if defined(_DEBUG)
 void lws_wsi_txc_describe(struct lws_tx_credit *txc, const char *at,
-		uint32_t sid) {
-	lwsl_info("%s: %p: %s: sid %d: %speer-to-us: %d, us-to-peer: %d\n", __func__,
-			txc, at, (int)sid, txc->skint ? "SKINT, " : "",
+		uint64_t sid) {
+	lwsl_info("%s: %p: %s: sid %llu: %speer-to-us: %d, us-to-peer: %d\n", __func__,
+			txc, at, (unsigned long long)sid, txc->skint ? "SKINT, " : "",
 			(int)txc->peer_tx_cr_est, (int)txc->tx_cr);
 }
 #endif

lib/roles/h2/http2.c

@@ -504,8 +504,8 @@ lws_h2_rst_stream(struct lws *wsi, uint32_t err, const char *reason)
 	if (!pps)
 		return 1;
 
-	lwsl_info("%s: RST_STREAM 0x%x, sid %d, REASON '%s'\n", __func__,
-		  (int)err, wsi->mux.my_sid, reason);
+	lwsl_info("%s: RST_STREAM 0x%x, sid %llu, REASON '%s'\n", __func__,
+		  (int)err, (unsigned long long)wsi->mux.my_sid, reason);
 
 	pps->u.rs.sid = (uint32_t)wsi->mux.my_sid;
 	pps->u.rs.err = err;
@@ -2775,8 +2775,8 @@ lws_h2_client_handshake(struct lws *wsi)
 			lws_wsi_tag(wsi), sid);
 
 
-	lwsl_info("%s: CLIENT_WAITING_TO_SEND_HEADERS: pollout (sid %d)\n",
-			__func__, wsi->mux.my_sid);
+	lwsl_info("%s: CLIENT_WAITING_TO_SEND_HEADERS: pollout (sid %llu)\n",
+			__func__, (unsigned long long)wsi->mux.my_sid);
 
 	p = start = buf = pt->serv_buf + LWS_PRE;
 	end = start + (wsi->a.context->pt_serv_buf_size / 2) - LWS_PRE - 1;

lib/roles/h2/ops-h2.c

@@ -1094,8 +1094,8 @@ rops_perform_user_POLLOUT_h2(struct lws *wsi)
 		}
                                   wa = wsi2; /* wsi2 is updated to point to the next element by move_child_to_tail */
 
-		lwsl_info("%s: child %s, sid %d, (wsistate 0x%x)\n",
-			  __func__, lws_wsi_tag(w), w->mux.my_sid,
+		lwsl_info("%s: child %s, sid %llu, (wsistate 0x%x)\n",
+			  __func__, lws_wsi_tag(w), (unsigned long long)w->mux.my_sid,
 			  (unsigned int)w->wsistate);
 
 		/* priority 1: post compression-transform buffered output */