Osmocom Open Build Service

libosmocore.spec Changed

commit_368d555172af490b2eb6fb8c958523760a0ad8dc.txt Added

commit_c59d99352c1903adcc84fbd54c2a60c410a6ad31.txt Deleted

libosmocore_1.11.0.26.c59d.dsc -> libosmocore_1.11.0.28.368d5.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmocore
 Binary: libosmocore, libosmocodec4, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore22, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm20, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty13, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg
 Architecture: any all
-Version: 1.11.0.26.c59d
+Version: 1.11.0.28.368d5
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmocore
 Standards-Version: 3.9.8
@@ -35,8 +35,8 @@
  libosmovty-doc deb doc optional arch=all
  libosmovty13 deb libs optional arch=any
 Checksums-Sha1:
- 16505abed990851450b1f413cc841be7b54ec1a7 1127120 libosmocore_1.11.0.26.c59d.tar.xz
+ 4b59d737c9e1772349906dc66836d7606d334b45 1128996 libosmocore_1.11.0.28.368d5.tar.xz
 Checksums-Sha256:
- 919a9e01e0055ed1a353489a79d970c9a31da46ec3ccff6b1c7ee922cbacecc5 1127120 libosmocore_1.11.0.26.c59d.tar.xz
+ ba718e7579fb62c27bcd300bd396849a55209c8a9bcd3db8a424e3f1806320eb 1128996 libosmocore_1.11.0.28.368d5.tar.xz
 Files:
- cb7de49c6bbe75cec244d91a2d7fb01e 1127120 libosmocore_1.11.0.26.c59d.tar.xz
+ 6dba3894222cea602cf152c3038eb692 1128996 libosmocore_1.11.0.28.368d5.tar.xz

libosmocore_1.11.0.26.c59d.tar.xz/.tarball-version -> libosmocore_1.11.0.28.368d5.tar.xz/.tarball-version Changed

libosmocore_1.11.0.26.c59d.tar.xz/configure.ac -> libosmocore_1.11.0.28.368d5.tar.xz/configure.ac Changed

libosmocore_1.11.0.26.c59d.tar.xz/debian/changelog -> libosmocore_1.11.0.28.368d5.tar.xz/debian/changelog Changed

libosmocore_1.11.0.26.c59d.tar.xz/tests/Makefile.am -> libosmocore_1.11.0.28.368d5.tar.xz/tests/Makefile.am Changed

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge Added

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/Makefile.am Added

@@ -0,0 +1,59 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
+AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS)
+AM_LDFLAGS = -no-install
+LDADD = $(top_builddir)/src/core/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS)
+
+check_PROGRAMS = $(top_builddir)/utils/osmo-config-merge \
+		 $(NULL)
+
+TESTSUITE = $(srcdir)/testsuite
+
+EXTRA_DIST = testsuite.at \
+	     $(srcdir)/package.m4 \
+	     $(TESTSUITE) \
+	     testA.cfg testA.confmerge testA.ok \
+	     testB.cfg testB.confmerge testB.ok \
+	     testB2.cfg testB2.confmerge testB2.ok \
+	     $(NULL)
+
+DISTCLEANFILES = atconfig
+
+# The `:;' works around a Bash 3.2 bug when the output is not writeable.
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+	:;{ \
+               echo '# Signature of the current package.' && \
+               echo 'm4_define(AT_PACKAGE_NAME,' && \
+               echo '  $(PACKAGE_NAME))' && \
+               echo 'm4_define(AT_PACKAGE_TARNAME,' && \
+               echo '  $(PACKAGE_TARNAME))' && \
+               echo 'm4_define(AT_PACKAGE_VERSION,' && \
+               echo '  $(PACKAGE_VERSION))' && \
+               echo 'm4_define(AT_PACKAGE_STRING,' && \
+               echo '  $(PACKAGE_STRING))' && \
+               echo 'm4_define(AT_PACKAGE_BUGREPORT,' && \
+               echo '  $(PACKAGE_BUGREPORT))'; \
+               echo 'm4_define(AT_PACKAGE_URL,' && \
+               echo '  $(PACKAGE_URL))'; \
+             } >'$(srcdir)/package.m4'
+
+update_exp: $(check_PROGRAMS)
+	$(top_builddir)/utils/osmo-config-merge $(srcdir)/testA.cfg $(srcdir)/testA.confmerge >$(srcdir)/testA.ok
+	$(top_builddir)/utils/osmo-config-merge $(srcdir)/testB.cfg $(srcdir)/testB.confmerge >$(srcdir)/testB.ok
+	$(top_builddir)/utils/osmo-config-merge $(srcdir)/testB2.cfg $(srcdir)/testB2.confmerge >$(srcdir)/testB2.ok
+
+check-local: atconfig $(TESTSUITE)
+	$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
+
+installcheck-local: atconfig $(TESTSUITE)
+	$(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
+		$(TESTSUITEFLAGS)
+
+clean-local:
+	test ! -f '$(TESTSUITE)' || \
+		$(SHELL) '$(TESTSUITE)' --clean
+
+AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testA.cfg Added

@@ -0,0 +1,93 @@
+!
+! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty
+!!
+!
+log gsmtap 127.0.0.1
+ logging level set-all debug
+ logging filter all 1
+!
+log stderr
+ logging filter all 1
+ logging print extended-timestamp 1
+ logging print file basename last
+ logging print category-hex 0
+ logging print category 1
+ logging print level 1
+ logging timestamp 1
+ logging color 1
+!
+ logging level set-all notice
+ logging level rsl info
+ logging level meas info
+ logging level pag info
+ logging level l1c info
+ logging level dsp info
+ logging level pcu info
+ logging level trx info
+ logging level osmux info
+ logging level lmib info
+ logging level lmux info
+!
+line vty
+ no login
+ bind 127.0.0.1
+!
+cpu-sched
+ policy rr 30
+!
+e1_input
+ e1_line 0 driver ipa
+ e1_line 0 port 0
+ no e1_line 0 keepalive
+phy 0
+ osmotrx ip local 127.0.0.1
+ osmotrx ip remote 127.0.0.1
+ instance 0
+  osmotrx rx-gain 10
+ instance 1
+  osmotrx rx-gain 10
+ instance 2
+  osmotrx rx-gain 10
+ instance 3
+  osmotrx rx-gain 10
+bts 0
+ band DCS1800
+ ipa unit-id 1234 0
+ oml remote-ip 127.0.0.11
+ rtp jitter-buffer 100
+ paging queue-size 200
+ paging lifetime 0
+ gsmtap-remote-host 127.0.0.1
+ gsmtap-sapi enable-all
+ no gsmtap-sapi pdtch
+ no gsmtap-sapi ptcch
+ min-qual-rach 50
+ min-qual-norm -5
+ !settsc
+ pcu-socket /tmp/pcu_sock
+ osmux
+  use on
+  local-ip 127.0.0.11
+  local-port 1984
+ trx 0
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 0
+ trx 1
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 1
+ trx 2
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 2
+ trx 3
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 3
+ctrl
+ bind 127.0.0.1

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testA.confmerge Added

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testA.ok Added

@@ -0,0 +1,98 @@
+!
+! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty
+!!
+!
+log gsmtap 127.0.0.1
+ logging level set-all debug
+ logging filter all 1
+!
+log stderr
+ logging filter all 1
+ logging print extended-timestamp 1
+ logging print file basename last
+ logging print category-hex 0
+ logging print category 1
+ logging print level 1
+ logging timestamp 1
+ logging color 1
+ logging level set-all notice
+ logging level rsl info
+ logging level meas info
+ logging level pag info
+ logging level l1c info
+ logging level dsp info
+ logging level pcu info
+ logging level trx info
+ logging level osmux info
+ logging level lmib info
+ logging level lmux info
+!
+!
+line vty
+ no login
+ bind 127.0.0.1
+!
+cpu-sched
+ policy rr 30
+!
+e1_input
+ e1_line 0 driver ipa
+ e1_line 0 port 0
+ no e1_line 0 keepalive
+phy 0
+ osmotrx ip local 127.0.0.1
+ osmotrx ip remote 127.0.0.1
+ instance 0
+  osmotrx rx-gain 10
+ instance 1
+  osmotrx rx-gain 10
+ instance 2
+  osmotrx rx-gain 10
+ instance 3
+  osmotrx rx-gain 10
+bts 0
+ band DCS1800
+ ipa unit-id 1234 0
+ oml remote-ip 127.0.0.11
+ rtp jitter-buffer 100
+ paging queue-size 200
+ paging lifetime 0
+ gsmtap-remote-host 127.0.0.1
+ gsmtap-sapi enable-all
+ no gsmtap-sapi pdtch
+ no gsmtap-sapi ptcch
+ min-qual-rach 50
+ min-qual-norm -5
+ !settsc
+ pcu-socket /tmp/pcu_sock
+ osmux
+  use on
+  local-ip 127.0.0.11
+  local-port 1984
+ trx 0
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 0
+  power-ramp step-size 2000 mdB
+ trx 1
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 1
+  power-ramp step-size 2000 mdB
+ trx 2
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 2
+  power-ramp step-size 2000 mdB
+ trx 3
+  power-ramp max-initial 0 mdBm
+  power-ramp step-size 8000 mdB
+  power-ramp step-interval 1
+  phy 0 instance 3
+  power-ramp step-size 2000 mdB
+ oml remote-ip 127.0.0.1
+ctrl
+ bind 127.0.0.1

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testB.cfg Added

@@ -0,0 +1,130 @@
+!
+! OsmoSTP (1.1.0.2-3884) configuration saved from vty
+!!
+!
+log gsmtap 127.0.0.1
+ logging level set-all debug
+ logging filter all 1
+log stderr
+ logging filter all 1
+ logging print file basename last
+ logging print category-hex 0
+ logging print category 1
+ logging print level 1
+ logging color 1
+ logging timestamp 1
+ logging print extended-timestamp 1
+ logging level set-all debug
+!
+stats interval 5
+!
+line vty
+ no login
+ bind 127.0.0.1
+!
+cs7 instance 0
+ point-code format 24
+ asp asp-sender-tcp 9999 2905 m3ua tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  transport-role server
+ asp asp-client0-tcp 10002 2906 m3ua tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  transport-role client
+ as as-sender-tcp m3ua
+  asp asp-sender-tcp
+  routing-key 1123 123
+ as as-client-tcp m3ua
+  routing-key 1155 155
+  asp asp-client0-tcp
+ route-table system
+  update route 123 16777215 linkset as-sender-tcp
+  update route 155 16777215 linkset as-client-tcp
+ listen m3ua 2905 tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  accept-asp-connections dynamic-permitted
+!
+!M3UA AS/ASP:
+!
+ asp asp-sender 9999 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-receiver0 10000 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-receiver1 10001 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-client0 10002 2906 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ asp asp-client60-norctx0 11060 2907 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ asp asp-client61-norctx0 11061 2907 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ as as-sender m3ua
+  asp asp-sender
+  routing-key 1023 23
+ as as-receiver m3ua
+  asp asp-receiver0
+  asp asp-receiver1
+  routing-key 1042 42
+ as as-client m3ua
+  routing-key 1055 55
+  asp asp-client0
+ as as-client60-norctx m3ua
+  routing-key 0 60
+  asp asp-client60-norctx0
+ as as-client61-norctx m3ua
+  routing-key 0 61
+  asp asp-client61-norctx0
+!
+! ROUTING TABLE:
+!
+ route-table system
+  update route 23 16777215 linkset as-sender
+  update route 42 16777215 linkset as-receiver
+  update route 55 16777215 linkset as-client
+  update route 60 16777215 linkset as-client60-norctx
+  update route 61 16777215 linkset as-client61-norctx
+!
+!SERVERS:
+!
+ listen m3ua 2905
+  local-ip 127.0.0.1
+  local-ip ::1
+  accept-asp-connections dynamic-permitted

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testB.confmerge Added

@@ -0,0 +1,72 @@
+cs7 instance 0
+ !
+ ! IPA AS/ASP:
+ !
+ asp ipa-asp-loadshare-sender0 20000 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ asp ipa-asp-loadshare-sender1 20001 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as ipa-as-loadshare-sender ipa
+  routing-key 0 6
+  point-code override dpc 31
+  asp ipa-asp-loadshare-sender0
+  asp ipa-asp-loadshare-sender1
+ asp ipa-asp-loadshare-receiver0 20002 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ asp ipa-asp-loadshare-receiver1 20003 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ as ipa-as-loadshare-receiver ipa
+  traffic-mode loadshare
+  routing-key 0 7
+  point-code override dpc 32
+  asp ipa-asp-loadshare-receiver0
+  asp ipa-asp-loadshare-receiver1
+ ! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3.
+ ! OVERRIDE:
+ asp ipa-asp-override-sender 20005 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as ipa-as-override-sender ipa
+  routing-key 0 6
+  point-code override dpc 33
+  asp ipa-asp-override-sender
+ asp ipa-asp-override-receiver0 20006 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ asp ipa-asp-override-receiver1 20007 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ as ipa-as-override-receiver ipa
+  traffic-mode override
+  routing-key 0 8
+  point-code override dpc 34
+  asp ipa-asp-override-receiver0
+  asp ipa-asp-override-receiver1
+ ! DYNAMIC AS:
+ as ipa-as-dynamic-asp ipa
+  routing-key 0 5
+  point-code override dpc 23
+ !
+ ! ROUTING TABLE:
+ !
+ route-table system
+  update route 31 16777215 linkset ipa-as-loadshare-receiver
+  update route 33 16777215 linkset ipa-as-override-receiver
+  update route 5  16777215 linkset ipa-as-dynamic-asp
+ !
+ !SERVERS:
+ !
+ listen ipa 5000
+  accept-asp-connections dynamic-permitted

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testB.ok Added

@@ -0,0 +1,200 @@
+!
+! OsmoSTP (1.1.0.2-3884) configuration saved from vty
+!!
+!
+log gsmtap 127.0.0.1
+ logging level set-all debug
+ logging filter all 1
+log stderr
+ logging filter all 1
+ logging print file basename last
+ logging print category-hex 0
+ logging print category 1
+ logging print level 1
+ logging color 1
+ logging timestamp 1
+ logging print extended-timestamp 1
+ logging level set-all debug
+!
+stats interval 5
+!
+line vty
+ no login
+ bind 127.0.0.1
+!
+cs7 instance 0
+ point-code format 24
+ asp asp-sender-tcp 9999 2905 m3ua tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  transport-role server
+ asp asp-client0-tcp 10002 2906 m3ua tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  transport-role client
+ as as-sender-tcp m3ua
+  asp asp-sender-tcp
+  routing-key 1123 123
+ as as-client-tcp m3ua
+  routing-key 1155 155
+  asp asp-client0-tcp
+ route-table system
+  update route 123 16777215 linkset as-sender-tcp
+  update route 155 16777215 linkset as-client-tcp
+  update route 31 16777215 linkset ipa-as-loadshare-receiver
+  update route 33 16777215 linkset ipa-as-override-receiver
+  update route 5  16777215 linkset ipa-as-dynamic-asp
+ listen m3ua 2905 tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  accept-asp-connections dynamic-permitted
+ asp asp-sender 9999 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-receiver0 10000 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-receiver1 10001 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-client0 10002 2906 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ asp asp-client60-norctx0 11060 2907 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ asp asp-client61-norctx0 11061 2907 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ as as-sender m3ua
+  asp asp-sender
+  routing-key 1023 23
+ as as-receiver m3ua
+  asp asp-receiver0
+  asp asp-receiver1
+  routing-key 1042 42
+ as as-client m3ua
+  routing-key 1055 55
+  asp asp-client0
+ as as-client60-norctx m3ua
+  routing-key 0 60
+  asp asp-client60-norctx0
+ as as-client61-norctx m3ua
+  routing-key 0 61
+  asp asp-client61-norctx0
+ route-table system
+  update route 23 16777215 linkset as-sender
+  update route 42 16777215 linkset as-receiver
+  update route 55 16777215 linkset as-client
+  update route 60 16777215 linkset as-client60-norctx
+  update route 61 16777215 linkset as-client61-norctx
+ listen m3ua 2905
+  local-ip 127.0.0.1
+  local-ip ::1
+  accept-asp-connections dynamic-permitted
+ !
+ ! IPA AS/ASP:
+ !
+ asp ipa-asp-loadshare-sender0 20000 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ asp ipa-asp-loadshare-sender1 20001 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as ipa-as-loadshare-sender ipa
+  routing-key 0 6
+  point-code override dpc 31
+  asp ipa-asp-loadshare-sender0
+  asp ipa-asp-loadshare-sender1
+ asp ipa-asp-loadshare-receiver0 20002 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ asp ipa-asp-loadshare-receiver1 20003 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ as ipa-as-loadshare-receiver ipa
+  traffic-mode loadshare
+  routing-key 0 7
+  point-code override dpc 32
+  asp ipa-asp-loadshare-receiver0
+  asp ipa-asp-loadshare-receiver1
+ ! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3.
+ ! OVERRIDE:
+ asp ipa-asp-override-sender 20005 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as ipa-as-override-sender ipa
+  routing-key 0 6
+  point-code override dpc 33
+  asp ipa-asp-override-sender
+ asp ipa-asp-override-receiver0 20006 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ asp ipa-asp-override-receiver1 20007 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ as ipa-as-override-receiver ipa
+  traffic-mode override
+  routing-key 0 8
+  point-code override dpc 34
+  asp ipa-asp-override-receiver0
+  asp ipa-asp-override-receiver1
+ ! DYNAMIC AS:
+ as ipa-as-dynamic-asp ipa
+  routing-key 0 5
+  point-code override dpc 23
+ !
+ ! ROUTING TABLE:
+ !
+ !
+ !SERVERS:
+ !
+ listen ipa 5000
+  accept-asp-connections dynamic-permitted
+!
+!M3UA AS/ASP:
+!
+!
+! ROUTING TABLE:
+!
+!
+!SERVERS:

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testB2.cfg Added

@@ -0,0 +1,130 @@
+!
+! OsmoSTP (1.1.0.2-3884) configuration saved from vty
+!!
+!
+log gsmtap 127.0.0.1
+ logging level set-all debug
+ logging filter all 1
+log stderr
+ logging filter all 1
+ logging print file basename last
+ logging print category-hex 0
+ logging print category 1
+ logging print level 1
+ logging color 1
+ logging timestamp 1
+ logging print extended-timestamp 1
+ logging level set-all debug
+!
+stats interval 5
+!
+line vty
+ no login
+ bind 127.0.0.1
+!
+cs7 instance 0
+ point-code format 24
+ asp asp-sender-tcp 9999 2905 m3ua tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  transport-role server
+ asp asp-client0-tcp 10002 2906 m3ua tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  transport-role client
+ as as-sender-tcp m3ua
+  asp asp-sender-tcp
+  routing-key 1123 123
+ as as-client-tcp m3ua
+  routing-key 1155 155
+  asp asp-client0-tcp
+ route-table system
+  update route 123 16777215 linkset as-sender-tcp
+  update route 155 16777215 linkset as-client-tcp
+ listen m3ua 2905 tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  accept-asp-connections dynamic-permitted
+!
+!M3UA AS/ASP:
+!
+ asp asp-sender 9999 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-receiver0 10000 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-receiver1 10001 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-client0 10002 2906 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ asp asp-client60-norctx0 11060 2907 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ asp asp-client61-norctx0 11061 2907 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ as as-sender m3ua
+  asp asp-sender
+  routing-key 1023 23
+ as as-receiver m3ua
+  asp asp-receiver0
+  asp asp-receiver1
+  routing-key 1042 42
+ as as-client m3ua
+  routing-key 1055 55
+  asp asp-client0
+ as as-client60-norctx m3ua
+  routing-key 0 60
+  asp asp-client60-norctx0
+ as as-client61-norctx m3ua
+  routing-key 0 61
+  asp asp-client61-norctx0
+!
+! ROUTING TABLE:
+!
+ route-table system
+  update route 23 16777215 linkset as-sender
+  update route 42 16777215 linkset as-receiver
+  update route 55 16777215 linkset as-client
+  update route 60 16777215 linkset as-client60-norctx
+  update route 61 16777215 linkset as-client61-norctx
+!
+!SERVERS:
+!
+ listen m3ua 2905
+  local-ip 127.0.0.1
+  local-ip ::1
+  accept-asp-connections dynamic-permitted

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testB2.confmerge Added

@@ -0,0 +1,72 @@
+cs7 instance 0
+!
+! IPA AS/ASP:
+!
+ asp ipa-asp-loadshare-sender0 20000 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ asp ipa-asp-loadshare-sender1 20001 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as ipa-as-loadshare-sender ipa
+  routing-key 0 6
+  point-code override dpc 31
+  asp ipa-asp-loadshare-sender0
+  asp ipa-asp-loadshare-sender1
+ asp ipa-asp-loadshare-receiver0 20002 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ asp ipa-asp-loadshare-receiver1 20003 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ as ipa-as-loadshare-receiver ipa
+  traffic-mode loadshare
+  routing-key 0 7
+  point-code override dpc 32
+  asp ipa-asp-loadshare-receiver0
+  asp ipa-asp-loadshare-receiver1
+! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3.
+! OVERRIDE:
+ asp ipa-asp-override-sender 20005 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as ipa-as-override-sender ipa
+  routing-key 0 6
+  point-code override dpc 33
+  asp ipa-asp-override-sender
+ asp ipa-asp-override-receiver0 20006 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ asp ipa-asp-override-receiver1 20007 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ as ipa-as-override-receiver ipa
+  traffic-mode override
+  routing-key 0 8
+  point-code override dpc 34
+  asp ipa-asp-override-receiver0
+  asp ipa-asp-override-receiver1
+! DYNAMIC AS:
+ as ipa-as-dynamic-asp ipa
+  routing-key 0 5
+  point-code override dpc 23
+!
+! ROUTING TABLE:
+!
+ route-table system
+  update route 31 16777215 linkset ipa-as-loadshare-receiver
+  update route 33 16777215 linkset ipa-as-override-receiver
+  update route 5  16777215 linkset ipa-as-dynamic-asp
+!
+!SERVERS:
+!
+ listen ipa 5000
+  accept-asp-connections dynamic-permitted

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testB2.ok Added

@@ -0,0 +1,200 @@
+!
+! OsmoSTP (1.1.0.2-3884) configuration saved from vty
+!!
+!
+log gsmtap 127.0.0.1
+ logging level set-all debug
+ logging filter all 1
+log stderr
+ logging filter all 1
+ logging print file basename last
+ logging print category-hex 0
+ logging print category 1
+ logging print level 1
+ logging color 1
+ logging timestamp 1
+ logging print extended-timestamp 1
+ logging level set-all debug
+!
+stats interval 5
+!
+line vty
+ no login
+ bind 127.0.0.1
+!
+cs7 instance 0
+ point-code format 24
+ asp asp-sender-tcp 9999 2905 m3ua tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  transport-role server
+ asp asp-client0-tcp 10002 2906 m3ua tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  transport-role client
+ as as-sender-tcp m3ua
+  asp asp-sender-tcp
+  routing-key 1123 123
+ as as-client-tcp m3ua
+  routing-key 1155 155
+  asp asp-client0-tcp
+ route-table system
+  update route 123 16777215 linkset as-sender-tcp
+  update route 155 16777215 linkset as-client-tcp
+  update route 31 16777215 linkset ipa-as-loadshare-receiver
+  update route 33 16777215 linkset ipa-as-override-receiver
+  update route 5  16777215 linkset ipa-as-dynamic-asp
+ listen m3ua 2905 tcp
+  local-ip 127.0.0.1
+  local-ip ::1
+  accept-asp-connections dynamic-permitted
+ asp asp-sender 9999 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-receiver0 10000 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-receiver1 10001 2905 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role sg
+  sctp-role server
+ asp asp-client0 10002 2906 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ asp asp-client60-norctx0 11060 2907 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ asp asp-client61-norctx0 11061 2907 m3ua
+  local-ip 127.0.0.1
+  local-ip ::1
+  remote-ip 127.0.0.1
+  remote-ip ::1
+  role asp
+  sctp-role client
+ as as-sender m3ua
+  asp asp-sender
+  routing-key 1023 23
+ as as-receiver m3ua
+  asp asp-receiver0
+  asp asp-receiver1
+  routing-key 1042 42
+ as as-client m3ua
+  routing-key 1055 55
+  asp asp-client0
+ as as-client60-norctx m3ua
+  routing-key 0 60
+  asp asp-client60-norctx0
+ as as-client61-norctx m3ua
+  routing-key 0 61
+  asp asp-client61-norctx0
+ route-table system
+  update route 23 16777215 linkset as-sender
+  update route 42 16777215 linkset as-receiver
+  update route 55 16777215 linkset as-client
+  update route 60 16777215 linkset as-client60-norctx
+  update route 61 16777215 linkset as-client61-norctx
+ listen m3ua 2905
+  local-ip 127.0.0.1
+  local-ip ::1
+  accept-asp-connections dynamic-permitted
+ asp ipa-asp-loadshare-sender0 20000 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ asp ipa-asp-loadshare-sender1 20001 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as ipa-as-loadshare-sender ipa
+  routing-key 0 6
+  point-code override dpc 31
+  asp ipa-asp-loadshare-sender0
+  asp ipa-asp-loadshare-sender1
+ asp ipa-asp-loadshare-receiver0 20002 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ asp ipa-asp-loadshare-receiver1 20003 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ as ipa-as-loadshare-receiver ipa
+  traffic-mode loadshare
+  routing-key 0 7
+  point-code override dpc 32
+  asp ipa-asp-loadshare-receiver0
+  asp ipa-asp-loadshare-receiver1
+ asp ipa-asp-override-sender 20005 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+ as ipa-as-override-sender ipa
+  routing-key 0 6
+  point-code override dpc 33
+  asp ipa-asp-override-sender
+ asp ipa-asp-override-receiver0 20006 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ asp ipa-asp-override-receiver1 20007 5000 ipa
+  local-ip 127.0.0.1
+  remote-ip 127.0.0.1
+  role sg
+  sctp-role server
+ as ipa-as-override-receiver ipa
+  traffic-mode override
+  routing-key 0 8
+  point-code override dpc 34
+  asp ipa-asp-override-receiver0
+  asp ipa-asp-override-receiver1
+ as ipa-as-dynamic-asp ipa
+  routing-key 0 5
+  point-code override dpc 23
+ listen ipa 5000
+  accept-asp-connections dynamic-permitted
+!
+!M3UA AS/ASP:
+!
+!
+! ROUTING TABLE:
+!
+!
+!SERVERS:
+!
+!
+! IPA AS/ASP:
+!
+! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3.
+! OVERRIDE:
+! DYNAMIC AS:
+!
+! ROUTING TABLE:
+!
+!
+!SERVERS:

libosmocore_1.11.0.28.368d5.tar.xz/tests/osmo-config-merge/testsuite.at Added

libosmocore_1.11.0.26.c59d.tar.xz/utils/osmo-config-merge.c -> libosmocore_1.11.0.28.368d5.tar.xz/utils/osmo-config-merge.c Changed

@@ -39,6 +39,7 @@
  */
 
 #include <stdio.h>
+#include <stdbool.h>
 #include <string.h>
 #include <errno.h>
 
@@ -89,16 +90,35 @@
 	return NULL;
 }
 
+/* Return pointer to line content, or empty string if only whitspace is found */
+static const char *line_lstrip(const char *line)
+{
+	OSMO_ASSERT(line);
+	unsigned int len = strlen(line);
+	for (unsigned int i = 0; i < len; i++) {
+		if (linei == ' ')
+			continue;
+		return &linei;
+	}
+	/* points to empty string '\0' */
+	return &linelen;
+}
+
 /* count the number of spaces / indent level */
 static int count_indent(const char *line)
 {
-	int i;
+	const char *content = line_lstrip(line);
+	return content - line;
+}
 
-	for (i = 0; i < strlen(line); i++) {
-		if (linei != ' ')
-			return i;
-	}
-	return i;
+static bool line_is_comment(const char *line)
+{
+	const char *content = line_lstrip(line);
+	if (content0 == '\0')
+		return true;
+	if (content0 == '!' || line0 == '#')
+		return true;
+	return false;
 }
 
 /* strip any triling CR / LF */
@@ -141,7 +161,9 @@
 		line_num++;
 		chomp(line);
 		int indent = count_indent(line);
+		bool coment = line_is_comment(&lineindent);
 		struct node *n;
+
 		if (indent > cur_indent) {
 			if (indent > cur_indent+1) {
 				fprintf(stderr, "File '%s' isn't well-formed in line %u, aborting!\n",
@@ -153,20 +175,25 @@
 			n = node_alloc_child(last);
 		} else if (indent < cur_indent) {
 			int i;
+			struct node *par = last;
 			for (i = 0; i < cur_indent - indent; i++) {
 				/* go to parent, add another sibling */
-				if (last->parent)
-					last = last->parent;
+				if (par->parent)
+					par = par->parent;
 			}
-			n = node_alloc_child(last->parent);
+			n = node_alloc_child(par->parent);
 		} else {
 			/* add a new sibling (child of parent) */
 			n = node_alloc_child(last->parent);
 		}
 		n->line = talloc_strdup(n, line);
 
-		last = n;
-		cur_indent = indent;
+		/* comments are not part of the indentation structure of the
+		 * file, hence commands after it are not to be affected by them: */
+		if (!coment) {
+			last = n;
+			cur_indent = indent;
+		}
 	}
 
 	fclose(infile);

Changes of Revision 415