diff --git a/schemas/uci/cwmp.json b/schemas/uci/cwmp.json index 1bba0e5..18f362d 100644 --- a/schemas/uci/cwmp.json +++ b/schemas/uci/cwmp.json @@ -103,6 +103,13 @@ "default": "", "description": "the **url** of ACS server received from the DHCP server via Option 43. This parameter is automatically updated by daemon, When **'dhcp_discovery'** option is enabled." }, + { + "name": "ip_version", + "type": "string", + "required": "no", + "default": "", + "description": "IP version of ConnectionRequestURL" + }, { "name": "get_rpc_methods", "type": "boolean", @@ -326,6 +333,13 @@ "required": "no", "default": "", "description": "This configure firewall rules. Allowed values . IP_Only means only acs ip as source ip used for firewall input rule, Port_Only means only destination port will be used and IP_Port or empty value meaning both ip and port will be used for firewall input rule." + }, + { + "name": "force_ipv4", + "type": "boolean", + "required": "no", + "default": "", + "description": "If set to 1, it forces the connectivity over v4 IP address." } ] }, diff --git a/src/common.c b/src/common.c index ee86459..1c81442 100755 --- a/src/common.c +++ b/src/common.c @@ -987,7 +987,7 @@ int cwmp_strcmp(const char *s1, const char *s2, const char *origin, int pos) if (s1 != NULL && s2 != NULL) return strcmp(s1, s2); else { - CWMP_LOG(ERROR, "%s:%d NULL argument found", origin, pos); + CWMP_LOG(WARNING, "%s:%d NULL argument found", origin, pos); return -1; } } @@ -997,7 +997,7 @@ int cwmp_strncmp(const char *s1, const char *s2, int len, const char *origin, in if (s1 != NULL && s2 != NULL && len > 0) return strncmp(s1, s2, len); else { - CWMP_LOG(ERROR, "%s:%d NULL argument found", origin, pos); + CWMP_LOG(WARNING, "%s:%d NULL argument found", origin, pos); return -1; } } @@ -1007,7 +1007,7 @@ int cwmp_strlen(const char *s1, const char *origin, int pos) if (s1 != NULL) return strlen(s1); else { - CWMP_LOG(ERROR, "%s:%d NULL argument found", origin, pos); + CWMP_LOG(WARNING, "%s:%d NULL argument found", origin, pos); return 0; } } @@ -1017,7 +1017,7 @@ int cwmp_strcasecmp(const char *s1, const char *s2, const char *origin, int pos) if (s1 != NULL && s2 != NULL) return strcasecmp(s1, s2); else { - CWMP_LOG(ERROR, "%s:%d NULL argument found", origin, pos); + CWMP_LOG(WARNING, "%s:%d NULL argument found", origin, pos); return -1; } } @@ -1027,7 +1027,7 @@ char *cwmp_strstr(const char *s1, const char *s2, const char *origin, int pos) if (s1 != NULL && s2 != NULL) return strstr(s1, s2); else { - CWMP_LOG(ERROR, "%s:%d NULL argument found", origin, pos); + CWMP_LOG(WARNING, "%s:%d NULL argument found", origin, pos); return NULL; } } @@ -1041,7 +1041,7 @@ char *cwmp_strncpy(char *dst, const char *src, int size, const char *origin, int strncpy(dst, src, size - 1); dst[size - 1] = '\0'; } else { - CWMP_LOG(ERROR, "%s:%d NULL argument found", origin, pos); + CWMP_LOG(WARNING, "%s:%d NULL argument found", origin, pos); } return dst; @@ -1052,7 +1052,7 @@ char *cwmp_strdup(const char *s1, const char *origin, int pos) if (s1) return strdup(s1); else { - CWMP_LOG(ERROR, "%s:%d NULL argument found", origin, pos); + CWMP_LOG(WARNING, "%s:%d NULL argument found", origin, pos); return NULL; } } @@ -1062,7 +1062,7 @@ void *cwmp_memset(void *src, int val, size_t size, const char *origin, int pos) if (src) return memset(src, val, size); else { - CWMP_LOG(ERROR, "%s:%d NULL argument found", origin, pos); + CWMP_LOG(WARNING, "%s:%d NULL argument found", origin, pos); return NULL; } } @@ -1072,7 +1072,7 @@ void *cwmp_memcpy(void *dst, const void *src, size_t size, const char *origin, i if (dst != NULL && src != NULL) return memcpy(dst, src, size); else { - CWMP_LOG(ERROR, "%s:%d NULL argument found", origin, pos); + CWMP_LOG(WARNING, "%s:%d NULL argument found", origin, pos); return dst; } }