From 901ed14c898ef229c654009ac0dc078d09d7b054 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 1 Feb 2021 12:48:48 +0100 Subject: gbproxy: remove (moved to own repository) New repository: https://git.osmocom.org/osmo-gbproxy/ Related: OS#4992 Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a --- contrib/gprs/gb-proxy-unblock-bug.py | 58 ------------------------------------ contrib/osmo-sgsn.spec.in | 22 -------------- contrib/systemd/Makefile.am | 2 -- contrib/systemd/osmo-gbproxy.service | 12 -------- 4 files changed, 94 deletions(-) delete mode 100755 contrib/gprs/gb-proxy-unblock-bug.py delete mode 100644 contrib/systemd/osmo-gbproxy.service (limited to 'contrib') diff --git a/contrib/gprs/gb-proxy-unblock-bug.py b/contrib/gprs/gb-proxy-unblock-bug.py deleted file mode 100755 index 0cd4b871f..000000000 --- a/contrib/gprs/gb-proxy-unblock-bug.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python - -""" -demonstrate a unblock bug on the GB Proxy.. -""" - -bts_ns_reset = "\x02\x00\x81\x01\x01\x82\x1f\xe7\x04\x82\x1f\xe7" -ns_reset_ack = "\x03\x01\x82\x1f\xe7\x04\x82\x1f\xe7" - -bts_ns_unblock = "\x06" -ns_unblock_ack = "\x07" - -bts_bvc_reset_0 = "\x00\x00\x00\x00\x22\x04\x82\x00\x00\x07\x81\x03\x3b\x81\x02" -ns_bvc_reset_0_ack = "\x00\x00\x00\x00\x23\x04\x82\x00\x00" - -bts_bvc_reset_8167 = "\x00\x00\x00\x00\x22\x04\x82\x1f\xe7\x07\x81\x08\x08\x88\x72\xf4\x80\x10\x1c\x00\x9c\x40" - - -import socket -socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) -socket.bind(("0.0.0.0", 0)) -socket.setblocking(1) - - -import sys -port = int(sys.argv[1]) -print "Sending data to port: %d" % port - -def send_and_receive(packet): - socket.sendto(packet, ("127.0.0.1", port)) - - try: - data, addr = socket.recvfrom(4096) - except socket.error, e: - print "ERROR", e - import sys - sys.exit(0) - return data - -#send stuff once - -to_send = [ - (bts_ns_reset, ns_reset_ack, "reset ack"), - (bts_ns_unblock, ns_unblock_ack, "unblock ack"), - (bts_bvc_reset_0, ns_bvc_reset_0_ack, "BVCI=0 reset ack"), -] - - -for (out, inp, type) in to_send: - res = send_and_receive(out) - if res != inp: - print "Failed to get the %s" % type - sys.exit(-1) - -import time -time.sleep(3) -res = send_and_receive(bts_bvc_reset_8167) -print "Sent all messages... check wireshark for the last response" diff --git a/contrib/osmo-sgsn.spec.in b/contrib/osmo-sgsn.spec.in index ca66e2ea9..cd3b5b7bf 100644 --- a/contrib/osmo-sgsn.spec.in +++ b/contrib/osmo-sgsn.spec.in @@ -61,14 +61,6 @@ Group: Productivity/Telephony/Servers %description -n osmo-gtphub Osmocom GTP Hub: Proxy for GTP traffic between multiple SGSNs and GGSNs. -%package -n osmo-gbproxy -Summary: Osmocom GPRS Gb Interface Proxy -Group: Productivity/Telephony/Servers - -%description -n osmo-gbproxy -The purpose of the Gb proxy is to aggregate the Gb links of multiple -BSS's and present them in one Gb link to the SGSN. - %prep %setup -q @@ -95,10 +87,6 @@ make %{?_smp_mflags} %postun -n osmo-gtphub %service_del_postun osmo-gtphub.service %pre -n osmo-gtphub %service_add_pre osmo-gtphub.service %post -n osmo-gtphub %service_add_post osmo-gtphub.service -%preun -n osmo-gbproxy %service_del_preun osmo-gbproxy.service -%postun -n osmo-gbproxy %service_del_postun osmo-gbproxy.service -%pre -n osmo-gbproxy %service_add_pre osmo-gbproxy.service -%post -n osmo-gbproxy %service_add_post osmo-gbproxy.service %endif %check @@ -109,7 +97,6 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %dir %{_docdir}/%{name}/examples %dir %{_docdir}/%{name}/examples/osmo-sgsn %exclude %{_docdir}/%{name}/examples/osmo-gtphub -%exclude %{_docdir}/%{name}/examples/osmo-gbproxy %{_docdir}/%{name}/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg %{_docdir}/%{name}/examples/osmo-sgsn/osmo-sgsn.cfg %{_docdir}/%{name}/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg @@ -128,13 +115,4 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %config(noreplace) %{_sysconfdir}/osmocom/osmo-gtphub.cfg %{_unitdir}/osmo-gtphub.service -%files -n osmo-gbproxy -%dir %{_docdir}/%{name}/examples -%dir %{_docdir}/%{name}/examples/osmo-gbproxy -%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy.cfg -%{_bindir}/osmo-gbproxy -%dir %{_sysconfdir}/osmocom -%config(noreplace) %{_sysconfdir}/osmocom/osmo-gbproxy.cfg -%{_unitdir}/osmo-gbproxy.service - %changelog diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 11e8f9815..ae4694c2a 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,11 +1,9 @@ EXTRA_DIST = \ - osmo-gbproxy.service \ osmo-gtphub.service \ osmo-sgsn.service if HAVE_SYSTEMD SYSTEMD_SERVICES = \ - osmo-gbproxy.service \ osmo-gtphub.service \ osmo-sgsn.service diff --git a/contrib/systemd/osmo-gbproxy.service b/contrib/systemd/osmo-gbproxy.service deleted file mode 100644 index a0b7829db..000000000 --- a/contrib/systemd/osmo-gbproxy.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Osmocom Gb proxy - -[Service] -Type=simple -ExecStart=/usr/bin/osmo-gbproxy -c /etc/osmocom/osmo-gbproxy.cfg -Restart=always -RestartSec=2 -RestartPreventExitStatus=1 - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3