From ef7847627018517abb3d48275e433ff022bc63e1 Mon Sep 17 00:00:00 2001
From: Suvendhu Hansa <suvendhu.hansa@iopsys.eu>
Date: Thu, 20 Jul 2023 09:54:50 +0000
Subject: [PATCH] Probable fix for failure to send inform on CR

During debugging it was observed that main cwmp process was stuck at uloop, this might occur due to ubus operation inside thread, as ubus is not thread safe.
---
 src/config.c |  2 +-
 src/http.c   | 29 +++++------------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/src/config.c b/src/config.c
index fab30b7..5b8cde2 100755
--- a/src/config.c
+++ b/src/config.c
@@ -247,7 +247,7 @@ static void config_get_acs_elements(struct uci_section *s)
 
 	char *url = get_value_from_uci_option(acs_tb[UCI_ACS_URL]);
 	char *dhcp_url = get_value_from_uci_option(acs_tb[UCI_ACS_DHCP_URL]);
-	snprintf(cwmp_main->conf.acs_url, sizeof(cwmp_main->conf.acs_url), "%s", cwmp_main->conf.dhcp_discovery ? dhcp_url : url);
+	snprintf(cwmp_main->conf.acs_url, sizeof(cwmp_main->conf.acs_url), "%s", cwmp_main->conf.dhcp_discovery ? (strlen(dhcp_url) ? dhcp_url : url) : url);
 	CWMP_LOG(DEBUG, "CWMP CONFIG - acs url: %s", cwmp_main->conf.acs_url);
 
 	snprintf(cwmp_main->conf.acs_userid, sizeof(cwmp_main->conf.acs_userid), "%s", get_value_from_uci_option(acs_tb[UCI_ACS_USERID]));
diff --git a/src/http.c b/src/http.c
index 26f1fdb..3a466ea 100644
--- a/src/http.c
+++ b/src/http.c
@@ -260,35 +260,16 @@ error:
 	return -1;
 }
 
-static void inform_status_check_cb(struct ubus_request *req, int type __attribute__((unused)), struct blob_attr *msg)
-{
-	if (msg == NULL) {
-		CWMP_LOG(ERROR, "inform ubus call resp msg is null");
-		return;
-	}
-
-	int *status = (int *)req->priv;
-	const struct blobmsg_policy p[2] = { { "status", BLOBMSG_TYPE_INT32 }, { "info", BLOBMSG_TYPE_STRING } };
-	struct blob_attr *tb[2] = { NULL, NULL };
-	blobmsg_parse(p, 2, tb, blobmsg_data(msg), blobmsg_len(msg));
-
-	*status = tb[0] ? blobmsg_get_u32(tb[0]) : -1;
-}
-
 static void http_success_cr(void)
 {
 	CWMP_LOG(INFO, "Connection Request triggering ...");
-	int status = -1, retry = 0, rc = -1;
-	struct blob_buf b = { 0 };
-	memset(&b, 0, sizeof(struct blob_buf));
-	blob_buf_init(&b, 0);
-	while ((rc < 0 || status != 1) && retry < 5) {
-		rc = icwmp_ubus_invoke("tr069", "inform", b.head, inform_status_check_cb, &status);
+	int retry = 0, rc = -1;
+	while (rc != 0 && retry < 5) {
+		rc = system("ubus call tr069 inform");
 		retry = retry + 1;
 	}
 
-	blob_buf_free(&b);
-	if (rc < 0 || status != 1)
+	if (rc != 0)
 		CWMP_LOG(ERROR, "Failed to send Inform message after 5 retry");
 }
 
@@ -368,7 +349,7 @@ static void http_cr_new_client(int client, bool service_available)
 			break;
 		}
 
-		if (read_bytes == 0) {
+		if (read_bytes < 1) {
 			/* It means the client has been disconnected */
 			CWMP_LOG(INFO, "client disconnected");
 			break;