From aa9f4457b0a73b1a28ef5055992b6f5f9f16d389 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 13 Sep 2020 21:49:46 +0200 Subject: [PATCH] Various fixes discovered while actually using FrameRelay_Emulation Change-Id: I7a537091c118173d7399aba20c82462aed9b6074 --- src/AF_PACKET_PortType.ttcn | 6 ++++++ src/FrameRelay_Emulation.ttcn | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/AF_PACKET_PortType.ttcn b/src/AF_PACKET_PortType.ttcn index f3304a9..b26d933 100644 --- a/src/AF_PACKET_PortType.ttcn +++ b/src/AF_PACKET_PortType.ttcn @@ -1,5 +1,11 @@ module AF_PACKET_PortType { +/* somehow TITAN insist on having this definition and a related 'system' keyword in the function + * which uses the map operation */ +type component af_packet { + port AF_PACKET_PT AF_PACKET; +}; + import from AF_PACKET_PortTypes all; type port AF_PACKET_PT message { diff --git a/src/FrameRelay_Emulation.ttcn b/src/FrameRelay_Emulation.ttcn index 13268f3..a554022 100644 --- a/src/FrameRelay_Emulation.ttcn +++ b/src/FrameRelay_Emulation.ttcn @@ -38,12 +38,12 @@ type union FRemu_Event { type port FRemu_PT message { inout FrameRelayFrame; in FRemu_Event; -} with { extension "internal" }; +} with { extension "internal" } type port FRemu_asp_PT message { inout FrameRelayFrame; out FRemu_Event; -} with { extension "internal" }; +} with { extension "internal" extension "provider" }; /* port between FR emulation and per-DLCI client components (like NS) */ type port FRemu_PROC_PT procedure { @@ -58,7 +58,7 @@ type component FR_Emulation_CT { port FR_CODEC_PT FR; /* port towards the user[s] (PVC specific) */ - port FRemu_PT CLIENT; + port FRemu_asp_PT CLIENT; port FRemu_PROC_PT PROC; var ConnectionData ConnectionTable[1024]; @@ -73,7 +73,7 @@ type component FR_Emulation_CT { /* FR Emulation user/client component/dispatcher. Exists once per FR_CODEC_PT */ type component FR_Client_CT { /* message port towards the Frame Relay Emulation */ - port FRemu_asp_PT FR; + port FRemu_PT FR; /* procedure port towards the Frame Relay Emulation */ port FRemu_PROC_PT FR_PROC; };