mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2025-12-10 07:44:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed ubus socket path config

Browse source
This commit is contained in:
suvendhu 2023-09-14 13:56:56 +05:30
parent 9d42524de0
commit 32f5e4ef99
5 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/api/uci/cwmp.md
View file

@ -324,13 +324,6 @@
<td class="td_row_odd"><div class="td_row_odd">/</div></td> <td class="td_row_odd"><div class="td_row_odd">/</div></td>
<td class="td_row_odd"><div class="td_row_odd">CPE Connection request URI path</div></td> <td class="td_row_odd"><div class="td_row_odd">CPE Connection request URI path</div></td>
</tr> </tr>
<tr>
<td class="td_row_even"><div class="td_row_even">ubus_socket</div></td>
<td class="td_row_even"><div class="td_row_even">string</div></td>
<td class="td_row_even"><div class="td_row_even">no</div></td>
<td class="td_row_even"><div class="td_row_even">NULL</div></td>
<td class="td_row_even"><div class="td_row_even">Specifies the path of the ubus socket.</div></td>
</tr>
<tr> <tr>
<td class="td_row_odd"><div class="td_row_odd">provisioning_code</div></td> <td class="td_row_odd"><div class="td_row_odd">provisioning_code</div></td>
<td class="td_row_odd"><div class="td_row_odd">string</div></td> <td class="td_row_odd"><div class="td_row_odd">string</div></td>

7
schemas/uci/cwmp.json
View file

@ -250,13 +250,6 @@
"default": "/", "default": "/",
"description": "CPE Connection request URI path" "description": "CPE Connection request URI path"
}, },
{
"name": "ubus_socket",
"type": "string",
"required": "no",
"default": "NULL",
"description": "Specifies the path of the ubus socket."
},
{ {
"name": "provisioning_code", "name": "provisioning_code",
"type": "string", "type": "string",

1
src/common.h
View file

@ -112,7 +112,6 @@ typedef struct config {
char cpe_userid[BUF_SIZE_256]; char cpe_userid[BUF_SIZE_256];
char cpe_passwd[BUF_SIZE_256]; char cpe_passwd[BUF_SIZE_256];
char custom_notify_json[BUF_SIZE_256]; char custom_notify_json[BUF_SIZE_256];
char ubus_socket[BUF_SIZE_256];
char connection_request_path[BUF_SIZE_256]; char connection_request_path[BUF_SIZE_256];
char auto_tc_transfer_type[BUF_SIZE_16]; char auto_tc_transfer_type[BUF_SIZE_16];
char auto_tc_result_type[BUF_SIZE_16]; char auto_tc_result_type[BUF_SIZE_16];

6
src/config.c
View file

@ -448,7 +448,6 @@ static void configure_var_state(void)
int get_preinit_config() int get_preinit_config()
{ {
#define UCI_CPE_UBUS_SOCKET_PATH "cwmp.cpe.ubus_socket"
#define UCI_CPE_LOG_FILE_NAME "cwmp.cpe.log_file_name" #define UCI_CPE_LOG_FILE_NAME "cwmp.cpe.log_file_name"
#define UCI_CPE_LOG_MAX_SIZE "cwmp.cpe.log_max_size" #define UCI_CPE_LOG_MAX_SIZE "cwmp.cpe.log_max_size"
#define UCI_CPE_ENABLE_STDOUT_LOG "cwmp.cpe.log_to_console" #define UCI_CPE_ENABLE_STDOUT_LOG "cwmp.cpe.log_to_console"
@ -467,10 +466,6 @@ int get_preinit_config()
log_set_severity_idx(value); log_set_severity_idx(value);
FREE(value); FREE(value);
uci_get_value(UCI_CPE_UBUS_SOCKET_PATH, &value);
snprintf(cwmp_main->conf.ubus_socket, sizeof(cwmp_main->conf.ubus_socket), "%s", value ? value : "");
FREE(value);
uci_get_value(UCI_CPE_LOG_FILE_NAME, &value); uci_get_value(UCI_CPE_LOG_FILE_NAME, &value);
log_set_log_file_name(value); log_set_log_file_name(value);
FREE(value); FREE(value);
@ -513,7 +508,6 @@ int get_preinit_config()
cwmp_uci_exit(); cwmp_uci_exit();
CWMP_LOG(DEBUG, "CWMP CONFIG - ubus socket: %s", cwmp_main->conf.ubus_socket);
CWMP_LOG(DEBUG, "CWMP CONFIG - default wan interface: %s", cwmp_main->conf.default_wan_iface); CWMP_LOG(DEBUG, "CWMP CONFIG - default wan interface: %s", cwmp_main->conf.default_wan_iface);
CWMP_LOG(DEBUG, "CWMP CONFIG - amendement version: %d", cwmp_main->conf.amd_version); CWMP_LOG(DEBUG, "CWMP CONFIG - amendement version: %d", cwmp_main->conf.amd_version);

4
src/ubus_utils.c
View file

@ -370,9 +370,7 @@ void bb_add_string(struct blob_buf *bb, const char *name, const char *value)
int icwmp_uloop_ubus_init() int icwmp_uloop_ubus_init()
{ {
char *u_sock_path = strlen(cwmp_main->conf.ubus_socket) ? cwmp_main->conf.ubus_socket : NULL; ubus_ctx = ubus_connect(NULL);
ubus_ctx = ubus_connect(u_sock_path);
if (!ubus_ctx) if (!ubus_ctx)
return -1; return -1;