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

dhcp: pass individual options to DHCP instead of NMSettingIPxConfig

Browse Source
This commit is contained in:
Dan Williams
2014-07-11 12:50:17 -05:00
parent d7b3ae8c10
commit 24c1523b51
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dhcp-manager/nm-dhcp-manager.h
View File

@@ -25,9 +25,6 @@
#include <glib.h>
#include <glib-object.h>
#include <nm-setting-ip4-config.h>
#include <nm-setting-ip6-config.h>
#include "nm-dhcp-client.h"
#include "nm-ip4-config.h"
#include "nm-dhcp4-config.h"
@@ -70,7 +67,9 @@ NMDHCPClient * nm_dhcp_manager_start_ip4 (NMDHCPManager *manager,
const GByteArray *hwaddr,
const char *uuid,
guint priority,
NMSettingIP4Config *s_ip4,
gboolean send_hostname,
const char *dhcp_hostname,
const char *dhcp_client_id,
guint32 timeout,
GByteArray *dhcp_anycast_addr);
@@ -80,7 +79,7 @@ NMDHCPClient * nm_dhcp_manager_start_ip6 (NMDHCPManager *manager,
const GByteArray *hwaddr,
const char *uuid,
guint priority,
NMSettingIP6Config *s_ip6,
const char *dhcp_hostname,
guint32 timeout,
GByteArray *dhcp_anycast_addr,
gboolean info_only);