diff --git a/src/builder/b-artifacts.c b/src/builder/b-artifacts.c
index 4f3f70b..17e5ce2 100644
--- a/src/builder/b-artifacts.c
+++ b/src/builder/b-artifacts.c
@@ -123,7 +123,7 @@ saib_artifact_state(void *userobj, void *sh, lws_ss_constate_t state,
sai_artifact_t *ap = (sai_artifact_t *)userobj;
struct stat s;
- lwsl_info("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name((int)state),
+ lwsl_info("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name(state),
(unsigned int)ack);
switch (state) {
diff --git a/src/builder/b-comms.c b/src/builder/b-comms.c
index 479ee86..95cce9a 100644
--- a/src/builder/b-comms.c
+++ b/src/builder/b-comms.c
@@ -546,7 +546,7 @@ saib_m_state(void *userobj, void *sh, lws_ss_constate_t state,
const char *pq;
int n;
- lwsl_user("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name((int)state),
+ lwsl_user("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name(state),
(unsigned int)ack);
switch (state) {
diff --git a/src/builder/b-sai.c b/src/builder/b-sai.c
index 8cf95e5..d944a98 100644
--- a/src/builder/b-sai.c
+++ b/src/builder/b-sai.c
@@ -556,7 +556,7 @@ sai_power_link_state(void *userobj, void *sh, lws_ss_constate_t state,
lwsl_ss_user(lws_ss_from_user(g), "state %s", lws_ss_state_name(state));
- switch ((int)state) {
+ switch (state) {
case LWSSSCS_CREATING:
snprintf(path, sizeof(path) - 1, "%s/power-off/%s",
builder.url_sai_power,
@@ -569,7 +569,9 @@ sai_power_link_state(void *userobj, void *sh, lws_ss_constate_t state,
lwsl_err("%s: set_metadata said %d\n", __func__, (int)r);
return lws_ss_request_tx(lws_ss_from_user(g));
- }
+ default:
+ break;
+ }
return LWSSSSRET_OK;
}
diff --git a/src/common/ss-client-logproxy.c b/src/common/ss-client-logproxy.c
index 166e6e7..adbc7a0 100644
--- a/src/common/ss-client-logproxy.c
+++ b/src/common/ss-client-logproxy.c
@@ -173,7 +173,7 @@ saicom_lp_state(void *userobj, void *sh, lws_ss_constate_t state,
{
said_logproxy_t *lp = (said_logproxy_t *)userobj;
- lwsl_info("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name((int)state),
+ lwsl_info("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name(state),
(unsigned int)ack);
switch (state) {
diff --git a/src/power/p-comms.c b/src/power/p-comms.c
index 4823b43..b7794ff 100644
--- a/src/power/p-comms.c
+++ b/src/power/p-comms.c
@@ -44,8 +44,8 @@ saip_m_rx(void *userobj, const uint8_t *buf, size_t len, int flags)
char plat[128];
size_t n;
- lwsl_notice("%s: len %d, flags: %d (saip_server_t %p)\n", __func__, (int)len, flags, (void *)sps);
- lwsl_hexdump_notice(buf, len);
+ lwsl_info("%s: len %d, flags: %d (saip_server_t %p)\n", __func__, (int)len, flags, (void *)sps);
+ lwsl_hexdump_info(buf, len);
while (p < end) {
n = 0;
@@ -125,14 +125,14 @@ saip_m_state(void *userobj, void *sh, lws_ss_constate_t state,
const char *pq;
int n;
- lwsl_user("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name((int)state),
+ lwsl_info("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name(state),
(unsigned int)ack);
switch (state) {
case LWSSSCS_CREATING:
- lwsl_notice("%s: binding ss to %p %s\n", __func__, sps, sps->url);
+ lwsl_info("%s: binding ss to %p %s\n", __func__, sps, sps->url);
if (lws_ss_set_metadata(sps->ss, "url", sps->url, strlen(sps->url)))
lwsl_warn("%s: unable to set metadata\n", __func__);
@@ -175,7 +175,7 @@ saip_m_state(void *userobj, void *sh, lws_ss_constate_t state,
break;
case LWSSSCS_CONNECTED:
- lwsl_user("%s: CONNECTED: %p\n", __func__, sps->ss);
+ lwsl_info("%s: CONNECTED: %p\n", __func__, sps->ss);
return lws_ss_request_tx(sps->ss);
case LWSSSCS_DISCONNECTED:
@@ -183,17 +183,17 @@ saip_m_state(void *userobj, void *sh, lws_ss_constate_t state,
* clean up any ongoing spawns related to this connection
*/
- lwsl_user("%s: DISCONNECTED\n", __func__);
+ lwsl_info("%s: DISCONNECTED\n", __func__);
lws_dll2_foreach_safe(&power.sai_server_owner, sps,
cleanup_on_ss_disconnect);
break;
case LWSSSCS_ALL_RETRIES_FAILED:
- lwsl_user("%s: LWSSSCS_ALL_RETRIES_FAILED\n", __func__);
+ lwsl_info("%s: LWSSSCS_ALL_RETRIES_FAILED\n", __func__);
return lws_ss_request_tx(sps->ss);
case LWSSSCS_QOS_ACK_REMOTE:
- lwsl_notice("%s: LWSSSCS_QOS_ACK_REMOTE\n", __func__);
+ lwsl_info("%s: LWSSSCS_QOS_ACK_REMOTE\n", __func__);
break;
default:
@@ -203,10 +203,7 @@ saip_m_state(void *userobj, void *sh, lws_ss_constate_t state,
return LWSSSSRET_OK;
}
-LWS_SS_INFO("power_server_link", saip_server_link_t)
+LWS_SS_INFO("sai_power", saip_server_link_t)
.rx = saip_m_rx,
-// .tx = saip_m_tx,
.state = saip_m_state,
- .user_alloc = sizeof(saip_server_link_t),
- .streamtype = "sai_power"
};
diff --git a/src/power/p-sai.c b/src/power/p-sai.c
index b27bc48..999b982 100644
--- a/src/power/p-sai.c
+++ b/src/power/p-sai.c
@@ -236,7 +236,7 @@ local_srv_tx(void *userobj, lws_ss_tx_ordinal_t ord, uint8_t *buf, size_t *len,
else
*flags |= LWSSS_FLAG_EOM;
- lwsl_ss_user(lws_ss_from_user(g), "TX %zu, flags 0x%x, r %d", *len,
+ lwsl_ss_info(lws_ss_from_user(g), "TX %zu, flags 0x%x, r %d", *len,
(unsigned int)*flags, (int)r);
return r;
@@ -269,7 +269,7 @@ local_srv_state(void *userobj, void *sh, lws_ss_constate_t state,
char *path = NULL, pn[128];
size_t len;
- lwsl_ss_user(lws_ss_from_user(g), "state %s", lws_ss_state_name(state));
+ // lwsl_ss_user(lws_ss_from_user(g), "state %s", lws_ss_state_name((int)state));
switch ((int)state) {
case LWSSSCS_CREATING:
@@ -278,7 +278,7 @@ local_srv_state(void *userobj, void *sh, lws_ss_constate_t state,
case LWSSSCS_SERVER_TXN:
lws_ss_get_metadata(lws_ss_from_user(g), "path", (const void **)&path, &len);
- lwsl_ss_user(lws_ss_from_user(g), "LWSSSCS_SERVER_TXN path %.*s", (int)len, path);
+ // lwsl_ss_user(lws_ss_from_user(g), "LWSSSCS_SERVER_TXN path %.*s", (int)len, path);
/*
* path is containing a string like "/power-off/b32"
diff --git a/src/power/p-smartplug.c b/src/power/p-smartplug.c
index f7bc668..866c58a 100644
--- a/src/power/p-smartplug.c
+++ b/src/power/p-smartplug.c
@@ -59,10 +59,6 @@ saip_spc_state(void *userobj, void *sh, lws_ss_constate_t state,
return LWSSSSRET_OK;
}
-LWS_SS_INFO("smartplug_control", saip_smartplug_t)
-// .rx = saip_spc_rx,
-// .tx = saip_spc_tx,
+LWS_SS_INFO("sai_power_smartplug", saip_smartplug_t)
.state = saip_spc_state,
- .user_alloc = sizeof(saip_smartplug_t),
- .streamtype = "sai_power_smartplug"
};
diff --git a/src/resource/r-comms.c b/src/resource/r-comms.c
index f78279a..56d1a2c 100644
--- a/src/resource/r-comms.c
+++ b/src/resource/r-comms.c
@@ -76,7 +76,7 @@ sair_lp_state(void *userobj, void *sh, lws_ss_constate_t state,
{
sair_resource_t *lp = (sair_resource_t *)userobj;
- lwsl_info("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name((int)state),
+ lwsl_info("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name(state),
(unsigned int)ack);
switch (state) {
diff --git a/src/server/s-websrv.c b/src/server/s-websrv.c
index f573b6e..79f5368 100644
--- a/src/server/s-websrv.c
+++ b/src/server/s-websrv.c
@@ -121,8 +121,6 @@ _sais_websrv_broadcast(struct lws_ss_handle *h, void *arg)
websrvss_srv_t *m = (websrvss_srv_t *)lws_ss_to_user_object(h);
sais_websrv_broadcast_t *a = (sais_websrv_broadcast_t *)arg;
- lwsl_err("%s: entry\n", __func__);
-
if (lws_buflist_append_segment(&m->bltx, a->buf, a->len) < 0) {
lwsl_warn("%s: buflist append fail\n", __func__);
@@ -289,8 +287,8 @@ websrvss_ws_rx(void *userobj, const uint8_t *buf, size_t len, int flags)
lws_dll2_owner_t o;
int n;
- lwsl_user("%s: len %d, flags: %d\n", __func__, (int)len, flags);
- lwsl_hexdump_info(buf, len);
+ // lwsl_user("%s: len %d, flags: %d\n", __func__, (int)len, flags);
+ // lwsl_hexdump_info(buf, len);
memset(&a, 0, sizeof(a));
a.map_st[0] = lsm_schema_json_map;
@@ -307,7 +305,7 @@ websrvss_ws_rx(void *userobj, const uint8_t *buf, size_t len, int flags)
return LWSSSSRET_DISCONNECT_ME;
}
- lwsl_notice("%s: schema idx %d\n", __func__, a.top_schema_index);
+ // lwsl_notice("%s: schema idx %d\n", __func__, a.top_schema_index);
switch (a.top_schema_index) {
case SAIS_WS_WEBSRV_RX_TASKRESET:
@@ -485,8 +483,6 @@ websrvss_ws_tx(void *userobj, lws_ss_tx_ordinal_t ord, uint8_t *buf,
char som, eom;
int used;
- lwsl_err("%s: entry\n", __func__);
-
if (!m->bltx)
return LWSSSSRET_TX_DONT_SEND;
diff --git a/src/web/w-websrv.c b/src/web/w-websrv.c
index 3d9316f..1344e60 100644
--- a/src/web/w-websrv.c
+++ b/src/web/w-websrv.c
@@ -72,8 +72,8 @@ saiw_lp_rx(void *userobj, const uint8_t *buf, size_t len, int flags)
sai_browse_rx_evinfo_t *ei;
int n;
- lwsl_user("%s: len %d, flags: %d\n", __func__, (int)len, flags);
- lwsl_hexdump_notice(buf, len);
+// lwsl_user("%s: len %d, flags: %d\n", __func__, (int)len, flags);
+// lwsl_hexdump_notice(buf, len);
if (flags & LWSSS_FLAG_SOM) {
memset(&m->a, 0, sizeof(m->a));
@@ -194,7 +194,7 @@ saiw_lp_state(void *userobj, void *sh, lws_ss_constate_t state,
saiw_websrv_t *m = (saiw_websrv_t *)userobj;
struct vhd *vhd = (struct vhd *)m->opaque_data;
- lwsl_user("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name((int)state),
+ lwsl_info("%s: %s, ord 0x%x\n", __func__, lws_ss_state_name((int)state),
(unsigned int)ack);
switch (state) {
@@ -202,7 +202,7 @@ saiw_lp_state(void *userobj, void *sh, lws_ss_constate_t state,
break;
case LWSSSCS_CONNECTED:
- lwsl_notice("%s: connected to websrv uds\n", __func__);
+ lwsl_info("%s: connected to websrv uds\n", __func__);
return lws_ss_request_tx(m->ss);
case LWSSSCS_DISCONNECTED:
diff --git a/src/web/w-ws-browser.c b/src/web/w-ws-browser.c
index 16f1432..1f1f42d 100644
--- a/src/web/w-ws-browser.c
+++ b/src/web/w-ws-browser.c
@@ -954,8 +954,6 @@ so_finish:
pss->authorized, pss->authorized ? pss->expiry_unix_time - lws_now_secs() : 0,
lws_json_purify(esc1, pss->auth_user, sizeof(esc1) - 1, &iu));
- lwsl_err("%s: vhd %p vhd->builders %p\n", __func__, vhd, vhd ? vhd->builders : NULL);
-
if (vhd && vhd->builders) {
lwsac_reference(vhd->builders);
sch->walk = lws_dll2_get_head(vhd->builders_owner);
@@ -1074,8 +1072,8 @@ b_finish:
sai_task_uuid_to_event_uuid(event_uuid,
sch->one_task->uuid);
- lwsl_debug("%s: ---------------- event uuid '%s'\n",
- __func__, event_uuid);
+ //lwsl_debug("%s: ---------------- event uuid '%s'\n",
+ // __func__, event_uuid);
lws_dll2_owner_clear(&sch->owner);
if (!sais_event_db_ensure_open(vhd, event_uuid, 0, &pdb)) {
@@ -1083,7 +1081,7 @@ b_finish:
lws_snprintf(filt, sizeof(filt), " and (task_uuid == '%s')",
sch->one_task->uuid);
- lwsl_debug("%s: ---------------- %s\n", __func__, filt);
+ // lwsl_debug("%s: ---------------- %s\n", __func__, filt);
if (lws_struct_sq3_deserialize(pdb, filt, NULL,
lsm_schema_sq3_map_artifact,
@@ -1099,7 +1097,7 @@ b_finish:
sch->walk = NULL;
pss->send_state = WSS_SEND_ARTIFACT_INFO;
if (!sch->owner.head) {
- lwsl_debug("%s: ---------------- no artifacts\n", __func__);
+ // lwsl_debug("%s: ---------------- no artifacts\n", __func__);
/* there's no artifact stuff to do */
endo = 1;
} else
@@ -1152,7 +1150,7 @@ b_finish:
}
first = 1;
p += w;
- lwsl_warn("%s: --------------------- %.*s\n", __func__, (int)w, start);
+ // lwsl_warn("%s: --------------------- %.*s\n", __func__, (int)w, start);
}
if (!sch->owner.head)
![[]](/git/avatar/c50933ca2aa61e0fe2c43d46bb6b59cb_avatar){kind=avatar}
Andy Green <andy@warmcat.com> 2025-07-05 10:47 UTC