IPL4asp: Fix ppid always shows 0, remove Iuh workaround

Change-Id: I941a794849c347ed61ca5170bca32f5329818d92
This commit is contained in:
Daniel Willmann 2022-01-05 09:03:59 +01:00
parent a79e9bbccc
commit aa9220aeac
2 changed files with 7 additions and 11 deletions

10
deps/Makefile vendored
View File

@ -13,10 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FORKEDGITLAB:=https://gitlab.eclipse.org/dwillmannv72
ECLIPSEGITLAB:=https://gitlab.eclipse.org/eclipse/titan
OSMOGITHUB:=https://github.com/osmocom
OSMOGIT:=git://git.osmocom.org
FORKEDGITLAB_REPOS= titan.TestPorts.IPL4asp
ECLIPSEGITLAB_REPOS= titan.Libraries.TCCUsefulFunctions \
titan.ProtocolEmulations.M3UA \
titan.ProtocolModules.BSSAPP_v7.3.0 \
@ -50,7 +52,6 @@ ECLIPSEGITLAB_REPOS= titan.Libraries.TCCUsefulFunctions \
titan.TestPorts.Common_Components.Socket-API \
titan.TestPorts.Common_Components.Abstract_Socket \
titan.TestPorts.HTTPmsg \
titan.TestPorts.IPL4asp \
titan.TestPorts.LANL2asp \
titan.TestPorts.PCAPasp \
titan.TestPorts.PIPEasp \
@ -71,7 +72,7 @@ OSMOGIT_REPOS= titan.ProtocolModules.MAP \
titan.TestPorts.AF_PACKET \
osmo-uecups
ALL_REPOS=$(ECLIPSEGITLAB_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS)
ALL_REPOS=$(ECLIPSEGITLAB_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS) $(FORKEDGITLAB_REPOS)
# Tag names from 'git-describe --tags'; if not available, a commit hash may be used instead.
# Do not put references to branches here, except for local testing: this breaks the caching
@ -115,7 +116,7 @@ titan.TestPorts.AF_PACKET_commit= 0.1-5-g89ebea6
titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0
titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994
titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde
titan.TestPorts.IPL4asp_commit= R.30.E
titan.TestPorts.IPL4asp_commit= R.30.E-4-gdcf7858
titan.TestPorts.LANL2asp_commit= R.8.C-3-gb07c265
titan.TestPorts.MTP3asp_commit= 1cecdad6f3641a5f19b3833703bff6e5005eff11
titan.TestPorts.PCAPasp_commit= R.8.A-3-g9ad320f
@ -187,3 +188,6 @@ $(foreach dir,$(OSMOGITHUB_REPOS), \
$(foreach dir,$(OSMOGIT_REPOS), \
$(eval $(call GIT_template,$(dir),$(OSMOGIT))))
$(foreach dir,$(FORKEDGITLAB_REPOS), \
$(eval $(call GIT_template,$(dir),$(FORKEDGITLAB))))

View File

@ -94,14 +94,6 @@ module Iuh_CodecPort {
case (20) {
pout.msg.hnbap := dec_HNBAP_PDU(pin.msg);
}
case (0) {
/* FIXME: lower layers report sinfo_ppid=0: */
if (match(pin.msg, '000100380000070003000C02404F736D6F484E6F64654200080001000009000300F110000B0004000000100006000200020007000103000A00020004'O)) {
pout.msg.hnbap := dec_HNBAP_PDU(pin.msg);
} else {
pout.msg.rua := dec_RUA_PDU(pin.msg);
}
}
case else {
pout.msg.payload := pin.msg;
}