mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2026-01-28 01:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

code cleanup and optimize

Browse source
This commit is contained in:
suvendhu 2022-07-29 20:05:37 +05:30
parent d36c03529b
commit d5a4f6bf0d
4 changed files with 37 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common.c
View file

@ -769,13 +769,13 @@ time_t convert_datetime_to_timestamp(char *value)
return mktime(&tm);
}
bool uci_str_to_bool(char *value)
bool cwmp_str_to_bool(char *value)
{
if (!value)
if (value == NULL)
return false;
if (strncasecmp(value, "true", 4) == 0 ||
value[0] == '1' ||
(value[0] == '1') ||
strncasecmp(value, "on", 2) == 0 ||
strncasecmp(value, "yes", 3) == 0 ||
strncasecmp(value, "enable", 6) == 0)

6
src/common.h
View file

@ -27,7 +27,11 @@
#endif
#define CWMP_STRCMP(S1, S2) ((S1 != NULL && S2 != NULL) ? strcmp(S1, S2) : -1)
#define CWMP_STRNCMP(S1, S2, SIZE) ((S1 != NULL && S2 != NULL && SIZE > 0) ? strncmp(S1, S2, SIZE) : -1)
#define CWMP_STRCASECMP(S1, S2) ((S1 != NULL && S2 != NULL) ? strcasecmp(S1, S2) : -1)
#define CWMP_STRNCASECMP(S1, S2, SIZE) ((S1 != NULL && S2 != NULL && SIZE > 0) ? strncasecmp(S1, S2, SIZE) : -1)
#define CWMP_STRDUP(S1) ((S1 != NULL) ? strdup(S1) : NULL)
#define CWMP_STRDUP_DEF(S1, DEF) ((S1 != NULL) ? strdup(S1) : strdup(DEF))
#define CWMP_STRLEN(S1) ((S1 != NULL) ? strlen(S1) : 0)
#define CWMP_STRNCPY(DST, SRC, SIZE) \
@ -545,7 +549,7 @@ int cwmp_get_retry_interval(struct cwmp *cwmp, bool heart_beat);
int cwmp_schedule_rpc(struct cwmp *cwmp, struct session *session);
int run_session_end_func(void);
void set_interface_reset_request(char *param_name, char *value);
bool uci_str_to_bool(char *value);
bool cwmp_str_to_bool(char *value);
bool match_reg_exp(char *reg_exp, char *param_name);
#endif

68
src/config.c
View file

@ -47,7 +47,8 @@ void get_dhcp_vend_info_cb(struct ubus_request *req, int type __attribute__((unu
};
blobmsg_for_each_attr(param, msg, rem) {
if (strcmp(blobmsg_name(param), "data") == 0) {
const char *p_name = blobmsg_name(param);
if (p_name != NULL && strcmp(p_name, "data") == 0) {
struct blob_attr *tb[__E_MAX] = {NULL};
if (blobmsg_parse(p, __E_MAX, tb, blobmsg_data(param), blobmsg_len(param)) != 0) {
return;
@ -55,7 +56,7 @@ void get_dhcp_vend_info_cb(struct ubus_request *req, int type __attribute__((unu
if (tb[E_VENDOR_INFO]) {
char *info = blobmsg_get_string(tb[E_VENDOR_INFO]);
int len = strlen(info) + 1;
int len = CWMP_STRLEN(info) + 1;
*v_info = (char *)malloc(len);
if (*v_info == NULL)
return;
@ -227,11 +228,9 @@ static void config_get_cpe_elements(struct config *conf, struct uci_section *s)
}
conf->supported_amd_version = conf->amd_version;
CWMP_LOG(DEBUG, "CWMP CONFIG - amendement version: %d", conf->amd_version);
if (cpe_tb[UCI_CPE_DEFAULT_WAN_IFACE]) {
conf->default_wan_iface = strdup(get_value_from_uci_option(cpe_tb[UCI_CPE_DEFAULT_WAN_IFACE]));
} else {
conf->default_wan_iface = strdup("wan");
}
char *intf = get_value_from_uci_option(cpe_tb[UCI_CPE_DEFAULT_WAN_IFACE]);
conf->default_wan_iface = CWMP_STRDUP_DEF(intf, "wan");
CWMP_LOG(DEBUG, "CWMP CONFIG - default wan interface: %s", conf->default_wan_iface);
}
@ -256,16 +255,16 @@ static void config_get_acs_elements(struct config *conf, struct uci_section *s)
memset(acs_tb, 0, sizeof(acs_tb));
uci_parse_section(s, acs_opts, __MAX_NUM_UCI_ACS_ATTRS, acs_tb);
conf->ipv6_enable = uci_str_to_bool(get_value_from_uci_option(acs_tb[UCI_ACS_IPV6_ENABLE]));
conf->ipv6_enable = cwmp_str_to_bool(get_value_from_uci_option(acs_tb[UCI_ACS_IPV6_ENABLE]));
CWMP_LOG(DEBUG, "CWMP CONFIG - ipv6 enable: %d", conf->ipv6_enable);
conf->acs_ssl_capath = CWMP_STRDUP(get_value_from_uci_option(acs_tb[UCI_ACS_SSL_CAPATH]));
CWMP_LOG(DEBUG, "CWMP CONFIG - acs ssl cpath: %s", conf->acs_ssl_capath ? conf->acs_ssl_capath : "");
conf->http_disable_100continue = uci_str_to_bool(get_value_from_uci_option(acs_tb[HTTP_DISABLE_100CONTINUE]));
conf->http_disable_100continue = cwmp_str_to_bool(get_value_from_uci_option(acs_tb[HTTP_DISABLE_100CONTINUE]));
CWMP_LOG(DEBUG, "CWMP CONFIG - http disable 100continue: %d", conf->http_disable_100continue);
conf->insecure_enable = uci_str_to_bool(get_value_from_uci_option(acs_tb[UCI_ACS_INSECURE_ENABLE]));
conf->insecure_enable = cwmp_str_to_bool(get_value_from_uci_option(acs_tb[UCI_ACS_INSECURE_ENABLE]));
CWMP_LOG(DEBUG, "CWMP CONFIG - acs insecure enable: %d", conf->insecure_enable);
}
@ -286,6 +285,9 @@ int get_preinit_config(struct config *conf)
uci_foreach_element(&pkg->sections, e) {
struct uci_section *s = uci_to_section(e);
if (s == NULL || s->type == NULL)
continue;
if (strcmp(s->type, "acs") == 0) {
config_get_acs_elements(conf, s);
} else if (strcmp(s->type, "cpe") == 0) {
@ -314,7 +316,7 @@ int get_global_config(struct config *conf)
char *value = NULL, *value2 = NULL, *value3 = NULL;
if ((error = uci_get_value(UCI_CPE_CWMP_ENABLE, &value)) == CWMP_OK) {
if (value != NULL && uci_str_to_bool(value) == false) {
if (value != NULL && cwmp_str_to_bool(value) == false) {
FREE(value);
CWMP_LOG(ERROR, "CWMP service is disabled");
exit(0);
@ -333,7 +335,7 @@ int get_global_config(struct config *conf)
// now read the vendor info from ifstatus before reading the DHCP_ACS_URL from uci
if (error == CWMP_OK && value != NULL) {
discovery_enable = uci_str_to_bool(value);
discovery_enable = cwmp_str_to_bool(value);
if (discovery_enable == true && conf->default_wan_iface != NULL) {
get_dhcp_vendor_info(conf->default_wan_iface);
}
@ -380,8 +382,6 @@ int get_global_config(struct config *conf)
conf->compression = COMP_GZIP;
} else if (0 == strcasecmp(value, "deflate")) {
conf->compression = COMP_DEFLATE;
} else {
conf->compression = COMP_NONE;
}
}
FREE(value);
@ -425,24 +425,16 @@ int get_global_config(struct config *conf)
if ((error = uci_get_value(UCI_CPE_USERID_PATH, &value)) == CWMP_OK) {
FREE(conf->cpe_userid);
if (value != NULL) {
conf->cpe_userid = strdup(value);
FREE(value);
} else {
conf->cpe_userid = strdup("");
}
conf->cpe_userid = CWMP_STRDUP_DEF(value, "");
FREE(value);
} else {
return error;
}
if ((error = uci_get_value(UCI_CPE_PASSWD_PATH, &value)) == CWMP_OK) {
FREE(conf->cpe_passwd);
if (value != NULL) {
conf->cpe_passwd = strdup(value);
FREE(value);
} else {
conf->cpe_passwd = strdup("");
}
conf->cpe_passwd = CWMP_STRDUP_DEF(value, "");
FREE(value);
} else {
return error;
}
@ -486,7 +478,7 @@ int get_global_config(struct config *conf)
if ((error = uci_get_value(UCI_CPE_NOTIFY_PERIODIC_ENABLE, &value)) == CWMP_OK) {
bool a = true;
if (value != NULL) {
a = uci_str_to_bool(value);
a = cwmp_str_to_bool(value);
FREE(value);
}
conf->periodic_notify_enable = a;
@ -548,7 +540,7 @@ int get_global_config(struct config *conf)
}
if ((error = uci_get_value(UCI_PERIODIC_INFORM_ENABLE_PATH, &value)) == CWMP_OK) {
conf->periodic_enable = uci_str_to_bool(value);
conf->periodic_enable = cwmp_str_to_bool(value);
FREE(value);
} else {
return error;
@ -583,7 +575,7 @@ int get_global_config(struct config *conf)
}
if ((error = uci_get_value(LW_NOTIFICATION_ENABLE, &value)) == CWMP_OK) {
conf->lw_notification_enable = uci_str_to_bool(value);
conf->lw_notification_enable = cwmp_str_to_bool(value);
FREE(value);
} else {
return error;
@ -591,12 +583,8 @@ int get_global_config(struct config *conf)
if ((error = uci_get_value(LW_NOTIFICATION_HOSTNAME, &value)) == CWMP_OK) {
FREE(conf->lw_notification_hostname);
if (value != NULL) {
conf->lw_notification_hostname = strdup(value);
FREE(value);
} else {
conf->lw_notification_hostname = strdup(conf->acsurl ? conf->acsurl : "");
}
conf->lw_notification_hostname = CWMP_STRDUP_DEF(value, conf->acsurl ? conf->acsurl : "");
FREE(value);
} else {
return error;
}
@ -638,16 +626,12 @@ int get_global_config(struct config *conf)
}
if (uci_get_value(UCI_CPE_JSON_CUSTOM_NOTIFY_FILE, &value) == CWMP_OK) {
FREE(conf->custom_notify_json);
if (value != NULL) {
conf->custom_notify_json = strdup(value);
FREE(value);
} else {
conf->custom_notify_json = NULL;
}
conf->custom_notify_json = CWMP_STRDUP(value);
FREE(value);
}
if ((error = uci_get_value(UCI_ACS_HEARTBEAT_ENABLE, &value)) == CWMP_OK) {
conf->heart_beat_enable = uci_str_to_bool(value);
conf->heart_beat_enable = cwmp_str_to_bool(value);
FREE(value);
} else {
return error;

6
src/log.c
View file

@ -69,7 +69,7 @@ int log_set_on_console(char *value)
if (value == NULL)
return 1;
enable_log_stdout = uci_str_to_bool(value);
enable_log_stdout = cwmp_str_to_bool(value);
return 1;
}
@ -78,7 +78,7 @@ int log_set_on_file(char *value)
if (value == NULL)
return 1;
enable_log_file = uci_str_to_bool(value);
enable_log_file = cwmp_str_to_bool(value);
return 1;
}
@ -87,7 +87,7 @@ int log_set_on_syslog(char *value)
if (value == NULL)
return 1;
enable_log_syslog = uci_str_to_bool(value);
enable_log_syslog = cwmp_str_to_bool(value);
return 1;
}