From cb1838d8075379fdc08095fdd718b459180a38ae Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 26 Oct 2017 00:33:26 +0200 Subject: rename osmo-bsc to osmo-bsc-sccplite This is to avoid naming conflicts with the new osmo-bsc, which resides in its own git repository (osmo-bsc.git) and which uses libosmo-sigtran and implements (primarily) 3GPP AoIP. Change-Id: If10d1599b62d010726336134091a4e855c380d93 --- debian/changelog | 4 + debian/control | 12 +-- debian/osmocom-bsc-sccplite.examples | 2 + debian/osmocom-bsc-sccplite.install | 2 + debian/osmocom-bsc.examples | 1 - debian/osmocom-bsc.install | 2 - debian/rules | 2 +- openbsc/.gitignore | 2 +- openbsc/contrib/bsc-test/msc.sh | 4 +- openbsc/contrib/systemd/osmo-bsc-sccplite.service | 12 +++ openbsc/contrib/systemd/osmo-bsc.service | 12 --- .../osmo-bsc-sccplite/osmo-bsc-sccplite.cfg | 94 ++++++++++++++++++++++ openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg | 94 ---------------------- openbsc/osmoappdesc.py | 4 +- openbsc/src/osmo-bsc/Makefile.am | 6 +- openbsc/src/osmo-bsc/osmo_bsc_main.c | 2 +- openbsc/tests/ctrl_test_runner.py | 8 +- openbsc/tests/vty_test_runner.py | 8 +- 18 files changed, 138 insertions(+), 133 deletions(-) create mode 100644 debian/osmocom-bsc-sccplite.examples create mode 100644 debian/osmocom-bsc-sccplite.install delete mode 100644 debian/osmocom-bsc.examples delete mode 100644 debian/osmocom-bsc.install create mode 100644 openbsc/contrib/systemd/osmo-bsc-sccplite.service delete mode 100644 openbsc/contrib/systemd/osmo-bsc.service create mode 100644 openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg delete mode 100644 openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg diff --git a/debian/changelog b/debian/changelog index e9a421205..dd850be58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ openbsc (0.15.1) UNRELEASED; urgency=medium * Prevent SGSN starting with 'auth-policy remote' when no 'gsup remote-*' are configured. Note: such configs are broken without extra workarounds anyway. + [ Harald Welte ] + * Rename osmo-bsc to osmo-bsc-sccplite to avoid clashes with new 3GPP AoIP + osmo-bsc.git code + -- Holger Hans Peter Freyther Tue, 24 May 2016 23:14:31 +0200 openbsc (0.14.0) unstable; urgency=low diff --git a/debian/control b/debian/control index 58e89668d..e31d0c42c 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git Vcs-Browser: http://openbsc.osmocom.org/trac/browser Homepage: https://projects.osmocom.org/projects/openbsc -Package: osmocom-bsc +Package: osmocom-bsc-sccplite Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -40,7 +40,7 @@ Depends: ${shlibs:Depends}, Description: GSM Network-in-a-Box, implements BSC, MSC, SMSC, HLR, VLR This is the Network-in-a-Box version of OpenBSC. It has all the GSM network components bundled together. When using osmocom-nitb, there is no need for a - Mobile Switching Center (MSC) which is needed when using osmocom-bsc. + Mobile Switching Center (MSC) which is needed when using osmocom-bsc-sccplite. Package: osmocom-ipaccess-utils Architecture: any @@ -64,13 +64,13 @@ Package: osmocom-bsc-nat Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: osmocom-bsc +Recommends: osmocom-bsc-sccplite Description: Osmocom Base Station Controller Network Address Translation This NAT is useful for masquerading multiple BSCs behind one. It listens for incoming BSCs on port 5000 and connects to a specified Mobile Switching Center (MSC). . - This package is part of OpenBSC and closely related to osmocom-bsc. + This package is part of OpenBSC and closely related to osmocom-bsc-sccplite. Package: openbsc-dev Architecture: all @@ -83,11 +83,11 @@ Description: Header file needed by tools tightly integrated The directory structure is copied after the structure in the repository and the header and .c file are installed into /usr/src/osmocom/openbsc/. -Package: osmocom-bsc-dbg +Package: osmocom-bsc-sccplite-dbg Architecture: any Section: debug Priority: extra -Depends: osmocom-bsc (= ${binary:Version}), ${misc:Depends} +Depends: osmocom-bsc-sccplite (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for the OpenBSC BSC Make debugging possible diff --git a/debian/osmocom-bsc-sccplite.examples b/debian/osmocom-bsc-sccplite.examples new file mode 100644 index 000000000..545709beb --- /dev/null +++ b/debian/osmocom-bsc-sccplite.examples @@ -0,0 +1,2 @@ +openbsc/doc/examples/osmo-bsc_mgcp +openbsc/doc/examples/osmo-bsc-sccplite diff --git a/debian/osmocom-bsc-sccplite.install b/debian/osmocom-bsc-sccplite.install new file mode 100644 index 000000000..9ce795c1b --- /dev/null +++ b/debian/osmocom-bsc-sccplite.install @@ -0,0 +1,2 @@ +/usr/bin/osmo-bsc_mgcp +/usr/bin/osmo-bsc-sccplite diff --git a/debian/osmocom-bsc.examples b/debian/osmocom-bsc.examples deleted file mode 100644 index a95f12ba3..000000000 --- a/debian/osmocom-bsc.examples +++ /dev/null @@ -1 +0,0 @@ -openbsc/doc/examples/osmo-bsc_mgcp diff --git a/debian/osmocom-bsc.install b/debian/osmocom-bsc.install deleted file mode 100644 index ab9459ecc..000000000 --- a/debian/osmocom-bsc.install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/osmo-bsc_mgcp -/usr/bin/osmo-bsc diff --git a/debian/rules b/debian/rules index d1d74a547..05bbbef25 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ override_dh_autoreconf: cd openbsc && autoreconf --install --force override_dh_strip: - dh_strip -posmocom-bsc --dbg-package=osmocom-bsc-dbg + dh_strip -posmocom-bsc-sccplite --dbg-package=osmocom-bsc-sccplite-dbg dh_strip -posmocom-nitb --dbg-package=osmocom-nitb-dbg dh_strip -posmocom-ipaccess-utils --dbg-package=osmocom-ipaccess-utils-dbg dh_strip -posmocom-bs11-utils --dbg-package=osmocom-bs11-utils-dbg diff --git a/openbsc/.gitignore b/openbsc/.gitignore index f54aa5925..3a811e7ee 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -9,7 +9,7 @@ bscconfig.h.in openbsc.pc src/osmo-nitb/osmo-nitb src/osmo-bsc_mgcp/osmo-bsc_mgcp -src/osmo-bsc/osmo-bsc +src/osmo-bsc/osmo-bsc-sccplite src/utils/meas_vis src/utils/meas_json src/utils/osmo-meas-pcap2db diff --git a/openbsc/contrib/bsc-test/msc.sh b/openbsc/contrib/bsc-test/msc.sh index bec011d4c..766603def 100755 --- a/openbsc/contrib/bsc-test/msc.sh +++ b/openbsc/contrib/bsc-test/msc.sh @@ -2,7 +2,7 @@ while true; do - echo "Kill the osmo-bsc" - /usr/bin/kill -s SIGUSR2 `pidof osmo-bsc` + echo "Kill the osmo-bsc-sccplite" + /usr/bin/kill -s SIGUSR2 `pidof osmo-bsc-sccplite` sleep 58s done diff --git a/openbsc/contrib/systemd/osmo-bsc-sccplite.service b/openbsc/contrib/systemd/osmo-bsc-sccplite.service new file mode 100644 index 000000000..70cda5f63 --- /dev/null +++ b/openbsc/contrib/systemd/osmo-bsc-sccplite.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenBSC BSC +Wants=osmo-bsc-mgcp.service + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-bsc-sccplite -c /etc/osmocom/osmo-bsc-sccplite.cfg -s +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/openbsc/contrib/systemd/osmo-bsc.service b/openbsc/contrib/systemd/osmo-bsc.service deleted file mode 100644 index 4047fef48..000000000 --- a/openbsc/contrib/systemd/osmo-bsc.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenBSC BSC -Wants=osmo-bsc-mgcp.service - -[Service] -Type=simple -Restart=always -ExecStart=/usr/bin/osmo-bsc -c /etc/osmocom/osmo-bsc.cfg -s -RestartSec=2 - -[Install] -WantedBy=multi-user.target diff --git a/openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg b/openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg new file mode 100644 index 000000000..ab23a76bc --- /dev/null +++ b/openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg @@ -0,0 +1,94 @@ +! +! OsmoBSC (0.9.14+gitr1+3d331c0062bb0c9694dbd4d1eab7adc58138c3ae) configuration saved from vty +!! +password foo +! +! +line vty + no login +! +e1_input + e1_line 0 driver ipa +network + network country code 1 + mobile network code 1 + short name OsmoBSC + long name OsmoBSC + auth policy closed + location updating reject cause 13 + encryption a5 0 + neci 1 + paging any use tch 0 + rrlp mode none + mm info 1 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + subscriber-keep-in-ram 0 + bts 0 + type nanobts + band DCS1800 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + dtx uplink force + dtx downlink + ip.access unit_id 0 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + gprs mode none + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 +msc + ip.access rtp-base 4000 + timeout-ping 20 + timeout-pong 5 + dest 192.168.100.11 6666 0 + access-list-name msc-list + no access-list-name +bsc + no access-list-name + access-list-name bsc-list diff --git a/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg b/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg deleted file mode 100644 index ab23a76bc..000000000 --- a/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg +++ /dev/null @@ -1,94 +0,0 @@ -! -! OsmoBSC (0.9.14+gitr1+3d331c0062bb0c9694dbd4d1eab7adc58138c3ae) configuration saved from vty -!! -password foo -! -! -line vty - no login -! -e1_input - e1_line 0 driver ipa -network - network country code 1 - mobile network code 1 - short name OsmoBSC - long name OsmoBSC - auth policy closed - location updating reject cause 13 - encryption a5 0 - neci 1 - paging any use tch 0 - rrlp mode none - mm info 1 - handover 0 - handover window rxlev averaging 10 - handover window rxqual averaging 1 - handover window rxlev neighbor averaging 10 - handover power budget interval 6 - handover power budget hysteresis 3 - handover maximum distance 9999 - subscriber-keep-in-ram 0 - bts 0 - type nanobts - band DCS1800 - cell_identity 0 - location_area_code 1 - training_sequence_code 7 - base_station_id_code 63 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - dtx uplink force - dtx downlink - ip.access unit_id 0 0 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - gprs mode none - trx 0 - rf_locked 0 - arfcn 871 - nominal power 23 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 0 -msc - ip.access rtp-base 4000 - timeout-ping 20 - timeout-pong 5 - dest 192.168.100.11 6666 0 - access-list-name msc-list - no access-list-name -bsc - no access-list-name - access-list-name bsc-list diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py index ba6d954ae..c5b20aca3 100644 --- a/openbsc/osmoappdesc.py +++ b/openbsc/osmoappdesc.py @@ -28,7 +28,7 @@ nitb_e1_configs = [ app_configs = { - "osmo-bsc": ["doc/examples/osmo-bsc/osmo-bsc.cfg"], + "osmo-bsc-sccplite": ["doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"], "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"], "mgcp": ["doc/examples/osmo-bsc_mgcp/mgcp.cfg"], "nitb": ["doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg", @@ -36,7 +36,7 @@ app_configs = { } -apps = [(4242, "src/osmo-bsc/osmo-bsc", "OsmoBSC", "osmo-bsc"), +apps = [(4242, "src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "osmo-bsc-sccplite"), (4244, "src/osmo-bsc_nat/osmo-bsc_nat", "OsmoBSCNAT", "nat"), (4243, "src/osmo-bsc_mgcp/osmo-bsc_mgcp", "OpenBSC MGCP", "mgcp"), (4242, "src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb"), diff --git a/openbsc/src/osmo-bsc/Makefile.am b/openbsc/src/osmo-bsc/Makefile.am index ae9410c9d..343af702c 100644 --- a/openbsc/src/osmo-bsc/Makefile.am +++ b/openbsc/src/osmo-bsc/Makefile.am @@ -21,10 +21,10 @@ AM_LDFLAGS = \ $(NULL) bin_PROGRAMS = \ - osmo-bsc \ + osmo-bsc-sccplite \ $(NULL) -osmo_bsc_SOURCES = \ +osmo_bsc_sccplite_SOURCES = \ osmo_bsc_main.c \ osmo_bsc_vty.c \ osmo_bsc_api.c \ @@ -38,7 +38,7 @@ osmo_bsc_SOURCES = \ $(NULL) # once again since TRAU uses CC symbol :( -osmo_bsc_LDADD = \ +osmo_bsc_sccplite_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index 6081460c9..022cd3dac 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -70,7 +70,7 @@ struct llist_head *bsc_access_lists(void) static void print_usage() { - printf("Usage: osmo-bsc\n"); + printf("Usage: osmo-bsc-sccplite\n"); } static void print_help() diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py index 46c4dcf01..fb6902705 100644 --- a/openbsc/tests/ctrl_test_runner.py +++ b/openbsc/tests/ctrl_test_runner.py @@ -155,11 +155,11 @@ class TestCtrlBSC(TestCtrlBase): os.unlink("tmp_dummy_sock") def ctrl_command(self): - return ["./src/osmo-bsc/osmo-bsc", "-r", "tmp_dummy_sock", "-c", - "doc/examples/osmo-bsc/osmo-bsc.cfg"] + return ["./src/osmo-bsc/osmo-bsc-sccplite", "-r", "tmp_dummy_sock", "-c", + "doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"] def ctrl_app(self): - return (4249, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") + return (4249, "./src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "bsc") def testCtrlErrs(self): r = self.do_get('invalid') @@ -606,7 +606,7 @@ class TestCtrlNAT(TestCtrlBase): # added. e.g. by implementing a get for the list. def add_bsc_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc")): + if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc-sccplite")): print("Skipping the BSC test") return test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlBSC) diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index 8bec7c0a6..a3161fba1 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -579,11 +579,11 @@ class TestVTYNITB(TestVTYGenericBSC): class TestVTYBSC(TestVTYGenericBSC): def vty_command(self): - return ["./src/osmo-bsc/osmo-bsc", "-c", - "doc/examples/osmo-bsc/osmo-bsc.cfg"] + return ["./src/osmo-bsc/osmo-bsc-sccplite", "-c", + "doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"] def vty_app(self): - return (4242, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") + return (4242, "./src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "bsc") def testConfigNetworkTree(self): self._testConfigNetworkTree() @@ -1113,7 +1113,7 @@ def nat_bsc_sock_test(nr, tk, verbose = False, proc=None): return bsc def add_bsc_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc")): + if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc-sccplite")): print("Skipping the BSC test") return test = unittest.TestLoader().loadTestsFromTestCase(TestVTYBSC) -- cgit v1.2.3