Fix up advertisement and blocking.

Upgrade calmclientandserver.

Author: Captain-ALM

C-ALM-VOIP/C-ALM-VOIP/AddrBook/AddressableBase.vb

@@ -7,8 +7,6 @@ Public MustInherit Class AddressableBase
     Protected _targport As Integer = 0
     Protected _myaddress As String = ""
     Protected _myport As Integer = 0
-    Protected _advaddress As String = ""
-    Protected _advport As Integer = 0
     Protected _type As AddressableType = AddressableType.None
     Protected _passmode As MessagePassMode = messagePassMode.Disable
     Protected _targver As IPVersion = IPVersion.None
@@ -22,8 +20,6 @@ Public MustInherit Class AddressableBase
         _targport = other._targport
         _myaddress = other._myaddress
         _myport = other._myport
-        _advaddress = other._advaddress
-        _advport = other._advport
         _type = other._type
         _passmode = other._passmode
         _targver = other._targver
@@ -81,26 +77,6 @@ Public MustInherit Class AddressableBase
         End Set
     End Property
     <Xml.Serialization.XmlIgnore>
-    Public Overridable Property advertisedAddress As String
-        Get
-            If _advaddress Is Nothing OrElse _advaddress = "" Then Return _myaddress
-            Return _advaddress
-        End Get
-        Set(value As String)
-            _advaddress = value
-        End Set
-    End Property
-    <Xml.Serialization.XmlIgnore>
-    Public Overridable Property advertisedPort As Integer
-        Get
-            If _advport = 0 Then Return _myport
-            Return _advport
-        End Get
-        Set(value As Integer)
-            _advport = value
-        End Set
-    End Property
-    <Xml.Serialization.XmlIgnore>
     Public Overridable Property type As AddressableType
         Get
             Return _type

C-ALM-VOIP/C-ALM-VOIP/AddrBook/BlockClient.vb

@@ -43,4 +43,7 @@ Public Class BlockClient
         Set(value As MessagePassMode)
         End Set
     End Property
+
+    Public Overrides Sub sendAdvertisement()
+    End Sub
 End Class

C-ALM-VOIP/C-ALM-VOIP/AddrBook/Client.vb

@@ -10,6 +10,8 @@ Public Class Client
     Protected _str As Streamer = Nothing
     Protected _cl As NetMarshalBase = Nothing
     Protected _lts As DateTime = DateTime.UtcNow
+    Protected _advaddress As String = ""
+    Protected _advport As Integer = 0
 
     Public Sub New(other As Contact)
         MyBase.New(other)
@@ -24,15 +26,41 @@ Public Class Client
     End Sub
 
     Public Overrides Function duplicateToNew() As AddressableBase
-        Return New Contact(Me)
+        Dim toret As New Contact(Me.advertisedAddress, Me.advertisedPort, Me.targetIPVersion, Me.type) With {.name = Me.name, .messagePassMode = Me.messagePassMode}
+        If Me.type = AddressableType.UDP Then
+            toret.myAddress = Me.myAddress
+            toret.myPort = Me.myPort
+        End If
+        Return toret
     End Function
 
+    Public Overridable Property advertisedAddress As String
+        Get
+            If _advaddress Is Nothing OrElse _advaddress = "" Then Return _targaddress
+            Return _advaddress
+        End Get
+        Set(value As String)
+            _advaddress = value
+        End Set
+    End Property
+
+    Public Overridable Property advertisedPort As Integer
+        Get
+            If _advport = 0 Then Return _targport
+            Return _advport
+        End Get
+        Set(value As Integer)
+            _advport = value
+        End Set
+    End Property
+
     Public Overridable Sub forceReceive(msg As IPacket)
         Me.msgrec(msg)
     End Sub
 
     Protected Overridable Sub msgrec(msg As IPacket)
         If _type = AddressableType.Block Or _passmode = voip.MessagePassMode.Disable Or _passmode = voip.MessagePassMode.Send Then Exit Sub
+
         If isForMe(msg) Then
             If msg.dataType = GetType(Tuple(Of Byte(), DateTime)) AndAlso isNewerTimeStamp(msg.data) Then
                 _lts = CType(msg.data, Tuple(Of Byte(), DateTime)).Item2

C-ALM-VOIP/C-ALM-VOIP/AddrBook/Contact.vb

@@ -49,24 +49,6 @@ Public Class Contact
             MyBase.targetIPVersion = value
         End Set
     End Property
-    <Xml.Serialization.XmlElement(ElementName:="advertisedAddress")>
-    Public Overridable Property advertisedAddressValue As String
-        Get
-            Return _advaddress
-        End Get
-        Set(value As String)
-            _advaddress = value
-        End Set
-    End Property
-    <Xml.Serialization.XmlElement(ElementName:="advertisedPort")>
-    Public Overridable Property advertisedPortValue As Integer
-        Get
-            Return _advport
-        End Get
-        Set(value As Integer)
-            _advport = value
-        End Set
-    End Property
 
     Public Overrides Function duplicateToNew() As AddressableBase
         Return New Contact(Me)

C-ALM-VOIP/C-ALM-VOIP/Views/Editor.vb

@@ -80,6 +80,8 @@ Public Class Editor
         End While
         SyncLock slockchker
             'Begin Population
+            Label7.Text = "My Address:"
+            Label8.Text = "My Port:"
             If ceditm = EditorMode.Create Or ceditm = EditorMode.EditContact Then
                 cmbxipv.Enabled = True
                 cmbxtype.Enabled = True
@@ -91,17 +93,16 @@ Public Class Editor
                 txtbxmyaddr.ReadOnly = False
                 nudmyport.ReadOnly = False
                 nudmyport.Controls(0).Enabled = True
-                If caddrbs.type <> AddressableType.Block Then
-                    If caddrbs.type = AddressableType.UDP Then
-                        txtbxmyaddr.Text = settings.external_Address_IPv4
-                        nudmyport.Value = settings.external_UDP_Port_IPv4
-                    ElseIf caddrbs.type = AddressableType.TCP Then
-                        txtbxmyaddr.Text = settings.external_Address_IPv4
-                        nudmyport.Value = settings.external_TCP_Port_IPv4
-                    End If
+                If caddrbs.type = AddressableType.UDP Then
+                    txtbxmyaddr.Text = settings.external_Address_IPv4
+                    nudmyport.Value = settings.external_UDP_Port_IPv4
                     txtbxmyaddr.Enabled = True
                     nudmyport.Enabled = True
                     cmbxstrmode.Enabled = True
+                ElseIf caddrbs.type = AddressableType.TCP Then
+                    txtbxmyaddr.Enabled = False
+                    nudmyport.Enabled = False
+                    cmbxstrmode.Enabled = True
                 Else
                     txtbxmyaddr.Enabled = False
                     nudmyport.Enabled = False
@@ -123,8 +124,15 @@ Public Class Editor
                 nudport.ReadOnly = True
                 nudport.Controls(0).Enabled = False
                 If ceditm = EditorMode.EditClient Then
-                    txtbxmyaddr.Text = caddrbs.advertisedAddress
-                    nudmyport.Value = caddrbs.advertisedPort
+                    If caddrbs.type = AddressableType.TCP And TypeOf caddrbs Is Client Then
+                        Label7.Text = "Actual Address:"
+                        Label8.Text = "Actual Port:"
+                        txtbxmyaddr.Text = CType(caddrbs, Client).advertisedAddress
+                        nudmyport.Value = CType(caddrbs, Client).advertisedPort
+                    Else
+                        txtbxmyaddr.Text = caddrbs.myAddress
+                        nudmyport.Value = caddrbs.myPort
+                    End If
                     txtbxmyaddr.Enabled = True
                     nudmyport.Enabled = True
                     cmbxstrmode.Enabled = True
@@ -255,6 +263,10 @@ Public Class Editor
             txtbxmyaddr.Enabled = False
             nudmyport.Enabled = False
             cmbxstrmode.Enabled = False
+        ElseIf cmbxtype.SelectedIndex + 1 = AddressableType.TCP And ceditm <> EditorMode.EditClient Then
+            txtbxmyaddr.Enabled = False
+            nudmyport.Enabled = False
+            cmbxstrmode.Enabled = True
         Else
             txtbxmyaddr.Enabled = True
             nudmyport.Enabled = True

C-ALM-VOIP/C-ALM-VOIP/Views/MainProgram.vb

@@ -296,8 +296,8 @@ Public NotInheritable Class MainProgram
             clientreg.updateCachedIndices()
             If clientreg.selectedIndices.Count > 0 Then
                 editfin = False
-                ceditm = EditorMode.EditClient
                 caddrbs = clientreg(clientreg.selectedIndices(0))
+                If caddrbs.type = AddressableType.Block Then ceditm = EditorMode.EditBlocker Else ceditm = EditorMode.EditClient
                 wp.showForm(Of Editor)(0, Me)
                 While Not editfin
                     Threading.Thread.Sleep(125)
@@ -491,7 +491,7 @@ Public NotInheritable Class MainProgram
                 CType(adbIn, Contact).targetAddress = returnFirstItemOrNothing(Of IPAddress)(resolve(adbIn.targetAddress, Net.Sockets.AddressFamily.InterNetwork)).ToString()
             End If
         End If
-        If clientreg.find(New MClient(adbIn.targetAddress, adbIn.targetPort)).Length <> 0 Then Return
+        If clientreg.find(New MClient(adbIn.targetAddress, adbIn.targetPort)).Length <> 0 And adbIn.type <> AddressableType.Block Then Return
         If adbIn.type = AddressableType.TCP Then
             If adbIn.targetIPVersion = IPVersion.IPv4 And Not tcpmarshalIPv4 Is Nothing Then
                 Dim tpl As New Tuple(Of String, Integer, String, voip.MessagePassMode)(adbIn.targetAddress, adbIn.targetPort, adbIn.name, adbIn.messagePassMode)
@@ -522,11 +522,16 @@ Public NotInheritable Class MainProgram
     End Sub
 
     Private Sub addClient(clIn As Client, forceData As IPacket)
-        If clientreg.find(New MClient(clIn.targetAddress, clIn.targetPort)).Length = 0 Then
+        Dim arr As Client() = clientreg.find(New MClient(clIn.targetAddress, clIn.targetPort))
+        If arr.Length = 0 Then
             clIn.sendAdvertisement()
             clientreg.add(clIn)
             If Not forceData Is Nothing Then clIn.forceReceive(forceData)
             If Not clIn.stream Is Nothing Then streamreg.add(clIn.stream)
+        ElseIf clIn.type = AddressableType.Block Then
+            For Each c As Client In arr
+                c.messagePassMode = MessagePassMode.Disable
+            Next
         End If
     End Sub
 

C-ALM-VOIP/C-ALM-VOIP/Views/Parsers/PEditor.vb

@@ -29,9 +29,9 @@ Public Class PEditor
                             If _caddrbs.type = AddressableType.UDP Then
                                 caddrbs.myAddress = _caddrbs.myAddress
                                 caddrbs.myPort = _caddrbs.myPort
-                            ElseIf _caddrbs.type = AddressableType.TCP Then
-                                caddrbs.advertisedAddress = _caddrbs.advertisedAddress
-                                caddrbs.advertisedPort = _caddrbs.advertisedPort
+                            ElseIf _caddrbs.type = AddressableType.TCP And ceditm = EditorMode.EditClient And TypeOf _caddrbs Is Client Then
+                                CType(caddrbs, Client).advertisedAddress = CType(_caddrbs, Client).advertisedAddress
+                                CType(caddrbs, Client).advertisedPort = CType(_caddrbs, Client).advertisedPort
                             End If
                             If ceditm = EditorMode.Create Or ceditm = EditorMode.EditContact Then
                                 CType(caddrbs, Contact).type = _caddrbs.type
@@ -59,8 +59,8 @@ Public Class PEditor
                     If ceditm <> EditorMode.EditBlocker Then
                         If _caddrbs.type = AddressableType.UDP Then
                             _caddrbs.myPort = args.held
-                        ElseIf _caddrbs.type = AddressableType.TCP Then
-                            _caddrbs.advertisedPort = args.held
+                        ElseIf _caddrbs.type = AddressableType.TCP And ceditm = EditorMode.EditClient And TypeOf _caddrbs Is Client Then
+                            CType(_caddrbs, Client).advertisedPort = args.held
                         End If
                     End If
                 ElseIf ev.EventSource.sourceObj Is frm.txtbxaddr And ev.EventType = ETs.Leave Then
@@ -72,8 +72,8 @@ Public Class PEditor
                     If ceditm <> EditorMode.EditBlocker Then
                         If _caddrbs.type = AddressableType.UDP Then
                             _caddrbs.myAddress = args.held
-                        ElseIf _caddrbs.type = AddressableType.TCP Then
-                            _caddrbs.advertisedAddress = args.held
+                        ElseIf _caddrbs.type = AddressableType.TCP And ceditm = EditorMode.EditClient And TypeOf _caddrbs Is Client Then
+                            CType(_caddrbs, Client).advertisedAddress = args.held
                         End If
                     End If
                 ElseIf ev.EventSource.sourceObj Is frm.txtbxname And ev.EventType = ETs.Leave Then

C-ALM-VOIP/LIBs/calmclientandserver.dll

@@ -226,6 +226,11 @@ calmclientandserver
 	<value>Boolean</value>
 	<returns>Whether length headers are used when passing messages</returns>
 	<remarks></remarks>
+</member><member name="M:captainalm.CALMNetMarshal.NetMarshalTCPClient.releaseCache">
+	<summary>
+ Releases the received message cache to the event
+ </summary>
+	<remarks></remarks>
 </member><member name="T:captainalm.CALMNetMarshal.NetMarshalTCPClient">
 	<summary>
  This class can be retrieved from the NetMarshalTCP and represents a separate client.