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

2008-08-15 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/dnsmasq-manager/nm-dnsmasq-manager.c
		- (create_dm_cmd_line): send the right router address



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3968 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-08-15 15:06:44 +00:00
parent 8f1066ea35
commit d682f35bf0
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2008-08-15 Dan Williams <dcbw@redhat.com>
* src/dnsmasq-manager/nm-dnsmasq-manager.c
- (create_dm_cmd_line): send the right router address
2008-08-15 Dan Williams <dcbw@redhat.com>
* src/ppp-manager/nm-ppp-manager.c

11
src/dnsmasq-manager/nm-dnsmasq-manager.c
View File

@@ -236,6 +236,7 @@ create_dm_cmd_line (const char *iface,
const NMSettingIP4Address *tmp;
struct in_addr addr;
char buf[INET_ADDRSTRLEN + 1];
char localaddr[INET_ADDRSTRLEN + 1];
dm_binary = nm_find_dnsmasq ();
if (!dm_binary) {
@@ -259,12 +260,12 @@ create_dm_cmd_line (const char *iface,
s = g_string_new ("--listen-address=");
addr.s_addr = tmp->address;
if (!inet_ntop (AF_INET, &addr, &buf[0], INET_ADDRSTRLEN)) {
if (!inet_ntop (AF_INET, &addr, &localaddr[0], INET_ADDRSTRLEN)) {
nm_warning ("%s: error converting IP4 address 0x%X",
__func__, ntohl (addr.s_addr));
goto error;
}
g_string_append (s, buf);
g_string_append (s, localaddr);
nm_cmd_line_add_string (cmd, s->str);
g_string_free (s, TRUE);
@@ -294,7 +295,11 @@ create_dm_cmd_line (const char *iface,
nm_cmd_line_add_string (cmd, s->str);
g_string_free (s, TRUE);
nm_cmd_line_add_string (cmd, "--dhcp-option=option:router,0.0.0.0");
s = g_string_new ("--dhcp-option=option:router,");
g_string_append (s, localaddr);
nm_cmd_line_add_string (cmd, s->str);
g_string_free (s, TRUE);
nm_cmd_line_add_string (cmd, "--dhcp-lease-max=50");
s = g_string_new ("--pid-file=");