aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-01-12 16:23:54 +0100
committerHarald Welte <laforge@osmocom.org>2020-01-12 16:26:52 +0100
commit41fe3625915c456513544b99ba8c057c0f650b3c (patch)
treee1d02589c6609b8f565db28f8d7a7eda1b02d8ad /contrib
parent0bb8fce2f1ae160a5cd989a27daa0a8f6c749ab0 (diff)
Revert "add osmo-mslookup-client program"
This reverts commit 637bbfcd9275f8c47212b29b50110f56ba6397bf, as it is a follow-up commit to Change-Id I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 which causes all OBS osmo-hlr builds to fail in the mslookup_client_mdns test. Change-Id: I43084ac3b24684f17df43fefc82019e44baaa236
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am5
-rw-r--r--contrib/dgsm/Makefile.am4
-rwxr-xr-xcontrib/dgsm/osmo-mslookup-pipe.py24
-rwxr-xr-xcontrib/dgsm/osmo-mslookup-socket.py35
4 files changed, 1 insertions, 67 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index cfd0b15..3439c97 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1 @@
-SUBDIRS = \
- systemd \
- dgsm \
- $(NULL)
+SUBDIRS = systemd
diff --git a/contrib/dgsm/Makefile.am b/contrib/dgsm/Makefile.am
deleted file mode 100644
index c759302..0000000
--- a/contrib/dgsm/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST = \
- osmo-mslookup-pipe.py \
- osmo-mslookup-socket.py \
- $(NULL)
diff --git a/contrib/dgsm/osmo-mslookup-pipe.py b/contrib/dgsm/osmo-mslookup-pipe.py
deleted file mode 100755
index b18bf5f..0000000
--- a/contrib/dgsm/osmo-mslookup-pipe.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python3
-# vim: shiftwidth=4 tabstop=4 expandtab
-import subprocess
-import json
-
-def query_mslookup(query_str):
- result = {'result': 'not-found'}
- proc = subprocess.Popen(('osmo-mslookup-client', '-f', 'json', query_str),
- stdout=subprocess.PIPE)
- for line in iter(proc.stdout.readline,''):
- if not line:
- break
- response = json.loads(line)
- if response.get('result') == 'result':
- result = response
- print('Response: %r' % response)
- return result
-
-if __name__ == '__main__':
- import sys
- query_str = '1000-5000@sip.voice.12345.msisdn'
- if len(sys.argv) > 1:
- query_str = sys.argv[1]
- print('Final result: %r' % query_mslookup(query_str))
diff --git a/contrib/dgsm/osmo-mslookup-socket.py b/contrib/dgsm/osmo-mslookup-socket.py
deleted file mode 100755
index a26ad9f..0000000
--- a/contrib/dgsm/osmo-mslookup-socket.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python3
-# vim: shiftwidth=4 tabstop=4 expandtab
-import socket
-import time
-
-MSLOOKUP_SOCKET_PATH = '/tmp/mslookup'
-
-def query_mslookup_socket(query_str, socket_path=MSLOOKUP_SOCKET_PATH):
- mslookup_socket = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)
- mslookup_socket.setblocking(True)
- mslookup_socket.connect(socket_path)
- result = {'result': 'not-found'}
- column_names = mslookup_socket.recv(1024).decode('ascii')
- if not column_names:
- return result
- column_names = column_names.split('\t')
- mslookup_socket.sendall(query_str.encode('ascii'))
- while True:
- csv = mslookup_socket.recv(1024).decode('ascii')
- if not csv:
- break
- response = dict(zip(column_names, csv.split('\t')))
- if response.get('result') == 'result':
- result = response
- print('Response: %r' % response)
- return result
-
-if __name__ == '__main__':
- import sys
- print(
- '\nPlease run separately: osmo-mslookup-client --socket /tmp/mslookup -d\n')
- query_str = '1000-5000@sip.voice.12345.msisdn'
- if len(sys.argv) > 1:
- query_str = sys.argv[1]
- print('Final result: %r' % query_mslookup_socket(query_str))