colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enum, bearer: added non-ip bearer

Browse Source
This commit is contained in:
Alexey Orishko
2022-08-21 21:17:00 +02:00
committed by Aleksander Morgado
parent 664610819e
commit 4ab2c80858
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/ModemManager-enums.h
View File

@@ -1223,7 +1223,8 @@ typedef enum { /*< underscore_name=mm_bearer_ip_method >*/
* @MM_BEARER_IP_FAMILY_IPV4: IPv4. * @MM_BEARER_IP_FAMILY_IPV4: IPv4.
* @MM_BEARER_IP_FAMILY_IPV6: IPv6. * @MM_BEARER_IP_FAMILY_IPV6: IPv6.
* @MM_BEARER_IP_FAMILY_IPV4V6: IPv4 and IPv6. * @MM_BEARER_IP_FAMILY_IPV4V6: IPv4 and IPv6.
* @MM_BEARER_IP_FAMILY_ANY: Mask specifying all IP families. * @MM_BEARER_IP_FAMILY_NON_IP: Non-IP Bearer. Since 1.20.
* @MM_BEARER_IP_FAMILY_ANY: Mask specifying all IP based families.
* *
* Type of IP family to be used in a given Bearer. * Type of IP family to be used in a given Bearer.
* *
@@ -1234,7 +1235,8 @@ typedef enum { /*< underscore_name=mm_bearer_ip_family >*/
MM_BEARER_IP_FAMILY_IPV4 = 1 << 0, MM_BEARER_IP_FAMILY_IPV4 = 1 << 0,
MM_BEARER_IP_FAMILY_IPV6 = 1 << 1, MM_BEARER_IP_FAMILY_IPV6 = 1 << 1,
MM_BEARER_IP_FAMILY_IPV4V6 = 1 << 2, MM_BEARER_IP_FAMILY_IPV4V6 = 1 << 2,
MM_BEARER_IP_FAMILY_ANY = 0xFFFFFFFF MM_BEARER_IP_FAMILY_NON_IP = 1 << 3,
MM_BEARER_IP_FAMILY_ANY = 0xFFFFFFF7
} MMBearerIpFamily; } MMBearerIpFamily;
/** /**

1
src/mm-modem-helpers-qmi.c
View File

@@ -1665,6 +1665,7 @@ mm_bearer_ip_family_to_qmi_pdp_type (MMBearerIpFamily ip_family,
case MM_BEARER_IP_FAMILY_IPV4V6: case MM_BEARER_IP_FAMILY_IPV4V6:
*out_pdp_type = QMI_WDS_PDP_TYPE_IPV4_OR_IPV6; *out_pdp_type = QMI_WDS_PDP_TYPE_IPV4_OR_IPV6;
return TRUE; return TRUE;
case MM_BEARER_IP_FAMILY_NON_IP:
case MM_BEARER_IP_FAMILY_NONE: case MM_BEARER_IP_FAMILY_NONE:
case MM_BEARER_IP_FAMILY_ANY: case MM_BEARER_IP_FAMILY_ANY:
default: default:

4
src/mm-modem-helpers.c
View File

@@ -4067,6 +4067,8 @@ mm_3gpp_get_pdp_type_from_ip_family (MMBearerIpFamily family)
return "IPV6"; return "IPV6";
case MM_BEARER_IP_FAMILY_IPV4V6: case MM_BEARER_IP_FAMILY_IPV4V6:
return "IPV4V6"; return "IPV4V6";
case MM_BEARER_IP_FAMILY_NON_IP:
return "Non-IP";
case MM_BEARER_IP_FAMILY_NONE: case MM_BEARER_IP_FAMILY_NONE:
case MM_BEARER_IP_FAMILY_ANY: case MM_BEARER_IP_FAMILY_ANY:
default: default:
@@ -4087,6 +4089,8 @@ mm_3gpp_get_ip_family_from_pdp_type (const gchar *pdp_type)
return MM_BEARER_IP_FAMILY_IPV6; return MM_BEARER_IP_FAMILY_IPV6;
if (g_str_equal (pdp_type, "IPV4V6")) if (g_str_equal (pdp_type, "IPV4V6"))
return MM_BEARER_IP_FAMILY_IPV4V6; return MM_BEARER_IP_FAMILY_IPV4V6;
if (g_str_equal (pdp_type, "Non-IP"))
return MM_BEARER_IP_FAMILY_NON_IP;
return MM_BEARER_IP_FAMILY_NONE; return MM_BEARER_IP_FAMILY_NONE;
} }