diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2021-11-02 22:34:34 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2021-11-02 22:41:11 +0100 |
| commit | b3cca0c23b06c889e9fd281b72242515f8f977d4 (patch) | |
| tree | 05e6fdfee56cb57c7c00a433e5385a465459643b | |
| parent | 984fe276a6e38695acf256cbf45d36c2e7744926 (diff) | |
| download | libmbim-b3cca0c23b06c889e9fd281b72242515f8f977d4.tar.gz | |
libmbim-glib,api: rename 'network blacklist' to 'network denylist'
Unfortunately we cannot fully remove the blacklist name forever, as we
must keep API. We move it to -compat so that it gets removed whenever
we decide to break API.
| -rwxr-xr-x | docs/reference/libmbim-glib/libmbim-glib-common.sections | 2 | ||||
| -rw-r--r-- | src/libmbim-glib/mbim-cid.c | 2 | ||||
| -rw-r--r-- | src/libmbim-glib/mbim-cid.h | 4 | ||||
| -rw-r--r-- | src/libmbim-glib/mbim-compat.h | 13 |
4 files changed, 18 insertions, 3 deletions
diff --git a/docs/reference/libmbim-glib/libmbim-glib-common.sections b/docs/reference/libmbim-glib/libmbim-glib-common.sections index ab4585e..cbcb8fa 100755 --- a/docs/reference/libmbim-glib/libmbim-glib-common.sections +++ b/docs/reference/libmbim-glib/libmbim-glib-common.sections @@ -815,6 +815,8 @@ mbim_message_ms_basic_connect_extensions_lte_attach_status_response_parse mbim_message_ms_basic_connect_extensions_lte_attach_status_notification_parse <SUBSECTION> MBIM_NW_ERROR_UNKNOWN +<SUBSECTION> +MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_BLACKLIST <SUBSECTION Private> MbimDeprecatedCidBasicConnect MbimDeprecatedRegistrationFlag diff --git a/src/libmbim-glib/mbim-cid.c b/src/libmbim-glib/mbim-cid.c index b4b5dc6..46d2a04 100644 --- a/src/libmbim-glib/mbim-cid.c +++ b/src/libmbim-glib/mbim-cid.c @@ -152,7 +152,7 @@ static const CidConfig cid_intel_firmware_update_config [MBIM_CID_INTEL_FIRMWARE #define MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LAST MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_REGISTRATION_PARAMETERS static const CidConfig cid_ms_basic_connect_extensions_config [MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LAST] = { { SET, QUERY, NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_PROVISIONED_CONTEXTS */ - { SET, QUERY, NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_BLACKLIST */ + { SET, QUERY, NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_DENYLIST */ { SET, QUERY, NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_CONFIG */ { SET, QUERY, NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_STATUS */ { NO_SET, QUERY, NO_NOTIFY }, /* MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SYS_CAPS */ diff --git a/src/libmbim-glib/mbim-cid.h b/src/libmbim-glib/mbim-cid.h index 6a7a89e..13c2700 100644 --- a/src/libmbim-glib/mbim-cid.h +++ b/src/libmbim-glib/mbim-cid.h @@ -322,7 +322,7 @@ typedef enum { /*< since=1.26 >*/ * MbimCidMsBasicConnectExtensions: * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_UNKNOWN: Unknown command. * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_PROVISIONED_CONTEXTS: Provisioned contexts (v2). - * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_BLACKLIST: Network blacklist. + * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_DENYLIST: Network denylist. Since 1.28. * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_CONFIGURATION: LTE attach configuration. * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_INFO: LTE attach status information. Since 1.26. * @MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SYS_CAPS: System capabilities. @@ -345,7 +345,7 @@ typedef enum { /*< since=1.26 >*/ typedef enum { /*< since=1.18 >*/ MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_UNKNOWN = 0, MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_PROVISIONED_CONTEXTS = 1, - MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_BLACKLIST = 2, + MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_DENYLIST = 2, MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_CONFIGURATION = 3, MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_LTE_ATTACH_INFO = 4, MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SYS_CAPS = 5, diff --git a/src/libmbim-glib/mbim-compat.h b/src/libmbim-glib/mbim-compat.h index a2c7483..58ac6ae 100644 --- a/src/libmbim-glib/mbim-compat.h +++ b/src/libmbim-glib/mbim-compat.h @@ -227,6 +227,19 @@ typedef int MbimNwErrorDeprecated; */ #define MBIM_NW_ERROR_UNKNOWN (MbimNwErrorDeprecated) MBIM_NW_ERROR_NONE +/*****************************************************************************/ +/* Rename blacklist to denylist */ + +/** + * MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_BLACKLIST: + * + * Network deny list. + * + * Since: 1.18 + * Deprecated: 1.28: Use MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_DENYLIST instead. + */ +#define MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_BLACKLIST (MbimDeprecatedCidMsBasicConnectExtensions) MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_NETWORK_DENYLIST + #endif /* MBIM_DISABLE_DEPRECATED */ G_END_DECLS |