From dc2016504a29f703ef49146ff5056237e6031a6c Mon Sep 17 00:00:00 2001 From: focus Date: Thu, 17 Mar 2011 18:35:32 +0000 Subject: [PATCH] with dhcp ON, after apply and menu quit wrong check for changed interface parameters, received from dhcp git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1310 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/system/configure_network.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/system/configure_network.cpp b/src/system/configure_network.cpp index 6c17fb156..230d87d48 100644 --- a/src/system/configure_network.cpp +++ b/src/system/configure_network.cpp @@ -146,6 +146,23 @@ bool CNetworkConfig::modified_from_orig(void) if((ssid != orig_ssid) || (key != orig_key)) return 1; } + /* check for following changes with dhcp enabled trigger apply question on menu quit, + * even if apply already done */ + if (inet_static) { + if ((orig_address != address ) || + (orig_netmask != netmask ) || + (orig_broadcast != broadcast ) || + (orig_gateway != gateway )) + return 1; + } + return ( + (orig_automatic_start != automatic_start) || + (orig_hostname != hostname ) || + (orig_inet_static != inet_static ) || + (orig_ifname != ifname) + ); + +#if 0 return ( (orig_automatic_start != automatic_start) || (orig_address != address ) || @@ -156,6 +173,7 @@ bool CNetworkConfig::modified_from_orig(void) (orig_inet_static != inet_static ) || (orig_ifname != ifname) ); +#endif } void CNetworkConfig::commitConfig(void)