{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752654213, "reponame":"libwebsockets", "desc":"libwebsockets lightweight C networking library", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://libwebsockets.org/repo/libwebsockets", "f":3, "items": [ {"schema":"libjg2-1", "cid":"902d0ffb086641c35d0648a61c6ee9ac", "commit": {"type":"commit", "time": 1628526676, "time_ofs": 60, "oid_tree": { "oid": "ee665cf8cb62c135ca0a547cacf0af10f86271c6", "alias": []}, "oid":{ "oid": "9365490ef017219fc691b0877710b1fb122527c9", "alias": []}, "msg": "conmon: only build if WITH_CONMON", "sig_commit": { "git_time": { "time": 1628526676, "offset": 60 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }, "sig_author": { "git_time": { "time": 1627975539, "offset": 480 }, "name": "Yichen Gu", "email": "guyiche@amazon.com", "md5": "20b6c52ee176e8bd161a1df8ad7deb42" }}, "body": "conmon: only build if WITH_CONMON\n" , "diff": "diff --git a/lib/secure-streams/protocols/ss-h1.c b/lib/secure-streams/protocols/ss-h1.c\nindex 7087b47..db70698 100644\n--- a/lib/secure-streams/protocols/ss-h1.c\n+++ b/lib/secure-streams/protocols/ss-h1.c\n@@ -452,7 +452,9 @@ secstream_h1(struct lws *wsi, enum lws_callback_reasons reason, void *user,\n \t\t}\n \t\tassert(h-\u003epolicy);\n \n+#if defined(LWS_WITH_CONMON)\n \t\tlws_conmon_ss_json(h);\n+#endif\n \n \t\tlws_metrics_caliper_report_hist(h-\u003ecal_txn, wsi);\n \t\tlwsl_info(\u0022%s: %s CLIENT_CONNECTION_ERROR: %s\u005cn\u0022, __func__,\n@@ -486,7 +488,9 @@ secstream_h1(struct lws *wsi, enum lws_callback_reasons reason, void *user,\n \n \t\tlws_sul_cancel(\u0026h-\u003esul_timeout);\n \n+#if defined(LWS_WITH_CONMON)\n \t\tlws_conmon_ss_json(h);\n+#endif\n \n \t\tlws_metrics_caliper_report_hist(h-\u003ecal_txn, wsi);\n \t\t//lwsl_notice(\u0022%s: %s LWS_CALLBACK_CLOSED_CLIENT_HTTP\u005cn\u0022,\n@@ -526,7 +530,9 @@ secstream_h1(struct lws *wsi, enum lws_callback_reasons reason, void *user,\n \t\tif (!h)\n \t\t\treturn -1;\n \n+#if defined(LWS_WITH_CONMON)\n \t\tlws_conmon_ss_json(h);\n+#endif\n \n \t\tstatus \u003d (int)lws_http_client_http_response(wsi);\n \t\tlwsl_info(\u0022%s: LWS_CALLBACK_ESTABLISHED_CLIENT_HTTP: %d\u005cn\u0022, __func__, status);\ndiff --git a/lib/secure-streams/protocols/ss-mqtt.c b/lib/secure-streams/protocols/ss-mqtt.c\nindex 2c46eec..9c0ec0e 100644\n--- a/lib/secure-streams/protocols/ss-mqtt.c\n+++ b/lib/secure-streams/protocols/ss-mqtt.c\n@@ -66,7 +66,9 @@ secstream_mqtt(struct lws *wsi, enum lws_callback_reasons reason, void *user,\n \t\tif (!h)\n \t\t\tbreak;\n \n+#if defined(LWS_WITH_CONMON)\n \t\tlws_conmon_ss_json(h);\n+#endif\n \n \t\tr \u003d lws_ss_event_helper(h, LWSSSCS_UNREACHABLE);\n \t\th-\u003ewsi \u003d NULL;\n@@ -86,9 +88,9 @@ secstream_mqtt(struct lws *wsi, enum lws_callback_reasons reason, void *user,\n \t\tif (!h)\n \t\t\tbreak;\n \t\tlws_sul_cancel(\u0026h-\u003esul_timeout);\n-\n+#if defined(LWS_WITH_CONMON)\n \t\tlws_conmon_ss_json(h);\n-\n+#endif\n \t\tif (h-\u003ess_dangling_connected)\n \t\t\tr \u003d lws_ss_event_helper(h, LWSSSCS_DISCONNECTED);\n \t\telse\ndiff --git a/lib/secure-streams/protocols/ss-raw.c b/lib/secure-streams/protocols/ss-raw.c\nindex 31516dd..76b11ea 100644\n--- a/lib/secure-streams/protocols/ss-raw.c\n+++ b/lib/secure-streams/protocols/ss-raw.c\n@@ -48,7 +48,9 @@ secstream_raw(struct lws *wsi, enum lws_callback_reasons reason, void *user,\n \t\tlwsl_info(\u0022%s: %s, %s CLIENT_CONNECTION_ERROR: %s\u005cn\u0022, __func__,\n \t\t\t lws_ss_tag(h), h-\u003epolicy-\u003estreamtype, in ? (char *)in : \u0022(null)\u0022);\n \n+#if defined(LWS_WITH_CONMON)\n \t\tlws_conmon_ss_json(h);\n+#endif\n \n \t\tr \u003d lws_ss_event_helper(h, LWSSSCS_UNREACHABLE);\n \t\tif (r \u003d\u003d LWSSSSRET_DESTROY_ME)\n@@ -64,7 +66,9 @@ secstream_raw(struct lws *wsi, enum lws_callback_reasons reason, void *user,\n \t\t\tbreak;\n \t\tlws_sul_cancel(\u0026h-\u003esul_timeout);\n \n+#if defined(LWS_WITH_CONMON)\n \t\tlws_conmon_ss_json(h);\n+#endif\n \n \t\tlwsl_info(\u0022%s: %s, %s RAW_CLOSE\u005cn\u0022, __func__, lws_ss_tag(h),\n \t\t\t h-\u003epolicy ? h-\u003epolicy-\u003estreamtype : \u0022no policy\u0022);\ndiff --git a/lib/secure-streams/protocols/ss-ws.c b/lib/secure-streams/protocols/ss-ws.c\nindex e2ffe2c..39bdda1 100644\n--- a/lib/secure-streams/protocols/ss-ws.c\n+++ b/lib/secure-streams/protocols/ss-ws.c\n@@ -46,7 +46,9 @@ secstream_ws(struct lws *wsi, enum lws_callback_reasons reason, void *user,\n \t\tif (!h)\n \t\t\tbreak;\n \n+#if defined(LWS_WITH_CONMON)\n \t\tlws_conmon_ss_json(h);\n+#endif\n \n \t\tr \u003d lws_ss_event_helper(h, LWSSSCS_UNREACHABLE);\n \t\tif (r \u003d\u003d LWSSSSRET_DESTROY_ME)\n@@ -64,7 +66,9 @@ secstream_ws(struct lws *wsi, enum lws_callback_reasons reason, void *user,\n \t\t\tbreak;\n \t\tlws_sul_cancel(\u0026h-\u003esul_timeout);\n \n+#if defined(LWS_WITH_CONMON)\n \t\tlws_conmon_ss_json(h);\n+#endif\n \n \t\tr \u003d lws_ss_event_helper(h, LWSSSCS_DISCONNECTED);\n \t\tif (r \u003d\u003d LWSSSSRET_DESTROY_ME)\ndiff --git a/lib/secure-streams/secure-streams-process.c b/lib/secure-streams/secure-streams-process.c\nindex eda1a5b..d5822b6 100644\n--- a/lib/secure-streams/secure-streams-process.c\n+++ b/lib/secure-streams/secure-streams-process.c\n@@ -608,6 +608,7 @@ callback_ss_proxy(struct lws *wsi, enum lws_callback_reasons reason,\n \t\t\t * priority 2\n \t\t\t */\n \n+#if defined(LWS_WITH_CONMON)\n \t\t\tif (conn-\u003ess-\u003econmon_json) {\n \t\t\t\tunsigned int xlen \u003d conn-\u003ess-\u003econmon_len;\n \n@@ -625,7 +626,7 @@ callback_ss_proxy(struct lws *wsi, enum lws_callback_reasons reason,\n \t\t\t\tpay \u003d 0;\n \t\t\t\tgoto again;\n \t\t\t}\n-\n+#endif\n \t\t\t/*\n \t\t\t * if no fresh rx metadata, just pass through incoming\n \t\t\t * dsh\n","s":{"c":1752654213,"u": 3901}} ],"g": 5642,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}