diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-08-01 10:34:46 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-08-02 17:19:35 -0500 |
| commit | 468243baf2453ee9d209b863c673cb48dbe41d5c (patch) | |
| tree | e8140bbeb2c3a20d2ff3ce348c04a9d154ccaf36 /src/nm-ip4-config.h | |
| parent | 1923f54d79ab912d4469ce50014cd48a2bbdff75 (diff) | |
| download | NetworkManager-468243baf2453ee9d209b863c673cb48dbe41d5c.tar.gz | |
core: combine and apply IPv4 configs instead of applying directly
Like IPv6, keep the DHCP/LLv4 config separate and combine it with the
NMSettingIP4Config to arrive at the final, combined IP4 config. This
brings the behavior in line with IPv6 code flow and will allow adding
the VPN routes config into the mix more easily.
Diffstat (limited to 'src/nm-ip4-config.h')
| -rw-r--r-- | src/nm-ip4-config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 79e833877c..f441be86c4 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -64,6 +64,7 @@ void nm_ip4_config_merge_setting (NMIP4Config *config, NMSettingIP4Config *setti void nm_ip4_config_update_setting (NMIP4Config *config, NMSettingIP4Config *setting); /* Utility functions */ +void nm_ip4_config_merge (NMIP4Config *dst, NMIP4Config *src); gboolean nm_ip4_config_destination_is_direct (NMIP4Config *config, guint32 dest, int plen); /* Gateways */ |