gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-13 00:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #198 from openziti/release-next

Browse Source 
Release next
This commit is contained in:
dovholuknf
2020-11-03 23:55:15 -05:00
committed by GitHub
parent 3e7eefb562 492fb09a38
commit 4e1088196b
5 changed files with 1324 additions and 1299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesktopEdge/MainWindow.xaml
+23 -3
View File
@@ -288,15 +288,35 @@
<Grid.RowDefinitions>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="80"></RowDefinition>
<RowDefinition Height="120"></RowDefinition>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Label Name="ErrorTitle" Foreground="White" Content="An Error Occurred" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"/>
<TextBlock x:Name="ErrorDetails" TextWrapping="WrapWithOverflow" Foreground="LightGray" Padding="10" Text="An Unknown Error Occurred, you could try restarting the service and the interface to continue" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" FontSize="14" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"/>
<TextBlock x:Name="ErrorDetails" TextWrapping="WrapWithOverflow" Width="400" Foreground="LightGray" Padding="10" Text="An Unknown Error Occurred, you could try restarting the service and the interface to continue" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" FontSize="14" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"/>
<Label Grid.Row="3" Foreground="Gray" FontWeight="Light" Content="Check the Log for Details" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
<Label Name="QuitErrorButton" Grid.Row="4" Foreground="#F4044D" FontWeight="SemiBold" Content="Close" Cursor="Hand" MouseDown="CloseError" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
<Grid Grid.Row="4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"></ColumnDefinition>
<ColumnDefinition Width="1*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Button Grid.Column="0" Margin="40,0,20,0" Cursor="Hand" BorderThickness="0" Foreground="#FFFFFF" Background="#0068F9" Content="Close Error" Click="CloseError" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans">
<Button.Resources>
<Style TargetType="Border">
<Setter Property="CornerRadius" Value="5"/>
</Style>
</Button.Resources>
</Button>
<Button Grid.Column="1" Margin="20,0,40,0" Cursor="Hand" BorderThickness="0" Foreground="#FFFFFF" Background="#F4044D" Content="Quit App" Click="CloseApp" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans">
<Button.Resources>
<Style TargetType="Border">
<Setter Property="CornerRadius" Value="5"/>
</Style>
</Button.Resources>
</Button>
</Grid>
</Grid>
</Grid>
</Grid>
DesktopEdge/MainWindow.xaml.cs
+684 -683
View File
File diff suppressed because it is too large Load Diff
ZitiDesktopEdge.Client/ServiceClient/ClientImpl.cs
+611 -611
View File
File diff suppressed because it is too large Load Diff
service/cziti/dns.go
+5 -1
View File
@@ -229,8 +229,12 @@ func (dns *dnsImpl) ReturnToDns(hostname string) net.IP {
dnsEntry := dns.hostnameMap[normalizeDnsName(hostname)]
if dnsEntry != nil {
dnsEntry.dnsEnabled = true
return dnsEntry.ip
} else {
// probably is an ip - pasee as ip and try to return that
ip := net.ParseIP(hostname)
return ip
}
return dnsEntry.ip
}
func DnsInit(tun api.DesktopEdgeIface, ip string, maskBits int) {
version
+1 -1
View File
@@ -1 +1 @@
1.3.8
1.3.9