Merge remote-tracking branch 'upstream/pr/234' into vlm_master

This commit addresses compatibility of PR vlm#234 with vlm#226 (addition of APER support)
mouse07410 · Feb 13, 2018 · 6bca6c7 · 6bca6c7
2 parents 6ce6bd5 + cea02d7
commit 6bca6c7
Show file tree

Hide file tree

Showing 60 changed files with 1,116 additions and 4,002 deletions.
diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -35,6 +35,7 @@ EXTRA_DIST = \
     sample.source.MHEG5     \
     sample.source.PKIX1     \
     sample.source.RRC       \
+    sample.source.S1AP      \
     sample.source.TAP3      \
     sample.source.ULP       \
     sample.makefile.regen

diff --git a/examples/README b/examples/README
@@ -36,6 +36,9 @@ This directory contains a few examples.
     Before trying to compile, read the README file in that directory.
     WARNING WARNING WARNING: WORK IN PROGRESS. Not supposed to work yet.
 
+11. The ./sample.source.S1AP directory contain the 3GPP S1AP decoder for
+    S1AP version 14.4.0. Read the README file in that directory.
+
 The crfc2asn1.pl script can be used to extract ASN.1 data from RFC texts.
 For instance, it is used to extract X.509, MEGACO, and LDAPv3 ASN.1 modules
 from the corresponding RFC texts (rfc3280.txt, rfc3525.txt, rfc4211.txt).