Skip to content

network: add ModemManager support #22315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
yuwata wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

network: add ModemManager support #22315

yuwata wants to merge 3 commits into from

Conversation

@yuwata
Copy link
Member

@yuwata yuwata commented Jan 31, 2022

Closes #20370.

@yuwata yuwata added the network label Jan 31, 2022
@yuwata yuwata mentioned this pull request Jan 31, 2022
Open
@yuwata yuwata force-pushed the network-wwan branch 4 times, most recently from fb8a7c5 to 1250c2e Compare January 31, 2022 10:39
@lgtm-com

This comment has been minimized.

Sign in to view
bluca
bluca reviewed Jan 31, 2022
View reviewed changes
@lgtm-com

This comment has been minimized.

Sign in to view
@lgtm-com
Copy link

lgtm-com bot commented Feb 1, 2022

This pull request introduces 1 alert when merging 9facc68 into 9d67fb0 - view on LGTM.com

new alerts:

  • 1 for Use of potentially dangerous function

@bluca
Copy link
Member

bluca commented Feb 18, 2022

needs a rebase

@yuwata yuwata force-pushed the network-wwan branch 2 times, most recently from 16285b8 to c76525e Compare March 12, 2022 12:37
keszybz
keszybz reviewed Mar 22, 2022
View reviewed changes
Copy link
Member

@keszybz keszybz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable. I'm a bit surprised that we need to do dbus introspection to figure out the path. @poettering, opinions on that?

src/network/networkd-wwan-bus.c
Comment on lines +12 to +18
typedef enum {
MM_BEARER_IP_FAMILY_NONE = 0,
MM_BEARER_IP_FAMILY_IPV4 = 1 << 0,
MM_BEARER_IP_FAMILY_IPV6 = 1 << 1,
MM_BEARER_IP_FAMILY_IPV4V6 = 1 << 2,
MM_BEARER_IP_FAMILY_ANY = 0xFFFFFFFF
} MMBearerIpFamily;
Copy link
Member

@keszybz keszybz Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be better to just reuse ADDRESS_FAMILY_* for this? The mapping seems to be 1:1 anyway.

Copy link
Member Author

@yuwata yuwata Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, ADDRESS_FAMILY_YES is 3, not 4.

src/network/networkd-wwan.c

if (b->connected && b->ip4_method == MM_BEARER_IP_METHOD_DHCP) {
if (!link_dhcp4_enabled(link))
log_link_notice(link, "The WWAN connection requested DHCPv4 client, but it is disabled.");
Copy link
Member

@keszybz keszybz Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, IIUC, we log notice but otherwise ignore our own config. I think this is not very useful: we should either let our config take priority here, and not call dhcp4_start(), or we should just ignore our own config. Ideally, we would default link->network->dhcp to ADDRESS_FAMILY_ANY if the support for ModemManager is configured. This would make things "just work", but still allow explicit configuration if wanted.

Copy link
Member Author

@yuwata yuwata Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dhcp4_start() does nothing and returns 0 when DHCP4 client is disabled. So, the current implementation is equivalent to the first suggestion.

src/network/networkd-wwan.c
Comment on lines +333 to +336
if (!link_ipv6_accept_ra_enabled(link) && !link_dhcp6_enabled(link))
log_link_notice(link,
"The WWAN connection requested IPv6 dynamic address configuration,"
"but both IPv6 Router Discovery and DHCPv6 client are disabled.");
Copy link
Member

@keszybz keszybz Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

Copy link
Member Author

@yuwata yuwata Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also here, ndisc_start() and dhcp6_start() do nothing if they are disabled.

@bluca bluca modified the milestones: v258, v259 Jun 10, 2025
andr2000 pushed a commit to andr2000/systemd that referenced this pull request Sep 3, 2025
network: add ModemManager support
5b95483 
Heavily based on systemd#22315 by Yu Watanabe.

Upstream-Status: Inappropriate [Inappropriate]
andr2000 pushed a commit to andr2000/systemd that referenced this pull request Sep 3, 2025
network: add ModemManager support
df31895 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
andr2000 pushed a commit to andr2000/systemd that referenced this pull request Sep 4, 2025
network: add ModemManager support
fcf7657 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
andr2000 pushed a commit to andr2000/systemd that referenced this pull request Sep 6, 2025
@andr2000
network: add ModemManager support
852b183 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 6, 2025
@andr2000
network: add ModemManager support
13fe3c4 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 6, 2025
@andr2000
network: add ModemManager support
32fe2e6 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 8, 2025
@andr2000
network: add ModemManager support
47f33b9 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 8, 2025
@andr2000
network: add ModemManager support
6220c30 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 8, 2025
@andr2000
network: add ModemManager support
a00d736 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 8, 2025
@andr2000
network: add ModemManager support
4a4d39b 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
@andr2000 andr2000 mentioned this pull request Sep 8, 2025
Open
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 8, 2025
@andr2000
network: add ModemManager support
e042f55 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Upstream-Status: Inappropriate [Inappropriate]
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 9, 2025
@andr2000 @yuwata
network: add ModemManager support
1e33509 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 10, 2025
@andr2000 @yuwata
network: add ModemManager support
1407daa 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 11, 2025
@andr2000 @yuwata
network: add ModemManager support
be3cbd1 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 15, 2025
@andr2000 @yuwata
network: add ModemManager support
16b9cb2 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 15, 2025
@andr2000 @yuwata
network: add ModemManager support
df46484 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 18, 2025
@andr2000 @yuwata
network: add ModemManager support
33f48d3 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Sep 18, 2025
@andr2000 @yuwata
network: add ModemManager support
8d3136e 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no
ModemSimpleConnectProps=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503

[DHCP]
RouteMetric=200

[DHCPv4]
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Nov 6, 2025
@andr2000 @yuwata
network: add ModemManager support
ad7e748 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no

[ModemManager]
SimpleConnectPropertie]s=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503
RouteMetric=200
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Nov 6, 2025
@andr2000 @yuwata
network: add ModemManager support
4eead22 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no

[ModemManager]
SimpleConnectPropertie]s=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503
RouteMetric=200
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Nov 11, 2025
@andr2000 @yuwata
network: add ModemManager support
7926942 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no

[ModemManager]
SimpleConnectPropertie]s=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503
RouteMetric=200
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Nov 11, 2025
@andr2000 @yuwata
network: add ModemManager support
b835be1 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no

[ModemManager]
SimpleConnectPropertie]s=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503
RouteMetric=200
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
@bluca bluca removed this from the v259 milestone Nov 11, 2025
andr2000 added a commit to andr2000/systemd that referenced this pull request Dec 12, 2025
@andr2000 @yuwata
network: add ModemManager support
03fdc24 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no

[ModemManager]
SimpleConnectProperties=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503
RouteMetric=200
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Dec 15, 2025
@andr2000 @yuwata
network: add ModemManager support
2173c41 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no

[ModemManager]
SimpleConnectPropertie]s=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503
RouteMetric=200
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Dec 16, 2025
@andr2000 @yuwata
network: add ModemManager support
765e28c 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no

[ModemManager]
SimpleConnectPropertie]s=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503
RouteMetric=200
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
andr2000 added a commit to andr2000/systemd that referenced this pull request Jan 7, 2026
@andr2000 @yuwata
network: add ModemManager support
64e66bd 
Heavily based on systemd#22315 by Yu Watanabe.

[Match]
Name=wwan*

[Network]
LLDP=no
LinkLocalAddressing=no
IPv6AcceptRA=no

[ModemManager]
SimpleConnectPropertie]s=apn=internet ip-type=ipv4 allow-roaming=no pin=1111 operator-id=25503
RouteMetric=200
UseGateway=yes

Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@keszybz keszybz keszybz left review comments

@bluca bluca bluca left review comments

@poettering poettering poettering left review comments

+1 more reviewer

@aleksander0m aleksander0m aleksander0m left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

busctl needs-rebase network new-feature reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks udev

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Integration with ModemManager

10 participants

@yuwata @bluca @WhyNotHugo @aleksander0m @shpalani @sequencer @pschichtel @dsseng @keszybz @poettering