fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-17 21:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wwan/ofono: merge branch 'peat-psuwit:for-upstream/combined-context-mms-proxy-route'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1584

(cherry picked from commit 9ed802b0c2)
This commit is contained in:
Thomas Haller 2023-03-30 08:41:46 +02:00
commit c52bd82ca1
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core/devices/wwan/nm-modem-ofono.c
View file

@ -1320,9 +1320,18 @@ handle_settings(NMModemOfono *self, GVariant *v_dict)
}
}
if (g_variant_lookup(v_dict, "MessageProxy", "&s", &s)) {
_LOGI("MessageProxy: %s", s);
if (s && nm_inet_parse_bin(AF_INET, s, NULL, &address_network)) {
if (g_variant_lookup(v_dict, "Proxy", "&s", &s) && s) {
gs_free char *proxy = g_strdup(s);
char *colon;
_LOGI("(MMS) Proxy: %s", s);
/* Strip the port out. We can do this as we know this is IPv4. */
colon = strchr(proxy, ':');
if (colon)
*colon = '\0';
if (nm_inet_parse_bin(AF_INET, proxy, NULL, &address_network)) {
const NMPlatformIP4Route mms_route = {
.network = address_network,
.plen = 32,
@ -1335,7 +1344,7 @@ handle_settings(NMModemOfono *self, GVariant *v_dict)
nm_l3_config_data_add_route_4(priv->l3cd_4, &mms_route);
} else
_LOGW("invalid MessageProxy: %s", s);
_LOGW("invalid (MMS) Proxy: %s", s);
}
ret = TRUE;