aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-09-04 03:35:30 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2017-09-06 16:47:47 +0200
commit1e52928ad9e87f2db0a9abe0ba37d2c9c2629463 (patch)
tree21581a95387fb508d5ac12bfb62fb572be4aaffc /contrib
parent075cac02b0e346e1fdb1176f7434a900999ec6f5 (diff)
drop files unrelated to osmo-sgsn
These either remain from openbsc.git or slipped in while applying recent patches from openbsc.git and do not belong in osmo-sgsn. Change-Id: Ie9dc7514c3850010d0e9b3ab716b4f4e8d83594f
Diffstat (limited to 'contrib')
-rw-r--r--contrib/a-link/sccp-split-by-con.lua170
-rw-r--r--contrib/bsc-test/README1
-rw-r--r--contrib/bsc-test/all_dial8
-rwxr-xr-xcontrib/bsc-test/dial.sh11
-rwxr-xr-xcontrib/bsc-test/drop-oml.sh6
-rwxr-xr-xcontrib/bsc-test/drop.sh8
-rw-r--r--contrib/bsc-test/hangup4
-rwxr-xr-xcontrib/bsc-test/msc.sh8
-rwxr-xr-xcontrib/bsc_control.py120
-rwxr-xr-xcontrib/bt.py33
-rwxr-xr-xcontrib/convert_to_enum.py37
-rwxr-xr-xcontrib/ctrl2sse.py147
-rw-r--r--contrib/hlr-remove-old.sql18
-rwxr-xr-xcontrib/hlrsync/hlrsync.py125
-rwxr-xr-xcontrib/mgcp_server.py60
-rw-r--r--contrib/nat/test_regexp.c30
-rw-r--r--contrib/nat/ussd_example.py65
-rwxr-xr-xcontrib/rtp/gen_rtp_header.erl420
-rw-r--r--contrib/rtp/rtp_replay.st21
-rw-r--r--contrib/rtp/rtp_replay_shared.st118
-rw-r--r--contrib/rtp/rtp_replay_sip.st87
-rw-r--r--contrib/rtp/timestamp_rtp.lua28
-rw-r--r--contrib/sms/fill-hlr.st66
-rw-r--r--contrib/sms/hlr-query.st10
-rw-r--r--contrib/sms/sqlite-probe.tap.d5
-rw-r--r--contrib/systemd/osmo-bsc-mgcp.service11
-rw-r--r--contrib/systemd/osmo-bsc.service12
-rw-r--r--contrib/systemd/osmo-msc.service14
-rw-r--r--contrib/systemd/osmo-nitb.service11
-rw-r--r--contrib/testconv/Makefile16
-rw-r--r--contrib/testconv/testconv_main.c133
31 files changed, 0 insertions, 1803 deletions
diff --git a/contrib/a-link/sccp-split-by-con.lua b/contrib/a-link/sccp-split-by-con.lua
deleted file mode 100644
index f5d5502a..00000000
--- a/contrib/a-link/sccp-split-by-con.lua
+++ /dev/null
@@ -1,170 +0,0 @@
--- Split trace based on SCCP Source
--- There are still bugs to find... bugs bugs bugs... hmm
-do
- local function init_listener()
- print("CREATED LISTENER")
- local tap = Listener.new("ip", "sccp && (ip.src == 172.16.1.81 || ip.dst == 172.16.1.81)")
- local sccp_type_field = Field.new("sccp.message_type")
- local sccp_src_field = Field.new("sccp.slr")
- local sccp_dst_field = Field.new("sccp.dlr")
- local msg_type_field = Field.new("gsm_a.dtap_msg_mm_type")
- local lu_rej_field = Field.new("gsm_a.dtap.rej_cause")
- local ip_src_field = Field.new("ip.src")
- local ip_dst_field = Field.new("ip.dst")
-
- --
- local bssmap_msgtype_field = Field.new("gsm_a.bssmap_msgtype")
- -- assignment failure 0x03
- --
-
- --
- local dtap_cause_field = Field.new("gsm_a_dtap.cause")
- local dtap_cc_field = Field.new("gsm_a.dtap_msg_cc_type")
-
- local connections = {}
-
- function check_failure(con)
- check_lu_reject(con)
- check_disconnect(con)
- check_failures(con)
- end
-
- -- cipher mode reject
- function check_failures(con)
- local msgtype = bssmap_msgtype_field()
- if not msgtype then
- return
- end
-
- msgtype = tonumber(msgtype)
- if msgtype == 89 then
- print("Cipher mode reject")
- con[4] = true
- elseif msgtype == 0x03 then
- print("Assignment failure")
- con[4] = true
- elseif msgtype == 0x22 then
- print("Clear Request... RF failure?")
- con[4] = true
- end
- end
-
- -- check if a DISCONNECT is normal
- function check_disconnect(con)
- local msg_type = dtap_cc_field()
- if not msg_type then
- return
- end
-
- if tonumber(msg_type) ~= 0x25 then
- return
- end
-
- local cause = dtap_cause_field()
- if not cause then
- return
- end
-
- cause = tonumber(cause)
- if cause ~= 0x10 then
- print("DISCONNECT != Normal")
- con[4] = true
- end
- end
-
- -- check if we have a LU Reject
- function check_lu_reject(con)
- local msg_type = msg_type_field()
- if not msg_type then
- return
- end
-
- msg_type = tonumber(tostring(msg_type))
- if msg_type == 0x04 then
- print("LU REJECT with " .. tostring(lu_rej_field()))
- con[4] = true
- end
- end
-
- function tap.packet(pinfo,tvb,ip)
- local ip_src = tostring(ip_src_field())
- local ip_dst = tostring(ip_dst_field())
- local sccp_type = tonumber(tostring(sccp_type_field()))
- local sccp_src = sccp_src_field()
- local sccp_dst = sccp_dst_field()
-
- local con
-
- if sccp_type == 0x01 then
- elseif sccp_type == 0x2 then
- local src = string.format("%s-%s", ip_src, tostring(sccp_src))
- local dst = string.format("%s-%s", ip_dst, tostring(sccp_dst))
- local datestring = os.date("%Y%m%d%H%M%S")
- local pcap_name = string.format("alink_trace_%s-%s_%s.pcap", src, dst, datestring)
- local dumper = Dumper.new_for_current(pcap_name)
-
- local con = { ip_src, tostring(sccp_src), tostring(sccp_dst), false, dumper, pcap_name }
-
- dumper:dump_current()
- connections[src] = con
- connections[dst] = con
- elseif sccp_type == 0x4 then
- -- close a connection... remove it from the list
- local src = string.format("%s-%s", ip_src, tostring(sccp_src))
- local dst = string.format("%s-%s", ip_dst, tostring(sccp_dst))
-
- local con = connections[src]
- if not con then
- return
- end
-
- con[5]:dump_current()
- con[5]:flush()
-
- -- this causes a crash on unpacted wireshark
- con[5]:close()
-
- -- the connection had a failure
- if con[4] == true then
- local datestring = os.date("%Y%m%d%H%M%S")
- local new_name = string.format("alink_failure_%s_%s-%s.pcap", datestring, con[2], con[3])
- os.rename(con[6], new_name)
- else
- os.remove(con[6])
- end
-
-
- -- clear the old connection
- connections[src] = nil
- connections[dst] = nil
-
- elseif sccp_type == 0x5 then
- -- not handled yet... we should verify stuff here...
- local dst = string.format("%s-%s", ip_dst, tostring(sccp_dst))
- local con = connections[dst]
- if not con then
- return
- end
- con[5]:dump_current()
- elseif sccp_type == 0x6 then
- local dst = string.format("%s-%s", ip_dst, tostring(sccp_dst))
- local con = connections[dst]
- if not con then
- print("DON'T KNOW THIS CONNECTION for " .. ip_dst)
- return
- end
- con[5]:dump_current()
- check_failure(con)
- end
-
- end
- function tap.draw()
- print("DRAW")
- end
- function tap.reset()
- print("RESET")
- end
- end
-
- init_listener()
-end
diff --git a/contrib/bsc-test/README b/contrib/bsc-test/README
deleted file mode 100644
index adb222e2..00000000
--- a/contrib/bsc-test/README
+++ /dev/null
@@ -1 +0,0 @@
-Some crazy scripts call testing... and MSC link failure simulation
diff --git a/contrib/bsc-test/all_dial b/contrib/bsc-test/all_dial
deleted file mode 100644
index 96e5f00b..00000000
--- a/contrib/bsc-test/all_dial
+++ /dev/null
@@ -1,8 +0,0 @@
-ABORT BUSY
-ABORT 'NO CARRIER'
-ABORT 'OK'
-
-'' AT
-SAY "Dialing a number\n"
-'OK' ATD05660066;
-
diff --git a/contrib/bsc-test/dial.sh b/contrib/bsc-test/dial.sh
deleted file mode 100755
index e5e19f63..00000000
--- a/contrib/bsc-test/dial.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Evil dial script..
-
-while true;
-do
- chat -v -f all_dial < /dev/ttyACM0 > /dev/ttyACM0
- sleep 5s
- chat -v -f hangup < /dev/ttyACM0 > /dev/ttyACM0
- sleep 2s
-done
-
diff --git a/contrib/bsc-test/drop-oml.sh b/contrib/bsc-test/drop-oml.sh
deleted file mode 100755
index 84eead7b..00000000
--- a/contrib/bsc-test/drop-oml.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-sleep 3
-echo "enable"
-sleep 1
-echo "drop bts connection 0 oml"
-sleep 1
diff --git a/contrib/bsc-test/drop.sh b/contrib/bsc-test/drop.sh
deleted file mode 100755
index c7b66ba7..00000000
--- a/contrib/bsc-test/drop.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true;
-do
- echo "Going to drop the OML connection"
- ./drop-oml.sh | telnet 127.0.0.1 4242
- sleep 58m
-done
diff --git a/contrib/bsc-test/hangup b/contrib/bsc-test/hangup
deleted file mode 100644
index cad6870f..00000000
--- a/contrib/bsc-test/hangup
+++ /dev/null
@@ -1,4 +0,0 @@
-TIMEOUT 10
-'' ^Z
-SAY "Waiting for hangup confirm\n"
-'' ATH;
diff --git a/contrib/bsc-test/msc.sh b/contrib/bsc-test/msc.sh
deleted file mode 100755
index bec011d4..00000000
--- a/contrib/bsc-test/msc.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true;
-do
- echo "Kill the osmo-bsc"
- /usr/bin/kill -s SIGUSR2 `pidof osmo-bsc`
- sleep 58s
-done
diff --git a/contrib/bsc_control.py b/contrib/bsc_control.py
deleted file mode 100755
index c1b09ce7..00000000
--- a/contrib/bsc_control.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/python
-# -*- mode: python-mode; py-indent-tabs-mode: nil -*-
-"""
-/*
- * Copyright (C) 2016 sysmocom s.f.m.c. GmbH
- *
- * All Rights Reserved
- *
- * 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-"""
-
-from optparse import OptionParser
-from ipa import Ctrl
-import socket
-
-verbose = False
-
-def connect(host, port):
- if verbose:
- print "Connecting to host %s:%i" % (host, port)
-
- sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sck.setblocking(1)
- sck.connect((host, port))
- return sck
-
-def do_set_get(sck, var, value = None):
- (r, c) = Ctrl().cmd(var, value)
- sck.send(c)
- answer = Ctrl().rem_header(sck.recv(4096))
- return (answer,) + Ctrl().verify(answer, r, var, value)
-
-def set_var(sck, var, val):
- (a, _, _) = do_set_get(sck, var, val)
- return a
-
-def get_var(sck, var):
- (_, _, v) = do_set_get(sck, var)
- return v
-
-def _leftovers(sck, fl):
- """
- Read outstanding data if any according to flags
- """
- try:
- data = sck.recv(1024, fl)
- except socket.error as (s_errno, strerror):
- return False
- if len(data) != 0:
- tail = data
- while True:
- (head, tail) = Ctrl().split_combined(tail)
- print "Got message:", Ctrl().rem_header(head)
- if len(tail) == 0:
- break
- return True
- return False
-
-if __name__ == '__main__':
- parser = OptionParser("Usage: %prog [options] var [value]")
- parser.add_option("-d", "--host", dest="host",
- help="connect to HOST", metavar="HOST")
- parser.add_option("-p", "--port", dest="port", type="int",
- help="use PORT", metavar="PORT", default=4249)
- parser.add_option("-g", "--get", action="store_true",
- dest="cmd_get", help="perform GET operation")
- parser.add_option("-s", "--set", action="store_true",
- dest="cmd_set", help="perform SET operation")
- parser.add_option("-v", "--verbose", action="store_true",
- dest="verbose", help="be verbose", default=False)
- parser.add_option("-m", "--monitor", action="store_true",
- dest="monitor", help="monitor the connection for traps", default=False)
-
- (options, args) = parser.parse_args()
-
- verbose = options.verbose
-
- if options.cmd_set and options.cmd_get:
- parser.error("Get and set options are mutually exclusive!")
-
- if not (options.cmd_get or options.cmd_set or options.monitor):
- parser.error("One of -m, -g, or -s must be set")
-
- if not (options.host):
- parser.error("Destination host and port required!")
-
- sock = connect(options.host, options.port)
-
- if options.cmd_set:
- if len(args) < 2:
- parser.error("Set requires var and value arguments")
- _leftovers(sock, socket.MSG_DONTWAIT)
- print "Got message:", set_var(sock, args[0], ' '.join(args[1:]))
-
- if options.cmd_get:
- if len(args) != 1:
- parser.error("Get requires the var argument")
- _leftovers(sock, socket.MSG_DONTWAIT)
- (a, _, _) = do_set_get(sock, args[0])
- print "Got message:", a
-
- if options.monitor:
- while True:
- if not _leftovers(sock, 0):
- print "Connection is gone."
- break
- sock.close()
diff --git a/contrib/bt.py b/contrib/bt.py
deleted file mode 100755
index 1b111efc..00000000
--- a/contrib/bt.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-
-import os
-
-f = open("unbalanced")
-lines = []
-for line in f:
- lines.append(line)
-
-filenames = {}
-
-output = []
-for line in lines:
- if "[0x" in line:
- start = line.find("[")
- end = line.find("]")
- addr = line[start+1:end]
- try:
- file = filenames[addr]
- except KeyError:
- r = os.popen("addr2line -fs -e ./bsc_hack %s" % addr)
- all = r.read().replace("\n", ",")
- file = all
- filenames[addr] = file
-
- line = line.replace(addr, file)
- output.append(line)
-
-g = open("unbalanced.2", "w")
-g.write("".join(output))
-
-
-
diff --git a/contrib/convert_to_enum.py b/contrib/convert_to_enum.py
deleted file mode 100755
index bcd6f2ce..00000000
--- a/contrib/convert_to_enum.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Convert ETSI documents to an enum
-#
-
-import re, sys
-
-def convert(string):
- string = string.strip().replace(" ", "").rjust(8, "0")
- var = 0
- offset = 7
- for char in string:
- assert offset >= 0
- var = var | (int(char) << offset)
- offset = offset - 1
-
- return var
-
-def string(name):
- name = name.replace(" ", "_")
- name = name.replace('"', "")
- name = name.replace('/', '_')
- name = name.replace('(', '_')
- name = name.replace(')', '_')
- return "%s_%s" % (sys.argv[2], name.upper())
-
-file = open(sys.argv[1])
-
-
-for line in file:
- m = re.match(r"[ \t]*(?P<value>[01 ]+)[ ]+(?P<name>[a-zA-Z /0-9()]+)", line[:-1])
-
- if m:
- print "\t%s\t\t= %d," % (string(m.groupdict()["name"]), convert(m.groupdict()["value"]))
- else:
- print line[:-1]
diff --git a/contrib/ctrl2sse.py b/contrib/ctrl2sse.py
deleted file mode 100755
index 8b630ecf..00000000
--- a/contrib/ctrl2sse.py
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/bin/python2
-
-mod_license = '''
-/*
- * Copyright (C) 2016 sysmocom s.f.m.c. GmbH
- *
- * All Rights Reserved
- *
- * 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-'''
-
-import sys, argparse, random, logging, tornado.ioloop, tornado.web, tornado.tcpclient, tornado.httpclient, eventsource, bsc_control
-from eventsource import listener, request
-
-'''
-N. B: this is not an example of building proper REST API or building secure web application.
-It's only purpose is to illustrate conversion of Osmocom's Control Interface to web-friendly API.
-Exposing this to Internet while connected to production network might lead to all sorts of mischief and mayhem
-from NSA' TAO breaking into your network to zombie apocalypse. Do NOT do that.
-'''
-
-token = None
-stream = None
-url = None
-
-'''
-Returns json according to following schema - see http://json-schema.org/documentation.html for details:
-{
- "title": "Ctrl Schema",
- "type": "object",
- "properties": {
- "variable": {
- "type": "string"
- },
- "varlue": {
- "type": "string"
- }
- },
- "required": ["interface", "variable", "value"]
-}
-Example validation from command-line:
-json validate --schema-file=schema.json --document-file=data.json
-The interface is represented as string because it might look different for IPv4 vs v6.
-'''
-
-def read_header(data):
- t_length = bsc_control.ipa_ctrl_header(data)
- if (t_length):
- stream.read_bytes(t_length - 1, callback = read_trap)
- else:
- print >> sys.stderr, "protocol error: length missing in %s!" % data
-
-@tornado.gen.coroutine
-def read_trap(data):
- (t, z, v, p) = data.split()
- if (t != 'TRAP' or int(z) != 0):
- print >> sys.stderr, "protocol error: TRAP != %s or 0! = %d" % (t, int(z))
- else:
- yield tornado.httpclient.AsyncHTTPClient().fetch(tornado.httpclient.HTTPRequest(url = "%s/%s/%s" % (url, "ping", token),
- method = 'POST',
- headers = {'Content-Type': 'application/json'},
- body = tornado.escape.json_encode({ 'variable' : v, 'value' : p })))
- stream.read_bytes(4, callback = read_header)
-
-@tornado.gen.coroutine
-def trap_setup(host, port, target_host, target_port, tk):
- global stream
- global url
- global token
- token = tk
- url = "http://%s:%s/sse" % (host, port)
- stream = yield tornado.tcpclient.TCPClient().connect(target_host, target_port)
- stream.read_bytes(4, callback = read_header)
-
-def get_v(s, v):
- return { 'variable' : v, 'value' : bsc_control.get_var(s, tornado.escape.native_str(v)) }
-
-class CtrlHandler(tornado.web.RequestHandler):
- def initialize(self):
- self.skt = bsc_control.connect(self.settings['ctrl_host'], self.settings['ctrl_port'])
-
- def get(self, v):
- self.write(get_v(self.skt, v))
-
- def post(self):
- self.write(get_v(self.skt, self.get_argument("variable")))
-
-class SetCtrl(CtrlHandler):
- def get(self, var, val):
- bsc_control.set_var(self.skt, tornado.escape.native_str(var), tornado.escape.native_str(val))
- super(SetCtrl, self).get(tornado.escape.native_str(var))
-
- def post(self):
- bsc_control.set_var(self.skt, tornado.escape.native_str(self.get_argument("variable")), tornado.escape.native_str(self.get_argument("value")))
- super(SetCtrl, self).post()
-
-class Slash(tornado.web.RequestHandler):
- def get(self):
- self.write('<html><head><title>%s</title></head><body>Using Tornado framework v%s'
- '<form action="/get" method="POST">'
- '<input type="text" name="variable">'
- '<input type="submit" value="GET">'
- '</form>'
- '<form action="/set" method="POST">'
- '<input type="text" name="variable">'
- '<input type="text" name="value">'
- '<input type="submit" value="SET">'
- '</form>'
- '</body></html>' % ("Osmocom Control Interface Proxy", tornado.version))
-
-if __name__ == '__main__':
- p = argparse.ArgumentParser(description='Osmocom Control Interface proxy.')
- p.add_argument('-c', '--control-port', type = int, default = 4252, help = "Target Control Interface port")
- p.add_argument('-a', '--control-host', default = 'localhost', help = "Target Control Interface adress")
- p.add_argument('-b', '--host', default = 'localhost', help = "Adress to bind proxy's web interface")
- p.add_argument('-p', '--port', type = int, default = 6969, help = "Port to bind proxy's web interface")
- p.add_argument('-d', '--debug', action='store_true', help = "Activate debugging (default off)")
- p.add_argument('-t', '--token', default = 'osmocom', help = "Token to be used by SSE client in URL e. g. http://127.0.0.1:8888/poll/osmocom where 'osmocom' is default token value")
- p.add_argument('-k', '--keepalive', type = int, default = 5000, help = "Timeout betwwen keepalive messages, in milliseconds, defaults to 5000")
- args = p.parse_args()
- random.seed()
- tornado.netutil.Resolver.configure('tornado.netutil.ThreadedResolver') # Use non-blocking resolver
- logging.basicConfig()
- application = tornado.web.Application([
- (r"/", Slash),
- (r"/get", CtrlHandler),
- (r"/get/(.*)", CtrlHandler),
- (r"/set", SetCtrl),
- (r"/set/(.*)/(.*)", SetCtrl),
- (r"/sse/(.*)/(.*)", listener.EventSourceHandler, dict(event_class = listener.JSONIdEvent, keepalive = args.keepalive)),
- ], debug = args.debug, ctrl_host = args.control_host, ctrl_port = args.control_port)
- application.listen(address = args.host, port = args.port)
- trap_setup(args.host, args.port, application.settings['ctrl_host'], application.settings['ctrl_port'], args.token)
- tornado.ioloop.IOLoop.instance().start()
diff --git a/contrib/hlr-remove-old.sql b/contrib/hlr-remove-old.sql
deleted file mode 100644
index 626a331e..00000000
--- a/contrib/hlr-remove-old.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Remove old data from the database
-DELETE FROM Subscriber
- WHERE id != 1 AND datetime('now', '-10 days') > updated AND authorized != 1;
-DELETE FROM Equipment
- WHERE datetime('now', '-10 days') > updated;
-DELETE FROM EquipmentWatch
- WHERE datetime('now', '-10 days') > updated;
-DELETE FROM SMS
- WHERE datetime('now', '-10 days') > created;
-DELETE FROM VLR
- WHERE datetime('now', '-10 days') > updated;
-DELETE FROM ApduBlobs
- WHERE datetime('now', '-10 days') > created;
-DELETE FROM Counters
- WHERE datetime('now', '-10 days') > timestamp;
-DELETE FROM RateCounters
- WHERE datetime('now', '-10 days') > timestamp;
-VACUUM;
diff --git a/contrib/hlrsync/hlrsync.py b/contrib/hlrsync/hlrsync.py
deleted file mode 100755
index e4a49555..00000000
--- a/contrib/hlrsync/hlrsync.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/python2.5
-
-from __future__ import with_statement
-
-from pysqlite2 import dbapi2 as sqlite3
-import sys
-
-hlr = sqlite3.connect(sys.argv[1])
-web = sqlite3.connect(sys.argv[2])
-
-# switch to autocommit
-hlr.isolation_level = None
-web.isolation_level = None
-
-hlr.row_factory = sqlite3.Row
-web.row_factory = sqlite3.Row
-
-with hlr:
- hlr_subscrs = hlr.execute("""
- SELECT * FROM Subscriber
- """).fetchall()
- hlr_tokens = hlr.execute("""
- SELECT * FROM AuthToken
- """).fetchall()
-
-with web:
- web_tokens = web.execute("""
- SELECT * FROM reg_tokens
- """).fetchall()
- web_sms = web.execute("""
- SELECT * FROM sms_queue
- """).fetchall()
-
-# index by subscr id
-hlr_subscrs_by_id = {}
-hlr_subscrs_by_ext = {}
-hlr_tokens_by_subscr_id = {}
-for x in hlr_subscrs:
- hlr_subscrs_by_id[x['id']] = x
- hlr_subscrs_by_ext[x['extension']] = x
-del hlr_subscrs
-for x in hlr_tokens:
- hlr_tokens_by_subscr_id[x['subscriber_id']] = x
-del hlr_tokens
-
-web_tokens_by_subscr_id = {}
-for x in web_tokens:
- web_tokens_by_subscr_id[x['subscriber_id']] = x
-del web_tokens
-
-# remove leftover web_tokens and correct inconsistent fields
-with web:
- for x in web_tokens_by_subscr_id.values():
- subscr = hlr_subscrs_by_id.get(x['subscriber_id'], None)
- if subscr is None:
- web.execute("""
- DELETE FROM reg_tokens WHERE subscriber_id = ?
- """, (x['subscriber_id'],))
- del web_tokens_by_subscr_id[x['subscriber_id']]
- continue
- if str(x['imsi']) != str(subscr['imsi']) or \
- x['extension'] != subscr['extension'] or \
- x['tmsi'] != subscr['tmsi'] or \
- x['lac'] != subscr['lac']:
- web.execute("""
- UPDATE reg_tokens
- SET imsi = ?, extension = ?, tmsi = ?, lac = ?
- WHERE subscriber_id = ?
- """, (str(subscr['imsi']), subscr['extension'],
- subscr['tmsi'], subscr['lac'], x['subscriber_id']))
-
-# add missing web_tokens
-with web:
- for x in hlr_tokens_by_subscr_id.values():
- subscr = hlr_subscrs_by_id.get(x['subscriber_id'], None)
- if subscr is None:
- hlr.execute("""
- DELETE FROM AuthToken WHERE subscriber_id = ?
- """, (x['subscriber_id'],))
- del hlr_tokens_by_subscr_id[x['subscriber_id']]
- continue
- webtoken = web_tokens_by_subscr_id.get(x['subscriber_id'], None)
- if webtoken is None:
- web.execute("""
- INSERT INTO reg_tokens
- (subscriber_id, extension, reg_completed, name, email, lac, imsi, token, tmsi)
- VALUES
- (?, ?, 0, ?, '', ?, ?, ?, ?)
- """, (x['subscriber_id'], subscr['extension'], subscr['name'],
- subscr['lac'], str(subscr['imsi']), x['token'], subscr['tmsi']))
-
-# authorize subscribers
-with hlr:
- for x in web_tokens_by_subscr_id.values():
- subscr = hlr_subscrs_by_id.get(x['subscriber_id'], None)
- if x['reg_completed'] and not subscr['authorized']:
- hlr.execute("""
- UPDATE Subscriber
- SET authorized = 1
- WHERE id = ?
- """, (x['subscriber_id'],))
-
-# Sync SMS from web to hlr
-with hlr:
- for sms in web_sms:
- subscr = hlr_subscrs_by_ext.get(sms['receiver_ext'])
- if subscr is None:
- print '%s not found' % sms['receiver_ext']
- continue
- hlr.execute("""
- INSERT INTO SMS
- (created, sender_id, receiver_id, reply_path_req, status_rep_req, protocol_id, data_coding_scheme, ud_hdr_ind, text)
- VALUES
- (?, 1, ?, 0, 0, 0, 0, 0, ?)
- """, (sms['created'], subscr['id'], sms['text']))
-with web:
- for sms in web_sms:
- web.execute("""
- DELETE FROM sms_queue WHERE id = ?
- """, (sms['id'],))
-
-
-hlr.close()
-web.close()
-
diff --git a/contrib/mgcp_server.py b/contrib/mgcp_server.py
deleted file mode 100755
index 05c489db..00000000
--- a/contrib/mgcp_server.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-# Simple server for mgcp... send audit, receive response..
-
-import socket, time
-
-MGCP_GATEWAY_PORT = 2427
-MGCP_CALLAGENT_PORT = 2727
-
-rsip_resp = """200 321321332\r\n"""
-audit_packet = """AUEP %d 13@mgw MGCP 1.0\r\n"""
-crcx_packet = """CRCX %d 14@mgw MGCP 1.0\r\nC: 4a84ad5d25f\r\nL: p:20, a:GSM-EFR, nt:IN\r\nM: recvonly\r\n"""
-dlcx_packet = """DLCX %d 14@mgw MGCP 1.0\r\nC: 4a84ad5d25f\r\nI: %d\r\n"""
-mdcx_packet = """MDCX %d 14@mgw MGCP 1.0\r\nC: 4a84ad5d25f\r\nI: %d\r\nL: p:20, a:GSM-EFR, nt:IN\r\nM: recvonly\r\n\r\nv=0\r\no=- 258696477 0 IN IP4 172.16.1.107\r\ns=-\r\nc=IN IP4 172.16.1.107\r\nt=0 0\r\nm=audio 6666 RTP/AVP 127\r\na=rtpmap:127 GSM-EFR/8000/1\r\na=ptime:20\r\na=recvonly\r\nm=image 4402 udptl t38\r\na=T38FaxVersion:0\r\na=T38MaxBitRate:14400\r\n"""
-
-def hexdump(src, length=8):
- """Recipe is from http://code.activestate.com/recipes/142812/"""
- result = []
- digits = 4 if isinstance(src, unicode) else 2
- for i in xrange(0, len(src), length):
- s = src[i:i+length]
- hexa = b' '.join(["%0*X" % (digits, ord(x)) for x in s])
- text = b''.join([x if 0x20 <= ord(x) < 0x7F else b'.' for x in s])
- result.append( b"%04X %-*s %s" % (i, length*(digits + 1), hexa, text) )
- return b'\n'.join(result)
-
-server_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-server_socket.bind(("127.0.0.1", MGCP_CALLAGENT_PORT))
-server_socket.setblocking(1)
-
-last_ci = 1
-def send_and_receive(packet):
- global last_ci
- server_socket.sendto(packet, ("127.0.0.1", MGCP_GATEWAY_PORT))
- try:
- data, addr = server_socket.recvfrom(4096)
-
- # attempt to store the CI of the response
- list = data.split("\n")
- for item in list:
- if item.startswith("I: "):
- last_ci = int(item[3:])
-
- print hexdump(data), addr
- except socket.error, e:
- print e
- pass
-
-def generate_tid():
- import random
- return random.randint(0, 65123)
-
-
-
-while True:
- send_and_receive(audit_packet % generate_tid())
- send_and_receive(crcx_packet % generate_tid() )
- send_and_receive(mdcx_packet % (generate_tid(), last_ci))
- send_and_receive(dlcx_packet % (generate_tid(), last_ci))
-
- time.sleep(3)
diff --git a/contrib/nat/test_regexp.c b/contrib/nat/test_regexp.c
deleted file mode 100644
index 808a703c..00000000
--- a/contrib/nat/test_regexp.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* make test_regexp */
-#include <sys/types.h>
-#include <regex.h>
-#include <stdio.h>
-
-
-int main(int argc, char **argv)
-{
- regex_t reg;
- regmatch_t matches[2];
-
- if (argc != 4) {
- printf("Invoke with: test_regexp REGEXP REPLACE NR\n");
- return -1;
- }
-
- if (regcomp(&reg, argv[1], REG_EXTENDED) != 0) {
- fprintf(stderr, "Regexp '%s' is not valid.\n", argv[1]);
- return -1;
- }
-
- if (regexec(&reg, argv[3], 2, matches, 0) == 0 && matches[1].rm_eo != -1)
- printf("New Number: %s%s\n", argv[2], &argv[3][matches[1].rm_so]);
- else
- printf("No match.\n");
-
- regfree(&reg);
-
- return 0;
-}
diff --git a/contrib/nat/ussd_example.py b/contrib/nat/ussd_example.py
deleted file mode 100644
index 8f7a58d3..00000000
--- a/contrib/nat/ussd_example.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python2.7
-
-"""
-AGPLv3+ 2016 Copyright Holger Hans Peter Freyther
-
-Example of how to connect to the USSD side-channel and how to respond
-with a fixed message.
-"""
-
-import socket
-import struct
-
-ussdSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-ussdSocket.connect(('127.0.0.1', 5001))
-
-def send_dt1(dstref, data):
- dlen = struct.pack('B', len(data)).encode('hex')
- hex = '06' + dstref.encode('hex') + '00' + '01' + dlen + data.encode('hex')
- pdata = hex.decode('hex')
- out = struct.pack('>HB', len(pdata), 0xfd) + pdata
- ussdSocket.send(out)
-
-def send_rel(srcref, dstref):
- hex = '04' + dstref.encode('hex') + srcref.encode('hex') + '000100'
- pdata = hex.decode('hex')
- out = struct.pack('>HB', len(pdata), 0xfd) + pdata
- ussdSocket.send(out)
-
-def recv_one():
- plen = ussdSocket.recv(3)
- (plen,ptype) = struct.unpack(">HB", plen)
- data = ussdSocket.recv(plen)
-
- return ptype, data
-
-# Assume this is the ID request
-data = ussdSocket.recv(4)
-ussdSocket.send("\x00\x08\xfe\x05\x00" + "\x05\x01" + "ussd")
-# ^len ^len of tag ... and ignore
-
-# Expect a fake message. see struct ipac_msgt_sccp_state
-ptype, data = recv_one()
-print("%d %s" % (ptype, data.encode('hex')))
-(srcref, dstref, transid, invokeid) = struct.unpack("<3s3sBB", data[1:9])
-print("New transID %d invoke %d" % (transid, invokeid))
-
-# Expect a the invocation.. todo.. extract invoke id
-ptype, data = recv_one()
-print("%d %s" % (ptype, data.encode('hex')))
-
-# Reply with BSSAP + GSM 04.08 + MAP portion
-# 00 == invoke id 0f == DCS
-res = "01002a9b2a0802e1901c22a220020100301b02013b301604010f041155e7d2f9bc3a41412894991c06a9c9a713"
-send_dt1(dstref, res.decode('hex'))
-
-clear = "000420040109"
-send_dt1(dstref, clear.decode('hex'))
-
-# should be the clear complete
-send_rel(srcref, dstref)
-
-# Give it some time to handle connection shutdown properly
-print("Gracefully sleeping")
-import time
-time.sleep(3)
diff --git a/contrib/rtp/gen_rtp_header.erl b/contrib/rtp/gen_rtp_header.erl
deleted file mode 100755
index 47839c1c..00000000
--- a/contrib/rtp/gen_rtp_header.erl
+++ /dev/null
@@ -1,420 +0,0 @@
-#!/usr/bin/env escript
-%% -*- erlang -*-
-%%! -smp disable
--module(gen_rtp_header).
-
-% -mode(compile).
-
--define(VERSION, "0.1").
-
--export([main/1]).
-
--record(rtp_packet,
- {
- version = 2,
- padding = 0,
- marker = 0,
- payload_type = 0,
- seqno = 0,
- timestamp = 0,
- ssrc = 0,
- csrcs = [],
- extension = <<>>,
- payload = <<>>,
- realtime
- }).
-
-
-main(Args) ->
- DefaultOpts = [{format, state},
- {ssrc, 16#11223344},
- {rate, 8000},
- {pt, 98}],
- {PosArgs, Opts} = getopts_checked(Args, DefaultOpts),
- log(debug, fun (Dev) ->
- io:format(Dev, "Initial options:~n", []),
- dump_opts(Dev, Opts),
- io:format(Dev, "~s: ~p~n", ["Args", PosArgs])
- end, [], Opts),
- main(PosArgs, Opts).
-
-main([First | RemArgs], Opts) ->
- try
- F = list_to_integer(First),
- Format = proplists:get_value(format, Opts, state),
- PayloadData = proplists:get_value(payload, Opts, undef),
- InFile = proplists:get_value(file, Opts, undef),
-
- Payload = case {PayloadData, InFile} of
- {undef, undef} ->
- % use default value
- #rtp_packet{}#rtp_packet.payload;
- {P, undef} -> P;
- {_, File} ->
- log(info, "Loading file '~s'~n", [File], Opts),
- {ok, InDev} = file:open(File, [read]),
- DS = [ Pl#rtp_packet.payload || {_T, Pl} <- read_packets(InDev, Opts)],
- file:close(InDev),
- log(debug, "File '~s' closed, ~w packets read.~n", [File, length(DS)], Opts),
- DS
- end,
- Dev = standard_io,
- write_packet_pre(Dev, Format),
- do_groups(Dev, Payload, F, RemArgs, Opts),
- write_packet_post(Dev, Format),
- 0
- catch
- _:_ ->
- log(debug, "~p~n", [hd(erlang:get_stacktrace())], Opts),
- usage(),
- halt(1)
- end
- ;
-
-main(_, _Opts) ->
- usage(),
- halt(1).
-
-%%% group (count + offset) handling %%%
-
-do_groups(_Dev, _Pl, _F, [], _Opts) ->
- ok;
-
-do_groups(Dev, Pl, F, [L], Opts) ->
- do_groups(Dev, Pl, F, [L, 0], Opts);
-
-do_groups(Dev, Pl, First, [L, O | Args], Opts) ->
- Ssrc = proplists:get_value(ssrc, Opts, #rtp_packet.ssrc),
- PT = proplists:get_value(pt, Opts, #rtp_packet.payload_type),
- Len = list_to_num(L),
- Offs = list_to_num(O),
- log(info, "Starting group: Ssrc=~.16B, PT=~B, First=~B, Len=~B, Offs=~B~n",
- [Ssrc, PT, First, Len, Offs], Opts),
- Pkg = #rtp_packet{ssrc = Ssrc, payload_type = PT},
- Pl2 = write_packets(Dev, Pl, Pkg, First, Len, Offs, Opts),
- {Args2, Opts2} = getopts_checked(Args, Opts),
- log(debug, fun (Io) ->
- io:format(Io, "Changed options:~n", []),
- dump_opts(Io, Opts2 -- Opts)
- end, [], Opts),
- do_groups(Dev, Pl2, First+Len, Args2, Opts2).
-
-%%% error handling helpers %%%
-
-getopts_checked(Args, Opts) ->
- try
- getopts(Args, Opts)
- catch
- C:R ->
- log(error, "~s~n",
- [explain_error(C, R, erlang:get_stacktrace(), Opts)], Opts),
- usage(),
- halt(1)
- end.
-
-explain_error(error, badarg, [{erlang,list_to_integer,[S,B]} | _ ], _Opts) ->
- io_lib:format("Invalid number '~s' (base ~B)", [S, B]);
-explain_error(error, badarg, [{erlang,list_to_integer,[S]} | _ ], _Opts) ->
- io_lib:format("Invalid decimal number '~s'", [S]);
-explain_error(C, R, [Hd | _ ], _Opts) ->
- io_lib:format("~p, ~p:~p", [Hd, C, R]);
-explain_error(_, _, [], _Opts) ->
- "".
-
-%%% usage and options %%%
-
-myname() ->
- filename:basename(escript:script_name()).
-
-usage(Text) ->
- io:format(standard_error, "~s: ~s~n", [myname(), Text]),
- usage().
-
-usage() ->
- io:format(standard_error,
- "Usage: ~s [Options] Start Count1 Offs1 [[Options] Count2 Offs2 ...]~n",
- [myname()]).
-
-show_version() ->
- io:format(standard_io,
- "~s ~s~n", [myname(), ?VERSION]).
-
-show_help() ->
- io:format(standard_io,
- "Usage: ~s [Options] Start Count1 Offs1 [[Options] Count2 Offs2 ...]~n~n" ++
- "Options:~n" ++
- " -h, --help this text~n" ++
- " --version show version info~n" ++
- " -i, --file=FILE reads payload from file (state format by default)~n" ++
- " -f, --frame-size=N read payload as binary frames of size N instead~n" ++
- " -p, --payload=HEX set constant payload~n" ++
- " --verbose=N set verbosity~n" ++
- " -v increase verbosity~n" ++
- " --format=state use state format for output (default)~n" ++
- " -C, --format=c use simple C lines for output~n" ++
- " --format=carray use a C array for output~n" ++
- " -s, --ssrc=SSRC set the SSRC~n" ++
- " -t, --type=N set the payload type~n" ++
- " -r, --rate=N set the RTP rate [8000]~n" ++
- " -D, --duration=N set the packet duration in RTP time units [160]~n" ++
- " -d, --delay=FLOAT add offset to playout timestamp~n" ++
- "~n" ++
- "Arguments:~n" ++
- " Start initial packet (sequence) number~n" ++
- " Count number of packets~n" ++
- " Offs timestamp offset (in RTP units)~n" ++
- "", [myname()]).
-
-getopts([ "--file=" ++ File | R], Opts) ->
- getopts(R, [{file, File} | Opts]);
-getopts([ "-i" ++ T | R], Opts) ->
- getopts_alias_arg("--file", T, R, Opts);
-getopts([ "--frame-size=" ++ N | R], Opts) ->
- Size = list_to_integer(N),
- getopts(R, [{frame_size, Size}, {in_format, bin} | Opts]);
-getopts([ "-f" ++ T | R], Opts) ->
- getopts_alias_arg("--frame-size", T, R, Opts);
-getopts([ "--duration=" ++ N | R], Opts) ->
- Duration = list_to_integer(N),
- getopts(R, [{duration, Duration} | Opts]);
-getopts([ "-D" ++ T | R], Opts) ->
- getopts_alias_arg("--duration", T, R, Opts);
-getopts([ "--rate=" ++ N | R], Opts) ->
- Rate = list_to_integer(N),
- getopts(R, [{rate, Rate} | Opts]);
-getopts([ "-r" ++ T | R], Opts) ->
- getopts_alias_arg("--rate", T, R, Opts);
-getopts([ "--version" | _], _Opts) ->
- show_version(),
- halt(0);
-getopts([ "--help" | _], _Opts) ->
- show_help(),
- halt(0);
-getopts([ "-h" ++ T | R], Opts) ->
- getopts_alias_no_arg("--help", T, R, Opts);
-getopts([ "--verbose=" ++ V | R], Opts) ->
- Verbose = list_to_integer(V),
- getopts(R, [{verbose, Verbose} | Opts]);
-getopts([ "-v" ++ T | R], Opts) ->
- Verbose = proplists:get_value(verbose, Opts, 0),
- getopts_short_no_arg(T, R, [ {verbose, Verbose+1} | Opts]);
-getopts([ "--format=state" | R], Opts) ->
- getopts(R, [{format, state} | Opts]);
-getopts([ "--format=c" | R], Opts) ->
- getopts(R, [{format, c} | Opts]);
-getopts([ "-C" ++ T | R], Opts) ->
- getopts_alias_no_arg("--format=c", T, R, Opts);
-getopts([ "--format=carray" | R], Opts) ->
- getopts(R, [{format, carray} | Opts]);
-getopts([ "--payload=" ++ Hex | R], Opts) ->
- getopts(R, [{payload, hex_to_bin(Hex)} | Opts]);
-getopts([ "--ssrc=" ++ Num | R], Opts) ->
- getopts(R, [{ssrc, list_to_num(Num)} | Opts]);
-getopts([ "-s" ++ T | R], Opts) ->
- getopts_alias_arg("--ssrc", T, R, Opts);
-getopts([ "--type=" ++ Num | R], Opts) ->
- getopts(R, [{pt, list_to_num(Num)} | Opts]);
-getopts([ "-t" ++ T | R], Opts) ->
- getopts_alias_arg("--type", T, R, Opts);
-getopts([ "--delay=" ++ Num | R], Opts) ->
- getopts(R, [{delay, list_to_float(Num)} | Opts]);
-getopts([ "-d" ++ T | R], Opts) ->
- getopts_alias_arg("--delay", T, R, Opts);
-
-% parsing helpers
-getopts([ "--" | R], Opts) ->
- {R, normalize_opts(Opts)};
-getopts([ O = "--" ++ _ | _], _Opts) ->
- usage("Invalid option: " ++ O),
- halt(1);
-getopts([ [ $-, C | _] | _], _Opts) when C < $0; C > $9 ->
- usage("Invalid option: -" ++ [C]),
- halt(1);
-
-getopts(R, Opts) ->
- {R, normalize_opts(Opts)}.
-
-getopts_short_no_arg([], R, Opts) -> getopts(R, Opts);
-getopts_short_no_arg(T, R, Opts) -> getopts([ "-" ++ T | R], Opts).
-
-getopts_alias_no_arg(A, [], R, Opts) -> getopts([A | R], Opts);
-getopts_alias_no_arg(A, T, R, Opts) -> getopts([A, "-" ++ T | R], Opts).
-
-getopts_alias_arg(A, [], [T | R], Opts) -> getopts([A ++ "=" ++ T | R], Opts);
-getopts_alias_arg(A, T, R, Opts) -> getopts([A ++ "=" ++ T | R], Opts).
-
-normalize_opts(Opts) ->
- [ proplists:lookup(E, Opts) || E <- proplists:get_keys(Opts) ].
-
-%%% conversions %%%
-
-bin_to_hex(Bin) -> [hd(integer_to_list(N,16)) || <<N:4>> <= Bin].
-hex_to_bin(Hex) -> << <<(list_to_integer([Nib],16)):4>> || Nib <- Hex>>.
-
-list_to_num("-" ++ Str) -> -list_to_num(Str);
-list_to_num("0x" ++ Str) -> list_to_integer(Str, 16);
-list_to_num("0b" ++ Str) -> list_to_integer(Str, 2);
-list_to_num(Str = [ $0 | _ ]) -> list_to_integer(Str, 8);
-list_to_num(Str) -> list_to_integer(Str, 10).
-
-%%% dumping data %%%
-
-dump_opts(Dev, Opts) ->
- dump_opts2(Dev, Opts, proplists:get_keys(Opts)).
-
-dump_opts2(Dev, Opts, [OptName | R]) ->
- io:format(Dev, " ~-10s: ~p~n",
- [OptName, proplists:get_value(OptName, Opts)]),
- dump_opts2(Dev, Opts, R);
-dump_opts2(_Dev, _Opts, []) -> ok.
-
-%%% logging %%%
-
-log(L, Fmt, Args, Opts) when is_list(Opts) ->
- log(L, Fmt, Args, proplists:get_value(verbose, Opts, 0), Opts).
-
-log(debug, Fmt, Args, V, Opts) when V > 2 -> log2("DEBUG", Fmt, Args, Opts);
-log(info, Fmt, Args, V, Opts) when V > 1 -> log2("INFO", Fmt, Args, Opts);
-log(notice, Fmt, Args, V, Opts) when V > 0 -> log2("NOTICE", Fmt, Args, Opts);
-log(warn, Fmt, Args, _V, Opts) -> log2("WARNING", Fmt, Args, Opts);
-log(error, Fmt, Args, _V, Opts) -> log2("ERROR", Fmt, Args, Opts);
-
-log(Lvl, Fmt, Args, V, Opts) when V >= Lvl -> log2("", Fmt, Args, Opts);
-
-log(_, _, _, _i, _) -> ok.
-
-log2(Type, Fmt, Args, _Opts) when is_list(Fmt) ->
- io:format(standard_error, "~s: " ++ Fmt, [Type | Args]);
-log2("", Fmt, Args, _Opts) when is_list(Fmt) ->
- io:format(standard_error, Fmt, Args);
-log2(_Type, Fun, _Args, _Opts) when is_function(Fun, 1) ->
- Fun(standard_error).
-
-%%% RTP packets %%%
-
-make_rtp_packet(P = #rtp_packet{version = 2}) ->
- << (P#rtp_packet.version):2,
- 0:1, % P
- 0:1, % X
- 0:4, % CC
- (P#rtp_packet.marker):1,
- (P#rtp_packet.payload_type):7,
- (P#rtp_packet.seqno):16,
- (P#rtp_packet.timestamp):32,
- (P#rtp_packet.ssrc):32,
- (P#rtp_packet.payload)/bytes
- >>.
-
-parse_rtp_packet(
- << 2:2, % Version 2
- 0:1, % P (not supported yet)
- 0:1, % X (not supported yet)
- 0:4, % CC (not supported yet)
- M:1,
- PT:7,
- SeqNo: 16,
- TS:32,
- Ssrc:32,
- Payload/bytes >>) ->
- #rtp_packet{
- version = 0,
- marker = M,
- payload_type = PT,
- seqno = SeqNo,
- timestamp = TS,
- ssrc = Ssrc,
- payload = Payload}.
-
-%%% payload generation %%%
-
-next_payload(F) when is_function(F) ->
- {F(), F};
-next_payload({F, D}) when is_function(F) ->
- {P, D2} = F(D),
- {P, {F, D2}};
-next_payload([P | R]) ->
- {P, R};
-next_payload([]) ->
- undef;
-next_payload(Bin = <<_/bytes>>) ->
- {Bin, Bin}.
-
-%%% real writing work %%%
-
-write_packets(_Dev, DS, _P, _F, 0, _O, _Opts) ->
- DS;
-write_packets(Dev, DataSource, P = #rtp_packet{}, F, L, O, Opts) ->
- Format = proplists:get_value(format, Opts, state),
- Ptime = proplists:get_value(duration, Opts, 160),
- Delay = proplists:get_value(delay, Opts, 0),
- Rate = proplists:get_value(rate, Opts, 8000),
- case next_payload(DataSource) of
- {Payload, DataSource2} ->
- write_packet(Dev, Ptime * F / Rate + Delay,
- P#rtp_packet{seqno = F, timestamp = F*Ptime+O,
- payload = Payload},
- Format),
- write_packets(Dev, DataSource2, P, F+1, L-1, O, Opts);
- Other -> Other
- end.
-
-write_packet(Dev, Time, P = #rtp_packet{}, Format) ->
- Bin = make_rtp_packet(P),
-
- write_packet_line(Dev, Time, P, Bin, Format).
-
-write_packet_pre(Dev, carray) ->
- io:format(Dev,
- "struct {float t; int len; char *data;} packets[] = {~n", []);
-
-write_packet_pre(_Dev, _) -> ok.
-
-write_packet_post(Dev, carray) ->
- io:format(Dev, "};~n", []);
-
-write_packet_post(_Dev, _) -> ok.
-
-write_packet_line(Dev, Time, _P, Bin, state) ->
- io:format(Dev, "~f ~s~n", [Time, bin_to_hex(Bin)]);
-
-write_packet_line(Dev, Time, #rtp_packet{seqno = N, timestamp = TS}, Bin, c) ->
- ByteList = [ [ $0, $x | integer_to_list(Byte, 16) ] || <<Byte:8>> <= Bin ],
- ByteStr = string:join(ByteList, ", "),
- io:format(Dev, "/* time=~f, SeqNo=~B, TS=~B */ {~s}~n", [Time, N, TS, ByteStr]);
-
-write_packet_line(Dev, Time, #rtp_packet{seqno = N, timestamp = TS}, Bin, carray) ->
- io:format(Dev, " /* RTP: SeqNo=~B, TS=~B */~n", [N, TS]),
- io:format(Dev, " {~f, ~B, \"", [Time, size(Bin)]),
- [ io:format(Dev, "\\x~2.16.0B", [Byte]) || <<Byte:8>> <= Bin ],
- io:format(Dev, "\"},~n", []).
-
-%%% real reading work %%%
-
-read_packets(Dev, Opts) ->
- Format = proplists:get_value(in_format, Opts, state),
-
- read_packets(Dev, Opts, Format).
-
-read_packets(Dev, Opts, Format) ->
- case read_packet(Dev, Opts, Format) of
- eof -> [];
- Tuple -> [Tuple | read_packets(Dev, Opts, Format)]
- end.
-
-read_packet(Dev, Opts, bin) ->
- Size = proplists:get_value(frame_size, Opts),
- case file:read(Dev, Size) of
- {ok, Data} -> {0, #rtp_packet{payload = iolist_to_binary(Data)}};
- eof -> eof
- end;
-read_packet(Dev, _Opts, Format) ->
- case read_packet_line(Dev, Format) of
- {Time, Bin} -> {Time, parse_rtp_packet(Bin)};
- eof -> eof
- end.
-
-read_packet_line(Dev, state) ->
- case io:fread(Dev, "", "~f ~s") of
- {ok, [Time, Hex]} -> {Time, hex_to_bin(Hex)};
- eof -> eof
- end.
diff --git a/contrib/rtp/rtp_replay.st b/contrib/rtp/rtp_replay.st
deleted file mode 100644
index e26d0738..00000000
--- a/contrib/rtp/rtp_replay.st
+++ /dev/null
@@ -1,21 +0,0 @@
-"
-Simple UDP replay from the state files
-"
-
-PackageLoader fileInPackage: #Sockets.
-FileStream fileIn: 'rtp_replay_shared.st'.
-
-
-Eval [
- | replay file host dport |
-
- file := Smalltalk arguments at: 1 ifAbsent: [ 'rtpstream.state' ].
- host := Smalltalk arguments at: 2 ifAbsent: [ '127.0.0.1' ].
- dport := (Smalltalk arguments at: 3 ifAbsent: [ '4000' ]) asInteger.
- sport := (Smalltalk arguments at: 4 ifAbsent: [ '0' ]) asInteger.
-
- replay := RTPReplay on: file fromPort: sport.
-
- Transcript nextPutAll: 'Going to stream now'; nl.
- replay streamAudio: host port: dport.
-]
diff --git a/contrib/rtp/rtp_replay_shared.st b/contrib/rtp/rtp_replay_shared.st
deleted file mode 100644
index 7b68c0f5..00000000
--- a/contrib/rtp/rtp_replay_shared.st
+++ /dev/null
@@ -1,118 +0,0 @@
-"
-Simple UDP replay from the state files
-"
-
-PackageLoader fileInPackage: #Sockets.
-
-Object subclass: SDPUtils [
- "Look into using PetitParser."
- SDPUtils class >> findPort: aSDP [
- aSDP linesDo: [:line |
- (line startsWith: 'm=audio ') ifTrue: [
- | stream |
- stream := line readStream
- skip: 'm=audio ' size;
- yourself.
- ^ Number readFrom: stream.
- ]
- ].
-
- ^ self error: 'Not found'.
- ]
-
- SDPUtils class >> findHost: aSDP [
- aSDP linesDo: [:line |
- (line startsWith: 'c=IN IP4 ') ifTrue: [
- | stream |
- ^ stream := line readStream
- skip: 'c=IN IP4 ' size;
- upToEnd.
- ]
- ].
-
- ^ self error: 'Not found'.
- ]
-]
-
-Object subclass: RTPReplay [
- | filename socket |
- RTPReplay class >> on: aFile [
- ^ self new
- initialize;
- file: aFile; yourself
- ]
-
- RTPReplay class >> on: aFile fromPort: aPort [
- ^ self new
- initialize: aPort;
- file: aFile; yourself
- ]
-
- initialize [
- self initialize: 0.
- ]
-
- initialize: aPort [
- socket := Sockets.DatagramSocket local: '0.0.0.0' port: aPort.
- ]
-
- file: aFile [
- filename := aFile
- ]
-
- localPort [
- ^ socket port
- ]
-
- streamAudio: aHost port: aPort [
- | file last_time last_image udp_send dest |
-
- last_time := nil.
- last_image := nil.
- file := FileStream open: filename mode: #read.
-
- "Send the payload"
- dest := Sockets.SocketAddress byName: aHost.
- udp_send := [:payload | | datagram |
- datagram := Sockets.Datagram data: payload contents address: dest port: aPort.
- socket nextPut: datagram
- ].
-
- [file atEnd] whileFalse: [
- | lineStream time data now_image |
- lineStream := file nextLine readStream.
-
- "Read the time, skip the blank, parse the data"
- time := Number readFrom: lineStream.
- lineStream skip: 1.
-
- data := WriteStream on: (ByteArray new: 30).
- [lineStream atEnd] whileFalse: [
- | hex |
- hex := lineStream next: 2.
- data nextPut: (Number readFrom: hex readStream radix: 16).
- ].
-
- last_time isNil
- ifTrue: [
- "First time, send it right now"
- last_time := time.
- last_image := Time millisecondClockValue.
- udp_send value: data.
- ]
- ifFalse: [
- | wait_image new_image_time |
-
- "How long to wait?"
- wait_image := last_image + ((time - last_time) * 1000).
- [ wait_image > Time millisecondClockValue ]
- whileTrue: [Processor yield].
-
- udp_send value: data.
- last_time := time.
- last_image := wait_image.
- ]
- ]
- ]
-]
-
diff --git a/contrib/rtp/rtp_replay_sip.st b/contrib/rtp/rtp_replay_sip.st
deleted file mode 100644
index 5f844df1..00000000
--- a/contrib/rtp/rtp_replay_sip.st
+++ /dev/null
@@ -1,87 +0,0 @@
-"""
-Create a SIP connection and then stream...
-"""
-
-PackageLoader
- fileInPackage: #OsmoSIP.
-
-"Load for the replay code"
-FileStream fileIn: 'rtp_replay_shared.st'.
-
-
-Osmo.SIPCall subclass: StreamCall [
- | sem stream |
-
- createCall: aSDP [
- | sdp |
- stream := RTPReplay on: 'rtp_ssrc6976010.240.240.1_to_10.240.240.50.state'.
- sdp := aSDP % {stream localPort}.
- ^ super createCall: sdp.
- ]
-
- sem: aSemaphore [
- sem := aSemaphore
- ]
-
- sessionNew [
- | host port |
- Transcript nextPutAll: 'The call has started'; nl.
- Transcript nextPutAll: sdp_result; nl.
-
- host := SDPUtils findHost: sdp_result.
- port := SDPUtils findPort: sdp_result.
-
- [
- stream streamAudio: host port: port.
- Transcript nextPutAll: 'Streaming has finished.'; nl.
- ] fork.
- ]
-
- sessionFailed [
- sem signal
- ]
-
- sessionEnd [
- sem signal
- ]
-]
-
-Eval [
- | transport agent call sem sdp_fr sdp_amr |
-
-
- sdp_fr := (WriteStream on: String new)
- nextPutAll: 'v=0'; cr; nl;
- nextPutAll: 'o=twinkle 1739517580 1043400482 IN IP4 127.0.0.1'; cr; nl;
- nextPutAll: 's=-'; cr; nl;
- nextPutAll: 'c=IN IP4 127.0.0.1'; cr; nl;
- nextPutAll: 't=0 0'; cr; nl;
- nextPutAll: 'm=audio %1 RTP/AVP 0 101'; cr; nl;
- nextPutAll: 'a=rtpmap:0 PCMU/8000'; cr; nl;
- nextPutAll: 'a=rtpmap:101 telephone-event/8000'; cr; nl;
- nextPutAll: 'a=fmtp:101 0-15'; cr; nl;
- nextPutAll: 'a=ptime:20'; cr; nl;
- contents.
-
- sem := Semaphore new.
- transport := Osmo.SIPUdpTransport
- startOn: '0.0.0.0' port: 5066.
- agent := Osmo.SIPUserAgent createOn: transport.
- transport start.
-
- call := (StreamCall
- fromUser: 'sip:1000@sip.zecke.osmocom.org'
- host: '127.0.0.1'
- port: 5060
- to: 'sip:123456@127.0.0.1'
- on: agent)
- sem: sem; yourself.
-
- call createCall: sdp_fr.
-
-
- "Wait for the stream to have ended"
- sem wait.
-
- (Delay forSeconds: 4) wait.
-]
diff --git a/contrib/rtp/timestamp_rtp.lua b/contrib/rtp/timestamp_rtp.lua
deleted file mode 100644
index c18a06be..00000000
--- a/contrib/rtp/timestamp_rtp.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-print("Ni hao")
-
-
-do
- local tap = Listener.new("ip", "rtp")
- local rtp_ssrc = Field.new("rtp.ssrc")
- local frame_time = Field.new("frame.time_relative")
- local rtp = Field.new("rtp")
-
- function tap.packet(pinfo, tvb, ip)
- local ip_src, ip_dst = tostring(ip.ip_src), tostring(ip.ip_dst)
- local rtp_data = rtp()
- local filename = "rtp_ssrc" .. rtp_ssrc() "_src_" .. ip_src .. "_to_" .. ip_dst .. ".state"
- local f = io.open(filename, "a")
-
- f:write(tostring(frame_time()) .. " ")
- f:write(tostring(rtp_data.value))
- f:write("\n")
- f:close()
- end
-
- function tap.draw()
- print("DRAW")
- end
- function tap.reset()
- print("RESET")
- end
-end
diff --git a/contrib/sms/fill-hlr.st b/contrib/sms/fill-hlr.st
deleted file mode 100644
index da0643ec..00000000
--- a/contrib/sms/fill-hlr.st
+++ /dev/null
@@ -1,66 +0,0 @@
-"I create output for some simple SQL statements for the HLR db"
-
-
-Eval [
-
-"Create tables if they don't exist"
-Transcript show: 'CREATE TABLE SMS (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- created TIMESTAMP NOT NULL,
- sent TIMESTAMP,
- sender_id INTEGER NOT NULL,
- receiver_id INTEGER NOT NULL,
- deliver_attempts INTEGER NOT NULL DEFAULT 0,
- valid_until TIMESTAMP,
- reply_path_req INTEGER NOT NULL,
- status_rep_req INTEGER NOT NULL,
- protocol_id INTEGER NOT NULL,
- data_coding_scheme INTEGER NOT NULL,
- ud_hdr_ind INTEGER NOT NULL,
- dest_addr TEXT,
- user_data BLOB,
- header BLOB,
- text TEXT);'; nl;
- show: 'CREATE TABLE Subscriber (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- created TIMESTAMP NOT NULL,
- updated TIMESTAMP NOT NULL,
- imsi NUMERIC UNIQUE NOT NULL,
- name TEXT,
- extension TEXT UNIQUE,
- authorized INTEGER NOT NULL DEFAULT 0,
- tmsi TEXT UNIQUE,
- lac INTEGER NOT NULL DEFAULT 0);'; nl.
-
-"Create some dummy subscribers"
-num_sub := 1000.
-num_sms := 30.
-lac := 1.
-
-Transcript show: 'BEGIN;'; nl.
-
-1 to: num_sub do: [:each |
- Transcript show: 'INSERT INTO Subscriber
- (imsi, created, updated, authorized, lac, extension)
- VALUES
- (%1, datetime(''now''), datetime(''now''), 1, %2, %3);' %
- {(274090000000000 + each). lac. each}; nl.
-].
-
-1 to: num_sms do: [:sms |
- 1 to: num_sub do: [:sub |
- Transcript show: 'INSERT INTO SMS
- (created, sender_id, receiver_id, valid_until,
- reply_path_req, status_rep_req, protocol_id,
- data_coding_scheme, ud_hdr_ind, dest_addr,
- text) VALUES
- (datetime(''now''), 1, %1, ''2222-2-2'',
- 0, 0, 0,
- 0, 0, ''123456'',
- ''abc'');' % {sub}; nl.
- ]
-].
-
-Transcript show: 'COMMIT;'; nl.
-
-]
diff --git a/contrib/sms/hlr-query.st b/contrib/sms/hlr-query.st
deleted file mode 100644
index bd3f97a4..00000000
--- a/contrib/sms/hlr-query.st
+++ /dev/null
@@ -1,10 +0,0 @@
-"Query for one SMS"
-
-Eval [
-1 to: 100 do: [:each |
- Transcript show: 'SELECT SMS.* FROM SMS
- JOIN Subscriber ON SMS.receiver_id = Subscriber.id
- WHERE SMS.id >= 1 AND SMS.sent IS NULL AND Subscriber.lac > 0
- ORDER BY SMS.id LIMIT 1;'; nl.
-].
-]
diff --git a/contrib/sms/sqlite-probe.tap.d b/contrib/sms/sqlite-probe.tap.d
deleted file mode 100644
index e75cdfcf..00000000
--- a/contrib/sms/sqlite-probe.tap.d
+++ /dev/null
@@ -1,5 +0,0 @@
-probe process("/usr/lib/libsqlite3.so.0.8.6").function("sqlite3_get_table")
-{
- a = user_string($zSql);
- printf("sqlite3_get_table called '%s'\n", a);
-}
diff --git a/contrib/systemd/osmo-bsc-mgcp.service b/contrib/systemd/osmo-bsc-mgcp.service
deleted file mode 100644
index c040e607..00000000
--- a/contrib/systemd/osmo-bsc-mgcp.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenBSC MGCP
-
-[Service]
-Type=simple
-Restart=always
-ExecStart=/usr/bin/osmo-bsc_mgcp -s -c /etc/osmocom/osmo-bsc-mgcp.cfg
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/contrib/systemd/osmo-bsc.service b/contrib/systemd/osmo-bsc.service
deleted file mode 100644
index 4047fef4..00000000
--- a/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/contrib/systemd/osmo-msc.service b/contrib/systemd/osmo-msc.service
deleted file mode 100644
index 7cebb146..00000000
--- a/contrib/systemd/osmo-msc.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Osmocom Mobile Switching Center (MSC)
-Wants=osmo-hlr.service
-After=osmo-hlr.service
-After=osmo-hnbgw.service
-
-[Service]
-Type=simple
-Restart=always
-ExecStart=/usr/bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/contrib/systemd/osmo-nitb.service b/contrib/systemd/osmo-nitb.service
deleted file mode 100644
index 377497ee..00000000
--- a/contrib/systemd/osmo-nitb.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenBSC Network In the Box (NITB)
-
-[Service]
-Type=simple
-Restart=always
-ExecStart=/usr/bin/osmo-nitb -s -C -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/contrib/testconv/Makefile b/contrib/testconv/Makefile
deleted file mode 100644
index bb856f75..00000000
--- a/contrib/testconv/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-OBJS = testconv_main.o
-
-CC = gcc
-CFLAGS = -O0 -ggdb -Wall
-LDFLAGS =
-CPPFLAGS = -I../.. -I../../include $(shell pkg-config --cflags libosmocore) $(shell pkg-config --cflags libbcg729)
-LIBS = ../../src/libmgcp/libmgcp.a ../../src/libcommon/libcommon.a $(shell pkg-config --libs libosmocore) $(shell pkg-config --libs libbcg729) -lgsm -lrt
-
-testconv: $(OBJS)
- $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-
-testconv_main.o: testconv_main.c
-
-$(OBJS):
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
diff --git a/contrib/testconv/testconv_main.c b/contrib/testconv/testconv_main.c
deleted file mode 100644
index 6c95c554..00000000
--- a/contrib/testconv/testconv_main.c
+++ /dev/null
@@ -1,133 +0,0 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <err.h>
-
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/application.h>
-
-#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/mgcp.h>
-#include <openbsc/mgcp_internal.h>
-
-#include "bscconfig.h"
-#ifndef BUILD_MGCP_TRANSCODING
-#error "Requires MGCP transcoding enabled (see --enable-mgcp-transcoding)"
-#endif
-
-#include "openbsc/mgcp_transcode.h"
-
-static int audio_name_to_type(const char *name)
-{
- if (!strcasecmp(name, "gsm"))
- return 3;
-#ifdef HAVE_BCG729
- else if (!strcasecmp(name, "g729"))
- return 18;
-#endif
- else if (!strcasecmp(name, "pcma"))
- return 8;
- else if (!strcasecmp(name, "l16"))
- return 11;
- return -1;
-}
-
-int mgcp_get_trans_frame_size(void *state_, int nsamples, int dst);
-
-int main(int argc, char **argv)
-{
- char buf[4096] = {0x80, 0};
- int cc, rc;
- struct mgcp_rtp_end *dst_end;
- struct mgcp_rtp_end *src_end;
- struct mgcp_trunk_config tcfg = {{0}};
- struct mgcp_endpoint endp = {0};
- struct mgcp_process_rtp_state *state;
- int in_size;
- int in_samples = 160;
- int out_samples = 0;
- uint32_t ts = 0;
- uint16_t seq = 0;
-
- osmo_init_logging(&log_info);
-
- tcfg.endpoints = &endp;
- tcfg.number_endpoints = 1;
- endp.tcfg = &tcfg;
- mgcp_initialize_endp(&endp);
-
- dst_end = &endp.bts_end;
- src_end = &endp.net_end;
-
- if (argc <= 2)
- errx(1, "Usage: {gsm|g729|pcma|l16} {gsm|g729|pcma|l16} [SPP]");
-
- if ((src_end->codec.payload_type = audio_name_to_type(argv[1])) == -1)
- errx(1, "invalid input format '%s'", argv[1]);
- if ((dst_end->codec.payload_type = audio_name_to_type(argv[2])) == -1)
- errx(1, "invalid output format '%s'", argv[2]);
- if (argc > 3)
- out_samples = atoi(argv[3]);
-
- if (out_samples) {
- dst_end->codec.frame_duration_den = dst_end->codec.rate;
- dst_end->codec.frame_duration_num = out_samples;
- dst_end->frames_per_packet = 1;
- }
-
- rc = mgcp_transcoding_setup(&endp, dst_end, src_end);
- if (rc < 0)
- errx(1, "setup failed: %s", strerror(-rc));
-
- state = dst_end->rtp_process_data;
- OSMO_ASSERT(state != NULL);
-
- in_size = mgcp_transcoding_get_frame_size(state, in_samples, 0);
- OSMO_ASSERT(sizeof(buf) >= in_size + 12);
-
- buf[1] = src_end->codec.payload_type;
- *(uint16_t*)(buf+2) = htons(1);
- *(uint32_t*)(buf+4) = htonl(0);
- *(uint32_t*)(buf+8) = htonl(0xaabbccdd);
-
- while ((cc = read(0, buf + 12, in_size))) {
- int cont;
- int len;
-
- if (cc != in_size)
- err(1, "read");
-
- *(uint16_t*)(buf+2) = htonl(seq);
- *(uint32_t*)(buf+4) = htonl(ts);
-
- seq += 1;
- ts += in_samples;
-
- cc += 12; /* include RTP header */
-
- len = cc;
-
- do {
- cont = mgcp_transcoding_process_rtp(&endp, dst_end,
- buf, &len, sizeof(buf));
- if (cont == -EAGAIN) {
- fprintf(stderr, "Got EAGAIN\n");
- break;
- }
-
- if (cont < 0)
- errx(1, "processing failed: %s", strerror(-cont));
-
- len -= 12; /* ignore RTP header */
-
- if (write(1, buf + 12, len) != len)
- err(1, "write");
-
- len = cont;
- } while (len > 0);
- }
- return 0;
-}
-