Update run time data in /var/run/icwmpd

This commit is contained in:
Neeraj Bijalwan 2022-01-06 12:47:53 +00:00 committed by Vivek Kumar Dutta
parent 6a03433e3b
commit 9b22b59edf
5 changed files with 12 additions and 12 deletions

6
cwmp.c
View file

@ -566,9 +566,9 @@ int create_cwmp_var_state_files()
else
return CWMP_GEN_ERR;
}
if (!folder_exists("/var/state/icwmpd")) {
if (mkdir("/var/state/icwmpd", S_IRWXU | S_IRWXG | S_IRWXO) == -1) {
CWMP_LOG(INFO, "Not able to create the folder /var/state/icwmpd");
if (!folder_exists("/var/run/icwmpd")) {
if (mkdir("/var/run/icwmpd", S_IRWXU | S_IRWXG | S_IRWXO) == -1) {
CWMP_LOG(INFO, "Not able to create the folder /var/run/icwmpd");
return CWMP_GEN_ERR;
}
}

View file

@ -21,7 +21,7 @@
#define RPC_SEND 1
#define CWMP_BACKUP_SESSION "<cwmp></cwmp>"
#define CWMP_BKP_FILE "/var/state/icwmpd/.icwmpd_backup_session.xml"
#define CWMP_BKP_FILE "/var/run/icwmpd/icwmpd_backup_session.xml"
typedef enum backup_loading
{
ALL,

View file

@ -48,8 +48,8 @@ extern struct list_head list_param_obj_notify;
uci_foreach_element(list_notif, e) { \*/
#define DM_ENABLED_NOTIFY "/var/state/icwmpd/.dm_enabled_notify"
#define NOTIFY_FILE "/etc/icwmpd/.icwmpd_notify"
#define DM_ENABLED_NOTIFY "/var/run/icwmpd/dm_enabled_notify"
#define NOTIFY_FILE "/etc/icwmpd/icwmpd_notify"
void ubus_check_value_change_callback(struct ubus_request *req, int type, struct blob_attr *msg);
void cwmp_update_enabled_notify_file(void);
int check_value_change(void);

View file

@ -38,7 +38,7 @@ if [[ $notif2 != *"Device.WiFi.SSID.1.SSID"* ]]; then
exit 1
fi
rm /etc/icwmpd/.icwmpd_notify
rm /etc/icwmpd/icwmpd_notify
echo "PASS test valid custom notification json file"
@ -75,7 +75,7 @@ fi
echo "PASS test custom notification invalid json file"
rm /etc/icwmpd/.icwmpd_notify
rm /etc/icwmpd/icwmpd_notify
#
# Test custom notification json file containing forced active notification
@ -110,7 +110,7 @@ fi
echo "PASS test custom notification json file containing forced active notification"
rm /etc/icwmpd/.icwmpd_notify
rm /etc/icwmpd/icwmpd_notify
#
# Test custom notification json file containing invalid parameter path
@ -145,6 +145,6 @@ fi
echo "PASS test custom notification json file containing invalid parameter path"
rm /etc/icwmpd/.icwmpd_notify
rm /etc/icwmpd/icwmpd_notify
echo "PASS: $TEST_NAME"
echo "PASS: $TEST_NAME"

View file

@ -19,7 +19,7 @@ if [ "$status" != "1" ]; then
exit 1
fi
rm /etc/icwmpd/.dm_enabled_notify
rm /etc/icwmpd/dm_enabled_notify
remove_icwmp_log
echo "Restarting icwmpd in order to apply the new firmware" >> ./funl-test-debug.log
supervisorctl restart icwmpd >> ./funl-test-debug.log