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

Support to manage cwmp from usp

Browse source
This commit is contained in:
Vivek Kumar Dutta 2024-07-22 06:49:05 +00:00 • committed by IOPSYS Dev
parent 7dc217b54a
commit 7e86433c31
No known key found for this signature in database
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bbf_plugin/datamodel.c
View file

@ -16,6 +16,10 @@
#define DU_STATE_CHANGE_SEC_NAME "du_state_change"
#define TRANSFER_COMPL_SEC_NAME "transfer_complete"
#ifndef CWMP_DUAL_SUPPORT
#define CWMP_DUAL_SUPPORT BBFDM_CWMP
#endif
static char *CWMP_EVENTS[] = {"0 BOOTSTRAP", "1 BOOT", "2 PERIODIC", "3 SCHEDULED", "5 KICKED", "6 CONNECTION REQUEST", "7 TRANSFER COMPLETE", "8 DIAGNOSTICS COMPLETE", "9 REQUEST DOWNLOAD", "10 AUTONOMOUS TRANSFER COMPLETE", "11 DU STATE CHANGE COMPLETE", "12 AUTONOMOUS DU STATE CHANGE COMPLETE", "13 WAKEUP", "M Reboot", "M ScheduleInform", "M Download", "M ScheduleDownload", "M Upload", "M ChangeDUState", "14 HEARTBEAT", NULL};
static char *Forced_Inform_Parmeters[] = {"Device.RootDataModelVersion", "Device.DeviceInfo.HardwareVersion", "Device.DeviceInfo.SoftwareVersion", "Device.DeviceInfo.ProvisioningCode", "Device.ManagementServer.ParameterKey", "Device.ManagementServer.ConnectionRequestURL", "Device.ManagementServer.AliasBasedAddressing", NULL};
static char *DUStateOperationType[] = {"Install", "Update", "Uninstall", NULL};
@ -1365,7 +1369,7 @@ DM_MAP_OBJ tDynamicObj[] = {
/*** Device. ***/
DMOBJ tCWMPObj[] = {
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, dynamicleaf, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
{"ManagementServer", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tManagementServerObj, tManagementServerParams, NULL, BBFDM_CWMP},
{"ManagementServer", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tManagementServerObj, tManagementServerParams, NULL, CWMP_DUAL_SUPPORT},
{"CWMPManagementServer", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, BBFDM_USP},
{"XMPP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, BBFDM_CWMP},
{0}
@ -1384,9 +1388,9 @@ DMOBJ tManagementServerObj[] = {
DMLEAF tManagementServerParams[] = {
/* PARAM, permission, type, getvalue, setvalue, bbfdm_type, version*/
{"URL", &DMWRITE, DMT_STRING, get_management_server_url, set_management_server_url, BBFDM_CWMP},
{"Username", &DMWRITE, DMT_STRING, get_management_server_username, set_management_server_username, BBFDM_CWMP},
{"Password", &DMWRITE, DMT_STRING, get_empty, set_management_server_passwd, BBFDM_CWMP},
{"URL", &DMWRITE, DMT_STRING, get_management_server_url, set_management_server_url, CWMP_DUAL_SUPPORT},
{"Username", &DMWRITE, DMT_STRING, get_management_server_username, set_management_server_username, CWMP_DUAL_SUPPORT},
{"Password", &DMWRITE, DMT_STRING, get_empty, set_management_server_passwd, CWMP_DUAL_SUPPORT},
{"ScheduleReboot", &DMWRITE, DMT_TIME, get_management_server_schedule_reboot, set_management_server_schedule_reboot, BBFDM_CWMP},
{"DelayReboot", &DMWRITE, DMT_INT, get_management_server_delay_reboot, set_management_server_delay_reboot, BBFDM_CWMP},
{"PeriodicInformEnable", &DMWRITE, DMT_BOOL, get_management_server_periodic_inform_enable, set_management_server_periodic_inform_enable, BBFDM_CWMP},
@ -1409,7 +1413,7 @@ DMLEAF tManagementServerParams[] = {
{"InstanceMode", &DMWRITE, DMT_STRING, get_instance_mode, set_instance_mode, BBFDM_CWMP},
{"SupportedConnReqMethods", &DMREAD, DMT_STRING, get_management_server_supported_conn_req_methods, NULL, BBFDM_CWMP},
{"InstanceWildcardsSupported", &DMREAD, DMT_BOOL, get_management_server_instance_wildcard_supported, NULL, BBFDM_CWMP},
{"EnableCWMP", &DMWRITE, DMT_BOOL, get_management_server_enable_cwmp, set_management_server_enable_cwmp, BBFDM_CWMP},
{"EnableCWMP", &DMWRITE, DMT_BOOL, get_management_server_enable_cwmp, set_management_server_enable_cwmp, CWMP_DUAL_SUPPORT},
{"UDPConnectionRequestAddress", &DMREAD, DMT_STRING, get_upd_cr_address, NULL, BBFDM_CWMP},
{"NATDetected", &DMREAD, DMT_BOOL, get_nat_detected, NULL, BBFDM_CWMP},
{"InformParameterNumberOfEntries", &DMREAD, DMT_UNINT, get_inform_parameter_number_of_entries, NULL, BBFDM_CWMP},

9
src/http.c
View file

@ -404,6 +404,7 @@ static void http_cr_new_client(int client, bool service_available)
if (!username || !password) {
// if we dont have username or password configured proceed with connecting to ACS
CWMP_LOG(WARNING, "CPE username/password not defined - 503");
service_available = false;
goto http_end;
}
@ -435,6 +436,7 @@ static void http_cr_new_client(int client, bool service_available)
goto http_end;
}
CWMP_LOG(DEBUG, "Processing CR service_available %d, client %d", service_available, client);
bool read_done = false;
/* Perform read from FD until all required data are collected or
* HTTP_FD_FEEDS_COUNT number of read operation has been performed.
@ -483,6 +485,7 @@ static void http_cr_new_client(int client, bool service_available)
*/
size_t avail_space = (size_t)(sizeof(data) - strlen(data));
if (buf_len < avail_space) {
CWMP_LOG(DEBUG, "Continue buffer overrun %d=>%d", buf_len, avail_space);
strcat(data, buffer);
continue;
}
@ -557,6 +560,7 @@ static void http_cr_new_client(int client, bool service_available)
int auth_check = validate_http_digest_auth("GET", cr_path, auth_digest_buffer + strlen("Authorization: Digest "), REALM, username, password, cwmp_main->conf.session_timeout, request_host);
if (auth_check == -1) { /* invalid nonce */
CWMP_LOG(INFO, "Auth check failed for incoming CR");
internal_error = true;
goto http_end;
}
@ -687,7 +691,7 @@ void icwmp_http_server_listen(void)
struct sockaddr_in6 client;
//Listen
listen(cwmp_main->cr_socket_desc, 3);
listen(cwmp_main->cr_socket_desc, 5);
//Accept and incoming connection
c = sizeof(struct sockaddr_in);
@ -700,7 +704,7 @@ void icwmp_http_server_listen(void)
CWMP_LOG(ERROR, "Could not accept connections for Connection Request!");
shutdown(cwmp_main->cr_socket_desc, SHUT_RDWR);
icwmp_http_server_init();
listen(cwmp_main->cr_socket_desc, 3);
listen(cwmp_main->cr_socket_desc, 5);
cr_request = 0;
restrict_start_time = 0;
continue;
@ -717,6 +721,7 @@ void icwmp_http_server_listen(void)
} else {
cr_request++;
if (cr_request > CONNECTION_REQUEST_RESTRICT_REQUEST) {
CWMP_LOG(WARNING, "Too many connection requests %d, block CR for %d Sec", cr_request, CONNECTION_REQUEST_RESTRICT_PERIOD)
restrict_start_time = current_time;
service_available = false;
}