<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16827">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "add osmo-mslookup-client program"<br><br>This reverts commit 637bbfcd9275f8c47212b29b50110f56ba6397bf, as it<br>is a follow-up commit to Change-Id I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728<br>which causes all OBS osmo-hlr builds to fail in the mslookup_client_mdns test.<br><br>Change-Id: I43084ac3b24684f17df43fefc82019e44baaa236<br>---<br>M .gitignore<br>M configure.ac<br>M contrib/Makefile.am<br>D contrib/dgsm/Makefile.am<br>D contrib/dgsm/osmo-mslookup-pipe.py<br>D contrib/dgsm/osmo-mslookup-socket.py<br>M src/mslookup/Makefile.am<br>D src/mslookup/osmo-mslookup-client.c<br>8 files changed, 1 insertion(+), 957 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index 0965935..eec364a 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -36,7 +36,6 @@</span><br><span> src/osmo-hlr-db-tool</span><br><span> src/osmo-euse-demo</span><br><span> src/gsupclient/gsup-test-client</span><br><span style="color: hsl(0, 100%, 40%);">-src/mslookup/osmo-mslookup-client</span><br><span> </span><br><span> tests/atconfig</span><br><span> tests/testsuite</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 59261e8..57aecba 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -185,7 +185,6 @@</span><br><span> doc/manuals/Makefile</span><br><span> contrib/Makefile</span><br><span> contrib/systemd/Makefile</span><br><span style="color: hsl(0, 100%, 40%);">- contrib/dgsm/Makefile</span><br><span> tests/Makefile</span><br><span> tests/auc/Makefile</span><br><span> tests/auc/gen_ts_55_205_test_sets/Makefile</span><br><span>diff --git a/contrib/Makefile.am b/contrib/Makefile.am</span><br><span>index cfd0b15..3439c97 100644</span><br><span>--- a/contrib/Makefile.am</span><br><span>+++ b/contrib/Makefile.am</span><br><span>@@ -1,4 +1 @@</span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS = \</span><br><span style="color: hsl(0, 100%, 40%);">- systemd \</span><br><span style="color: hsl(0, 100%, 40%);">- dgsm \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = systemd</span><br><span>diff --git a/contrib/dgsm/Makefile.am b/contrib/dgsm/Makefile.am</span><br><span>deleted file mode 100644</span><br><span>index c759302..0000000</span><br><span>--- a/contrib/dgsm/Makefile.am</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-EXTRA_DIST = \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-mslookup-pipe.py \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-mslookup-socket.py \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span>diff --git a/contrib/dgsm/osmo-mslookup-pipe.py b/contrib/dgsm/osmo-mslookup-pipe.py</span><br><span>deleted file mode 100755</span><br><span>index b18bf5f..0000000</span><br><span>--- a/contrib/dgsm/osmo-mslookup-pipe.py</span><br><span>+++ /dev/null</span><br><span>@@ -1,24 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python3</span><br><span style="color: hsl(0, 100%, 40%);">-# vim: shiftwidth=4 tabstop=4 expandtab</span><br><span style="color: hsl(0, 100%, 40%);">-import subprocess</span><br><span style="color: hsl(0, 100%, 40%);">-import json</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def query_mslookup(query_str):</span><br><span style="color: hsl(0, 100%, 40%);">- result = {'result': 'not-found'}</span><br><span style="color: hsl(0, 100%, 40%);">- proc = subprocess.Popen(('osmo-mslookup-client', '-f', 'json', query_str),</span><br><span style="color: hsl(0, 100%, 40%);">- stdout=subprocess.PIPE)</span><br><span style="color: hsl(0, 100%, 40%);">- for line in iter(proc.stdout.readline,''):</span><br><span style="color: hsl(0, 100%, 40%);">- if not line:</span><br><span style="color: hsl(0, 100%, 40%);">- break</span><br><span style="color: hsl(0, 100%, 40%);">- response = json.loads(line)</span><br><span style="color: hsl(0, 100%, 40%);">- if response.get('result') == 'result':</span><br><span style="color: hsl(0, 100%, 40%);">- result = response</span><br><span style="color: hsl(0, 100%, 40%);">- print('Response: %r' % response)</span><br><span style="color: hsl(0, 100%, 40%);">- return result</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-if __name__ == '__main__':</span><br><span style="color: hsl(0, 100%, 40%);">- import sys</span><br><span style="color: hsl(0, 100%, 40%);">- query_str = '1000-5000@sip.voice.12345.msisdn'</span><br><span style="color: hsl(0, 100%, 40%);">- if len(sys.argv) > 1:</span><br><span style="color: hsl(0, 100%, 40%);">- query_str = sys.argv[1]</span><br><span style="color: hsl(0, 100%, 40%);">- print('Final result: %r' % query_mslookup(query_str))</span><br><span>diff --git a/contrib/dgsm/osmo-mslookup-socket.py b/contrib/dgsm/osmo-mslookup-socket.py</span><br><span>deleted file mode 100755</span><br><span>index a26ad9f..0000000</span><br><span>--- a/contrib/dgsm/osmo-mslookup-socket.py</span><br><span>+++ /dev/null</span><br><span>@@ -1,35 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python3</span><br><span style="color: hsl(0, 100%, 40%);">-# vim: shiftwidth=4 tabstop=4 expandtab</span><br><span style="color: hsl(0, 100%, 40%);">-import socket</span><br><span style="color: hsl(0, 100%, 40%);">-import time</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-MSLOOKUP_SOCKET_PATH = '/tmp/mslookup'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def query_mslookup_socket(query_str, socket_path=MSLOOKUP_SOCKET_PATH):</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_socket = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_socket.setblocking(True)</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_socket.connect(socket_path)</span><br><span style="color: hsl(0, 100%, 40%);">- result = {'result': 'not-found'}</span><br><span style="color: hsl(0, 100%, 40%);">- column_names = mslookup_socket.recv(1024).decode('ascii')</span><br><span style="color: hsl(0, 100%, 40%);">- if not column_names:</span><br><span style="color: hsl(0, 100%, 40%);">- return result</span><br><span style="color: hsl(0, 100%, 40%);">- column_names = column_names.split('\t')</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_socket.sendall(query_str.encode('ascii'))</span><br><span style="color: hsl(0, 100%, 40%);">- while True:</span><br><span style="color: hsl(0, 100%, 40%);">- csv = mslookup_socket.recv(1024).decode('ascii')</span><br><span style="color: hsl(0, 100%, 40%);">- if not csv:</span><br><span style="color: hsl(0, 100%, 40%);">- break</span><br><span style="color: hsl(0, 100%, 40%);">- response = dict(zip(column_names, csv.split('\t')))</span><br><span style="color: hsl(0, 100%, 40%);">- if response.get('result') == 'result':</span><br><span style="color: hsl(0, 100%, 40%);">- result = response</span><br><span style="color: hsl(0, 100%, 40%);">- print('Response: %r' % response)</span><br><span style="color: hsl(0, 100%, 40%);">- return result</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-if __name__ == '__main__':</span><br><span style="color: hsl(0, 100%, 40%);">- import sys</span><br><span style="color: hsl(0, 100%, 40%);">- print(</span><br><span style="color: hsl(0, 100%, 40%);">- '\nPlease run separately: osmo-mslookup-client --socket /tmp/mslookup -d\n')</span><br><span style="color: hsl(0, 100%, 40%);">- query_str = '1000-5000@sip.voice.12345.msisdn'</span><br><span style="color: hsl(0, 100%, 40%);">- if len(sys.argv) > 1:</span><br><span style="color: hsl(0, 100%, 40%);">- query_str = sys.argv[1]</span><br><span style="color: hsl(0, 100%, 40%);">- print('Final result: %r' % query_mslookup_socket(query_str))</span><br><span>diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am</span><br><span>index a720c40..07fb6f4 100644</span><br><span>--- a/src/mslookup/Makefile.am</span><br><span>+++ b/src/mslookup/Makefile.am</span><br><span>@@ -26,12 +26,3 @@</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span> $(TALLOC_LIBS) \</span><br><span> $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = osmo-mslookup-client</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_mslookup_client_SOURCES = osmo-mslookup-client.c</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_mslookup_client_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-mslookup.la \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(TALLOC_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_mslookup_client_CFLAGS = $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS)</span><br><span>diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c</span><br><span>deleted file mode 100644</span><br><span>index 1c0efe9..0000000</span><br><span>--- a/src/mslookup/osmo-mslookup-client.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,879 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/*! \file osmo-mslookup-client.c</span><br><span style="color: hsl(0, 100%, 40%);">- * Distributed GSM: find the location of subscribers, for example by multicast DNS,</span><br><span style="color: hsl(0, 100%, 40%);">- * to obtain HLR, SIP or SMPP server addresses (or arbitrary service names).</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2019 by Neels Hofmeyr <neels@hofmeyr.de></span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(0, 100%, 40%);">- * with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdio.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <getopt.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <errno.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <talloc.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/un.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/application.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/logging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/select.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/socket.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mslookup_client.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mslookup_client_mdns.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mdns_sock.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mdns.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define CSV_HEADERS "query\tresult\tlast\tage\tv4_ip\tv4_port\tv6_ip\tv6_port"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void print_version(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- printf("osmo-mslookup-client version %s\n", PACKAGE_VERSION);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Copyright (C) 2019 by sysmocom - s.f.m.c. GmbH\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Copyright (C) 2019 by Neels Hofmeyr <neels@hofmeyr.de>\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "This program is free software; you can redistribute it and/or modify\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "it under the terms of the GNU General Public License as published by\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "the Free Software Foundation; either version 2 of the License, or\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "(at your option) any later version.\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "\n");</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void print_help()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- print_version();</span><br><span style="color: hsl(0, 100%, 40%);">- printf(</span><br><span style="color: hsl(0, 100%, 40%);">-"Standalone mslookup client for Distributed GSM\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"Receiving mslookup results means listening for responses on a socket. Often,\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"integration (e.g. FreeSwitch dialplan.py) makes it hard to select() on a socket\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"to read responses, because that interferes with the main program (e.g.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"FreeSwitch's dialplan.py seems to be integrated with an own select() main loop\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"that interferes with osmo_select_main(), or an smpp.py uses\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"smpplib.client.listen() as main loop, etc.).\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"This program provides a trivial solution, by outsourcing the mslookup main loop\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"to a separate process. Communication is done via cmdline arg and stdout pipe or\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"a (blocking) unix domain socket, results are returned in CSV or JSON format.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"This can be done one-shot, i.e. exit as soon as the response has been\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"determined, or in daemon form, i.e. continuously listen for requests and return\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"responses.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"About running a local daemon: it is unintuitive to connect to a socket to solve\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"a problem of reading from a socket -- it seems like just more of the same\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"problem. The reasons why the daemon is in fact useful are:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"- The osmo-mslookup-client daemon will return only those results matching\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" requests issued on that socket connection.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"- A program can simply blockingly recv() from the osmo-mslookup-client socket\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" instead of needing to run osmo_select_main() so that libosmo-mslookup is able\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" to asynchronously receive responses from remote servers.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"- Only one long-lived multicast socket needs to be opened instead of a new\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" socket for each request.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"Output is in CSV or json, see --format. The default is tab-separated CSV\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"with these columns:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-CSV_HEADERS "\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"One-shot operation example:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"$ osmo-mslookup-client 1000-@sip.voice.12345.msisdn -f json\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"{\"query\": \"sip.voice.12345.msisdn\", \"result\": \"result\", \"last\": true, \"age\": 5, \"v4\": [\"1.2.3.7\", \"23\"]}\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"$\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"Daemon operation example:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"$ osmo-mslookup-client -s /tmp/mslookup -d\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"(and a client program then connects to /tmp/mslookup, find an implementation\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"example below)\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"Integrating with calling programs can be done by:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"- call osmo-mslookup-client with the query string as argument.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" It will open a multicast DNS socket, send out a query and wait for the\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" matching response. It will print the result on stdout and exit.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" This method launches a new process for every mslookup query,\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" and creates a short-lived multicast listener for each invocation.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" This is fine for low activity, but does not scale well.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"- invoke osmo-mslookup-client --socket /tmp/mslookup -d.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Individual queries can be sent by connecting to that unix domain socket,\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" blockingly reading the response when it arrives and disconnecting.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" This way only one process keeps one multicast listener open.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Callers can connect to this socket without spawning processes.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" This is recommended for scale.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"Python example clients for {CSV,JSON}x{cmdline,socket} can be found here:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-pipe.py\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-socket.py\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"Options:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"[[delay-][timeout]@]service.number.id\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" A service query string with optional individual timeout.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" The same format is also used on a daemon socket, if any.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" The timeout consists of the min-delay and the timeout numbers,\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" corresponding to the --min-delay and --timeout options, in milliseconds.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" These options apply if a query string lacks own numbers.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Examples:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" gsup.hlr.1234567.imsi Use cmdline timeout settings\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" 5000@gsup.hlr.1234567.imsi Return N results for 5 seconds\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" 1000-5000@sip.voice.123.msisdn Same, but silent for first second\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" 10000-@smpp.sms.567.msisdn Return 1 result after 10 seconds\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--format -f csv (default)\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Format result lines in CSV format.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--no-csv-headers -H\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" If the format is 'csv', by default, the first output line prints the\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" CSV headers used for CSV output format. This option disables these CSV\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" headers.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--format -f json\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Format result lines in json instead of semicolon separated, like:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" {\"query\": \"sip.voice.12345.msisdn\", \"result\": \"ok\", \"v4\": [\"10.9.8.7\", \"5060\"]}\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--daemon -d\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Keep running after a request has been serviced\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--mdns-ip -m " OSMO_MSLOOKUP_MDNS_IP4 " -m " OSMO_MSLOOKUP_MDNS_IP6 "\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--mdns-port -M " OSMO_STRINGIFY_VAL(OSMO_MSLOOKUP_MDNS_PORT) "\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Set multicast IP address / port to send mDNS requests and listen for\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" mDNS reponses\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--mdns-domain-suffix -D " OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Append this suffix to each mDNS query's domain to avoid colliding with the\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" top-level domains administrated by IANA.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--min-delay -t 1000 (in milliseconds)\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Set minimum delay to wait before returning any results.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" When this timeout has elapsed, the best current result is returned,\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" if any is available.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Responses arriving after the min-delay has elapsed which have a younger\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" age than previous results are returned immediately.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Note: When a response with age of zero comes in, the result is returned\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" immediately and the request is discarded: non-daemon mode exits, daemon\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" mode ignores later results.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--timeout -T 1000 (in milliseconds)\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Set timeout after which to stop listening for responses.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" If this is smaller than -t, the value from -t will be used for -T as well.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Note: When a response with age of zero comes in, the result is returned\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" immediately and the request is discarded: non-daemon mode exits, daemon\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" mode ignores later results.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--socket -s /path/to/unix-domain-socket\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Listen to requests from and write responses to a UNIX domain socket.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--send -S <query> <age> <ip1> <port1> <ip2> <port2>\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Do not query, but send an mslookup result. This is useful only for\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" testing. Examples:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" --send foo.123.msisdn 300 23.42.17.11 1234\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" --send foo.123.msisdn 300 2323:4242:1717:1111::42 1234\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" --send foo.123.msisdn 300 23.42.17.11 1234 2323:4242:1717:1111::42 1234\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--quiet -q\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" Do not print errors to stderr, do not log to stderr.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"--help -h\n"</span><br><span style="color: hsl(0, 100%, 40%);">-" This help\n"</span><br><span style="color: hsl(0, 100%, 40%);">-);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-enum result_format {</span><br><span style="color: hsl(0, 100%, 40%);">- FORMAT_CSV = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- FORMAT_JSON,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct {</span><br><span style="color: hsl(0, 100%, 40%);">- bool daemon;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr_str mdns_addr;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t min_delay;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t timeout;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *socket_path;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *format_str;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *mdns_domain_suffix;</span><br><span style="color: hsl(0, 100%, 40%);">- bool csv_headers;</span><br><span style="color: hsl(0, 100%, 40%);">- bool send;</span><br><span style="color: hsl(0, 100%, 40%);">- bool quiet;</span><br><span style="color: hsl(0, 100%, 40%);">-} cmdline_opts = {</span><br><span style="color: hsl(0, 100%, 40%);">- .mdns_addr = { .af=AF_INET, .ip=OSMO_MSLOOKUP_MDNS_IP4, .port=OSMO_MSLOOKUP_MDNS_PORT },</span><br><span style="color: hsl(0, 100%, 40%);">- .min_delay = 1000,</span><br><span style="color: hsl(0, 100%, 40%);">- .timeout = 1000,</span><br><span style="color: hsl(0, 100%, 40%);">- .csv_headers = true,</span><br><span style="color: hsl(0, 100%, 40%);">- .mdns_domain_suffix = OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define print_error(fmt, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cmdline_opts.quiet) \</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, fmt, ##args); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while (0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-char g_buf[1024];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-long long int parse_int(long long int minval, long long int maxval, const char *arg, int *rc)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- long long int val;</span><br><span style="color: hsl(0, 100%, 40%);">- char *endptr;</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc)</span><br><span style="color: hsl(0, 100%, 40%);">- *rc = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!arg)</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- errno = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- val = strtoll(arg, &endptr, 10);</span><br><span style="color: hsl(0, 100%, 40%);">- if (errno || val < minval || val > maxval || *endptr)</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc)</span><br><span style="color: hsl(0, 100%, 40%);">- *rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- return val;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int cb_doing_nothing(struct osmo_fd *fd, unsigned int what)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* --send: Just send a response, for manual testing. */</span><br><span style="color: hsl(0, 100%, 40%);">-int do_send(int argc, char ** argv)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* parse args <query> <age> <v4-ip> <v4-port> <v6-ip> <v6-port> */</span><br><span style="color: hsl(0, 100%, 40%);">-#define ARG(NR) ((argc > NR)? argv[NR] : NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- const char *query_str = ARG(0);</span><br><span style="color: hsl(0, 100%, 40%);">- const char *age_str = ARG(1);</span><br><span style="color: hsl(0, 100%, 40%);">- const char *ip_strs[2][2] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { ARG(2), ARG(3) },</span><br><span style="color: hsl(0, 100%, 40%);">- { ARG(4), ARG(5) },</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query q = {};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_result r = { .rc = OSMO_MSLOOKUP_RC_RESULT };</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- void *ctx = talloc_named_const(NULL, 0, __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_sock *sock;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!query_str) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("--send needs a query string like foo.123456.imsi\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mslookup_query_init_from_domain_str(&q, query_str)) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Invalid query string '%s', need a query string like foo.123456.imsi\n",</span><br><span style="color: hsl(0, 100%, 40%);">- query_str);</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!age_str) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("--send needs an age\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- r.age = parse_int(0, UINT32_MAX, age_str, &rc);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("invalid age\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 2; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr_str addr;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t port;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ip_strs[i][0])</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- port = parse_int(1, 65535, ip_strs[i][1] ? : "2342", &rc);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("invalid port: %s\n", ip_strs[i][1] ? : "NULL");</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_from_str(&addr, ip_strs[i][0], port)) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("invalid IP addr: %s\n", ip_strs[i][0]);</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (addr.af == AF_INET)</span><br><span style="color: hsl(0, 100%, 40%);">- r.host_v4 = addr;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- r.host_v6 = addr;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Sending mDNS to " OSMO_SOCKADDR_STR_FMT ": %s\n", OSMO_SOCKADDR_STR_FMT_ARGS(&cmdline_opts.mdns_addr),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_result_name_c(ctx, &q, &r));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- sock = osmo_mdns_sock_init(ctx, cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port,</span><br><span style="color: hsl(0, 100%, 40%);">- cb_doing_nothing, NULL, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!sock) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("unable to open mDNS socket\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto exit_cleanup;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = osmo_mdns_result_encode(ctx, 0, &q, &r, cmdline_opts.mdns_domain_suffix);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!msg) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("unable to encode mDNS response\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto exit_cleanup;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mdns_sock_send(sock, msg)) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("unable to send mDNS message\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto exit_cleanup;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-exit_cleanup:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mdns_sock_cleanup(sock);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct {</span><br><span style="color: hsl(0, 100%, 40%);">- void *ctx;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int requests_handled;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd socket_ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_client *mslookup_client;</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head queries;</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head socket_clients;</span><br><span style="color: hsl(0, 100%, 40%);">- enum result_format format;</span><br><span style="color: hsl(0, 100%, 40%);">-} globals = {</span><br><span style="color: hsl(0, 100%, 40%);">- .queries = LLIST_HEAD_INIT(globals.queries),</span><br><span style="color: hsl(0, 100%, 40%);">- .socket_clients = LLIST_HEAD_INIT(globals.socket_clients),</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-typedef void (*formatter_t)(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void formatter_csv(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_strbuf sb = { .buf=buf, .len=buflen };</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "%s", query_str);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!r)</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "\tERROR\t\t\t\t\t\t");</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "\t%s", osmo_mslookup_result_code_name(r->rc));</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "\t%s", r->last ? "last" : "not-last");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "\t%u", r->age);</span><br><span style="color: hsl(0, 100%, 40%);">- switch (r->rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_MSLOOKUP_RC_RESULT:</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_is_nonzero(&r->host_v4))</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v4.ip, r->host_v4.port);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "\t\t");</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_is_nonzero(&r->host_v6))</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v6.ip, r->host_v6.port);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "\t\t");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "\t\t\t\t\t");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void formatter_json(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_strbuf sb = { .buf=buf, .len=buflen };</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "{\"query\": \"%s\"", query_str);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!r)</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, ", \"result\": \"ERROR\"");</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, ", \"result\": \"%s\"", osmo_mslookup_result_code_name(r->rc));</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, ", \"last\": %s", r->last ? "true" : "false");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, ", \"age\": %u", r->age);</span><br><span style="color: hsl(0, 100%, 40%);">- if (r->rc == OSMO_MSLOOKUP_RC_RESULT) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_is_nonzero(&r->host_v4))</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, ", \"v4\": [\"%s\", \"%u\"]", r->host_v4.ip, r->host_v4.port);</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_is_nonzero(&r->host_v6))</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, ", \"v6\": [\"%s\", \"%u\"]", r->host_v6.ip, r->host_v6.port);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "}");</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-formatter_t formatters[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [FORMAT_CSV] = formatter_csv,</span><br><span style="color: hsl(0, 100%, 40%);">- [FORMAT_JSON] = formatter_json,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void respond_str_stdout(const char *str) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stdout, "%s\n", str);</span><br><span style="color: hsl(0, 100%, 40%);">- fflush(stdout);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void start_query_str(const char *query_str);</span><br><span style="color: hsl(0, 100%, 40%);">-void start_query_strs(char **query_strs, size_t query_strs_len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct socket_client {</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head entry;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- char query_str[1024];</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void socket_client_close(struct socket_client *c)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd *ofd = &c->ofd;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- close(ofd->fd);</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_unregister(ofd);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&c->entry);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(c);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void socket_client_respond_result(struct socket_client *c, const char *response)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- write(c->ofd.fd, response, strlen(response));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int socket_read_cb(struct osmo_fd *ofd)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct socket_client *c = ofd->data;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- char rxbuf[1024];</span><br><span style="color: hsl(0, 100%, 40%);">- char *query_with_timeout;</span><br><span style="color: hsl(0, 100%, 40%);">- char *query_str;</span><br><span style="color: hsl(0, 100%, 40%);">- char *at;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = recv(ofd->fd, rxbuf, sizeof(rxbuf), 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto close;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (errno == EAGAIN)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- goto close;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc >= sizeof(c->query_str))</span><br><span style="color: hsl(0, 100%, 40%);">- goto close;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rxbuf[rc] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">- query_with_timeout = strtok(rxbuf, "\r\n");</span><br><span style="color: hsl(0, 100%, 40%);">- at = strchr(query_with_timeout, '@');</span><br><span style="color: hsl(0, 100%, 40%);">- query_str = at ? at + 1 : query_with_timeout;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (c->query_str[0]) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("ERROR: Only one query per client connect is allowed;"</span><br><span style="color: hsl(0, 100%, 40%);">- " received '%s' and '%s' on the same connection\n",</span><br><span style="color: hsl(0, 100%, 40%);">- c->query_str, query_str);</span><br><span style="color: hsl(0, 100%, 40%);">- formatters[globals.format](g_buf, sizeof(g_buf), query_str, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- socket_client_respond_result(c, g_buf);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRLCPY_ARRAY(c->query_str, query_str);</span><br><span style="color: hsl(0, 100%, 40%);">- start_query_str(query_with_timeout);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("query: %s\n", query_with_timeout);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-close:</span><br><span style="color: hsl(0, 100%, 40%);">- socket_client_close(c);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int socket_cb(struct osmo_fd *ofd, unsigned int flags)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_READ)</span><br><span style="color: hsl(0, 100%, 40%);">- rc = socket_read_cb(ofd);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int socket_accept(struct osmo_fd *ofd, unsigned int flags)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct socket_client *c;</span><br><span style="color: hsl(0, 100%, 40%);">- struct sockaddr_un un_addr;</span><br><span style="color: hsl(0, 100%, 40%);">- socklen_t len;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- len = sizeof(un_addr);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = accept(ofd->fd, (struct sockaddr*)&un_addr, &len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Failed to accept a new connection\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- c = talloc_zero(globals.ctx, struct socket_client);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(c);</span><br><span style="color: hsl(0, 100%, 40%);">- c->ofd.fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- c->ofd.when = BSC_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- c->ofd.cb = socket_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- c->ofd.data = c;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_fd_register(&c->ofd) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Failed to register new connection fd\n");</span><br><span style="color: hsl(0, 100%, 40%);">- close(c->ofd.fd);</span><br><span style="color: hsl(0, 100%, 40%);">- c->ofd.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(c);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&c->entry, &globals.socket_clients);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers)</span><br><span style="color: hsl(0, 100%, 40%);">- write(c->ofd.fd, CSV_HEADERS, strlen(CSV_HEADERS));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int socket_init(const char *sock_path)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd *ofd = &globals.socket_ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path, OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ofd->fd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Could not create unix socket: %s: %s\n", sock_path, strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->cb = socket_accept;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_fd_register(ofd);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Could not register listen fd: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- close(ofd->fd);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void socket_close()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct socket_client *c, *n;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry_safe(c, n, &globals.socket_clients, entry)</span><br><span style="color: hsl(0, 100%, 40%);">- socket_client_close(c);</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_fd_is_registered(&globals.socket_ofd)) {</span><br><span style="color: hsl(0, 100%, 40%);">- close(globals.socket_ofd.fd);</span><br><span style="color: hsl(0, 100%, 40%);">- globals.socket_ofd.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_unregister(&globals.socket_ofd);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct query {</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head entry;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- char query_str[128];</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query query;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t handle;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void respond_result(const char *query_str, const struct osmo_mslookup_result *r)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct socket_client *c, *n;</span><br><span style="color: hsl(0, 100%, 40%);">- formatters[globals.format](g_buf, sizeof(g_buf), query_str, r);</span><br><span style="color: hsl(0, 100%, 40%);">- respond_str_stdout(g_buf);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!strcmp(query_str, c->query_str)) {</span><br><span style="color: hsl(0, 100%, 40%);">- socket_client_respond_result(c, g_buf);</span><br><span style="color: hsl(0, 100%, 40%);">- if (r->last)</span><br><span style="color: hsl(0, 100%, 40%);">- socket_client_close(c);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (r->last)</span><br><span style="color: hsl(0, 100%, 40%);">- globals.requests_handled++;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void respond_err(const char *query_str)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- respond_result(query_str, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct query *query_by_handle(uint32_t request_handle)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct query *q;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(q, &globals.queries, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (request_handle == q->handle)</span><br><span style="color: hsl(0, 100%, 40%);">- return q;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void mslookup_result_cb(struct osmo_mslookup_client *client,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t request_handle,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mslookup_result *result)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct query *q = query_by_handle(request_handle);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!q)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- respond_result(q->query_str, result);</span><br><span style="color: hsl(0, 100%, 40%);">- if (result->last) {</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&q->entry);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(q);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void start_query_str(const char *query_str)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct query *q;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *domain_str = query_str;</span><br><span style="color: hsl(0, 100%, 40%);">- char *at;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query_handling h = {</span><br><span style="color: hsl(0, 100%, 40%);">- .min_wait_milliseconds = cmdline_opts.min_delay,</span><br><span style="color: hsl(0, 100%, 40%);">- .result_timeout_milliseconds = cmdline_opts.timeout,</span><br><span style="color: hsl(0, 100%, 40%);">- .result_cb = mslookup_result_cb,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- at = strchr(query_str, '@');</span><br><span style="color: hsl(0, 100%, 40%);">- if (at) {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- char timeouts[16];</span><br><span style="color: hsl(0, 100%, 40%);">- char *dash;</span><br><span style="color: hsl(0, 100%, 40%);">- char *timeout;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- domain_str = at + 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- h.min_wait_milliseconds = h.result_timeout_milliseconds = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_print_n(timeouts, sizeof(timeouts), query_str, at - query_str) >= sizeof(timeouts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("ERROR: timeouts part too long in query string\n");</span><br><span style="color: hsl(0, 100%, 40%);">- respond_err(domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- dash = strchr(timeouts, '-');</span><br><span style="color: hsl(0, 100%, 40%);">- if (dash) {</span><br><span style="color: hsl(0, 100%, 40%);">- char min_delay[16];</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_print_n(min_delay, sizeof(min_delay), timeouts, dash - timeouts);</span><br><span style="color: hsl(0, 100%, 40%);">- h.min_wait_milliseconds = parse_int(0, UINT32_MAX, min_delay, &rc);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("ERROR: invalid min-delay number: %s\n", min_delay);</span><br><span style="color: hsl(0, 100%, 40%);">- respond_err(domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- timeout = dash + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- timeout = timeouts;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (*timeout) {</span><br><span style="color: hsl(0, 100%, 40%);">- h.result_timeout_milliseconds = parse_int(0, UINT32_MAX, timeout, &rc);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("ERROR: invalid timeout number: %s\n", timeout);</span><br><span style="color: hsl(0, 100%, 40%);">- respond_err(domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (strlen(domain_str) >= sizeof(q->query_str)) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("ERROR: query string is too long: '%s'\n", domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">- respond_err(domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- q = talloc_zero(globals.ctx, struct query);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(q);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRLCPY_ARRAY(q->query_str, domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mslookup_query_init_from_domain_str(&q->query, q->query_str)) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("ERROR: cannot parse query string: '%s'\n", domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">- respond_err(domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(q);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- q->handle = osmo_mslookup_client_request(globals.mslookup_client, &q->query, &h);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!q->handle) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("ERROR: cannot send query: '%s'\n", domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">- respond_err(domain_str);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(q);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&q->entry, &globals.queries);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void start_query_strs(char **query_strs, size_t query_strs_len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < query_strs_len; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- start_query_str(query_strs[i]);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int main(int argc, char **argv)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc = EXIT_FAILURE;</span><br><span style="color: hsl(0, 100%, 40%);">- globals.ctx = talloc_named_const(NULL, 0, "osmo-mslookup-client");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(globals.ctx, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_level(osmo_stderr_target, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_category(osmo_stderr_target, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_extended_timestamp(osmo_stderr_target, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- int c;</span><br><span style="color: hsl(0, 100%, 40%);">- long long int val;</span><br><span style="color: hsl(0, 100%, 40%);">- char *endptr;</span><br><span style="color: hsl(0, 100%, 40%);">- int option_index = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- static struct option long_options[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "format", 1, 0, 'f' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "no-csv-headers", 0, 0, 'H' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "daemon", 0, 0, 'd' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "mdns-ip", 1, 0, 'm' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "mdns-port", 1, 0, 'M' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "mdns-domain-suffix", 1, 0, 'D' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "timeout", 1, 0, 'T' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "min-delay", 1, 0, 't' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "socket", 1, 0, 's' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "send", 0, 0, 'S' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "quiet", 0, 0, 'q' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "help", 0, 0, 'h' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "version", 0, 0, 'V' },</span><br><span style="color: hsl(0, 100%, 40%);">- {}</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define PARSE_INT(TARGET, MINVAL, MAXVAL) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- int _rc; \</span><br><span style="color: hsl(0, 100%, 40%);">- TARGET = parse_int(MINVAL, MAXVAL, optarg, &_rc); \</span><br><span style="color: hsl(0, 100%, 40%);">- if (_rc) { \</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Invalid " #TARGET ": %s\n", optarg); \</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit; \</span><br><span style="color: hsl(0, 100%, 40%);">- } \</span><br><span style="color: hsl(0, 100%, 40%);">- } while (0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- c = getopt_long(argc, argv, "f:Hdm:M:D:t:T:s:SqhV", long_options, &option_index);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (c == -1)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (c) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 'f':</span><br><span style="color: hsl(0, 100%, 40%);">- cmdline_opts.format_str = optarg;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'H':</span><br><span style="color: hsl(0, 100%, 40%);">- cmdline_opts.csv_headers = false;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'd':</span><br><span style="color: hsl(0, 100%, 40%);">- cmdline_opts.daemon = true;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'm':</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_from_str(&cmdline_opts.mdns_addr, optarg, cmdline_opts.mdns_addr.port)</span><br><span style="color: hsl(0, 100%, 40%);">- || !osmo_sockaddr_str_is_nonzero(&cmdline_opts.mdns_addr)) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Invalid mDNS IP address: %s\n", optarg);</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'M':</span><br><span style="color: hsl(0, 100%, 40%);">- PARSE_INT(cmdline_opts.mdns_addr.port, 1, 65535);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'D':</span><br><span style="color: hsl(0, 100%, 40%);">- cmdline_opts.mdns_domain_suffix = optarg;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 't':</span><br><span style="color: hsl(0, 100%, 40%);">- PARSE_INT(cmdline_opts.min_delay, 0, UINT32_MAX);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'T':</span><br><span style="color: hsl(0, 100%, 40%);">- PARSE_INT(cmdline_opts.timeout, 0, UINT32_MAX);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 's':</span><br><span style="color: hsl(0, 100%, 40%);">- cmdline_opts.socket_path = optarg;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'S':</span><br><span style="color: hsl(0, 100%, 40%);">- cmdline_opts.send = true;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'q':</span><br><span style="color: hsl(0, 100%, 40%);">- cmdline_opts.quiet = true;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case 'h':</span><br><span style="color: hsl(0, 100%, 40%);">- print_help();</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'V':</span><br><span style="color: hsl(0, 100%, 40%);">- print_version();</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* catch unknown options *as well as* missing arguments. */</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Error in command line options. Exiting.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (cmdline_opts.send) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (cmdline_opts.daemon || cmdline_opts.format_str || cmdline_opts.socket_path) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("--send option cannot have any listening related args.");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- rc = do_send(argc - optind, argv + optind);</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cmdline_opts.daemon && !(argc - optind)) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_help();</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (cmdline_opts.daemon && !cmdline_opts.timeout) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("In daemon mode, --timeout must not be zero.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (cmdline_opts.quiet)</span><br><span style="color: hsl(0, 100%, 40%);">- log_target_destroy(osmo_stderr_target);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (cmdline_opts.format_str) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_str_startswith("json", cmdline_opts.format_str))</span><br><span style="color: hsl(0, 100%, 40%);">- globals.format = FORMAT_JSON;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (osmo_str_startswith("csv", cmdline_opts.format_str))</span><br><span style="color: hsl(0, 100%, 40%);">- globals.format = FORMAT_CSV;</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Invalid format: %s\n", cmdline_opts.format_str);</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers)</span><br><span style="color: hsl(0, 100%, 40%);">- respond_str_stdout(CSV_HEADERS);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- globals.mslookup_client = osmo_mslookup_client_new(globals.ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!globals.mslookup_client</span><br><span style="color: hsl(0, 100%, 40%);">- || !osmo_mslookup_client_add_mdns(globals.mslookup_client,</span><br><span style="color: hsl(0, 100%, 40%);">- cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port,</span><br><span style="color: hsl(0, 100%, 40%);">- -1, cmdline_opts.mdns_domain_suffix)) {</span><br><span style="color: hsl(0, 100%, 40%);">- print_error("Failed to start mDNS client\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (cmdline_opts.socket_path) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (socket_init(cmdline_opts.socket_path))</span><br><span style="color: hsl(0, 100%, 40%);">- goto program_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- start_query_strs(&argv[optind], argc - optind);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_select_main_ctx(0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cmdline_opts.daemon</span><br><span style="color: hsl(0, 100%, 40%);">- && globals.requests_handled</span><br><span style="color: hsl(0, 100%, 40%);">- && llist_empty(&globals.queries))</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-program_exit:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_client_free(globals.mslookup_client);</span><br><span style="color: hsl(0, 100%, 40%);">- socket_close();</span><br><span style="color: hsl(0, 100%, 40%);">- log_fini();</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(globals.ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16827">change 16827</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-hlr/+/16827"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I43084ac3b24684f17df43fefc82019e44baaa236 </div>
<div style="display:none"> Gerrit-Change-Number: 16827 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>