Bugfixes, "Verbesserungen"

2019-09-25 10:01:04 +02:00
parent d07cbe0676
commit c0d894546a
18 changed files with 292 additions and 155 deletions
--- a/Dokumentation/Administration/NWEdit.vb
+++ b/Dokumentation/Administration/NWEdit.vb
@@ -5,13 +5,15 @@ Public Class NWEdit
    Private cmd As New SqlCommand
    Private reader As SqlDataReader

-    Public Netzwerkname As String
-    Public NWStandort As String
-    Public NWName As String
-    Public NWAddress As String
+    'Public Netzwerkname As String
+    'Public NWStandort As String
+    'Public NWName As String
+    'Public NWAddress As String

    Public Neu As Boolean = False

+    Property NW As New cNetzwerk
+
    Private Function dbload()
        con.ConnectionString = Class1.DBConString
        cmd.Connection = con
@@ -20,43 +22,60 @@ Public Class NWEdit
    Private Sub NetzwerkBearbeiten_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        dbload()
        LblInfo.Text = ""
+
+        import()
+
        If Class1.DebugMode = True Then
            PanDebug.Visible = True
        End If
        If Class1.Absender = "Main" Then
-            NWStandort = Main.SenderStandort
-            NWName = Main.SenderNetzwerk
-            Netzwerkname = Main.SenderStandort & "_" & Main.SenderNetzwerk
+            'NWStandort = Main.SenderStandort
+            'NWName = Main.SenderNetzwerk
+            'Netzwerkname = Main.SenderStandort & "_" & Main.SenderNetzwerk
        ElseIf Class1.Absender = "Standorthinzu" Then
-            Netzwerkname = Standorthinzu.NeuerStandortNameIntern
-            NWStandort = Standorthinzu.NeuerStandortName
-            NWName = "Intern"
+            NW.Netzwerkname = Standorthinzu.NeuerStandortNameIntern
+            NW.NWStandort = Standorthinzu.NeuerStandortName
+            NW.NetName = "Intern"
        ElseIf Class1.Absender = "Netzwerkhinzu" Then
-            Netzwerkname = NetzwerkHinzu.NeuerNetzwerkNameIntern
-            NWStandort = NetzwerkAdmin.LstStandort.SelectedItem
-            NWName = NetzwerkHinzu.TxtName.Text
+            NW.Netzwerkname = NetzwerkHinzu.NeuerNetzwerkNameIntern
+            NW.NWStandort = NetzwerkAdmin.LstStandort.SelectedItem
+            NW.NetName = NetzwerkHinzu.TxtName.Text
        Else
            MsgBox("Keine Daten")
        End If
-        import()
+
        SubnetMask2NWBits()
-        LblVLANName.Text = "Standort: " & NWStandort & " Name: " & NWName & " ändern:"
-        LblTest.Text = Netzwerkname
+        LblVLANName.Text = "Standort: " & NW.NWStandort & " Name: " & NW.NetName '& " ändern:"
+        LblTest.Text = NW.Netzwerkname
        ' PanDebug.Visible = False
    End Sub

    ''---------------------------------------------------------------------------LADEN---------------------------------------------------------------------------''

    Private Function import()
-        Try
-            con.Open()
-            cmd.CommandText = "SELECT * FROM Tbl_Netzwerke WHERE Netzwerkname='" & Netzwerkname & "'"
-            ausgabe_Netzwerk()
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
+        'Try
+        '    con.Open()
+        '    cmd.CommandText = "SELECT * FROM Tbl_Netzwerke WHERE Netzwerkname='" & Netzwerkname & "'"
+        '    ausgabe_Netzwerk()
+        'Catch ex As Exception
+        '    MsgBox(ex.Message)
+        'End Try
+
+        'con.Close()
+        '  NW.getNetzwerk(NWStandort, NWName)
+
+        TxtNetzwerk.Text = NW.Netzwerk
+        TxtSubnet.Text = NW.Subnetz
+        TxtGateway.Text = NW.Gateway
+        TxtDHCPBereichStart.Text = NW.DHCPStart
+        TxtDHCPBereichEnde.Text = NW.DHCPEnd
+        TxtDHCPServer.Text = NW.DHCPServer
+        TxtDNSServer.Text = NW.DNSServer
+        TxtVLAN.Text = NW.VLAN
+        TxtInfo.Text = NW.Info
+        ChkDHCPAnzeigen.Checked = NW.DHCPAbfragen
+

-        con.Close()
        If TxtNetzwerk.Text = "" Then
            Neu = True
        Else
@@ -64,26 +83,26 @@ Public Class NWEdit
        End If
    End Function

-    Private Function ausgabe_Netzwerk()
-        Try
-            reader = cmd.ExecuteReader()
-            Do While reader.Read()
-                TxtNetzwerk.Text = reader("Netzwerk")
-                TxtSubnet.Text = reader("Subnetz")
-                TxtGateway.Text = reader("Gateway")
-                TxtDHCPBereichStart.Text = reader("DHCPStart")
-                TxtDHCPBereichEnde.Text = reader("DHCPEnd")
-                TxtDHCPServer.Text = reader("DHCPServer")
-                TxtDNSServer.Text = reader("DNSServer")
-                TxtVLAN.Text = reader("VLAN")
-                TxtInfo.Text = reader("Info")
-                ChkDHCPAnzeigen.Checked = Class1.ReadNullAs0(reader, "DHCPAbfragen")
-            Loop
-            reader.Close()
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
-    End Function
+    'Private Function ausgabe_Netzwerk()
+    '    Try
+    '        reader = cmd.ExecuteReader()
+    '        Do While reader.Read()
+    '            TxtNetzwerk.Text = reader("Netzwerk")
+    '            TxtSubnet.Text = reader("Subnetz")
+    '            TxtGateway.Text = reader("Gateway")
+    '            TxtDHCPBereichStart.Text = reader("DHCPStart")
+    '            TxtDHCPBereichEnde.Text = reader("DHCPEnd")
+    '            TxtDHCPServer.Text = reader("DHCPServer")
+    '            TxtDNSServer.Text = reader("DNSServer")
+    '            TxtVLAN.Text = reader("VLAN")
+    '            TxtInfo.Text = reader("Info")
+    '            ChkDHCPAnzeigen.Checked = Class1.ReadNullAs0(reader, "DHCPAbfragen")
+    '        Loop
+    '        reader.Close()
+    '    Catch ex As Exception
+    '        MsgBox(ex.Message)
+    '    End Try
+    'End Function



@@ -109,7 +128,7 @@ Public Class NWEdit
        If Neu = False Then
            Try
                con.Open()
-                cmd.CommandText = "UPDATE TBL_Netzwerke SET Netzwerk = '" & TxtNetzwerk.Text & "', Subnetz='" & TxtSubnet.Text & "', Gateway='" & TxtGateway.Text & "',DHCPAbfragen = '" & ChkDHCPAnzeigen.Checked & "', DHCPStart='" & TxtDHCPBereichStart.Text & "', DHCPEnd='" & TxtDHCPBereichEnde.Text & "', dhcpserver='" & TxtDHCPServer.Text & "', dnsserver='" & TxtDNSServer.Text & "', VLAN='" & TxtVLAN.Text & "', Info='" & TxtInfo.Text & "', NWAddress='" & NWAddress & "' WHERE Netzwerkname='" & Netzwerkname & "'"
+                cmd.CommandText = "UPDATE TBL_Netzwerke SET Netzwerk = '" & TxtNetzwerk.Text & "', Subnetz='" & TxtSubnet.Text & "', Gateway='" & TxtGateway.Text & "',DHCPAbfragen = '" & ChkDHCPAnzeigen.Checked & "', DHCPStart='" & TxtDHCPBereichStart.Text & "', DHCPEnd='" & TxtDHCPBereichEnde.Text & "', dhcpserver='" & TxtDHCPServer.Text & "', dnsserver='" & TxtDNSServer.Text & "', VLAN='" & TxtVLAN.Text & "', Info='" & TxtInfo.Text & "', NWAddress='" & NW.NWAddress & "' WHERE Netzwerkname='" & NW.Netzwerkname & "'"
                cmd.ExecuteNonQuery()
                con.Close()
            Catch ex As Exception
@@ -117,13 +136,13 @@ Public Class NWEdit
            End Try
        ElseIf Neu = True Then
            con.Open()
-            cmd.CommandText = "Insert into TBL_Netzwerke  (Netzwerkname, Netzwerk, Subnetz, Gateway, DHCPStart, DHCPEnd, DHCPServer, DNSServer, VLAN, Info, NWAddress) values ('" & Main.SenderNetzwerk & "', '" & TxtNetzwerk.Text & "', '" & TxtSubnet.Text & "','" & TxtGateway.Text & "', '" & TxtDHCPBereichStart.Text & "', '" & TxtDHCPBereichEnde.Text & "', '" & TxtDHCPServer.Text & "', '" & TxtDNSServer.Text & "', '" & TxtVLAN.Text & "', '" & TxtInfo.Text & "', '" & NWAddress & "')"
+            cmd.CommandText = "Insert into TBL_Netzwerke  (Netzwerkname, Netzwerk, Subnetz, Gateway, DHCPStart, DHCPEnd, DHCPServer, DNSServer, VLAN, Info, NWAddress) values ('" & Main.SenderNetzwerk & "', '" & TxtNetzwerk.Text & "', '" & TxtSubnet.Text & "','" & TxtGateway.Text & "', '" & TxtDHCPBereichStart.Text & "', '" & TxtDHCPBereichEnde.Text & "', '" & TxtDHCPServer.Text & "', '" & TxtDNSServer.Text & "', '" & TxtVLAN.Text & "', '" & TxtInfo.Text & "', '" & NW.NWAddress & "')"
            cmd.ExecuteNonQuery()
            con.Close()
        End If
        Try

-            Class1.Netzwerkfuellen(TxtNetzwerk.Text, TxtNWBits.Text, NWName, NWStandort)
+            Class1.Netzwerkfuellen(TxtNetzwerk.Text, TxtNWBits.Text, NW.NetName, NW.NWStandort)
            DHCPFill(TxtDHCPBereichStart.Text, TxtDHCPBereichEnde.Text, TxtNetzwerk.Text)
        Catch ex As Exception
            MsgBox(ex.Message)
@@ -159,12 +178,12 @@ Public Class NWEdit


    Public Function NWAddressGenerieren()
-        NWAddress = TxtNetzwerk.Text
+        NW.NWAddress = TxtNetzwerk.Text
        Try
            Do
-                NWAddress = NWAddress.Remove(NWAddress.Length - 1)
+                NW.NWAddress = NW.NWAddress.Remove(NW.NWAddress.Length - 1)

-            Loop Until NWAddress.Last() = "."
+            Loop Until NW.NWAddress.Last() = "."
        Catch ex As Exception
            MsgBox("Fehler beim Konvertieren der Netzwerkadresse.")
        End Try
@@ -177,7 +196,7 @@ Public Class NWEdit

        Dim host As Integer = Class1.IP2Host(TxtNetzwerk.Text)
        NWAddressGenerieren()
-        TxtHostbereich.Text = NWAddress & host + 1 & " bis " & NWAddress & host + (2 ^ hostbits) - 2
+        TxtHostbereich.Text = NW.NWAddress & host + 1 & " bis " & NW.NWAddress & host + (2 ^ hostbits) - 2
    End Function


--- a/Dokumentation/Administration/NetzwerkHinzu.vb
+++ b/Dokumentation/Administration/NetzwerkHinzu.vb
@@ -45,7 +45,9 @@ Public Class NetzwerkHinzu
                cmd.CommandText = "INSERT INTO Tbl_Netzwerke (Netzwerkname, Netzwerk, NWSTANDORT, NETNAME, Subnetz) VALUES ('" & NeuerNetzwerkNameIntern & "', '" & TxtIP.Text & "', '" & Standortname & "', '" & NeuerNetzwerkname & "', '255.255.255.0')"
                cmd.ExecuteNonQuery()
                Class1.Absender = "Netzwerkhinzu"
-                NWEdit.Show()
+                Dim nwe As New NWEdit
+                nwe.NW.getNetzwerk(Standortname, NeuerNetzwerkname)
+                nwe.Show()
            End If

        Catch ex As Exception
--- a/Dokumentation/Administration/Standorthinzu.vb
+++ b/Dokumentation/Administration/Standorthinzu.vb
@@ -44,7 +44,9 @@ Public Class Standorthinzu
                cmd.CommandText = "INSERT INTO Tbl_Netzwerke (Netzwerkname, VLAN, Netzwerk, NWSTANDORT, NETNAME, MAIN, SUBNETZ) VALUES ('" & NeuerStandortNameIntern & "', '0', '" & TxtNetzwerkintern.Text & "', '" & NeuerStandortName & "', 'Intern', '1', '255.255.255.0')"
                cmd.ExecuteNonQuery()
                Class1.Absender = "Standorthinzu"
-                NWEdit.Show()
+                Dim nwe As New NWEdit
+                nwe.NW.getNetzwerk(NeuerStandortName, "Intern")
+                nwe.Show()
            End If

        Catch ex As Exception
--- a/Dokumentation/Classes/Class1.vb
+++ b/Dokumentation/Classes/Class1.vb
@@ -20,6 +20,7 @@ Public Class Class1
    Public Shared DebugMode As Boolean = False
    Public Shared DebugText As String = ""
    Public Shared GroupUsers As List(Of cBenutzer)
+    Public Shared dtSuchergebnis As DataTable

    Public Shared HostList As New List(Of String)

--- a/Dokumentation/Classes/cEintrag.vb
+++ b/Dokumentation/Classes/cEintrag.vb
@@ -32,29 +32,33 @@ Public Class cEintrag
    Public Function getFromSQL() '(ip As String)
        Dim ds As New DataSet
        Dim test As String = ""
-        SQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE ID = '" & Me.ID & "'", ds)
-        If ds.Tables(0).Rows.Count > 0 Then
-            For Each c As DataColumn In ds.Tables(0).Columns
-                Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName)
-                If propInfo IsNot Nothing Then
-                    If Not IsDBNull(c.Table.Rows(0).Item(c)) Then
-                        propInfo.SetValue(Me, c.Table.Rows(0).Item(c))
+        Try
+            SQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE ID = '" & Me.ID & "'", ds)
+            If ds.Tables(0).Rows.Count > 0 Then
+                For Each c As DataColumn In ds.Tables(0).Columns
+                    Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName)
+                    If propInfo IsNot Nothing Then
+                        If Not IsDBNull(c.Table.Rows(0).Item(c)) Then
+                            propInfo.SetValue(Me, c.Table.Rows(0).Item(c))
+                        End If
                    End If
-                End If
-            Next
-        Else
-            ds.Clear()
-            SQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE Rubrik = '" & rubrik & "' AND Titel = '" & Titel & "'", ds)
-            For Each c As DataColumn In ds.Tables(0).Columns
-                Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName)
-                If propInfo IsNot Nothing Then
-                    If Not IsDBNull(c.Table.Rows(0).Item(c)) Then
-                        propInfo.SetValue(Me, c.Table.Rows(0).Item(c))
+                Next
+            Else
+                ds.Clear()
+                SQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE Rubrik = '" & rubrik & "' AND Titel = '" & Titel & "'", ds)
+                For Each c As DataColumn In ds.Tables(0).Columns
+                    Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName)
+                    If propInfo IsNot Nothing Then
+                        If Not IsDBNull(c.Table.Rows(0).Item(c)) Then
+                            propInfo.SetValue(Me, c.Table.Rows(0).Item(c))
+                        End If
                    End If
-                End If
-            Next
-            Me.ID = Guid.NewGuid().ToString("N") : NewID = True
-        End If
+                Next
+                Me.ID = Guid.NewGuid().ToString("N") : NewID = True
+            End If
+        Catch
+            Return -1
+        End Try

        '   MsgBox("hier")
    End Function
--- a/Dokumentation/Classes/cFirewallEntry.vb
+++ b/Dokumentation/Classes/cFirewallEntry.vb
@@ -1,6 +1,6 @@
 Imports System.Data.SqlClient

-Public Class FirewallEntry
+Public Class cFirewallEntry
    Property fwr_ID As String = ""
    Property fwr_hostip As String = ""
    Property fwr_in As String = ""
@@ -83,13 +83,13 @@ ORDER BY [fwr_in]"

    End Function

-    Public Function insertFirewallEntry(ByRef entry As FirewallEntry)
+    Public Function insertFirewallEntry(ByRef entry As cFirewallEntry)
        Dim insert As String
        getInsertCmd(insert)
        SQL.InsertSQL("TbL_FirewallRules", insert)
    End Function

-    Public Function updateFirewallEntry(ByRef entry As FirewallEntry)
+    Public Function updateFirewallEntry(ByRef entry As cFirewallEntry)
        Dim update, where As String
        getUpdateCmd(update, where)
        SQL.UpdateSQL("TbL_FirewallRules", update, where)
--- a/Dokumentation/Classes/cFolder.vb
+++ b/Dokumentation/Classes/cFolder.vb
@@ -24,7 +24,7 @@

    Public Shared Function explorerstarten(ip As String, Optional ByVal smb As Boolean = False)
        Dim Path, nwstandort, netname As String
-        Dim host As New Host
+        Dim host As New cHost
        If smb = False Then
            host.gethost(ip)
            If host.Linked = True Then
--- a/Dokumentation/Classes/cHost.vb
+++ b/Dokumentation/Classes/cHost.vb
@@ -1,6 +1,6 @@
 Imports System.Reflection

-Public Class Host
+Public Class cHost
    Property FQDN As String = ""
    Property QINFO As String = ""
    Property IPAdresse As String = ""
@@ -138,7 +138,7 @@ ORDER BY [fwr_in]"
        '   MsgBox("hier")
    End Function

-    Public Function getUpdateCmd(ByRef update As String, ByRef where As String, Optional ByRef slaveupdate As String = "", Optional ByRef slavewhere As String = "", Optional ByVal Linked As Boolean = False, Optional ByVal newhost As Host = Nothing)
+    Public Function getUpdateCmd(ByRef update As String, ByRef where As String, Optional ByRef slaveupdate As String = "", Optional ByRef slavewhere As String = "", Optional ByVal Linked As Boolean = False, Optional ByVal newhost As cHost = Nothing)
        If newhost Is Nothing Then
            slavewhere = ""
            Dim list As List(Of SQLVariable) = getparameterlistMaster()
@@ -154,7 +154,7 @@ ORDER BY [fwr_in]"
            update = update.Substring(0, update.Length - 1) 'wg. ','

            For Each i In slavelist ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''alle Hosts, bei denen dieser Host als LinkedWith eingetragen ist
-                If Not i.SQLText = "IPAdresse" And Not i.SQLText = "LinkedWith" Then
+                If Not i.SQLText = "IPAdresse" And Not i.SQLText = "LinkedWith" And Not i.SQLText = "NETNAME" And Not i.SQLText = "NWSTANDORT" And Not i.SQLText = "Netzwerk" Then
                    slaveupdate &= "[" & i.SQLText & "]='" & i.SQLValue & "',"
                ElseIf i.SQLText = "IPAdresse" Then
                    slavewhere &= "(Linked = 'True' AND (LinkedWith = '" & i.SQLValue & "'"
@@ -191,7 +191,7 @@ ORDER BY [fwr_in]"

    End Function

-    Public Function updateHostEntry(ByRef entry As Host)
+    Public Function updateHostEntry(ByRef entry As cHost)
        Dim update, where, slaveupdate, slavewhere As String
        getUpdateCmd(update, where, slaveupdate, slavewhere, Me.Linked)
        SQL.UpdateSQL("TbL_Netzwerkclients", update, where)
@@ -246,7 +246,7 @@ Diese Einträge werden ebenfalls gelöscht. Fortfahren?", "Hosteintrag löschen"
        If checkIfIPExist(newip) = False Then MsgBox("Die Adresse kann nicht verwendet werden. Bitte überprüfen.") : Return Me : Exit Function

        Dim oldip As String = Me.IPAdresse
-        Dim newhost As New Host
+        Dim newhost As New cHost
        newhost.gethost(newip)

        'Get Slaves of LinkedMaster 
--- a/Dokumentation/Classes/cNetzwerk.vb
+++ b/Dokumentation/Classes/cNetzwerk.vb
@@ -0,0 +1,80 @@
+Imports System.Reflection
+
+Public Class cNetzwerk
+    Property NetName As String = ""
+    Property NWStandort As String = ""
+    Property Netzwerkname As String = ""
+    Property Netzwerk As String = ""
+    Property Subnetz As String = ""
+    Property VLAN As String = ""
+    Property main As Boolean = Nothing
+    Property Gateway As String = ""
+    Property DHCPStart As String = ""
+    Property DHCPEnd As String = ""
+    Property DHCPServer As String = ""
+    Property DHCPAbfragen As Boolean = False
+    Property DNSServer As String = ""
+    Property NWAddress As String = ""
+    Property Info As String = ""
+    Property StartIP As String = ""
+
+
+    Function getparameterlist() As List(Of SQLVariable)
+        Dim list As New List(Of SQLVariable)
+        list.Add(New SQLVariable("NetName", NetName))
+        list.Add(New SQLVariable("NWStandort", NWStandort))
+        list.Add(New SQLVariable("Netzwerkname", Netzwerkname))
+        list.Add(New SQLVariable("Netzwerk", Netzwerk))
+        list.Add(New SQLVariable("Subnetz", Subnetz))
+        list.Add(New SQLVariable("VLAN", VLAN))
+        list.Add(New SQLVariable("main", main))
+        list.Add(New SQLVariable("Gateway", Gateway))
+        list.Add(New SQLVariable("DHCPStart", DHCPStart))
+        list.Add(New SQLVariable("DHCPEnd", DHCPEnd))
+        list.Add(New SQLVariable("DHCPServer", DHCPServer))
+        list.Add(New SQLVariable("DNSServer", DNSServer))
+        list.Add(New SQLVariable("NWAddress", NWAddress))
+        list.Add(New SQLVariable("Info", Info))
+        Return list
+    End Function
+
+
+    Public Function getNetzwerk(nwstandort_ As String, netname_ As String)
+        Dim ds As New DataSet
+        '    Dim test As String = ""
+        SQL.SQL2DS("select * from TbL_Netzwerke where Netzwerkname = '" & nwstandort_ & "_" & netname_ & "'", ds)
+        For Each c As DataColumn In ds.Tables(0).Columns
+            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName)
+            If propInfo IsNot Nothing Then
+                If Not IsDBNull(c.Table.Rows(0).Item(c)) Then
+                    propInfo.SetValue(Me, c.Table.Rows(0).Item(c))
+                End If
+            End If
+        Next
+        Me.NWStandort = nwstandort_ : Me.NetName = netname_
+        '   MsgBox("hier")
+    End Function
+
+    Public Function getFirstHost()
+        Dim Starthost As String = IP2Host(Me.Netzwerk) + 1
+        Me.StartIP = Me.NWAddress & Starthost
+
+    End Function
+
+    Public Shared Function IP2Host(IP As String)
+        Dim pointcounter As Integer = 0
+        Try
+            Do
+                If IP.StartsWith(".") Then
+                    pointcounter = pointcounter + 1
+                End If
+                IP = IP.Remove(0, 1)
+
+            Loop Until pointcounter = 3 'IP.First() = "."
+
+            Return IP
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Function
+End Class
--- a/Dokumentation/Dokumentation.vbproj
+++ b/Dokumentation/Dokumentation.vbproj
@@ -154,6 +154,7 @@
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="Classes\cEintrag.vb" />
+    <Compile Include="Classes\cNetzwerk.vb" />
    <Compile Include="frmAllgemeinEintrag.Designer.vb">
      <DependentUpon>frmAllgemeinEintrag.vb</DependentUpon>
    </Compile>
@@ -177,9 +178,9 @@
    </Compile>
    <Compile Include="Classes\DHCP.vb" />
    <Compile Include="Classes\Ext_Programme.vb" />
-    <Compile Include="Classes\FirewallEntry.vb" />
+    <Compile Include="Classes\cFirewallEntry.vb" />
    <Compile Include="Classes\cFolder.vb" />
-    <Compile Include="Classes\Host.vb" />
+    <Compile Include="Classes\cHost.vb" />
    <Compile Include="Classes\SQL.vb" />
    <Compile Include="Drucken\frmPrint.Designer.vb">
      <DependentUpon>frmPrint.vb</DependentUpon>
--- a/Dokumentation/Main.Designer.vb
+++ b/Dokumentation/Main.Designer.vb
@@ -80,7 +80,9 @@ Partial Class Main
        Me.DgvMainContextMenuItemHost = New System.Windows.Forms.ToolStripMenuItem()
        Me.ErstellenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DateienToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SMBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DgvMainContextMenuItemLink = New System.Windows.Forms.ToolStripMenuItem()
+        Me.IPAdresseInZwischenablageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
        Me.ObjektLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
@@ -97,8 +99,6 @@ Partial Class Main
        Me.TimerUhrzeit = New System.Windows.Forms.Timer(Me.components)
        Me.TimerUpdate = New System.Windows.Forms.Timer(Me.components)
        Me.TimerWillkommen = New System.Windows.Forms.Timer(Me.components)
-        Me.SMBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.IPAdresseInZwischenablageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.Panel2.SuspendLayout()
        Me.Panel4.SuspendLayout()
        Me.PanType.SuspendLayout()
@@ -330,54 +330,54 @@ Partial Class Main
        '
        Me.ToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NetzwerkeToolStripMenuItem, Me.AnsichtDruckenToolStripMenuItem, Me.ExportToolStripMenuItem, Me.ImportToolStripMenuItem, Me.BenutzerToolStripMenuItem, Me.ToolStripSeparator1, Me.UpdateToolStripMenuItem, Me.ExitToolStripMenuItem})
        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(49, 20)
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(50, 20)
        Me.ToolStripMenuItem1.Text = "Extras"
        '
        'NetzwerkeToolStripMenuItem
        '
        Me.NetzwerkeToolStripMenuItem.Name = "NetzwerkeToolStripMenuItem"
-        Me.NetzwerkeToolStripMenuItem.Size = New System.Drawing.Size(177, 22)
+        Me.NetzwerkeToolStripMenuItem.Size = New System.Drawing.Size(176, 22)
        Me.NetzwerkeToolStripMenuItem.Text = "Tabellen bearbeiten"
        '
        'AnsichtDruckenToolStripMenuItem
        '
        Me.AnsichtDruckenToolStripMenuItem.Name = "AnsichtDruckenToolStripMenuItem"
-        Me.AnsichtDruckenToolStripMenuItem.Size = New System.Drawing.Size(177, 22)
+        Me.AnsichtDruckenToolStripMenuItem.Size = New System.Drawing.Size(176, 22)
        Me.AnsichtDruckenToolStripMenuItem.Text = "Drucken"
        '
        'ExportToolStripMenuItem
        '
        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
-        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(177, 22)
+        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(176, 22)
        Me.ExportToolStripMenuItem.Text = "Export"
        '
        'ImportToolStripMenuItem
        '
        Me.ImportToolStripMenuItem.Name = "ImportToolStripMenuItem"
-        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(177, 22)
+        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(176, 22)
        Me.ImportToolStripMenuItem.Text = "Import"
        '
        'BenutzerToolStripMenuItem
        '
        Me.BenutzerToolStripMenuItem.Name = "BenutzerToolStripMenuItem"
-        Me.BenutzerToolStripMenuItem.Size = New System.Drawing.Size(177, 22)
+        Me.BenutzerToolStripMenuItem.Size = New System.Drawing.Size(176, 22)
        Me.BenutzerToolStripMenuItem.Text = "Benutzer"
        '
        'ToolStripSeparator1
        '
        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(174, 6)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(173, 6)
        '
        'UpdateToolStripMenuItem
        '
        Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem"
-        Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(177, 22)
+        Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(176, 22)
        Me.UpdateToolStripMenuItem.Text = "Update"
        '
        'ExitToolStripMenuItem
        '
        Me.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem"
-        Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(177, 22)
+        Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(176, 22)
        Me.ExitToolStripMenuItem.Text = "Exit"
        '
        'ToolStripMenuItem2
@@ -648,59 +648,71 @@ Partial Class Main
        '
        Me.DGVMainContext.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DgvMainContextMenuItemHost, Me.ErstellenToolStripMenuItem, Me.DateienToolStripMenuItem, Me.SMBToolStripMenuItem, Me.DgvMainContextMenuItemLink, Me.IPAdresseInZwischenablageToolStripMenuItem, Me.ToolStripSeparator3, Me.ObjektLöschenToolStripMenuItem, Me.ToolStripSeparator2, Me.NetzwerkdateienToolStripMenuItem, Me.ToolsToolStripMenuItem})
        Me.DGVMainContext.Name = "ContextMenuStrip2"
-        Me.DGVMainContext.Size = New System.Drawing.Size(230, 236)
+        Me.DGVMainContext.Size = New System.Drawing.Size(230, 214)
        '
        'DgvMainContextMenuItemHost
        '
        Me.DgvMainContextMenuItemHost.Name = "DgvMainContextMenuItemHost"
-        Me.DgvMainContextMenuItemHost.Size = New System.Drawing.Size(180, 22)
+        Me.DgvMainContextMenuItemHost.Size = New System.Drawing.Size(229, 22)
        Me.DgvMainContextMenuItemHost.Text = "Bearbeiten"
        '
        'ErstellenToolStripMenuItem
        '
        Me.ErstellenToolStripMenuItem.Name = "ErstellenToolStripMenuItem"
-        Me.ErstellenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ErstellenToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
        Me.ErstellenToolStripMenuItem.Text = "Erstellen"
        '
        'DateienToolStripMenuItem
        '
        Me.DateienToolStripMenuItem.Name = "DateienToolStripMenuItem"
-        Me.DateienToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.DateienToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
        Me.DateienToolStripMenuItem.Text = "Dateien"
        '
+        'SMBToolStripMenuItem
+        '
+        Me.SMBToolStripMenuItem.Name = "SMBToolStripMenuItem"
+        Me.SMBToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
+        Me.SMBToolStripMenuItem.Text = "SMB"
+        '
        'DgvMainContextMenuItemLink
        '
        Me.DgvMainContextMenuItemLink.Name = "DgvMainContextMenuItemLink"
-        Me.DgvMainContextMenuItemLink.Size = New System.Drawing.Size(180, 22)
+        Me.DgvMainContextMenuItemLink.Size = New System.Drawing.Size(229, 22)
        Me.DgvMainContextMenuItemLink.Text = "Link öffnen"
        '
+        'IPAdresseInZwischenablageToolStripMenuItem
+        '
+        Me.IPAdresseInZwischenablageToolStripMenuItem.Name = "IPAdresseInZwischenablageToolStripMenuItem"
+        Me.IPAdresseInZwischenablageToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
+        Me.IPAdresseInZwischenablageToolStripMenuItem.Text = "IP Adresse in Zwischenablage"
+        '
        'ToolStripSeparator3
        '
        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(226, 6)
        '
        'ObjektLöschenToolStripMenuItem
        '
        Me.ObjektLöschenToolStripMenuItem.Name = "ObjektLöschenToolStripMenuItem"
-        Me.ObjektLöschenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ObjektLöschenToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
        Me.ObjektLöschenToolStripMenuItem.Text = "Objekt löschen"
        '
        'ToolStripSeparator2
        '
        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(226, 6)
        '
        'NetzwerkdateienToolStripMenuItem
        '
        Me.NetzwerkdateienToolStripMenuItem.Name = "NetzwerkdateienToolStripMenuItem"
-        Me.NetzwerkdateienToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.NetzwerkdateienToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
        Me.NetzwerkdateienToolStripMenuItem.Text = "Standort-Dateien"
        '
        'ToolsToolStripMenuItem
        '
        Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PuttyToolStripMenuItem, Me.PingToolStripMenuItem, Me.ToolStripSeparator4})
        Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem"
-        Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
        Me.ToolsToolStripMenuItem.Text = "Tools"
        '
        'PuttyToolStripMenuItem
@@ -787,18 +799,6 @@ Partial Class Main
        Me.TimerWillkommen.Enabled = True
        Me.TimerWillkommen.Interval = 5000
        '
-        'SMBToolStripMenuItem
-        '
-        Me.SMBToolStripMenuItem.Name = "SMBToolStripMenuItem"
-        Me.SMBToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.SMBToolStripMenuItem.Text = "SMB"
-        '
-        'IPAdresseInZwischenablageToolStripMenuItem
-        '
-        Me.IPAdresseInZwischenablageToolStripMenuItem.Name = "IPAdresseInZwischenablageToolStripMenuItem"
-        Me.IPAdresseInZwischenablageToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
-        Me.IPAdresseInZwischenablageToolStripMenuItem.Text = "IP Adresse in Zwischenablage"
-        '
        'Main
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/Dokumentation/Main.resx
+++ b/Dokumentation/Main.resx
@@ -117,9 +117,6 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="PictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/Dokumentation/Main.vb
+++ b/Dokumentation/Main.vb
@@ -457,6 +457,9 @@ Public Class Main
    End Function

    Public Function dgvfill(ds As DataSet, design As String)
+        '  Class1.dtSuchergebnis.Clear()
+        Class1.dtSuchergebnis = ds.Tables(0)
+
        Dim starttime As Date = DateTime.Now
        Dim endtime As New Date
        If design = "Netzwerk" Then
@@ -746,10 +749,14 @@ Public Class Main
    Private Sub CmdNetzwerkbearbeiten_Click(sender As Object, e As EventArgs) Handles CmdNetzwerkbearbeiten.Click
        werbinich()
        Class1.Absender = "Main"
-        NWEdit.StartPosition = FormStartPosition.Manual
-        NWEdit.Location = New Point(Location.X + 300, Location.Y + 300)
+        Dim NWE As New NWEdit
+        'NWE.NWStandort = SenderStandort
+        'NWE.Netzwerkname = SenderNetzwerk
+        NWE.NW.getNetzwerk(SenderStandort, SenderNetzwerk)
+        NWE.StartPosition = FormStartPosition.Manual
+        NWE.Location = New Point(Location.X + 300, Location.Y + 300)
        'NetzwerkBearbeiten.Show()
-        NWEdit.Show()
+        NWE.Show()
    End Sub

    Private Sub NetzwerkeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NetzwerkeToolStripMenuItem.Click
@@ -789,9 +796,13 @@ Public Class Main
            Try
                frm.IP = (DgVMain.CurrentRow.Cells("IPAdresse").Value)
            Catch
-                frm.IP = (DgVMain.Rows(0).Cells("IPAdresse").Value)
+                Dim NW As New cNetzwerk
+                NW.getNetzwerk(LstStandort.SelectedItem, LstNetzwerk.SelectedItem)
+                NW.getFirstHost()
+                frm.IP = NW.StartIP
            End Try
-            If cBerechtigungen.BenutzerBerechtigungfuerStandort(Class1.LoggedOnUser.BenutzeranmeldeName, DgVMain.CurrentRow.Cells("NWSTANDORT").Value) = "R" Then
+            'If cBerechtigungen.BenutzerBerechtigungfuerStandort(Class1.LoggedOnUser.BenutzeranmeldeName, DgVMain.CurrentRow.Cells("NWSTANDORT").Value) = "R" Then
+            If cBerechtigungen.BenutzerBerechtigungfuerStandort(Class1.LoggedOnUser.BenutzeranmeldeName, LstStandort.SelectedItem) = "R" Then
                frm.Panel1.Enabled = False : frm.PanFirewall.Enabled = False
            End If
            AddHandler frm.FormClosing, Function()
@@ -807,7 +818,9 @@ Public Class Main
            Eintrag.rubrik = Class1.DBNull2emptyString(DgVMain.CurrentRow.Cells("Rubrik").Value)
            Eintrag.Titel = Class1.DBNull2emptyString(DgVMain.CurrentRow.Cells("Titel").Value)
            Eintrag.Berechtigung = Class1.DBNull2emptyString(DgVMain.CurrentRow.Cells("Zugriff").Value)
-            Eintrag.getFromSQL()
+            If Eintrag.getFromSQL() = -1 Then
+                btnNeu.PerformClick() : Exit Sub
+            End If
            Dim frm As New frmAllgemeinEintrag
            frm.Eintrag = Eintrag
            frm.Text = Eintrag.Titel
@@ -1222,11 +1235,10 @@ Public Class Main
    End Sub

    Private Sub btnTest3_Click(sender As Object, e As EventArgs) Handles btnTest3.Click
-        Dim test As String
-        For Each st As String In Class1.HostList
-            test &= st & vbCrLf
-        Next
-        MsgBox(test)
+        Dim test As New cNetzwerk
+        test.getNetzwerk(LstStandort.SelectedItem, LstNetzwerk.SelectedItem)
+        test.getFirstHost()
+        MsgBox("STOP HIER")
    End Sub

    Private Sub ToolStripMenuItemINFO_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItemINFO.Click
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -169,7 +169,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 0.0.1.32 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 0.0.1.34 ähnelt.
        '''</summary>
        Friend ReadOnly Property Version() As String
            Get
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -131,7 +131,7 @@
    <value>..\Resources\Link.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Version" xml:space="preserve">
-    <value>0.0.1.32</value>
+    <value>0.0.1.34</value>
  </data>
  <data name="Link" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
--- a/Dokumentation/frmHostBearbeiten.Designer.vb
+++ b/Dokumentation/frmHostBearbeiten.Designer.vb
@@ -406,12 +406,12 @@ Partial Class frmHostBearbeiten
        '
        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MitHTTPFüllenToolStripMenuItem})
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(159, 26)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(157, 26)
        '
        'MitHTTPFüllenToolStripMenuItem
        '
        Me.MitHTTPFüllenToolStripMenuItem.Name = "MitHTTPFüllenToolStripMenuItem"
-        Me.MitHTTPFüllenToolStripMenuItem.Size = New System.Drawing.Size(158, 22)
+        Me.MitHTTPFüllenToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
        Me.MitHTTPFüllenToolStripMenuItem.Text = "mit HTTP füllen"
        '
        'CmdIPUp
--- a/Dokumentation/frmHostBearbeiten.vb
+++ b/Dokumentation/frmHostBearbeiten.vb
@@ -1,16 +1,16 @@
 Public Class frmHostBearbeiten

    Public Shared IP As String = ""
-    Public host As New Host
+    Public host As New cHost

    Private Sub frmHostBearbeiten_Load(sender As Object, e As EventArgs) Handles Me.Load
        lblSuchfilter.Visible = Main.SucheAktiv
-        host = New Host
+        host = New cHost
        host.gethost(IP)
        fillform(host)
    End Sub

-    Public Function fillform(host As Host, Optional ByVal Linked As Boolean = False)
+    Public Function fillform(host As cHost, Optional ByVal Linked As Boolean = False)
        If Linked = False Then ''''''''''''''''''
            TxtIP.Text = host.IPAdresse
            TxtHost.Text = host.HOST
@@ -35,7 +35,7 @@
        TxtLink.Text = host.LINK

        Dim ds As New DataSet
-        Host.getSlaves(host.IPAdresse, ds)
+        cHost.getSlaves(host.IPAdresse, ds)
        If ds.Tables(0).Rows.Count > 0 Then
            ShowSlavesPanel(True, ds)
        Else
@@ -49,7 +49,7 @@
    End Function

    Public Function LoadFromExternal(IPtoLoad As String)
-        Dim host As New Host
+        Dim host As New cHost
        host.gethost(IPtoLoad)
        fillform(host)
    End Function
@@ -123,23 +123,27 @@

            If sender.name = "CmdIPUp" Then

-                If Main.SelectedDGVIndex + 1 < (meh.Rows.Count - 1) Then Main.SelectedDGVIndex = Main.SelectedDGVIndex + 1
-                newip = meh.Rows(Main.SelectedDGVIndex).Cells("IPAdresse").Value
-                    If Main.FirstDisplayedDGVEntry + 1 <= endhost Then Main.FirstDisplayedDGVEntry = Main.FirstDisplayedDGVEntry + 1
+                'If Main.SelectedDGVIndex + 1 < (meh.Rows.Count - 1) Then Main.SelectedDGVIndex = Main.SelectedDGVIndex + 1
+                'newip = meh.Rows(Main.SelectedDGVIndex).Cells("IPAdresse").Value
+                'If Main.FirstDisplayedDGVEntry + 1 <= endhost Then Main.FirstDisplayedDGVEntry = Main.FirstDisplayedDGVEntry + 1
+                If Main.SelectedDGVIndex + 1 <= Class1.dtSuchergebnis.Rows.Count - 1 Then Main.SelectedDGVIndex = Main.SelectedDGVIndex + 1
+                newip = Class1.dtSuchergebnis.Rows(Main.SelectedDGVIndex).Item("IPAdresse")

            End If

-            If sender.name = "CmdIPDown" Then
+                If sender.name = "CmdIPDown" Then

+                'If Main.SelectedDGVIndex - 1 >= 0 Then Main.SelectedDGVIndex = Main.SelectedDGVIndex - 1
+                'newip = meh.Rows(Main.SelectedDGVIndex).Cells("IPAdresse").Value
+                'If Main.FirstDisplayedDGVEntry - 1 >= 1 Then Main.FirstDisplayedDGVEntry = Main.FirstDisplayedDGVEntry - 1
                If Main.SelectedDGVIndex - 1 >= 0 Then Main.SelectedDGVIndex = Main.SelectedDGVIndex - 1
-                newip = meh.Rows(Main.SelectedDGVIndex).Cells("IPAdresse").Value
-                If Main.FirstDisplayedDGVEntry - 1 >= 1 Then Main.FirstDisplayedDGVEntry = Main.FirstDisplayedDGVEntry - 1
+                newip = Class1.dtSuchergebnis.Rows(Main.SelectedDGVIndex).Item("IPAdresse")

            End If

        End If

-        host = New Host
+        host = New cHost
        host.gethost(newip)
        fillform(host)
    End Sub
@@ -159,9 +163,11 @@
    Private Sub CmdLink_Click(sender As Object, e As EventArgs) Handles CmdLink.Click
        Dim NETNAME As String = host.NETNAME
        Dim Netzwerk As String = host.Netzwerk
+        Dim NWStandort As String = host.NWSTANDORT
        host.gethost(TxtLinkedWith.Text)
        host.NETNAME = NETNAME
        host.Netzwerk = Netzwerk
+        host.NWSTANDORT = NWStandort
        fillform(host, True)
    End Sub

@@ -225,14 +231,25 @@
            If e.KeyValue = Keys.Enter Then
                Dim Netz As String = Class1.ip2ipnet(TxtIP.Text)
                Dim NewHost As String = TxtHost.Text
-                host = New Host
+                host = New cHost
                host.gethost(Netz & NewHost)
                fillform(host)
+                If IPzuIndex(host.IPAdresse) Then Main.SelectedDGVIndex = IPzuIndex(host.IPAdresse)
            End If
        Catch
        End Try
    End Sub

+    Private Function IPzuIndex(IP As String) As Integer
+        For i As Integer = 0 To Class1.dtSuchergebnis.Rows.Count
+            If Class1.dtSuchergebnis.Rows(i).Item("IPAdresse") = IP Then
+                Return i
+                Exit Function
+            End If
+        Next
+        Return -1
+    End Function
+
    Private Sub ChkKennwortAnzeigen_CheckedChanged(sender As Object, e As EventArgs) Handles ChkKennwortAnzeigen.CheckedChanged
        If ChkKennwortAnzeigen.Checked Then
            TxtKennwort.PasswordChar = ""
@@ -250,13 +267,13 @@
    End Sub

    Private Sub CmdReset_Click(sender As Object, e As EventArgs) Handles CmdReset.Click
-        host = New Host
+        host = New cHost
        host.gethost(TxtIP.Text)
        fillform(host)
    End Sub

    Private Sub CmdCopy_Click(sender As Object, e As EventArgs) Handles CmdCopy.Click
-        Dim ZielHost As New Host
+        Dim ZielHost As New cHost
        ZielHost = host
        Dim ip As String
        Class1.Host2IP(TxtHost.Text, host.NWSTANDORT, host.NETNAME, ip)
@@ -270,7 +287,7 @@
    Private Sub CmdDelete_Click(sender As Object, e As EventArgs) Handles CmdDelete.Click
        fillHost()
        host.DeleteHost()
-        host = New Host
+        host = New cHost
        host.gethost(TxtIP.Text)
        fillform(host)
    End Sub
@@ -299,7 +316,7 @@
    End Sub

    Private Sub GeheZuToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GeheZuToolStripMenuItem.Click
-        Dim host As New Host
+        Dim host As New cHost
        host.gethost(TxtLinkedWith.Text)
        fillform(host)
    End Sub
@@ -311,4 +328,6 @@
    Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.DoubleClick
        Clipboard.SetText(host.IPAdresse)
    End Sub
+
+
 End Class
--- a/Dokumentation/uscntr_Firewalleinstellungen.vb
+++ b/Dokumentation/uscntr_Firewalleinstellungen.vb
@@ -14,7 +14,7 @@

    Public Function Laden()
        ds.Clear()
-        FirewallEntry.getFirewallEntrys(ds, Host)
+        cFirewallEntry.getFirewallEntrys(ds, Host)
        FillDGV(ds)
    End Function

@@ -111,7 +111,7 @@
    End Sub

    Private Sub CmdSpeichern_Click(sender As Object, e As EventArgs) Handles CmdSpeichern.Click
-        Dim eintrag As New FirewallEntry
+        Dim eintrag As New cFirewallEntry
        eintrag.fwr_ID = fwr_ID
        eintrag.fwr_hostip = Host
        eintrag.fwr_in = TxtIpIn.Text.Replace("'", "")