From afc592b39f6bb73bbb3298f08e36e088ab15eb3c Mon Sep 17 00:00:00 2001 From: Omar Kallel Date: Fri, 10 Mar 2023 16:58:29 +0000 Subject: [PATCH] Move diagnostics flags to icwmp repo --- dmtree/tr143/diagnostics.c | 24 ++++++------------------ dmtree/tr181/dns.c | 4 +--- dmtree/tr181/wifi.c | 5 ----- dmtree/tr471/iplayercap.c | 4 +--- libbbf_api/dmapi.h | 17 ----------------- 5 files changed, 8 insertions(+), 46 deletions(-) diff --git a/dmtree/tr143/diagnostics.c b/dmtree/tr143/diagnostics.c index e9980aeb..3a317897 100644 --- a/dmtree/tr143/diagnostics.c +++ b/dmtree/tr143/diagnostics.c @@ -53,10 +53,8 @@ static int set_ip_ping_diagnostics_state(char *refparam, struct dmctx *ctx, void return FAULT_9007; return 0; case VALUESET: - if (DM_LSTRCMP(value, "Requested") == 0) { + if (DM_LSTRCMP(value, "Requested") == 0) set_diagnostics_option("ipping", "DiagnosticState", value); - bbf_set_end_session_flag(ctx, BBF_END_SESSION_IPPING_DIAGNOSTIC); - } return 0; } return 0; @@ -288,10 +286,8 @@ static int set_IPDiagnosticsTraceRoute_DiagnosticsState(char *refparam, struct d return FAULT_9007; return 0; case VALUESET: - if (DM_LSTRCMP(value, "Requested") == 0) { + if (DM_LSTRCMP(value, "Requested") == 0) set_diagnostics_option("traceroute", "DiagnosticState", value); - bbf_set_end_session_flag(ctx, BBF_END_SESSION_TRACEROUTE_DIAGNOSTIC); - } return 0; } return 0; @@ -532,10 +528,8 @@ static int set_IPDiagnosticsDownloadDiagnostics_DiagnosticsState(char *refparam, return FAULT_9007; return 0; case VALUESET: - if (DM_LSTRCMP(value, "Requested") == 0) { + if (DM_LSTRCMP(value, "Requested") == 0) set_diagnostics_option("download", "DiagnosticState", value); - bbf_set_end_session_flag(ctx, BBF_END_SESSION_DOWNLOAD_DIAGNOSTIC); - } return 0; } return 0; @@ -860,10 +854,8 @@ static int set_IPDiagnosticsUploadDiagnostics_DiagnosticsState(char *refparam, s return FAULT_9007; return 0; case VALUESET: - if (DM_LSTRCMP(value, "Requested") == 0) { + if (DM_LSTRCMP(value, "Requested") == 0) set_diagnostics_option("upload", "DiagnosticState", value); - bbf_set_end_session_flag(ctx, BBF_END_SESSION_UPLOAD_DIAGNOSTIC); - } return 0; } return 0; @@ -1204,10 +1196,8 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_DiagnosticsState(char *refparam, return FAULT_9007; return 0; case VALUESET: - if (DM_LSTRCMP(value, "Requested") == 0) { + if (DM_LSTRCMP(value, "Requested") == 0) set_diagnostics_option("udpechodiag", "DiagnosticState", value); - bbf_set_end_session_flag(ctx, BBF_END_SESSION_UDPECHO_DIAGNOSTIC); - } return 0; } return 0; @@ -1463,10 +1453,8 @@ static int set_IPDiagnosticsServerSelectionDiagnostics_DiagnosticsState(char *re return FAULT_9007; return 0; case VALUESET: - if (DM_LSTRCMP(value, "Requested") == 0) { + if (DM_LSTRCMP(value, "Requested") == 0) set_diagnostics_option("serverselection", "DiagnosticState", value); - bbf_set_end_session_flag(ctx, BBF_END_SESSION_SERVERSELECTION_DIAGNOSTIC); - } return 0; } return 0; diff --git a/dmtree/tr181/dns.c b/dmtree/tr181/dns.c index 82a00826..e63f6317 100644 --- a/dmtree/tr181/dns.c +++ b/dmtree/tr181/dns.c @@ -624,10 +624,8 @@ static int set_nslookupdiagnostics_diagnostics_state(char *refparam, struct dmct return FAULT_9007; return 0; case VALUESET: - if (DM_LSTRCMP(value, "Requested") == 0) { + if (DM_LSTRCMP(value, "Requested") == 0) set_diagnostics_option("nslookup", "DiagnosticState", value); - bbf_set_end_session_flag(ctx, BBF_END_SESSION_NSLOOKUP_DIAGNOSTIC); - } return 0; } return 0; diff --git a/dmtree/tr181/wifi.c b/dmtree/tr181/wifi.c index 6cc1ab3b..a6e2cf6d 100644 --- a/dmtree/tr181/wifi.c +++ b/dmtree/tr181/wifi.c @@ -3121,11 +3121,6 @@ static int set_neighboring_wifi_diagnostics_diagnostics_state(char *refparam, st dmuci_add_section_bbfdm("dmmap_wifi_neighboring", "diagnostic_status", &s); dmuci_set_value_by_section(s, "DiagnosticsState", value); - - if (DM_LSTRCMP(value, "Requested") == 0) { - bbf_set_end_session_flag(ctx, BBF_END_SESSION_NEIGBORING_WIFI_DIAGNOSTIC); - } - return 0; } return 0; diff --git a/dmtree/tr471/iplayercap.c b/dmtree/tr471/iplayercap.c index 7f2620e2..1b910a37 100644 --- a/dmtree/tr471/iplayercap.c +++ b/dmtree/tr471/iplayercap.c @@ -59,10 +59,8 @@ static int set_IPDiagnosticsIPLayerCapacity_DiagnosticsState(char *refparam, str return FAULT_9007; return 0; case VALUESET: - if (DM_LSTRCMP(value, "Requested") == 0) { + if (DM_LSTRCMP(value, "Requested") == 0) set_diagnostics_option("iplayercapacity", "DiagnosticState", value); - bbf_set_end_session_flag(ctx, BBF_END_SESSION_IPLAYERCAPACITY_DIAGNOSTIC); - } return 0; } return 0; diff --git a/libbbf_api/dmapi.h b/libbbf_api/dmapi.h index f505ec44..7a517355 100644 --- a/libbbf_api/dmapi.h +++ b/libbbf_api/dmapi.h @@ -394,23 +394,6 @@ enum instance_mode { INSTANCE_MODE_ALIAS }; -enum bbf_end_session_enum { - BBF_END_SESSION_REBOOT = 1, - BBF_END_SESSION_EXTERNAL_ACTION = 1<<1, - BBF_END_SESSION_RELOAD = 1<<2, - BBF_END_SESSION_FACTORY_RESET = 1<<3, - BBF_END_SESSION_IPPING_DIAGNOSTIC = 1<<4, - BBF_END_SESSION_DOWNLOAD_DIAGNOSTIC = 1<<5, - BBF_END_SESSION_UPLOAD_DIAGNOSTIC = 1<<6, - BBF_END_SESSION_X_FACTORY_RESET_SOFT = 1<<7, - BBF_END_SESSION_NSLOOKUP_DIAGNOSTIC = 1<<8, - BBF_END_SESSION_TRACEROUTE_DIAGNOSTIC = 1<<9, - BBF_END_SESSION_UDPECHO_DIAGNOSTIC = 1<<10, - BBF_END_SESSION_SERVERSELECTION_DIAGNOSTIC = 1<<11, - BBF_END_SESSION_NEIGBORING_WIFI_DIAGNOSTIC = 1<<12, - BBF_END_SESSION_IPLAYERCAPACITY_DIAGNOSTIC = 1<<21 -}; - enum dm_browse_enum { DM_ERROR = -1, DM_OK = 0,