From 9639e52726854782508e35a75c6abf874bd9e608 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 16 Jun 2021 10:18:33 +0200 Subject: filter: remove support for TTY blacklist, TTY greylist and TTY default allowed These lists were used in the corresponding TTY_BLACKLIST and TTY_MANUAL_SCAN_ONLY filter rules, in the LEGACY and PARANOID filter types, which are no longer supported. The DEFAULT_ALLOWED filter rule made sense only in the LEGACY filter type, and therefore it is also now removed, leaving the DEFAULT_FORBIDDEN fallback rule exclusively. In other words, there is now no way to ask ModemManager to implicitly allow TTY ports; the only way to do that is by explicit making the TTY ports fall in one filter rule that would allow them. --- docs/reference/api/ModemManager-overview.xml | 52 ++++++++++++++-------------- docs/reference/api/ModemManager-sections.txt | 5 +-- 2 files changed, 29 insertions(+), 28 deletions(-) (limited to 'docs/reference/api') diff --git a/docs/reference/api/ModemManager-overview.xml b/docs/reference/api/ModemManager-overview.xml index e2316a5a..dd4acbea 100644 --- a/docs/reference/api/ModemManager-overview.xml +++ b/docs/reference/api/ModemManager-overview.xml @@ -197,37 +197,12 @@ $ sudo udevadm trigger - MM_FILTER_RULE_TTY, MM_FILTER_RULE_TTY_DEFAULT_ALLOWED and MM_FILTER_RULE_TTY_DEFAULT_FORBIDDEN + MM_FILTER_RULE_TTY If the MM_FILTER_RULE_TTY filter is disabled, no TTY port will be allowed. If this filter is enabled, TTY ports will only be allowed if the TTY-specific filters (defined next) allow it. - - The MM_FILTER_RULE_TTY_DEFAULT_ALLOWED and MM_FILTER_RULE_TTY_DEFAULT_FORBIDDEN rules allow - defining what happens when a TTY port isn't explicitly forbidden or accepted by any of - the TTY-specific filters. When MM_FILTER_RULE_TTY is enabled, one of these other two options - must be set. - - - - MM_FILTER_RULE_TTY_BLACKLIST - - This filter will not allow probing any of the devices flagged as - ID_MM_TTY_BLACKLIST, like the ones in the default blacklist - shipped by ModemManager. - - - - MM_FILTER_RULE_TTY_MANUAL_SCAN_ONLY - - This filter will not allow automatic probing any of the devices flagged as - ID_MM_TTY_MANUAL_SCAN_ONLY, like the ones in the default - USB serial adapters greylist shipped by ModemManager. Devices flagged like - this will only be probed when a manual scan is requested via the - ScanDevices - method. - MM_FILTER_RULE_TTY_PLATFORM_DRIVER @@ -257,6 +232,13 @@ $ sudo udevadm trigger interface port will be allowed automatically. + + MM_FILTER_RULE_TTY_DEFAULT_FORBIDDEN + + This rule is the implicit one defining what happens when a TTY port isn't explicitly + accepted by any of the TTY-specific filters; i.e. the TTY port will be forbidden. + + MM_FILTER_RULE_WWAN @@ -270,6 +252,24 @@ $ sudo udevadm trigger + + + The following filter rules have been deprecated and are no longer used. + + + MM_FILTER_RULE_TTY_BLACKLIST + + Deprecated in 1.18.0. + + + + MM_FILTER_RULE_TTY_MANUAL_SCAN_ONLY + + Deprecated in 1.18.0. + + + +
diff --git a/docs/reference/api/ModemManager-sections.txt b/docs/reference/api/ModemManager-sections.txt index 9b3e4f3d..74f7c8c6 100644 --- a/docs/reference/api/ModemManager-sections.txt +++ b/docs/reference/api/ModemManager-sections.txt @@ -200,8 +200,6 @@ ID_MM_PHYSDEV_UID ID_MM_DEVICE_PROCESS ID_MM_DEVICE_IGNORE ID_MM_PORT_IGNORE -ID_MM_TTY_BLACKLIST -ID_MM_TTY_MANUAL_SCAN_ONLY ID_MM_PORT_TYPE_AT_PPP ID_MM_PORT_TYPE_AT_PRIMARY ID_MM_PORT_TYPE_AT_SECONDARY @@ -212,4 +210,7 @@ ID_MM_PORT_TYPE_QMI ID_MM_PORT_TYPE_MBIM ID_MM_TTY_BAUDRATE ID_MM_TTY_FLOW_CONTROL + +ID_MM_TTY_BLACKLIST +ID_MM_TTY_MANUAL_SCAN_ONLY
-- cgit v1.2.3-70-g09d2