osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41026?usp=email )
Change subject: Add git-version-gen
......................................................................
Add git-version-gen
Change-Id: Ic6245f4d0ccced5089c55eccbe07b36c43d71e9c
---
M Makefile.am
M configure.ac
A git-version-gen
3 files changed, 162 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/26/41026/1
diff --git a/Makefile.am b/Makefile.am
index 8f12649..9fb4aef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,3 +6,9 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libosmo-asn1-tcap.pc
+
+EXTRA_DIST = \
+ .version \
+ debian \
+ git-version-gen \
+ $(NULL)
diff --git a/configure.ac b/configure.ac
index 5e57145..497b3d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,8 @@
-AC_INIT([libosmo-asn1-tcap], 0.0.0, [openbsc-devel(a)lists.openbsc.org])
+AC_INIT([libosmo-asn1-tcap],
+ m4_esyscmd([./git-version-gen .tarball-version]),
+ [openbsc(a)lists.openbsc.org])
+
+AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([dist-bzip2])
diff --git a/git-version-gen b/git-version-gen
new file mode 100755
index 0000000..42cf3d2
--- /dev/null
+++ b/git-version-gen
@@ -0,0 +1,151 @@
+#!/bin/sh
+# Print a version string.
+scriptversion=2010-01-28.01
+
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
+# It may be run two ways:
+# - from a git repository in which the "git describe" command below
+# produces useful output (thus requiring at least one signed tag)
+# - from a non-git-repo directory containing a .tarball-version file, which
+# presumes this script is invoked like "./git-version-gen .tarball-version".
+
+# In order to use intra-version strings in your project, you will need two
+# separate generated version string files:
+#
+# .tarball-version - present only in a distribution tarball, and not in
+# a checked-out repository. Created with contents that were learned at
+# the last time autoconf was run, and used by git-version-gen. Must not
+# be present in either $(srcdir) or $(builddir) for git-version-gen to
+# give accurate answers during normal development with a checked out tree,
+# but must be present in a tarball when there is no version control system.
+# Therefore, it cannot be used in any dependencies. GNUmakefile has
+# hooks to force a reconfigure at distribution time to get the value
+# correct, without penalizing normal development with extra reconfigures.
+#
+# .version - present in a checked-out repository and in a distribution
+# tarball. Usable in dependencies, particularly for files that don't
+# want to depend on config.h but do want to track version changes.
+# Delete this file prior to any autoconf run where you want to rebuild
+# files to pick up a version string change; and leave it stale to
+# minimize rebuild time after unrelated changes to configure sources.
+#
+# It is probably wise to add these two files to .gitignore, so that you
+# don't accidentally commit either generated file.
+#
+# Use the following line in your configure.ac, so that $(VERSION) will
+# automatically be up-to-date each time configure is run (and note that
+# since configure.ac no longer includes a version string, Makefile rules
+# should not depend on configure.ac for version updates).
+#
+# AC_INIT([GNU project],
+# m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+# [bug-project@example])
+#
+# Then use the following lines in your Makefile.am, so that .version
+# will be present for dependencies, and so that .tarball-version will
+# exist in distribution tarballs.
+#
+# BUILT_SOURCES = $(top_srcdir)/.version
+# $(top_srcdir)/.version:
+# echo $(VERSION) > $@-t && mv $@-t $@
+# dist-hook:
+# echo $(VERSION) > $(distdir)/.tarball-version
+
+case $# in
+ 1) ;;
+ *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
+esac
+
+tarball_version_file=$1
+nl='
+'
+
+# First see if there is a tarball-only version file.
+# then try "git describe", then default.
+if test -f $tarball_version_file
+then
+ v=`cat $tarball_version_file` || exit 1
+ case $v in
+ *$nl*) v= ;; # reject multi-line output
+ [0-9]*) ;;
+ *) v= ;;
+ esac
+ test -z "$v" \
+ && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
+fi
+
+if test -n "$v"
+then
+ : # use $v
+elif
+ v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
+ || git describe --abbrev=4 HEAD 2>/dev/null` \
+ && case $v in
+ [0-9]*) ;;
+ v[0-9]*) ;;
+ *) (exit 1) ;;
+ esac
+then
+ # Is this a new git that lists number of commits since the last
+ # tag or the previous older version that did not?
+ # Newer: v6.10-77-g0f8faeb
+ # Older: v6.10-g0f8faeb
+ case $v in
+ *-*-*) : git describe is okay three part flavor ;;
+ *-*)
+ : git describe is older two part flavor
+ # Recreate the number of commits and rewrite such that the
+ # result is the same as if we were using the newer version
+ # of git describe.
+ vtag=`echo "$v" | sed 's/-.*//'`
+ numcommits=`git rev-list "$vtag"..HEAD | wc -l`
+ v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+ ;;
+ esac
+
+ # Change the first '-' to a '.', so version-comparing tools work properly.
+ # Remove the "g" in git describe's output string, to save a byte.
+ v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+else
+ v=UNKNOWN
+fi
+
+v=`echo "$v" |sed 's/^v//'`
+
+# Don't declare a version "dirty" merely because a time stamp has changed.
+git status > /dev/null 2>&1
+
+dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+case "$dirty" in
+ '') ;;
+ *) # Append the suffix only if there isn't one already.
+ case $v in
+ *-dirty) ;;
+ *) v="$v-dirty" ;;
+ esac ;;
+esac
+
+# Omit the trailing newline, so that m4_esyscmd can use the result directly.
+echo "$v" | tr -d '\012'
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--
To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41026?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-asn1-tcap
Gerrit-Branch: master
Gerrit-Change-Id: Ic6245f4d0ccced5089c55eccbe07b36c43d71e9c
Gerrit-Change-Number: 41026
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41020?usp=email )
Change subject: (cosmetic) asn: Remove trailing whitespace
......................................................................
(cosmetic) asn: Remove trailing whitespace
Change-Id: Ib0aaa0f37f813851e8cfe28aaa22b105b5dcac17
---
M asn/tcap.asn
1 file changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/20/41020/1
diff --git a/asn/tcap.asn b/asn/tcap.asn
index 5b98942..9df2e5b 100644
--- a/asn/tcap.asn
+++ b/asn/tcap.asn
@@ -3,17 +3,17 @@
DEFINITIONS ::=
-BEGIN
+BEGIN
--EXPORTS OPERATION, ERROR, Component, InvokeId Type;
-- WS stuff
ExternalPDU ::= [UNIVERSAL 8] IMPLICIT SEQUENCE
{
oid OBJECT IDENTIFIER,
- dialog [0] IMPLICIT Dialog1
+ dialog [0] IMPLICIT Dialog1
}
-
-
+
+
Dialog1 ::= OCTET STRING
-- End WS
-- Transaction Portion fields
@@ -26,29 +26,29 @@
abort [APPLICATION 7] IMPLICIT Abort
}
-Unidirectional ::= SEQUENCE{
+Unidirectional ::= SEQUENCE{
dialoguePortion DialoguePortion OPTIONAL,
components ComponentPortion
}
-Begin ::= SEQUENCE{
+Begin ::= SEQUENCE{
otid OrigTransactionID,
dialoguePortion DialoguePortion OPTIONAL,
- components ComponentPortion OPTIONAL
+ components ComponentPortion OPTIONAL
}
-End ::= SEQUENCE{
+End ::= SEQUENCE{
dtid DestTransactionID,
dialoguePortion DialoguePortion OPTIONAL,
- components ComponentPortion OPTIONAL
+ components ComponentPortion OPTIONAL
}
-
-Continue ::= SEQUENCE {
+
+Continue ::= SEQUENCE {
otid OrigTransactionID,
dtid DestTransactionID,
dialoguePortion DialoguePortion OPTIONAL,
- components ComponentPortion OPTIONAL
+ components ComponentPortion OPTIONAL
}
Abort ::= SEQUENCE{
@@ -58,11 +58,11 @@
Reason ::= CHOICE{
p-abortCause P-AbortCause,
- u-abortCause DialoguePortion
+ u-abortCause DialoguePortion
}
-
--- NOTE - When the Abort Message is generated by the Transaction sublayer, a p-Abort Cause may be
--- present. The u-abortCause may be generated by the component sublayer in which case it is an ABRT
+
+-- NOTE - When the Abort Message is generated by the Transaction sublayer, a p-Abort Cause may be
+-- present. The u-abortCause may be generated by the component sublayer in which case it is an ABRT
-- APDU, or by the TC-User in which case it could be either an ABRT APDU or data in some user-defined
-- abstract syntax.
@@ -104,7 +104,7 @@
returnResultLast [2] IMPLICIT ReturnResult,
returnError [3] IMPLICIT ReturnError,
reject [4] IMPLICIT Reject,
- returnResultNotLast [7] IMPLICIT ReturnResult
+ returnResultNotLast [7] IMPLICIT ReturnResult
}
-- The Components are sequences of data elements.
@@ -116,7 +116,7 @@
parameter Parameter OPTIONAL }
Parameter ::= ANY
-
+
-- ANY is filled by the single ASN.1 data type following the keyword PARAMETER or the keyword ARGUMENT
-- in the type definition of a particular operation.
@@ -135,7 +135,7 @@
invokeID InvokeIdType,
errorCode ErrorCode,
parameter Parameter OPTIONAL }
-
+
-- ANY is filled by the single ASN.1 data type following the keyword PARAMETER in the type definition
-- of a particular error.
@@ -154,11 +154,11 @@
OPERATION ::= CHOICE {
localValue INTEGER,
- globalValue OBJECT IDENTIFIER }
+ globalValue OBJECT IDENTIFIER }
ERROR ::= CHOICE {
localValue INTEGER,
- globalValue OBJECT IDENTIFIER }
+ globalValue OBJECT IDENTIFIER }
-- OPERATIONS
@@ -185,7 +185,7 @@
-- shall reference an error value
--| type shall reference an error type
-- if no error value is specified
-
+
-- LinkedOperationNames ::= OperationList | empty
-- OperationList ::= Operation | OperationList "," Operation
-- Operation ::= value (OPERATION)
@@ -244,4 +244,4 @@
privateer [PRIVATE 20] IMPLICIT INTEGER
}
-END -- end of the TCAP Package Module
+END -- end of the TCAP Package Module
--
To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41020?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-asn1-tcap
Gerrit-Branch: master
Gerrit-Change-Id: Ib0aaa0f37f813851e8cfe28aaa22b105b5dcac17
Gerrit-Change-Number: 41020
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41021?usp=email )
Change subject: Fix decoding of TCAP messages
......................................................................
Fix decoding of TCAP messages
asn1c would fail while decoding the DialoguePortion of a TCAP message
probably because Tag APPLICATION 11 is sent as constructed tag and the
WS adaptation expects a primitive one.
Support for EXTERNAL needs newer asn1c.
Related: SYS#7486
Change-Id: I4a27a52b2be70b1fc50e0a3d5441ded4c151fe65
---
M asn/tcap.asn
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/21/41021/1
diff --git a/asn/tcap.asn b/asn/tcap.asn
index 9df2e5b..2b967cd 100644
--- a/asn/tcap.asn
+++ b/asn/tcap.asn
@@ -66,11 +66,11 @@
-- APDU, or by the TC-User in which case it could be either an ABRT APDU or data in some user-defined
-- abstract syntax.
---DialoguePortion ::= [APPLICATION 11] EXPLICIT EXTERNAL
+DialoguePortion ::= [APPLICATION 11] EXPLICIT EXTERNAL
-- WS adaptation
-DialoguePortion ::= [APPLICATION 11] IMPLICIT DialogueOC
-DialogueOC ::= OCTET STRING
+--DialoguePortion ::= [APPLICATION 11] IMPLICIT DialogueOC
+--DialogueOC ::= OCTET STRING
-- The dialogue portion carries the dialogue control PDUs as value of the external data type.
-- The direct reference should be set to { ccitt recommendation q 773 as (1) dialogue-as (1) version (1) }
--
To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41021?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-asn1-tcap
Gerrit-Branch: master
Gerrit-Change-Id: I4a27a52b2be70b1fc50e0a3d5441ded4c151fe65
Gerrit-Change-Number: 41021
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41013?usp=email )
Change subject: dia/diameter_3gpp_ts29_229.dia: inherit only Line-Identifier
......................................................................
dia/diameter_3gpp_ts29_229.dia: inherit only Line-Identifier
That's the only type being used, and skip inheriting other types
avoids inherit problem below:
ETSI ES 283 035 has an AVP (vendor=ETSI) with same name "Event-Type" but
different content (enumerated) and vendor (ETSI) than the one in 3GPP TS
32.299 (grouped, vendor 3GPP).
When trying to inherit one from the other (through indirect TS 29.229),
diameter compiler fails with:
diameter_3gpp_ts32_299.dia failed: AVP Event-Type imported by @inherits diameter_etsi_es283_035 at line 0 defined at line 143
Change-Id: Iece0c768eb2dbb429726796a73274fd476cd1d0b
---
M dia/diameter_3gpp_ts29_229.dia
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/13/41013/1
diff --git a/dia/diameter_3gpp_ts29_229.dia b/dia/diameter_3gpp_ts29_229.dia
index ff1d8f7..62ac31f 100644
--- a/dia/diameter_3gpp_ts29_229.dia
+++ b/dia/diameter_3gpp_ts29_229.dia
@@ -24,7 +24,7 @@
@vendor 10415 3GPP
@inherits diameter_gen_base_rfc6733
-@inherits diameter_etsi_es283_035
+@inherits diameter_etsi_es283_035 Line-Identifier
@inherits diameter_rfc4005_nasreq
;; only attributes required by other applications are defined
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41013?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Iece0c768eb2dbb429726796a73274fd476cd1d0b
Gerrit-Change-Number: 41013
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>