<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17680">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgw: use library version of RTP_CodecPort_CtrlFunct<br><br>The .cc and the .ttcn file of RTP_CodecPort_CtrlFunct is currently<br>copied into the mgw directory and then used. However, those files do<br>exist in the /library folder as well, lets just link them using<br>gen_links.sh<br><br>Change-Id: I14f80051f6a168b7a8155c6e523c085e974b62b5<br>---<br>D mgw/RTP_CodecPort_CtrlFunct.ttcn<br>D mgw/RTP_CodecPort_CtrlFunctDef.cc<br>M mgw/gen_links.sh<br>3 files changed, 1 insertion(+), 100 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/mgw/RTP_CodecPort_CtrlFunct.ttcn b/mgw/RTP_CodecPort_CtrlFunct.ttcn</span><br><span>deleted file mode 100644</span><br><span>index 9f6cad2..0000000</span><br><span>--- a/mgw/RTP_CodecPort_CtrlFunct.ttcn</span><br><span>+++ /dev/null</span><br><span>@@ -1,44 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-module RTP_CodecPort_CtrlFunct {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- import from RTP_CodecPort all;</span><br><span style="color: hsl(0, 100%, 40%);">- import from IPL4asp_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- external function f_IPL4_listen(</span><br><span style="color: hsl(0, 100%, 40%);">- inout RTP_CODEC_PT portRef,</span><br><span style="color: hsl(0, 100%, 40%);">- in HostName locName,</span><br><span style="color: hsl(0, 100%, 40%);">- in PortNumber locPort,</span><br><span style="color: hsl(0, 100%, 40%);">- in ProtoTuple proto,</span><br><span style="color: hsl(0, 100%, 40%);">- in OptionList options := {}</span><br><span style="color: hsl(0, 100%, 40%);">- ) return Result;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- external function f_IPL4_connect(</span><br><span style="color: hsl(0, 100%, 40%);">- inout RTP_CODEC_PT portRef,</span><br><span style="color: hsl(0, 100%, 40%);">- in HostName remName,</span><br><span style="color: hsl(0, 100%, 40%);">- in PortNumber remPort,</span><br><span style="color: hsl(0, 100%, 40%);">- in HostName locName,</span><br><span style="color: hsl(0, 100%, 40%);">- in PortNumber locPort,</span><br><span style="color: hsl(0, 100%, 40%);">- in ConnectionId connId,</span><br><span style="color: hsl(0, 100%, 40%);">- in ProtoTuple proto,</span><br><span style="color: hsl(0, 100%, 40%);">- in OptionList options := {}</span><br><span style="color: hsl(0, 100%, 40%);">- ) return Result;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- external function f_IPL4_close(</span><br><span style="color: hsl(0, 100%, 40%);">- inout RTP_CODEC_PT portRef,</span><br><span style="color: hsl(0, 100%, 40%);">- in ConnectionId id,</span><br><span style="color: hsl(0, 100%, 40%);">- in ProtoTuple proto := { unspecified := {} }</span><br><span style="color: hsl(0, 100%, 40%);">- ) return Result;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- external function f_IPL4_setUserData(</span><br><span style="color: hsl(0, 100%, 40%);">- inout RTP_CODEC_PT portRef,</span><br><span style="color: hsl(0, 100%, 40%);">- in ConnectionId id,</span><br><span style="color: hsl(0, 100%, 40%);">- in UserData userData</span><br><span style="color: hsl(0, 100%, 40%);">- ) return Result;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- external function f_IPL4_getUserData(</span><br><span style="color: hsl(0, 100%, 40%);">- inout RTP_CODEC_PT portRef,</span><br><span style="color: hsl(0, 100%, 40%);">- in ConnectionId id,</span><br><span style="color: hsl(0, 100%, 40%);">- out UserData userData</span><br><span style="color: hsl(0, 100%, 40%);">- ) return Result;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/mgw/RTP_CodecPort_CtrlFunctDef.cc b/mgw/RTP_CodecPort_CtrlFunctDef.cc</span><br><span>deleted file mode 100644</span><br><span>index ce8e176..0000000</span><br><span>--- a/mgw/RTP_CodecPort_CtrlFunctDef.cc</span><br><span>+++ /dev/null</span><br><span>@@ -1,56 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#include "IPL4asp_PortType.hh"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "RTP_CodecPort.hh"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "IPL4asp_PT.hh"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-namespace RTP__CodecPort__CtrlFunct {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- IPL4asp__Types::Result f__IPL4__listen(</span><br><span style="color: hsl(0, 100%, 40%);">- RTP__CodecPort::RTP__CODEC__PT& portRef,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::HostName& locName,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::PortNumber& locPort,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::ProtoTuple& proto,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::OptionList& options)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- IPL4asp__Types::Result f__IPL4__connect(</span><br><span style="color: hsl(0, 100%, 40%);">- RTP__CodecPort::RTP__CODEC__PT& portRef,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::HostName& remName,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::PortNumber& remPort,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::HostName& locName,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::PortNumber& locPort,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::ConnectionId& connId,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::ProtoTuple& proto,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::OptionList& options)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- return f__IPL4__PROVIDER__connect(portRef, remName, remPort,</span><br><span style="color: hsl(0, 100%, 40%);">- locName, locPort, connId, proto, options);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- IPL4asp__Types::Result f__IPL4__close(</span><br><span style="color: hsl(0, 100%, 40%);">- RTP__CodecPort::RTP__CODEC__PT& portRef, </span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::ConnectionId& connId, </span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::ProtoTuple& proto)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- return f__IPL4__PROVIDER__close(portRef, connId, proto);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- IPL4asp__Types::Result f__IPL4__setUserData(</span><br><span style="color: hsl(0, 100%, 40%);">- RTP__CodecPort::RTP__CODEC__PT& portRef,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::ConnectionId& connId,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::UserData& userData)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- return f__IPL4__PROVIDER__setUserData(portRef, connId, userData);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- IPL4asp__Types::Result f__IPL4__getUserData(</span><br><span style="color: hsl(0, 100%, 40%);">- RTP__CodecPort::RTP__CODEC__PT& portRef,</span><br><span style="color: hsl(0, 100%, 40%);">- const IPL4asp__Types::ConnectionId& connId,</span><br><span style="color: hsl(0, 100%, 40%);">- IPL4asp__Types::UserData& userData)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- return f__IPL4__PROVIDER__getUserData(portRef, connId, userData);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh</span><br><span>index f919637..8893954 100755</span><br><span>--- a/mgw/gen_links.sh</span><br><span>+++ b/mgw/gen_links.sh</span><br><span>@@ -44,6 +44,7 @@</span><br><span> FILES+="OSMUX_CodecPort.ttcn OSMUX_Emulation.ttcn OSMUX_Types.ttcn OSMUX_CodecPort_CtrlFunct.ttcn OSMUX_CodecPort_CtrlFunctDef.cc "</span><br><span> FILES+="Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn "</span><br><span> FILES+="Osmocom_VTY_Functions.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc "</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span> ignore_pp_results</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17680">change 17680</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17680"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I14f80051f6a168b7a8155c6e523c085e974b62b5 </div>
<div style="display:none"> Gerrit-Change-Number: 17680 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>