Skip to content

Commit c442aea

Browse files
committed
The configuration failed if the name contains spaces / Gateways not published to configure view on refresh
1 parent 4d8d879 commit c442aea

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

Source/NETworkManager/Models/Network/NetworkInterface.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Net;
77
using System.Net.NetworkInformation;
88
using System.Threading.Tasks;
9+
using System.Windows;
910

1011
namespace NETworkManager.Models.Network
1112
{
@@ -129,22 +130,22 @@ public Task ConfigureNetworkInterfaceAsync(NetworkInterfaceConfig config)
129130
public void ConfigureNetworkInterface(NetworkInterfaceConfig config)
130131
{
131132
// IP
132-
string command = string.Format("netsh interface ipv4 set address name=\"{0}\" ", config.Name);
133-
command += config.EnableStaticIPAddress ? string.Format("source=static address={0} mask={1} gateway={2}", config.IPAddress, config.Subnetmask, config.Gateway) : "source=dhcp";
133+
string command = @"netsh interface ipv4 set address name='" + config.Name + @"'";
134+
command += config.EnableStaticIPAddress ? @" source=static address=" + config.IPAddress + @" mask=" + config.Subnetmask + @" gateway=" + config.Gateway : @" source=dhcp";
134135

135136
// DNS
136-
command += string.Format(";netsh interface ipv4 set DNSservers name=\"{0}\" ", config.Name);
137-
command += config.EnableStaticDNS ? string.Format("source=static address={0} register=primary validate=no", config.PrimaryDNSServer) : "source=dhcp";
138-
command += (config.EnableStaticDNS && !string.IsNullOrEmpty(config.SecondaryDNSServer)) ? string.Format(";netsh interface ipv4 add DNSservers name=\"{0}\" address={1} index=2 validate=no", config.Name, config.SecondaryDNSServer) : "";
137+
command += @";netsh interface ipv4 set DNSservers name='" + config.Name + @"'";
138+
command += config.EnableStaticDNS ? @" source=static address=" + config.PrimaryDNSServer + @" register=primary validate=no" : @" source=dhcp";
139+
command += (config.EnableStaticDNS && !string.IsNullOrEmpty(config.SecondaryDNSServer)) ? @";netsh interface ipv4 add DNSservers name='" + config.Name + @"' address=" + config.SecondaryDNSServer + @" index=2 validate=no" : "";
139140

140141
// Start process with elevated rights...
141142
ProcessStartInfo processStartInfo = new ProcessStartInfo()
142143
{
143144
Verb = "runas",
144145
FileName = "powershell.exe",
145-
Arguments = string.Format("-NoProfile -NoLogo -Command {0}", command)
146+
Arguments = "-NoProfile -NoLogo -Command " + command
146147
};
147-
148+
148149
processStartInfo.WindowStyle = ProcessWindowStyle.Hidden;
149150

150151
using (Process process = new Process())

Source/NETworkManager/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@
4949
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
5050
// übernehmen, indem Sie "*" eingeben:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("1.5.0.0")]
52+
[assembly: AssemblyVersion("1.4.1.0")]

Source/NETworkManager/ViewModels/Applications/NetworkInterfaceViewModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ public NetworkInterfaceInfo SelectedNetworkInterface
144144
else
145145
{
146146
ConfigEnableStaticIPAddress = true;
147-
ConfigIPAddress = value.IPv4Address.FirstOrDefault().ToString();
148-
ConfigSubnetmaskOrCidr = value.Subnetmask.FirstOrDefault().ToString();
149-
ConfigGateway = (value.IPv4Gateway == null) ? value.IPv4Gateway.ToString() : string.Empty;
147+
ConfigIPAddress = (value != null) ? value.IPv4Address.FirstOrDefault().ToString() : string.Empty;
148+
ConfigSubnetmaskOrCidr = (value.Subnetmask != null) ? value.Subnetmask.FirstOrDefault().ToString() : string.Empty;
149+
ConfigGateway = (value.IPv4Gateway != null) ? value.IPv4Gateway.FirstOrDefault().ToString() : string.Empty;
150150
}
151151

152152
if (value.DNSAutoconfigurationEnabled)

0 commit comments

Comments
 (0)