<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16828">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "add mDNS lookup method to libosmo-mslookup"<br><br>This reverts commit f10463c5fc6d9e786ab7c648d99f7450f9a25906, as it<br>causes all OBS osmo-hlr builds to fail in the mslookup_client_mdns test.<br><br>Change-Id: I5aec5b59f304c7f732c4a31131beedf29c966d9d<br>---<br>M .gitignore<br>M configure.ac<br>M include/Makefile.am<br>M include/osmocom/Makefile.am<br>D include/osmocom/mslookup/Makefile.am<br>D include/osmocom/mslookup/mdns.h<br>D include/osmocom/mslookup/mdns_msg.h<br>D include/osmocom/mslookup/mdns_rfc.h<br>D include/osmocom/mslookup/mdns_sock.h<br>D include/osmocom/mslookup/mslookup_client_mdns.h<br>M src/mslookup/Makefile.am<br>D src/mslookup/mdns.c<br>D src/mslookup/mdns_msg.c<br>D src/mslookup/mdns_rfc.c<br>D src/mslookup/mdns_sock.c<br>D src/mslookup/mslookup_client_mdns.c<br>M tests/mslookup/Makefile.am<br>D tests/mslookup/mdns_test.c<br>D tests/mslookup/mdns_test.err<br>D tests/mslookup/mslookup_client_mdns_test.c<br>D tests/mslookup/mslookup_client_mdns_test.err<br>M tests/testsuite.at<br>22 files changed, 0 insertions(+), 2,829 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/28/16828/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index eec364a..acfea84 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -51,8 +51,6 @@</span><br><span> tests/db/db_test</span><br><span> tests/hlr_vty_test.db*</span><br><span> tests/db_upgrade/*.dump</span><br><span style="color: hsl(0, 100%, 40%);">-tests/mslookup/mdns_test</span><br><span style="color: hsl(0, 100%, 40%);">-tests/mslookup/mslookup_client_mdns_test</span><br><span> tests/mslookup/mslookup_client_test</span><br><span> tests/mslookup/mslookup_test</span><br><span> </span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 57aecba..217df9f 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -178,7 +178,6 @@</span><br><span> include/Makefile</span><br><span> include/osmocom/Makefile</span><br><span> include/osmocom/hlr/Makefile</span><br><span style="color: hsl(0, 100%, 40%);">- include/osmocom/mslookup/Makefile</span><br><span> libosmo-gsup-client.pc</span><br><span> libosmo-mslookup.pc</span><br><span> sql/Makefile</span><br><span>diff --git a/include/Makefile.am b/include/Makefile.am</span><br><span>index 9827950..e9a7126 100644</span><br><span>--- a/include/Makefile.am</span><br><span>+++ b/include/Makefile.am</span><br><span>@@ -2,10 +2,7 @@</span><br><span> </span><br><span> nobase_include_HEADERS = \</span><br><span> osmocom/gsupclient/gsup_client.h \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom/mslookup/mdns.h \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom/mslookup/mdns_sock.h \</span><br><span> osmocom/mslookup/mslookup_client_fake.h \</span><br><span> osmocom/mslookup/mslookup_client.h \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom/mslookup/mslookup_client_mdns.h \</span><br><span> osmocom/mslookup/mslookup.h \</span><br><span> $(NULL)</span><br><span>diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am</span><br><span>index b75c86a..dbc2344 100644</span><br><span>--- a/include/osmocom/Makefile.am</span><br><span>+++ b/include/osmocom/Makefile.am</span><br><span>@@ -1,4 +1,3 @@</span><br><span> SUBDIRS = \</span><br><span> hlr \</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup \</span><br><span> $(NULL)</span><br><span>diff --git a/include/osmocom/mslookup/Makefile.am b/include/osmocom/mslookup/Makefile.am</span><br><span>deleted file mode 100644</span><br><span>index 72ccd94..0000000</span><br><span>--- a/include/osmocom/mslookup/Makefile.am</span><br><span>+++ /dev/null</span><br><span>@@ -1,6 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-# most headers here are installed, see /include/Makefile.am</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = \</span><br><span style="color: hsl(0, 100%, 40%);">- mdns_msg.h \</span><br><span style="color: hsl(0, 100%, 40%);">- mdns_rfc.h \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span>diff --git a/include/osmocom/mslookup/mdns.h b/include/osmocom/mslookup/mdns.h</span><br><span>deleted file mode 100644</span><br><span>index b62e95f..0000000</span><br><span>--- a/include/osmocom/mslookup/mdns.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,39 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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%);">-/*! \file mdns.h */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mslookup.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "mdns.osmocom.org"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *domain_suffix);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t *packet_id, const char *domain_suffix);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mslookup_result *result, const char *domain_suffix);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query *query, struct osmo_mslookup_result *result,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *domain_suffix);</span><br><span>diff --git a/include/osmocom/mslookup/mdns_msg.h b/include/osmocom/mslookup/mdns_msg.h</span><br><span>deleted file mode 100644</span><br><span>index ae7dd17..0000000</span><br><span>--- a/include/osmocom/mslookup/mdns_msg.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,54 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdint.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include "mdns_rfc.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_record {</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head list;</span><br><span style="color: hsl(0, 100%, 40%);">- enum osmo_mdns_rfc_record_type type;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t length;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *data;</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 osmo_mdns_msg_request {</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t id;</span><br><span style="color: hsl(0, 100%, 40%);">- char *domain;</span><br><span style="color: hsl(0, 100%, 40%);">- enum osmo_mdns_rfc_record_type type;</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 osmo_mdns_msg_answer {</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t id;</span><br><span style="color: hsl(0, 100%, 40%);">- char *domain;</span><br><span style="color: hsl(0, 100%, 40%);">- /*! list of osmo_mdns_record. */</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head records;</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 osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req);</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *answer);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans);</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec,</span><br><span style="color: hsl(0, 100%, 40%);">- char *key_buf, size_t key_size, char *value_buf, size_t value_size);</span><br><span>diff --git a/include/osmocom/mslookup/mdns_rfc.h b/include/osmocom/mslookup/mdns_rfc.h</span><br><span>deleted file mode 100644</span><br><span>index 9d6be5a..0000000</span><br><span>--- a/include/osmocom/mslookup/mdns_rfc.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,113 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdbool.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdint.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/endian.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%);">-/* RFC 1035 2.3.4 */</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMO_MDNS_RFC_MAX_NAME_LEN 255</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* RFC 1035 3.3 <character-string> */</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN 256</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-enum osmo_mdns_rfc_record_type {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN = 0,</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* RFC 1035 3.2.2 */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_MDNS_RFC_RECORD_TYPE_A = 1, /* IPv4 address */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_MDNS_RFC_RECORD_TYPE_TXT = 16, /* Text strings */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* RFC 3596 2.1 */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_MDNS_RFC_RECORD_TYPE_AAAA = 28, /* IPv6 address */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* RFC 1035 3.2.3 */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_MDNS_RFC_RECORD_TYPE_ALL = 255, /* Request only: ask for all */</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 osmo_mdns_rfc_class {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_MDNS_RFC_CLASS_UNKNOWN = 0,</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* RFC 1035 3.2.4 */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_MDNS_RFC_CLASS_IN = 1, /* Internet and IP networks */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* RFC 1035 3.2.5 */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_MDNS_RFC_CLASS_ALL = 255, /* Request only: ask for all */</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%);">-/* RFC 1035 4.1.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_rfc_header {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t id;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t rd:1,</span><br><span style="color: hsl(0, 100%, 40%);">- tc:1,</span><br><span style="color: hsl(0, 100%, 40%);">- aa:1,</span><br><span style="color: hsl(0, 100%, 40%);">- opcode:4,</span><br><span style="color: hsl(0, 100%, 40%);">- qr:1; /* QR (0: query, 1: response) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t rcode:4,</span><br><span style="color: hsl(0, 100%, 40%);">- z:3,</span><br><span style="color: hsl(0, 100%, 40%);">- ra:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t qdcount; /* Number of questions */</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ancount; /* Number of answers */</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t nscount; /* Number of authority records */</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t arcount; /* Number of additional records */</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t id;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t qr:1, opcode:4, aa:1, tc:1, rd:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ra:1, z:3, rcode:4;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t qdcount;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ancount;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t nscount;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t arcount;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* RFC 1035 4.1.2 */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_rfc_question {</span><br><span style="color: hsl(0, 100%, 40%);">- char *domain; /* Domain to be encoded as qname (e.g. "gsup.hlr.1234567.imsi") */</span><br><span style="color: hsl(0, 100%, 40%);">- enum osmo_mdns_rfc_record_type qtype;</span><br><span style="color: hsl(0, 100%, 40%);">- enum osmo_mdns_rfc_class qclass;</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%);">-/* RFC 1035 4.1.3 */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_rfc_record {</span><br><span style="color: hsl(0, 100%, 40%);">- char *domain; /* Domain to be encoded as name (e.g. "gsup.hlr.1234567.imsi") */</span><br><span style="color: hsl(0, 100%, 40%);">- enum osmo_mdns_rfc_record_type type;</span><br><span style="color: hsl(0, 100%, 40%);">- enum osmo_mdns_rfc_class class;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t ttl;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t rdlength;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *rdata;</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%);">-char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain);</span><br><span style="color: hsl(0, 100%, 40%);">-char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst);</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec);</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len,</span><br><span style="color: hsl(0, 100%, 40%);">- size_t *record_len);</span><br><span>diff --git a/include/osmocom/mslookup/mdns_sock.h b/include/osmocom/mslookup/mdns_sock.h</span><br><span>deleted file mode 100644</span><br><span>index 615e971..0000000</span><br><span>--- a/include/osmocom/mslookup/mdns_sock.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,33 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-#include <netdb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/select.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_sock {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd osmo_fd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct addrinfo *ai;</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 osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port,</span><br><span style="color: hsl(0, 100%, 40%);">- int (*cb)(struct osmo_fd *fd, unsigned int what),</span><br><span style="color: hsl(0, 100%, 40%);">- void *data, unsigned int priv_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">-void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock);</span><br><span>diff --git a/include/osmocom/mslookup/mslookup_client_mdns.h b/include/osmocom/mslookup/mslookup_client_mdns.h</span><br><span>deleted file mode 100644</span><br><span>index e699107..0000000</span><br><span>--- a/include/osmocom/mslookup/mslookup_client_mdns.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,38 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdint.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mslookup_client;</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mslookup_client_method;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! MS Lookup mDNS server bind default IP. Taken from the Administratevly Scoped block, particularly the Organizational</span><br><span style="color: hsl(0, 100%, 40%);">- * Scoped range, https://tools.ietf.org/html/rfc2365 . */</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMO_MSLOOKUP_MDNS_IP4 "239.192.23.42"</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMO_MSLOOKUP_MDNS_IP6 "ff08::23:42" // <-- TODO: sane?</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMO_MSLOOKUP_MDNS_PORT 4266</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t port, int initial_packet_id,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *domain_suffix);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method);</span><br><span>diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am</span><br><span>index 07fb6f4..01be401 100644</span><br><span>--- a/src/mslookup/Makefile.am</span><br><span>+++ b/src/mslookup/Makefile.am</span><br><span>@@ -10,14 +10,9 @@</span><br><span> lib_LTLIBRARIES = libosmo-mslookup.la</span><br><span> </span><br><span> libosmo_mslookup_la_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- mdns.c \</span><br><span style="color: hsl(0, 100%, 40%);">- mdns_msg.c \</span><br><span style="color: hsl(0, 100%, 40%);">- mdns_rfc.c \</span><br><span style="color: hsl(0, 100%, 40%);">- mdns_sock.c \</span><br><span> mslookup.c \</span><br><span> mslookup_client.c \</span><br><span> mslookup_client_fake.c \</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_client_mdns.c \</span><br><span> $(NULL)</span><br><span> </span><br><span> libosmo_mslookup_la_LDFLAGS = -version-info $(LIBVERSION)</span><br><span>diff --git a/src/mslookup/mdns.c b/src/mslookup/mdns.c</span><br><span>deleted file mode 100644</span><br><span>index 4742a7c..0000000</span><br><span>--- a/src/mslookup/mdns.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,425 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* mslookup specific functions for encoding and decoding mslookup queries/results into mDNS packets, using the high</span><br><span style="color: hsl(0, 100%, 40%);">- * level functions from mdns_msg.c and mdns_record.c to build the request/answer messages. */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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 <osmocom/hlr/logging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mslookup.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mdns_msg.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mdns_rfc.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <errno.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <inttypes.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct msgb *osmo_mdns_msgb_alloc(const char *label)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return msgb_alloc(1024, label);</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%);">-/*! Combine the mslookup query service, ID and ID type into a domain string.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains</span><br><span style="color: hsl(0, 100%, 40%);">- * administrated by IANA. Example: "mdns.osmocom.org"</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns allocated buffer with the resulting domain (i.e. "sip.voice.123.msisdn.mdns.osmocom.org") on success,</span><br><span style="color: hsl(0, 100%, 40%);">- * NULL on failure.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-static char *domain_from_query(void *ctx, const struct osmo_mslookup_query *query, const char *domain_suffix)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- const char *id;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Get id from query */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (query->id.type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_MSLOOKUP_ID_IMSI:</span><br><span style="color: hsl(0, 100%, 40%);">- id = query->id.imsi;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_MSLOOKUP_ID_MSISDN:</span><br><span style="color: hsl(0, 100%, 40%);">- id = query->id.msisdn;</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%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "can't encode mslookup query id type %i", query->id.type);</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%);">- return talloc_asprintf(ctx, "%s.%s.%s.%s", query->service, id, osmo_mslookup_id_type_name(query->id.type),</span><br><span style="color: hsl(0, 100%, 40%);">- domain_suffix);</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%);">-/*! Split up query service, ID and ID type from a domain string into a mslookup query.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] domain with domain_suffix, e.g. "sip.voice.123.msisdn.mdns.osmocom.org"</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains</span><br><span style="color: hsl(0, 100%, 40%);">- * administrated by IANA. It is not part of the resulting struct osmo_mslookup_query, so we</span><br><span style="color: hsl(0, 100%, 40%);">- * remove it in this function. Example: "mdns.osmocom.org"</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int query_from_domain(struct osmo_mslookup_query *query, const char *domain, const char *domain_suffix)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int domain_len = strlen(domain) - strlen(domain_suffix) - 1;</span><br><span style="color: hsl(0, 100%, 40%);">- char domain_buf[OSMO_MDNS_RFC_MAX_NAME_LEN];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (domain_len <= 0 || domain_len >= sizeof(domain_buf))</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (domain[domain_len] != '.' || strcmp(domain + domain_len + 1, domain_suffix) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(domain_buf, domain, domain_len);</span><br><span style="color: hsl(0, 100%, 40%);">- domain_buf[domain_len] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_mslookup_query_init_from_domain_str(query, domain_buf);</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%);">-/*! Encode a mslookup query into a mDNS packet.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains</span><br><span style="color: hsl(0, 100%, 40%);">- * administrated by IANA. Example: "mdns.osmocom.org"</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns msgb, or NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *domain_suffix)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_msg_request req = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = osmo_mdns_msgb_alloc(__func__);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- req.id = packet_id;</span><br><span style="color: hsl(0, 100%, 40%);">- req.type = OSMO_MDNS_RFC_RECORD_TYPE_ALL;</span><br><span style="color: hsl(0, 100%, 40%);">- req.domain = domain_from_query(ctx, query, domain_suffix);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!req.domain)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mdns_msg_request_encode(ctx, msg, &req))</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(req.domain);</span><br><span style="color: hsl(0, 100%, 40%);">- return msg;</span><br><span style="color: hsl(0, 100%, 40%);">-error:</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(req.domain);</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%);">-/*! Decode a mDNS request packet into a mslookup query.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] packet_id the result must be sent with the same packet_id.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains</span><br><span style="color: hsl(0, 100%, 40%);">- * administrated by IANA. Example: "mdns.osmocom.org"</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns allocated mslookup query on success, NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t *packet_id, const char *domain_suffix)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_msg_request *req = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query *query = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- req = osmo_mdns_msg_request_decode(ctx, data, data_len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!req)</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%);">- query = talloc_zero(ctx, struct osmo_mslookup_query);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(query);</span><br><span style="color: hsl(0, 100%, 40%);">- if (query_from_domain(query, req->domain, domain_suffix) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error_free;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *packet_id = req->id;</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(req);</span><br><span style="color: hsl(0, 100%, 40%);">- return query;</span><br><span style="color: hsl(0, 100%, 40%);">-error_free:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(req);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(query);</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%);">-/*! Parse sockaddr_str from mDNS record, so the mslookup result can be filled with it.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] sockaddr_str resulting IPv4 or IPv6 sockaddr_str.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] rec single record of the abstracted list of mDNS records</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 on success, -EINVAL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-static int sockaddr_str_from_mdns_record(struct osmo_sockaddr_str *sockaddr_str, struct osmo_mdns_record *rec)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- switch (rec->type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_MDNS_RFC_RECORD_TYPE_A:</span><br><span style="color: hsl(0, 100%, 40%);">- if (rec->length != 4) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of A record\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_from_32(sockaddr_str, *(uint32_t *)rec->data, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_MDNS_RFC_RECORD_TYPE_AAAA:</span><br><span style="color: hsl(0, 100%, 40%);">- if (rec->length != 16) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of AAAA record\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_from_in6_addr(sockaddr_str, (struct in6_addr*)rec->data, 0);</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%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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%);">-/*! Encode a successful mslookup result, along with the original query and packet_id into one mDNS answer packet.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * The records in the packet are ordered as follows:</span><br><span style="color: hsl(0, 100%, 40%);">- * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or</span><br><span style="color: hsl(0, 100%, 40%);">- * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present).</span><br><span style="color: hsl(0, 100%, 40%);">- * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] packet_id as received in osmo_mdns_query_decode().</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] query the original query, so we can send the domain back in the answer (i.e. "sip.voice.1234.msisdn").</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] result holds the age, IPs and ports of the queried service.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains</span><br><span style="color: hsl(0, 100%, 40%);">- * administrated by IANA. Example: "mdns.osmocom.org"</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns msg on success, NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mslookup_result *result, const char *domain_suffix)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_msg_answer ans = {};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record *rec_age = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record rec_ip_v4 = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record rec_ip_v6 = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record *rec_ip_v4_port = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record *rec_ip_v6_port = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct in_addr rec_ip_v4_in;</span><br><span style="color: hsl(0, 100%, 40%);">- struct in6_addr rec_ip_v6_in;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = osmo_mdns_msgb_alloc(__func__);</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[256];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ctx = talloc_named(ctx, 0, "osmo_mdns_result_encode");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Prepare answer (ans) */</span><br><span style="color: hsl(0, 100%, 40%);">- ans.domain = domain_from_query(ctx, query, domain_suffix);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ans.domain)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- ans.id = packet_id;</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&ans.records);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Record for age */</span><br><span style="color: hsl(0, 100%, 40%);">- rec_age = osmo_mdns_record_txt_keyval_encode(ctx, "age", "%"PRIu32, result->age);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rec_age);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&rec_age->list, &ans.records);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Records for IPv4 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_is_set(&result->host_v4)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_to_in_addr(&result->host_v4, &rec_ip_v4_in) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv4: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_result_name_b(buf, sizeof(buf), query, result));</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- rec_ip_v4.type = OSMO_MDNS_RFC_RECORD_TYPE_A;</span><br><span style="color: hsl(0, 100%, 40%);">- rec_ip_v4.data = (uint8_t *)&rec_ip_v4_in;</span><br><span style="color: hsl(0, 100%, 40%);">- rec_ip_v4.length = sizeof(rec_ip_v4_in);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&rec_ip_v4.list, &ans.records);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rec_ip_v4_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v4.port);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rec_ip_v4_port);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&rec_ip_v4_port->list, &ans.records);</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%);">- /* Records for IPv6 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_is_set(&result->host_v6)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_to_in6_addr(&result->host_v6, &rec_ip_v6_in) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv6: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_result_name_b(buf, sizeof(buf), query, result));</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- rec_ip_v6.type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA;</span><br><span style="color: hsl(0, 100%, 40%);">- rec_ip_v6.data = (uint8_t *)&rec_ip_v6_in;</span><br><span style="color: hsl(0, 100%, 40%);">- rec_ip_v6.length = sizeof(rec_ip_v6_in);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&rec_ip_v6.list, &ans.records);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rec_ip_v6_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v6.port);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rec_ip_v6_port);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&rec_ip_v6_port->list, &ans.records);</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_msg_answer_encode(ctx, msg, &ans)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode mDNS answer: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_result_name_b(buf, sizeof(buf), query, result));</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- return msg;</span><br><span style="color: hsl(0, 100%, 40%);">-error:</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ctx);</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%);">-static int decode_uint32_t(const char *str, uint32_t *val)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- long long int lld;</span><br><span style="color: hsl(0, 100%, 40%);">- char *endptr = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- *val = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- errno = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- lld = strtoll(str, &endptr, 10);</span><br><span style="color: hsl(0, 100%, 40%);">- if (errno || !endptr || *endptr)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- if (lld < 0 || lld > UINT32_MAX)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- *val = lld;</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%);">-static int decode_port(const char *str, uint16_t *port)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t val;</span><br><span style="color: hsl(0, 100%, 40%);">- if (decode_uint32_t(str, &val))</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- if (val > 65535)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- *port = val;</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%);">-/*! Read expected mDNS records into mslookup result.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * The records in the packet must be ordered as follows:</span><br><span style="color: hsl(0, 100%, 40%);">- * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or</span><br><span style="color: hsl(0, 100%, 40%);">- * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present).</span><br><span style="color: hsl(0, 100%, 40%);">- * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] result holds the age, IPs and ports of the queried service.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] ans abstracted mDNS answer with a list of resource records.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 on success, -EINVAL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record *rec;</span><br><span style="color: hsl(0, 100%, 40%);">- char txt_key[64];</span><br><span style="color: hsl(0, 100%, 40%);">- char txt_value[64];</span><br><span style="color: hsl(0, 100%, 40%);">- bool found_age = false;</span><br><span style="color: hsl(0, 100%, 40%);">- bool found_ip_v4 = false;</span><br><span style="color: hsl(0, 100%, 40%);">- bool found_ip_v6 = false;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr_str *expect_port_for = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *result = (struct osmo_mslookup_result){};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- result->rc = OSMO_MSLOOKUP_RC_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(rec, &ans->records, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- switch (rec->type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_MDNS_RFC_RECORD_TYPE_A:</span><br><span style="color: hsl(0, 100%, 40%);">- if (expect_port_for) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "'A' record found, but still expecting a 'port' value first\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (found_ip_v4) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record found twice in mDNS answer\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- found_ip_v4 = true;</span><br><span style="color: hsl(0, 100%, 40%);">- expect_port_for = &result->host_v4;</span><br><span style="color: hsl(0, 100%, 40%);">- if (sockaddr_str_from_mdns_record(expect_port_for, rec)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record with invalid address data\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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 OSMO_MDNS_RFC_RECORD_TYPE_AAAA:</span><br><span style="color: hsl(0, 100%, 40%);">- if (expect_port_for) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "'AAAA' record found, but still expecting a 'port' value first\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (found_ip_v6) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record found twice in mDNS answer\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- found_ip_v6 = true;</span><br><span style="color: hsl(0, 100%, 40%);">- expect_port_for = &result->host_v6;</span><br><span style="color: hsl(0, 100%, 40%);">- if (sockaddr_str_from_mdns_record(expect_port_for, rec) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record with invalid address data\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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 OSMO_MDNS_RFC_RECORD_TYPE_TXT:</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mdns_record_txt_keyval_decode(rec, txt_key, sizeof(txt_key),</span><br><span style="color: hsl(0, 100%, 40%);">- txt_value, sizeof(txt_value)) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "failed to decode txt record\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (strcmp(txt_key, "age") == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (found_age) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "duplicate 'TXT' record for 'age'\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- found_age = true;</span><br><span style="color: hsl(0, 100%, 40%);">- if (decode_uint32_t(txt_value, &result->age)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "'TXT' record: invalid 'age' value ('age=%s')\n", txt_value);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (strcmp(txt_key, "port") == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!expect_port_for) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "'TXT' record for 'port' without previous 'A' or 'AAAA' record\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (decode_port(txt_value, &expect_port_for->port)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "'TXT' record: invalid 'port' value ('port=%s')\n", txt_value);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- expect_port_for = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected key '%s' in TXT record\n", txt_key);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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%);">- /* Check if everything was found */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!found_age || !(found_ip_v4 || found_ip_v6) || expect_port_for) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "missing resource records in mDNS answer\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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%);">- result->rc = OSMO_MSLOOKUP_RC_RESULT;</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%);">-/*! Decode a mDNS answer packet into a mslookup result, query and packet_id.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] packet_id same ID as sent in the request packet.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] query the original query (service, ID, ID type).</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] result holds the age, IPs and ports of the queried service.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains</span><br><span style="color: hsl(0, 100%, 40%);">- * administrated by IANA. Example: "mdns.osmocom.org"</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 on success, -EINVAL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query *query, struct osmo_mslookup_result *result,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *domain_suffix)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc = -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_msg_answer *ans;</span><br><span style="color: hsl(0, 100%, 40%);">- ans = osmo_mdns_msg_answer_decode(ctx, data, data_len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ans)</span><br><span style="color: hsl(0, 100%, 40%);">- goto exit_free;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (query_from_domain(query, ans->domain, domain_suffix) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto exit_free;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mdns_result_from_answer(result, ans) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto exit_free;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *packet_id = ans->id;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exit_free:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ans);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/mslookup/mdns_msg.c b/src/mslookup/mdns_msg.c</span><br><span>deleted file mode 100644</span><br><span>index da65fef..0000000</span><br><span>--- a/src/mslookup/mdns_msg.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,261 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* High level mDNS encoding and decoding functions for whole messages:</span><br><span style="color: hsl(0, 100%, 40%);">- * Request message (header, question)</span><br><span style="color: hsl(0, 100%, 40%);">- * Answer message (header, resource record 1, ... resource record N)*/</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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 <errno.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mdns_msg.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! Encode request message into one mDNS packet, consisting of the header section and one question section.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 on success, -EINVAL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_header hdr = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_question qst = {0};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- hdr.id = req->id;</span><br><span style="color: hsl(0, 100%, 40%);">- hdr.qdcount = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mdns_rfc_header_encode(msg, &hdr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- qst.domain = req->domain;</span><br><span style="color: hsl(0, 100%, 40%);">- qst.qtype = req->type;</span><br><span style="color: hsl(0, 100%, 40%);">- qst.qclass = OSMO_MDNS_RFC_CLASS_IN;</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mdns_rfc_question_encode(ctx, msg, &qst) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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%);">-/*! Decode request message from a mDNS packet, consisting of the header section and one question section.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns allocated request message on success, NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_header hdr = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- size_t hdr_len = sizeof(struct osmo_mdns_rfc_header);</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_question* qst = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_msg_request *ret = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 0)</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%);">- qst = osmo_mdns_rfc_question_decode(ctx, data + hdr_len, data_len - hdr_len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!qst)</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%);">- ret = talloc_zero(ctx, struct osmo_mdns_msg_request);</span><br><span style="color: hsl(0, 100%, 40%);">- ret->id = hdr.id;</span><br><span style="color: hsl(0, 100%, 40%);">- ret->domain = talloc_strdup(ret, qst->domain);</span><br><span style="color: hsl(0, 100%, 40%);">- ret->type = qst->qtype;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(qst);</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</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%);">-/*! Initialize the linked list for resource records in a answer message. */</span><br><span style="color: hsl(0, 100%, 40%);">-void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *ans)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- *ans = (struct osmo_mdns_msg_answer){};</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&ans->records);</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%);">-/*! Encode answer message into one mDNS packet, consisting of the header section and N resource records.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * To keep things simple, this sends the domain with each resource record. Other DNS implementations make use of</span><br><span style="color: hsl(0, 100%, 40%);">- * "message compression", which would send a question section with the domain before the resource records, and then</span><br><span style="color: hsl(0, 100%, 40%);">- * point inside each resource record with an offset back to the domain in the question section (RFC 1035 4.1.4).</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 on success, -EINVAL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_header hdr = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record *ans_record;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- hdr.id = ans->id;</span><br><span style="color: hsl(0, 100%, 40%);">- hdr.qr = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- hdr.ancount = llist_count(&ans->records);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mdns_rfc_header_encode(msg, &hdr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(ans_record, &ans->records, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_record rec = {0};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rec.domain = ans->domain;</span><br><span style="color: hsl(0, 100%, 40%);">- rec.type = ans_record->type;</span><br><span style="color: hsl(0, 100%, 40%);">- rec.class = OSMO_MDNS_RFC_CLASS_IN;</span><br><span style="color: hsl(0, 100%, 40%);">- rec.ttl = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- rec.rdlength = ans_record->length;</span><br><span style="color: hsl(0, 100%, 40%);">- rec.rdata = ans_record->data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mdns_rfc_record_encode(ctx, msg, &rec) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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%);">- 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%);">-/*! Decode answer message from a mDNS packet.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Answer messages must consist of one header and one or more resource records. An additional question section or</span><br><span style="color: hsl(0, 100%, 40%);">- * message compression (RFC 1035 4.1.4) are not supported.</span><br><span style="color: hsl(0, 100%, 40%);">-* \returns allocated answer message on success, NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_header hdr = {};</span><br><span style="color: hsl(0, 100%, 40%);">- size_t hdr_len = sizeof(struct osmo_mdns_rfc_header);</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_msg_answer *ret = talloc_zero(ctx, struct osmo_mdns_msg_answer);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Parse header section */</span><br><span style="color: hsl(0, 100%, 40%);">- if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 1)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- ret->id = hdr.id;</span><br><span style="color: hsl(0, 100%, 40%);">- data_len -= hdr_len;</span><br><span style="color: hsl(0, 100%, 40%);">- data += hdr_len;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Parse resource records */</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&ret->records);</span><br><span style="color: hsl(0, 100%, 40%);">- while (data_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- size_t record_len;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_record *rec;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record* ret_record;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rec = osmo_mdns_rfc_record_decode(ret, data, data_len, &record_len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!rec)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Copy domain to ret */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret->domain) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (strcmp(ret->domain, rec->domain) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "domain mismatch in resource records ('%s' vs '%s')\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ret->domain, rec->domain);</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</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%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- ret->domain = talloc_strdup(ret, rec->domain);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Add simplified record to ret */</span><br><span style="color: hsl(0, 100%, 40%);">- ret_record = talloc_zero(ret, struct osmo_mdns_record);</span><br><span style="color: hsl(0, 100%, 40%);">- ret_record->type = rec->type;</span><br><span style="color: hsl(0, 100%, 40%);">- ret_record->length = rec->rdlength;</span><br><span style="color: hsl(0, 100%, 40%);">- ret_record->data = talloc_memdup(ret_record, rec->rdata, rec->rdlength);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&ret_record->list, &ret->records);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- data += record_len;</span><br><span style="color: hsl(0, 100%, 40%);">- data_len -= record_len;</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(rec);</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%);">- /* Verify record count */</span><br><span style="color: hsl(0, 100%, 40%);">- if (llist_count(&ret->records) != hdr.ancount) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "amount of parsed records (%i) doesn't match count in header (%i)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- llist_count(&ret->records), hdr.ancount);</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</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%);">- return ret;</span><br><span style="color: hsl(0, 100%, 40%);">-error:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ret);</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%);">-/*! Get a TXT resource record, which stores a key=value string.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns allocated resource record on success, NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct osmo_mdns_record *_osmo_mdns_record_txt_encode(void *ctx, const char *key, const char *value)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record *ret = talloc_zero(ctx, struct osmo_mdns_record);</span><br><span style="color: hsl(0, 100%, 40%);">- size_t len = strlen(key) + 1 + strlen(value);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (len > OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN - 1)</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%);">- /* redundant len is required, see RFC 1035 3.3.14 and 3.3. */</span><br><span style="color: hsl(0, 100%, 40%);">- ret->data = (uint8_t *)talloc_asprintf(ctx, "%c%s=%s", (char)len, key, value);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ret->data)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- ret->type = OSMO_MDNS_RFC_RECORD_TYPE_TXT;</span><br><span style="color: hsl(0, 100%, 40%);">- ret->length = len + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</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%);">-/*! Get a TXT resource record, which stores a key=value string, but build value from a format string.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns allocated resource record on success, NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- va_list ap;</span><br><span style="color: hsl(0, 100%, 40%);">- char *value = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record *r;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!value_fmt)</span><br><span style="color: hsl(0, 100%, 40%);">- return _osmo_mdns_record_txt_encode(ctx, key, "");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- va_start(ap, value_fmt);</span><br><span style="color: hsl(0, 100%, 40%);">- value = talloc_vasprintf(ctx, value_fmt, ap);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!value)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- va_end(ap);</span><br><span style="color: hsl(0, 100%, 40%);">- r = _osmo_mdns_record_txt_encode(ctx, key, value);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(value);</span><br><span style="color: hsl(0, 100%, 40%);">- return r;</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%);">-/*! Decode a TXT resource record, which stores a key=value string.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 on success, -EINVAL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec,</span><br><span style="color: hsl(0, 100%, 40%);">- char *key_buf, size_t key_size, char *value_buf, size_t value_size)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- const char *key_value;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *key_value_end;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *sep;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *value;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rec->type != OSMO_MDNS_RFC_RECORD_TYPE_TXT)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- key_value = (const char *)rec->data;</span><br><span style="color: hsl(0, 100%, 40%);">- key_value_end = key_value + rec->length;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Verify and then skip the redundant string length byte */</span><br><span style="color: hsl(0, 100%, 40%);">- if (*key_value != rec->length - 1)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- key_value++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (key_value >= key_value_end)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Find equals sign */</span><br><span style="color: hsl(0, 100%, 40%);">- sep = osmo_strnchr(key_value, key_value_end - key_value, '=');</span><br><span style="color: hsl(0, 100%, 40%);">- if (!sep)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Parse key */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_print_n(key_buf, key_size, key_value, sep - key_value);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Parse value */</span><br><span style="color: hsl(0, 100%, 40%);">- value = sep + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_print_n(value_buf, value_size, value, key_value_end - value);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c</span><br><span>deleted file mode 100644</span><br><span>index e1fc184..0000000</span><br><span>--- a/src/mslookup/mdns_rfc.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,265 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Low level mDNS encoding and decoding functions of the qname IE, header/question sections and resource records,</span><br><span style="color: hsl(0, 100%, 40%);">- * as described in these RFCs:</span><br><span style="color: hsl(0, 100%, 40%);">- * - RFC 1035 (Domain names - implementation and specification)</span><br><span style="color: hsl(0, 100%, 40%);">- * - RFC 3596 (DNS Extensions to Support IP Version 6) */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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 <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <ctype.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <errno.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/bitvec.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/mslookup/mdns_rfc.h></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%);">- * Encode/decode IEs</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%);">-/*! Encode a domain string as qname (RFC 1035 4.1.2).</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] domain multiple labels separated by dots, e.g. "sip.voice.1234.msisdn".</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns allocated buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...), NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- char *domain_dup;</span><br><span style="color: hsl(0, 100%, 40%);">- char *domain_iter;</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 2] = ""; /* len(qname) is len(domain) +1 */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) };</span><br><span style="color: hsl(0, 100%, 40%);">- char *label;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (strlen(domain) > OSMO_MDNS_RFC_MAX_NAME_LEN)</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%);">- domain_iter = domain_dup = talloc_strdup(ctx, domain);</span><br><span style="color: hsl(0, 100%, 40%);">- while ((label = strsep(&domain_iter, "."))) {</span><br><span style="color: hsl(0, 100%, 40%);">- size_t len = strlen(label);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Empty domain, dot at start, two dots in a row, or ending with a dot */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!len)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRBUF_PRINTF(sb, "%c%s", (char)len, label);</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%);">- talloc_free(domain_dup);</span><br><span style="color: hsl(0, 100%, 40%);">- return talloc_strdup(ctx, buf);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-error:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(domain_dup);</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%);">-/*! Decode a domain string from a qname (RFC 1035 4.1.2).</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] qname buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...)</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] qname_max_len amount of bytes that can be read at most from the memory location that qname points to.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns allocated buffer with domain string, multiple labels separated by dots (e.g. "sip.voice.1234.msisdn"),</span><br><span style="color: hsl(0, 100%, 40%);">- * NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_max_len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- const char *next_label, *qname_end = qname + qname_max_len;</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 1];</span><br><span style="color: hsl(0, 100%, 40%);">- int i = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (qname_max_len < 1)</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%);">- while (*qname) {</span><br><span style="color: hsl(0, 100%, 40%);">- size_t len = *qname;</span><br><span style="color: hsl(0, 100%, 40%);">- next_label = qname + len + 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN)</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%);">- if (i) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Two dots in a row is not allowed */</span><br><span style="color: hsl(0, 100%, 40%);">- if (buf[i - 1] == '.')</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%);">- buf[i] = '.';</span><br><span style="color: hsl(0, 100%, 40%);">- 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%);">- memcpy(buf + i, qname + 1, len);</span><br><span style="color: hsl(0, 100%, 40%);">- i += len;</span><br><span style="color: hsl(0, 100%, 40%);">- qname = next_label;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- buf[i] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return talloc_strdup(ctx, buf);</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%);">- * Encode/decode message sections</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%);">-/*! Encode header section (RFC 1035 4.1.1).</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] msgb mesage buffer to which the encoded data will be appended.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_header *buf = (struct osmo_mdns_rfc_header *) msgb_put(msg, sizeof(*hdr));</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(buf, hdr, sizeof(*hdr));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store16be(buf->id, &buf->id);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store16be(buf->qdcount, &buf->qdcount);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store16be(buf->ancount, &buf->ancount);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store16be(buf->nscount, &buf->nscount);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store16be(buf->arcount, &buf->arcount);</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%);">-/*! Decode header section (RFC 1035 4.1.1). */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (data_len != sizeof(*hdr))</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(hdr, data, data_len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- hdr->id = osmo_load16be(&hdr->id);</span><br><span style="color: hsl(0, 100%, 40%);">- hdr->qdcount = osmo_load16be(&hdr->qdcount);</span><br><span style="color: hsl(0, 100%, 40%);">- hdr->ancount = osmo_load16be(&hdr->ancount);</span><br><span style="color: hsl(0, 100%, 40%);">- hdr->nscount = osmo_load16be(&hdr->nscount);</span><br><span style="color: hsl(0, 100%, 40%);">- hdr->arcount = osmo_load16be(&hdr->arcount);</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%);">-/*! Encode question section (RFC 1035 4.1.2).</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] msgb mesage buffer to which the encoded data will be appended.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- char *qname;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t qname_len;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *qname_buf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* qname */</span><br><span style="color: hsl(0, 100%, 40%);">- qname = osmo_mdns_rfc_qname_encode(ctx, qst->domain);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!qname)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- qname_len = strlen(qname) + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- qname_buf = msgb_put(msg, qname_len);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(qname_buf, qname, qname_len);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(qname);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* qtype and qclass */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u16(msg, qst->qtype);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u16(msg, qst->qclass);</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%);">-/*! Decode question section (RFC 1035 4.1.2). */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_question *ret;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t qname_len = data_len - 4;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (data_len < 6)</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%);">- /* qname */</span><br><span style="color: hsl(0, 100%, 40%);">- ret = talloc_zero(ctx, struct osmo_mdns_rfc_question);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ret)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, qname_len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ret->domain) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ret);</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%);">- /* qtype and qclass */</span><br><span style="color: hsl(0, 100%, 40%);">- ret->qtype = osmo_load16be(data + qname_len);</span><br><span style="color: hsl(0, 100%, 40%);">- ret->qclass = osmo_load16be(data + qname_len + 2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</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%);">- * Encode/decode resource records</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%);">-/*! Encode one resource record (RFC 1035 4.1.3).</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] msgb mesage buffer to which the encoded data will be appended.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- char *name;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t name_len;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *buf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* name */</span><br><span style="color: hsl(0, 100%, 40%);">- name = osmo_mdns_rfc_qname_encode(ctx, rec->domain);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!name)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- name_len = strlen(name) + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- buf = msgb_put(msg, name_len);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(buf, name, name_len);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(name);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* type, class, ttl, rdlength */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u16(msg, rec->type);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u16(msg, rec->class);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u32(msg, rec->ttl);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u16(msg, rec->rdlength);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* rdata */</span><br><span style="color: hsl(0, 100%, 40%);">- buf = msgb_put(msg, rec->rdlength);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(buf, rec->rdata, rec->rdlength);</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%);">-/*! Decode one resource record (RFC 1035 4.1.3). */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len,</span><br><span style="color: hsl(0, 100%, 40%);">- size_t *record_len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_record *ret = talloc_zero(ctx, struct osmo_mdns_rfc_record);</span><br><span style="color: hsl(0, 100%, 40%);">- size_t name_len;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* name */</span><br><span style="color: hsl(0, 100%, 40%);">- ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, data_len - 10);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ret->domain)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- name_len = strlen(ret->domain) + 2;</span><br><span style="color: hsl(0, 100%, 40%);">- if (name_len + 10 > data_len)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* type, class, ttl, rdlength */</span><br><span style="color: hsl(0, 100%, 40%);">- ret->type = osmo_load16be(data + name_len);</span><br><span style="color: hsl(0, 100%, 40%);">- ret->class = osmo_load16be(data + name_len + 2);</span><br><span style="color: hsl(0, 100%, 40%);">- ret->ttl = osmo_load32be(data + name_len + 4);</span><br><span style="color: hsl(0, 100%, 40%);">- ret->rdlength = osmo_load16be(data + name_len + 8);</span><br><span style="color: hsl(0, 100%, 40%);">- if (name_len + 10 + ret->rdlength > data_len)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* rdata */</span><br><span style="color: hsl(0, 100%, 40%);">- ret->rdata = talloc_memdup(ret, data + name_len + 10, ret->rdlength);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ret->rdata)</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%);">- *record_len = name_len + 10 + ret->rdlength;</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</span><br><span style="color: hsl(0, 100%, 40%);">-error:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ret);</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>diff --git a/src/mslookup/mdns_sock.c b/src/mslookup/mdns_sock.c</span><br><span>deleted file mode 100644</span><br><span>index 5291660..0000000</span><br><span>--- a/src/mslookup/mdns_sock.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,144 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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 <errno.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdio.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdlib.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/types.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/socket.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <arpa/inet.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <netinet/in.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <netdb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdbool.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <talloc.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/utils.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/hlr/logging.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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! Open socket to send and receive multicast data.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * The socket is opened with SO_REUSEADDR, so we can bind to the same IP and port multiple times. This socket receives</span><br><span style="color: hsl(0, 100%, 40%);">- * everything sent to that multicast IP/port, including its own data data sent from osmo_mdns_sock_send(). So whenever</span><br><span style="color: hsl(0, 100%, 40%);">- * sending something, the receive callback will be called with the same data and should discard it.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] ip multicast IPv4 or IPv6 address.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] port port number.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] cb callback for incoming data that will be passed to osmo_fd_setup (should read from osmo_fd->fd).</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] data userdata passed to osmo_fd (available in cb as osmo_fd->data).</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] priv_nr additional userdata integer passed to osmo_fd (available in cb as osmo_fd->priv_nr).</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns allocated osmo_mdns_sock, NULL on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port,</span><br><span style="color: hsl(0, 100%, 40%);">- int (*cb)(struct osmo_fd *fd, unsigned int what),</span><br><span style="color: hsl(0, 100%, 40%);">- void *data, unsigned int priv_nr)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_sock *ret;</span><br><span style="color: hsl(0, 100%, 40%);">- int sock, rc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct addrinfo hints = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct ip_mreq multicast_req = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- in_addr_t iface = INADDR_ANY;</span><br><span style="color: hsl(0, 100%, 40%);">- char portbuf[10];</span><br><span style="color: hsl(0, 100%, 40%);">- int y = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(portbuf, sizeof(portbuf) -1, "%u", port);</span><br><span style="color: hsl(0, 100%, 40%);">- ret = talloc_zero(ctx, struct osmo_mdns_sock);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ret);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Fill addrinfo */</span><br><span style="color: hsl(0, 100%, 40%);">- hints.ai_family = PF_UNSPEC;</span><br><span style="color: hsl(0, 100%, 40%);">- hints.ai_socktype = SOCK_DGRAM;</span><br><span style="color: hsl(0, 100%, 40%);">- hints.ai_flags = (AI_PASSIVE | AI_NUMERICHOST);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = getaddrinfo(ip, portbuf, &hints, &ret->ai);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: getaddrinfo: %s\n", gai_strerror(rc));</span><br><span style="color: hsl(0, 100%, 40%);">- ret->ai = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</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%);">- /* Open socket */</span><br><span style="color: hsl(0, 100%, 40%);">- sock = socket(ret->ai->ai_family, ret->ai->ai_socktype, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (sock == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: socket: %s\n", strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</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%);">- /* Set multicast options */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ret->ai->ai_addr))->sin_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(multicast_req.imr_multiaddr));</span><br><span style="color: hsl(0, 100%, 40%);">- multicast_req.imr_interface.s_addr = htonl(INADDR_ANY);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</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%);">- /* Always allow binding the same IP and port twice. This is needed in OsmoHLR (where the code becomes cleaner by</span><br><span style="color: hsl(0, 100%, 40%);">- * just using a different socket for server and client code) and in the mslookup_client_mdns_test. Also for</span><br><span style="color: hsl(0, 100%, 40%);">- * osmo-mslookup-client if it is running multiple times in parallel (i.e. two incoming calls almost at the same</span><br><span style="color: hsl(0, 100%, 40%);">- * time need to be resolved with the simple dialplan example that just starts new processes). */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&y, sizeof(y));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</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%);">- /* Bind and register osmo_fd callback */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = bind(sock, ret->ai->ai_addr, ret->ai->ai_addrlen);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: bind: %s\n", strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(&ret->osmo_fd, sock, OSMO_FD_READ, cb, data, priv_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_fd_register(&ret->osmo_fd) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</span><br><span style="color: hsl(0, 100%, 40%);">-error:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret->ai)</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(ret->ai);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ret);</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%);">-/*! Send msgb over mdns_sock and consume msgb.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 on success, -1 on error.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- size_t len = msgb_length(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- int rc = sendto(mdns_sock->osmo_fd.fd, msgb_data(msg), len, 0, mdns_sock->ai->ai_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- mdns_sock->ai->ai_addrlen);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return (rc == len) ? 0 : -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%);">-/*! Tear down osmo_mdns_sock. */</span><br><span style="color: hsl(0, 100%, 40%);">-void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_close(&mdns_sock->osmo_fd);</span><br><span style="color: hsl(0, 100%, 40%);">- freeaddrinfo(mdns_sock->ai);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(mdns_sock);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/mslookup/mslookup_client_mdns.c b/src/mslookup/mslookup_client_mdns.c</span><br><span>deleted file mode 100644</span><br><span>index 7ba3502..0000000</span><br><span>--- a/src/mslookup/mslookup_client_mdns.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,235 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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 <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/types.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/socket.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <netdb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <errno.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/gsm/gsm_utils.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/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/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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_method_state {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Parameters passed by _add_method_dns() */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr_str bind_addr;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *domain_suffix;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_sock *mc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_client *client;</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head requests;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t next_packet_id;</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 osmo_mdns_method_request {</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head entry;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t request_handle;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query query;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t packet_id;</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 request_handle_by_query(uint32_t *request_handle, struct osmo_mdns_method_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query *query, uint16_t packet_id)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_request *request;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(request, &state->requests, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (strcmp(request->query.service, query->service) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mslookup_id_cmp(&request->query.id, &query->id) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Match! */</span><br><span style="color: hsl(0, 100%, 40%);">- *request_handle = request->request_handle;</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%);">- 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 mdns_method_recv(struct osmo_fd *osmo_fd, unsigned int what)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_state *state = osmo_fd->data;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_result result;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query query;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t packet_id;</span><br><span style="color: hsl(0, 100%, 40%);">- int n;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buffer[1024];</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t request_handle = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- void *ctx = state;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- n = read(osmo_fd->fd, buffer, sizeof(buffer));</span><br><span style="color: hsl(0, 100%, 40%);">- if (n < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "failed to read from socket\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 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%);">- if (osmo_mdns_result_decode(ctx, buffer, n, &packet_id, &query, &result, state->domain_suffix) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (request_handle_by_query(&request_handle, state, &query, packet_id) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_client_rx_result(state->client, request_handle, &result);</span><br><span style="color: hsl(0, 100%, 40%);">- return 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 mdns_method_request(struct osmo_mslookup_client_method *method, const struct osmo_mslookup_query *query,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t request_handle)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[256];</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_state *state = method->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_request *r = talloc_zero(method->client, struct osmo_mdns_method_request);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *r = (struct osmo_mdns_method_request){</span><br><span style="color: hsl(0, 100%, 40%);">- .request_handle = request_handle,</span><br><span style="color: hsl(0, 100%, 40%);">- .query = *query,</span><br><span style="color: hsl(0, 100%, 40%);">- .packet_id = state->next_packet_id,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&r->entry, &state->requests);</span><br><span style="color: hsl(0, 100%, 40%);">- state->next_packet_id++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msg = osmo_mdns_query_encode(method->client, r->packet_id, query, state->domain_suffix);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!msg) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "Cannot encode request: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_result_name_b(buf, sizeof(buf), query, 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%);">- /* Send over the wire */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_DEBUG, "sending mDNS query: %s.%s\n", query->service,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_id_name_b(buf, sizeof(buf), &query->id));</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mdns_sock_send(state->mc, msg) == -1)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "sending mDNS query failed\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 mdns_method_request_cleanup(struct osmo_mslookup_client_method *method, uint32_t request_handle)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_state *state = method->priv;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Tear down any state associated with this handle. */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_request *r;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(r, &state->requests, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (r->request_handle != request_handle)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&r->entry);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(r);</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%);">-static void mdns_method_destruct(struct osmo_mslookup_client_method *method)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_state *state = method->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_request *e, *n;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!state)</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%);">- /* Drop all DNS lookup request state. Triggering a timeout event and cleanup for mslookup client users will</span><br><span style="color: hsl(0, 100%, 40%);">- * happen in the mslookup_client.c, we will simply stop responding from this lookup method. */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry_safe(e, n, &state->requests, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&e->entry);</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_mdns_sock_cleanup(state->mc);</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%);">-/*! Initialize the mDNS lookup method.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] client the client to attach the method to.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] ip IPv4 or IPv6 address string.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] port The port to bind to.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] initial_packet_id Used in the first mslookup query, then increased by one in each following query. All</span><br><span style="color: hsl(0, 100%, 40%);">- * servers answer to each query with the same packet ID. Set to -1 to use a random</span><br><span style="color: hsl(0, 100%, 40%);">- * initial ID (recommended unless you need deterministic output). This ID is for visually</span><br><span style="color: hsl(0, 100%, 40%);">- * distinguishing the packets in packet sniffers, the mslookup client uses not just the</span><br><span style="color: hsl(0, 100%, 40%);">- * ID, but all query parameters (service type, ID, ID type), to determine if a reply is</span><br><span style="color: hsl(0, 100%, 40%);">- * relevant.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains</span><br><span style="color: hsl(0, 100%, 40%);">- * administrated by IANA. Example: "mdns.osmocom.org" */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t port, int initial_packet_id,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *domain_suffix)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_state *state;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_client_method *m;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- m = talloc_zero(client, struct osmo_mslookup_client_method);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(m);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- state = talloc_zero(m, struct osmo_mdns_method_state);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(state);</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&state->requests);</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_from_str(&state->bind_addr, ip, port)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: invalid address/port: %s %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ip, port);</span><br><span style="color: hsl(0, 100%, 40%);">- goto error_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 (initial_packet_id == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_get_rand_id((uint8_t *)&state->next_packet_id, 2) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: failed to generate random initial packet ID\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto error_cleanup;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- state->next_packet_id = initial_packet_id;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- state->client = client;</span><br><span style="color: hsl(0, 100%, 40%);">- state->domain_suffix = domain_suffix;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- state->mc = osmo_mdns_sock_init(state, ip, port, mdns_method_recv, state, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!state->mc)</span><br><span style="color: hsl(0, 100%, 40%);">- goto error_cleanup;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *m = (struct osmo_mslookup_client_method){</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "mDNS",</span><br><span style="color: hsl(0, 100%, 40%);">- .priv = state,</span><br><span style="color: hsl(0, 100%, 40%);">- .request = mdns_method_request,</span><br><span style="color: hsl(0, 100%, 40%);">- .request_cleanup = mdns_method_request_cleanup,</span><br><span style="color: hsl(0, 100%, 40%);">- .destruct = mdns_method_destruct,</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_mslookup_client_method_add(client, m);</span><br><span style="color: hsl(0, 100%, 40%);">- return m;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-error_cleanup:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(m);</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%);">-const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_state *state;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!dns_method || !dns_method->priv)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- state = dns_method->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- return &state->bind_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%);">-const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_method_state *state;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!dns_method || !dns_method->priv)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- state = dns_method->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- return state->domain_suffix;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am</span><br><span>index ebf2add..71602a3 100644</span><br><span>--- a/tests/mslookup/Makefile.am</span><br><span>+++ b/tests/mslookup/Makefile.am</span><br><span>@@ -16,15 +16,11 @@</span><br><span> $(NULL)</span><br><span> </span><br><span> EXTRA_DIST = \</span><br><span style="color: hsl(0, 100%, 40%);">- mdns_test.err \</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_client_mdns_test.err \</span><br><span> mslookup_client_test.err \</span><br><span> mslookup_test.err \</span><br><span> $(NULL)</span><br><span> </span><br><span> check_PROGRAMS = \</span><br><span style="color: hsl(0, 100%, 40%);">- mdns_test \</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_client_mdns_test \</span><br><span> mslookup_client_test \</span><br><span> mslookup_test \</span><br><span> $(NULL)</span><br><span>@@ -45,22 +41,6 @@</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span> $(NULL)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-mslookup_client_mdns_test_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_client_mdns_test.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-mslookup_client_mdns_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/mslookup/libosmo-mslookup.la \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-mdns_test_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- mdns_test.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-mdns_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/mslookup/libosmo-mslookup.la \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> .PHONY: update_exp</span><br><span> update_exp:</span><br><span> for i in $(check_PROGRAMS); do \</span><br><span>diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c</span><br><span>deleted file mode 100644</span><br><span>index 8a60e85..0000000</span><br><span>--- a/tests/mslookup/mdns_test.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,602 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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 Affero General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 3 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 Affero 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 Affero General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * along 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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <assert.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <errno.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <string.h></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/utils.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mdns_rfc.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mdns_msg.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct qname_enc_dec_test {</span><br><span style="color: hsl(0, 100%, 40%);">- const char *domain;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *qname;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t qname_max_len; /* default: strlen(qname) + 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 const struct qname_enc_dec_test qname_enc_dec_test_data[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- /* OK: typical mslookup domain */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = "hlr.1234567.imsi",</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi",</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%);">- /* Wrong format: double dot */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = "hlr..imsi",</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = 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%);">- /* Wrong format: double dot */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = "hlr",</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = "\x03hlr\0\x03imsi",</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%);">- /* Wrong format: dot at end */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = "hlr.",</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = 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%);">- /* Wrong format: dot at start */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = ".hlr",</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = 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%);">- /* Wrong format: empty */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = "",</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = 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%);">- /* OK: maximum length */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain =</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "12345"</span><br><span style="color: hsl(0, 100%, 40%);">- ,</span><br><span style="color: hsl(0, 100%, 40%);">- .qname =</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\x05" "12345"</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%);">- /* Error: too long domain */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain =</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "123456789." "123456789." "123456789." "123456789." "123456789."</span><br><span style="color: hsl(0, 100%, 40%);">- "12345toolong"</span><br><span style="color: hsl(0, 100%, 40%);">- ,</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = 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%);">- /* Error: too long qname */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- .qname =</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</span><br><span style="color: hsl(0, 100%, 40%);">- "\t123456789\t123456789\t123456789\t123456789\t123456789"</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%);">- /* Error: wrong token length in qname */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = "\x03" "hlr" "\x07" "1234567" "\x05" "imsi",</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%);">- /* Error: wrong token length in qname */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = "\x02" "hlr" "\x07" "1234567" "\x04" "imsi",</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%);">- /* Wrong format: token length at end of qname */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = "\x03hlr\x03",</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%);">- /* Error: overflow in label length */</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi",</span><br><span style="color: hsl(0, 100%, 40%);">- .qname_max_len = 17,</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 test_enc_dec_rfc_qname(void *ctx)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- char quote_buf[300];</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "-- %s --\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(qname_enc_dec_test_data); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct qname_enc_dec_test *t = &qname_enc_dec_test_data[i];</span><br><span style="color: hsl(0, 100%, 40%);">- char *res;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (t->domain) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "domain: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1));</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1));</span><br><span style="color: hsl(0, 100%, 40%);">- res = osmo_mdns_rfc_qname_encode(ctx, t->domain);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1));</span><br><span style="color: hsl(0, 100%, 40%);">- if (t->qname == res || (t->qname && res && strcmp(t->qname, res) == 0))</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> OK\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (res)</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(res);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "\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%);">- if (t->qname) {</span><br><span style="color: hsl(0, 100%, 40%);">- size_t qname_max_len = t->qname_max_len;</span><br><span style="color: hsl(0, 100%, 40%);">- if (qname_max_len)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "qname_max_len: %lu\n", qname_max_len);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- qname_max_len = strlen(t->qname) + 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "qname: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1));</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1));</span><br><span style="color: hsl(0, 100%, 40%);">- res = osmo_mdns_rfc_qname_decode(ctx, t->qname, qname_max_len);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1));</span><br><span style="color: hsl(0, 100%, 40%);">- if (t->domain == res || (t->domain && res && strcmp(t->domain, res) == 0))</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> OK\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (res)</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(res);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "\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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define PRINT_HDR(hdr, name) \</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "header %s:\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".id = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".qr = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".opcode = %x\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".aa = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".tc = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".rd = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".ra = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".z = %x\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".rcode = %x\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".qdcount = %u\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".ancount = %u\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".nscount = %u\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".arcount = %u\n", \</span><br><span style="color: hsl(0, 100%, 40%);">- name, hdr.id, hdr.qr, hdr.opcode, hdr.aa, hdr.tc, hdr.rd, hdr.ra, hdr.z, hdr.rcode, hdr.qdcount, \</span><br><span style="color: hsl(0, 100%, 40%);">- hdr.ancount, hdr.nscount, hdr.arcount)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct osmo_mdns_rfc_header header_enc_dec_test_data[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Typical use case for mslookup */</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 1337,</span><br><span style="color: hsl(0, 100%, 40%);">- .qdcount = 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%);">- /* Fill out everything */</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 42,</span><br><span style="color: hsl(0, 100%, 40%);">- .qr = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .opcode = 0x02,</span><br><span style="color: hsl(0, 100%, 40%);">- .aa = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .tc = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .rd = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .ra = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .z = 0x02,</span><br><span style="color: hsl(0, 100%, 40%);">- .rcode = 0x03,</span><br><span style="color: hsl(0, 100%, 40%);">- .qdcount = 1234,</span><br><span style="color: hsl(0, 100%, 40%);">- .ancount = 1111,</span><br><span style="color: hsl(0, 100%, 40%);">- .nscount = 2222,</span><br><span style="color: hsl(0, 100%, 40%);">- .arcount = 3333,</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 test_enc_dec_rfc_header()</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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "-- %s --\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i< ARRAY_SIZE(header_enc_dec_test_data); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mdns_rfc_header in = header_enc_dec_test_data[i];</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_header out = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(4096, "dns_test");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- PRINT_HDR(in, "in");</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mdns_rfc_header_encode(msg, &in);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg)));</span><br><span style="color: hsl(0, 100%, 40%);">- assert(osmo_mdns_rfc_header_decode(msgb_data(msg), msgb_length(msg), &out) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- PRINT_HDR(out, "out");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "in (hexdump): %s\n", osmo_hexdump((unsigned char *)&in, sizeof(in)));</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "out (hexdump): %s\n", osmo_hexdump((unsigned char *)&out, sizeof(out)));</span><br><span style="color: hsl(0, 100%, 40%);">- assert(memcmp(&in, &out, sizeof(in)) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> OK\n\n");</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</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 test_enc_dec_rfc_header_einval()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_header out = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(4096, "dns_test");</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "-- %s --\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- assert(osmo_mdns_rfc_header_decode(msgb_data(msg), 11, &out) == -EINVAL);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> OK\n\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</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_QST(qst, name) \</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "question %s:\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".domain = %s\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".qtype = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".qclass = %i\n", \</span><br><span style="color: hsl(0, 100%, 40%);">- name, (qst)->domain, (qst)->qtype, (qst)->qclass)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct osmo_mdns_rfc_question question_enc_dec_test_data[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = "hlr.1234567.imsi",</span><br><span style="color: hsl(0, 100%, 40%);">- .qtype = OSMO_MDNS_RFC_RECORD_TYPE_ALL,</span><br><span style="color: hsl(0, 100%, 40%);">- .qclass = OSMO_MDNS_RFC_CLASS_IN,</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%);">- .domain = "hlr.1234567.imsi",</span><br><span style="color: hsl(0, 100%, 40%);">- .qtype = OSMO_MDNS_RFC_RECORD_TYPE_A,</span><br><span style="color: hsl(0, 100%, 40%);">- .qclass = OSMO_MDNS_RFC_CLASS_ALL,</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%);">- .domain = "hlr.1234567.imsi",</span><br><span style="color: hsl(0, 100%, 40%);">- .qtype = OSMO_MDNS_RFC_RECORD_TYPE_AAAA,</span><br><span style="color: hsl(0, 100%, 40%);">- .qclass = OSMO_MDNS_RFC_CLASS_ALL,</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 test_enc_dec_rfc_question(void *ctx)</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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "-- %s --\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i< ARRAY_SIZE(question_enc_dec_test_data); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mdns_rfc_question in = question_enc_dec_test_data[i];</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_question *out;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(4096, "dns_test");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- PRINT_QST(&in, "in");</span><br><span style="color: hsl(0, 100%, 40%);">- assert(osmo_mdns_rfc_question_encode(ctx, msg, &in) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg)));</span><br><span style="color: hsl(0, 100%, 40%);">- out = osmo_mdns_rfc_question_decode(ctx, msgb_data(msg), msgb_length(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- assert(out);</span><br><span style="color: hsl(0, 100%, 40%);">- PRINT_QST(out, "out");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (strcmp(in.domain, out->domain) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR: domain does not match\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (in.qtype != out->qtype)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR: qtype does not match\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (in.qclass != out->qclass)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR: qclass does not match\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> OK\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "\n");</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(out);</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 test_enc_dec_rfc_question_null(void *ctx)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t data[5] = {0};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "-- %s --\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- assert(osmo_mdns_rfc_question_decode(ctx, data, sizeof(data)) == NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> OK\n\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%);">-#define PRINT_REC(rec, name) \</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "question %s:\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".domain = %s\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".type = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".class = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".ttl = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".rdlength = %i\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- ".rdata = %s\n", \</span><br><span style="color: hsl(0, 100%, 40%);">- name, (rec)->domain, (rec)->type, (rec)->class, (rec)->ttl, (rec)->rdlength, \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_quote_str((char *)(rec)->rdata, (rec)->rdlength))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct osmo_mdns_rfc_record record_enc_dec_test_data[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .domain = "hlr.1234567.imsi",</span><br><span style="color: hsl(0, 100%, 40%);">- .type = OSMO_MDNS_RFC_RECORD_TYPE_A,</span><br><span style="color: hsl(0, 100%, 40%);">- .class = OSMO_MDNS_RFC_CLASS_IN,</span><br><span style="color: hsl(0, 100%, 40%);">- .ttl = 1234,</span><br><span style="color: hsl(0, 100%, 40%);">- .rdlength = 9,</span><br><span style="color: hsl(0, 100%, 40%);">- .rdata = (uint8_t *)"10.42.2.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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void test_enc_dec_rfc_record(void *ctx)</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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "-- %s --\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i=0; i< ARRAY_SIZE(record_enc_dec_test_data); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mdns_rfc_record in = record_enc_dec_test_data[i];</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_rfc_record *out;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(4096, "dns_test");</span><br><span style="color: hsl(0, 100%, 40%);">- size_t record_len;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- PRINT_REC(&in, "in");</span><br><span style="color: hsl(0, 100%, 40%);">- assert(osmo_mdns_rfc_record_encode(ctx, msg, &in) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg)));</span><br><span style="color: hsl(0, 100%, 40%);">- out = osmo_mdns_rfc_record_decode(ctx, msgb_data(msg), msgb_length(msg), &record_len);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "record_len: %lu\n", record_len);</span><br><span style="color: hsl(0, 100%, 40%);">- assert(out);</span><br><span style="color: hsl(0, 100%, 40%);">- PRINT_REC(out, "out");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (strcmp(in.domain, out->domain) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR: domain does not match\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (in.type != out->type)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR: type does not match\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (in.class != out->class)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR: class does not match\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (in.ttl != out->ttl)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR: ttl does not match\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (in.rdlength != out->rdlength)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR: rdlength does not match\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (memcmp(in.rdata, out->rdata, in.rdlength) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> ERROR: rdata does not match\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> OK\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "\n");</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(out);</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%);">-static uint8_t ip_v4_n[] = {23, 42, 47, 11};</span><br><span style="color: hsl(0, 100%, 40%);">-static uint8_t ip_v6_n[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00};</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 test_records {</span><br><span style="color: hsl(0, 100%, 40%);">- RECORD_NONE,</span><br><span style="color: hsl(0, 100%, 40%);">- RECORD_A,</span><br><span style="color: hsl(0, 100%, 40%);">- RECORD_AAAA,</span><br><span style="color: hsl(0, 100%, 40%);">- RECORD_TXT_AGE,</span><br><span style="color: hsl(0, 100%, 40%);">- RECORD_TXT_PORT_444,</span><br><span style="color: hsl(0, 100%, 40%);">- RECORD_TXT_PORT_666,</span><br><span style="color: hsl(0, 100%, 40%);">- RECORD_TXT_INVALID_KEY,</span><br><span style="color: hsl(0, 100%, 40%);">- RECORD_TXT_INVALID_NO_KEY_VALUE,</span><br><span style="color: hsl(0, 100%, 40%);">- RECORD_INVALID,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-struct result_from_answer_test {</span><br><span style="color: hsl(0, 100%, 40%);">- const char *desc;</span><br><span style="color: hsl(0, 100%, 40%);">- const enum test_records records[5];</span><br><span style="color: hsl(0, 100%, 40%);">- bool error;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mslookup_result res;</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 test_result_from_answer(void *ctx)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- void *print_ctx = talloc_named_const(ctx, 0, __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr_str test_host_v4 = {.af = AF_INET, .port=444, .ip = "23.42.47.11"};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr_str test_host_v6 = {.af = AF_INET6, .port=666,</span><br><span style="color: hsl(0, 100%, 40%);">- .ip = "1122:3344:5566:7788:99aa:bbcc:ddee:ff00"};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_result test_result_v4 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3,</span><br><span style="color: hsl(0, 100%, 40%);">- .host_v4 = test_host_v4};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_result test_result_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3,</span><br><span style="color: hsl(0, 100%, 40%);">- .host_v6 = test_host_v6};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_result test_result_v4_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3,</span><br><span style="color: hsl(0, 100%, 40%);">- .host_v4 = test_host_v4, .host_v6 = test_host_v6};</span><br><span style="color: hsl(0, 100%, 40%);">- struct result_from_answer_test result_from_answer_data[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .desc = "IPv4",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444},</span><br><span style="color: hsl(0, 100%, 40%);">- .res = test_result_v4</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%);">- .desc = "IPv6",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666},</span><br><span style="color: hsl(0, 100%, 40%);">- .res = test_result_v6</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%);">- .desc = "IPv4 + IPv6",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_AAAA, RECORD_TXT_PORT_666},</span><br><span style="color: hsl(0, 100%, 40%);">- .res = test_result_v4_v6</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%);">- .desc = "A twice",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_A},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "AAAA twice",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_444, RECORD_AAAA},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "invalid TXT: no key/value pair",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_NO_KEY_VALUE},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "age twice",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_TXT_AGE},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "port as first record",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_PORT_444},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "port without previous ip record",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_TXT_PORT_444},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "invalid TXT: invalid key",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_KEY},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "unexpected record type",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_INVALID},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "missing record: age",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_A, RECORD_TXT_PORT_444},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "missing record: port for ipv4",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_A},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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%);">- .desc = "missing record: port for ipv4 #2",</span><br><span style="color: hsl(0, 100%, 40%);">- .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666, RECORD_A},</span><br><span style="color: hsl(0, 100%, 40%);">- .error = true</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 i = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int j = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "-- %s --\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(result_from_answer_data); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct result_from_answer_test *t = &result_from_answer_data[i];</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_msg_answer ans = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_result res = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- void *ctx_test = talloc_named_const(ctx, 0, t->desc);</span><br><span style="color: hsl(0, 100%, 40%);">- bool is_error;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "---\n");</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "test: %s\n", t->desc);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "error: %s\n", t->error ? "true" : "false");</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "records:\n");</span><br><span style="color: hsl(0, 100%, 40%);">- /* Build records list */</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&ans.records);</span><br><span style="color: hsl(0, 100%, 40%);">- for (j = 0; j < ARRAY_SIZE(t->records); j++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mdns_record *rec = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (t->records[j]) {</span><br><span style="color: hsl(0, 100%, 40%);">- case RECORD_NONE:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RECORD_A:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- A 42.42.42.42\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rec = talloc_zero(ctx_test, struct osmo_mdns_record);</span><br><span style="color: hsl(0, 100%, 40%);">- rec->type = OSMO_MDNS_RFC_RECORD_TYPE_A;</span><br><span style="color: hsl(0, 100%, 40%);">- rec->data = ip_v4_n;</span><br><span style="color: hsl(0, 100%, 40%);">- rec->length = sizeof(ip_v4_n);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RECORD_AAAA:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rec = talloc_zero(ctx_test, struct osmo_mdns_record);</span><br><span style="color: hsl(0, 100%, 40%);">- rec->type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA;</span><br><span style="color: hsl(0, 100%, 40%);">- rec->data = ip_v6_n;</span><br><span style="color: hsl(0, 100%, 40%);">- rec->length = sizeof(ip_v6_n);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RECORD_TXT_AGE:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- TXT age=3\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "age", "3");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RECORD_TXT_PORT_444:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- TXT port=444\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "444");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RECORD_TXT_PORT_666:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- TXT port=666\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "666");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RECORD_TXT_INVALID_KEY:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- TXT hello=world\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "hello", "world");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RECORD_TXT_INVALID_NO_KEY_VALUE:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- TXT 12345\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "12", "45");</span><br><span style="color: hsl(0, 100%, 40%);">- rec->data[3] = '3';</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RECORD_INVALID:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- (invalid)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rec = talloc_zero(ctx, struct osmo_mdns_record);</span><br><span style="color: hsl(0, 100%, 40%);">- rec->type = OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN;</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%);">- if (rec)</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&rec->list, &ans.records);</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%);">- /* Verify output */</span><br><span style="color: hsl(0, 100%, 40%);">- is_error = (osmo_mdns_result_from_answer(&res, &ans) != 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (t->error != is_error) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "got %s\n", is_error ? "error" : "no error");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(false);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!t->error) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "exp: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &t->res));</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "res: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &res));</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(t->res.rc == res.rc);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v4, &res.host_v4));</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v6, &res.host_v6));</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(t->res.age == res.age);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(t->res.last == res.last);</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%);">- talloc_free(ctx_test);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "=> OK\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%);">-int main()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- void *ctx = talloc_named_const(NULL, 0, "main");</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(ctx, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</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_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- test_enc_dec_rfc_qname(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- test_enc_dec_rfc_header();</span><br><span style="color: hsl(0, 100%, 40%);">- test_enc_dec_rfc_header_einval();</span><br><span style="color: hsl(0, 100%, 40%);">- test_enc_dec_rfc_question(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- test_enc_dec_rfc_question_null(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- test_enc_dec_rfc_record(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- test_result_from_answer(ctx);</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>diff --git a/tests/mslookup/mdns_test.err b/tests/mslookup/mdns_test.err</span><br><span>deleted file mode 100644</span><br><span>index 51e5afe..0000000</span><br><span>--- a/tests/mslookup/mdns_test.err</span><br><span>+++ /dev/null</span><br><span>@@ -1,336 +0,0 @@</span><br><span>--- test_enc_dec_rfc_qname --</span><br><span style="color: hsl(0, 100%, 40%);">-domain: "hlr.1234567.imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: "\3hlr\a1234567\4imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-res: "\3hlr\a1234567\4imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-qname: "\3hlr\a1234567\4imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: "hlr.1234567.imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-res: "hlr.1234567.imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-domain: "hlr..imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-domain: "hlr"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: "\3hlr"</span><br><span style="color: hsl(0, 100%, 40%);">-res: "\3hlr"</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-qname: "\3hlr"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: "hlr"</span><br><span style="color: hsl(0, 100%, 40%);">-res: "hlr"</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-domain: "hlr."</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-domain: ".hlr"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-domain: ""</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345"</span><br><span style="color: hsl(0, 100%, 40%);">-res: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345"</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345"</span><br><span style="color: hsl(0, 100%, 40%);">-res: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345"</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345toolong"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-qname: "\3hlr\a1234567\5imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-qname: "\2hlr\a1234567\4imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-qname: "\3hlr\3"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-qname_max_len: 17</span><br><span style="color: hsl(0, 100%, 40%);">-qname: "\3hlr\a1234567\4imsi"</span><br><span style="color: hsl(0, 100%, 40%);">-exp: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-res: NULL</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>--- test_enc_dec_rfc_header --</span><br><span style="color: hsl(0, 100%, 40%);">-header in:</span><br><span style="color: hsl(0, 100%, 40%);">-.id = 1337</span><br><span style="color: hsl(0, 100%, 40%);">-.qr = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.opcode = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.aa = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.tc = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.rd = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.ra = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.z = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.rcode = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.qdcount = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.ancount = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.nscount = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.arcount = 0</span><br><span style="color: hsl(0, 100%, 40%);">-encoded: 05 39 00 00 00 01 00 00 00 00 00 00 </span><br><span style="color: hsl(0, 100%, 40%);">-header out:</span><br><span style="color: hsl(0, 100%, 40%);">-.id = 1337</span><br><span style="color: hsl(0, 100%, 40%);">-.qr = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.opcode = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.aa = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.tc = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.rd = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.ra = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.z = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.rcode = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.qdcount = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.ancount = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.nscount = 0</span><br><span style="color: hsl(0, 100%, 40%);">-.arcount = 0</span><br><span style="color: hsl(0, 100%, 40%);">-in (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 </span><br><span style="color: hsl(0, 100%, 40%);">-out (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 </span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-header in:</span><br><span style="color: hsl(0, 100%, 40%);">-.id = 42</span><br><span style="color: hsl(0, 100%, 40%);">-.qr = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.opcode = 2</span><br><span style="color: hsl(0, 100%, 40%);">-.aa = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.tc = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.rd = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.ra = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.z = 2</span><br><span style="color: hsl(0, 100%, 40%);">-.rcode = 3</span><br><span style="color: hsl(0, 100%, 40%);">-.qdcount = 1234</span><br><span style="color: hsl(0, 100%, 40%);">-.ancount = 1111</span><br><span style="color: hsl(0, 100%, 40%);">-.nscount = 2222</span><br><span style="color: hsl(0, 100%, 40%);">-.arcount = 3333</span><br><span style="color: hsl(0, 100%, 40%);">-encoded: 00 2a 97 a3 04 d2 04 57 08 ae 0d 05 </span><br><span style="color: hsl(0, 100%, 40%);">-header out:</span><br><span style="color: hsl(0, 100%, 40%);">-.id = 42</span><br><span style="color: hsl(0, 100%, 40%);">-.qr = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.opcode = 2</span><br><span style="color: hsl(0, 100%, 40%);">-.aa = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.tc = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.rd = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.ra = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.z = 2</span><br><span style="color: hsl(0, 100%, 40%);">-.rcode = 3</span><br><span style="color: hsl(0, 100%, 40%);">-.qdcount = 1234</span><br><span style="color: hsl(0, 100%, 40%);">-.ancount = 1111</span><br><span style="color: hsl(0, 100%, 40%);">-.nscount = 2222</span><br><span style="color: hsl(0, 100%, 40%);">-.arcount = 3333</span><br><span style="color: hsl(0, 100%, 40%);">-in (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d </span><br><span style="color: hsl(0, 100%, 40%);">-out (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d </span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>--- test_enc_dec_rfc_header_einval --</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>--- test_enc_dec_rfc_question --</span><br><span style="color: hsl(0, 100%, 40%);">-question in:</span><br><span style="color: hsl(0, 100%, 40%);">-.domain = hlr.1234567.imsi</span><br><span style="color: hsl(0, 100%, 40%);">-.qtype = 255</span><br><span style="color: hsl(0, 100%, 40%);">-.qclass = 1</span><br><span style="color: hsl(0, 100%, 40%);">-encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 ff 00 01 </span><br><span style="color: hsl(0, 100%, 40%);">-question out:</span><br><span style="color: hsl(0, 100%, 40%);">-.domain = hlr.1234567.imsi</span><br><span style="color: hsl(0, 100%, 40%);">-.qtype = 255</span><br><span style="color: hsl(0, 100%, 40%);">-.qclass = 1</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-question in:</span><br><span style="color: hsl(0, 100%, 40%);">-.domain = hlr.1234567.imsi</span><br><span style="color: hsl(0, 100%, 40%);">-.qtype = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.qclass = 255</span><br><span style="color: hsl(0, 100%, 40%);">-encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 ff </span><br><span style="color: hsl(0, 100%, 40%);">-question out:</span><br><span style="color: hsl(0, 100%, 40%);">-.domain = hlr.1234567.imsi</span><br><span style="color: hsl(0, 100%, 40%);">-.qtype = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.qclass = 255</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-question in:</span><br><span style="color: hsl(0, 100%, 40%);">-.domain = hlr.1234567.imsi</span><br><span style="color: hsl(0, 100%, 40%);">-.qtype = 28</span><br><span style="color: hsl(0, 100%, 40%);">-.qclass = 255</span><br><span style="color: hsl(0, 100%, 40%);">-encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 1c 00 ff </span><br><span style="color: hsl(0, 100%, 40%);">-question out:</span><br><span style="color: hsl(0, 100%, 40%);">-.domain = hlr.1234567.imsi</span><br><span style="color: hsl(0, 100%, 40%);">-.qtype = 28</span><br><span style="color: hsl(0, 100%, 40%);">-.qclass = 255</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>--- test_enc_dec_rfc_question_null --</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>--- test_enc_dec_rfc_record --</span><br><span style="color: hsl(0, 100%, 40%);">-question in:</span><br><span style="color: hsl(0, 100%, 40%);">-.domain = hlr.1234567.imsi</span><br><span style="color: hsl(0, 100%, 40%);">-.type = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.class = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.ttl = 1234</span><br><span style="color: hsl(0, 100%, 40%);">-.rdlength = 9</span><br><span style="color: hsl(0, 100%, 40%);">-.rdata = "10.42.2.1"</span><br><span style="color: hsl(0, 100%, 40%);">-encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 01 00 00 04 d2 00 09 31 30 2e 34 32 2e 32 2e 31 </span><br><span style="color: hsl(0, 100%, 40%);">-record_len: 37</span><br><span style="color: hsl(0, 100%, 40%);">-question out:</span><br><span style="color: hsl(0, 100%, 40%);">-.domain = hlr.1234567.imsi</span><br><span style="color: hsl(0, 100%, 40%);">-.type = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.class = 1</span><br><span style="color: hsl(0, 100%, 40%);">-.ttl = 1234</span><br><span style="color: hsl(0, 100%, 40%);">-.rdlength = 9</span><br><span style="color: hsl(0, 100%, 40%);">-.rdata = "10.42.2.1"</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>--- test_result_from_answer --</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: IPv4</span><br><span style="color: hsl(0, 100%, 40%);">-error: false</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- A 42.42.42.42</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=444</span><br><span style="color: hsl(0, 100%, 40%);">-exp: -> ipv4: 23.42.47.11:444 (age=3) (not-last)</span><br><span style="color: hsl(0, 100%, 40%);">-res: -> ipv4: 23.42.47.11:444 (age=3) (not-last)</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: IPv6</span><br><span style="color: hsl(0, 100%, 40%);">-error: false</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=666</span><br><span style="color: hsl(0, 100%, 40%);">-exp: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last)</span><br><span style="color: hsl(0, 100%, 40%);">-res: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last)</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: IPv4 + IPv6</span><br><span style="color: hsl(0, 100%, 40%);">-error: false</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- A 42.42.42.42</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=444</span><br><span style="color: hsl(0, 100%, 40%);">-- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=666</span><br><span style="color: hsl(0, 100%, 40%);">-exp: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last)</span><br><span style="color: hsl(0, 100%, 40%);">-res: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last)</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: A twice</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- A 42.42.42.42</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=444</span><br><span style="color: hsl(0, 100%, 40%);">-- A 42.42.42.42</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR 'A' record found twice in mDNS answer</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: AAAA twice</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=444</span><br><span style="color: hsl(0, 100%, 40%);">-- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR 'AAAA' record found twice in mDNS answer</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: invalid TXT: no key/value pair</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT 12345</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR failed to decode txt record</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: age twice</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR duplicate 'TXT' record for 'age'</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: port as first record</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=444</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: port without previous ip record</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=444</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: invalid TXT: invalid key</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT hello=world</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR unexpected key 'hello' in TXT record</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: unexpected record type</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- (invalid)</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR unexpected record type</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: missing record: age</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- A 42.42.42.42</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=444</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR missing resource records in mDNS answer</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: missing record: port for ipv4</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- A 42.42.42.42</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR missing resource records in mDNS answer</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">-test: missing record: port for ipv4 #2</span><br><span style="color: hsl(0, 100%, 40%);">-error: true</span><br><span style="color: hsl(0, 100%, 40%);">-records:</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT age=3</span><br><span style="color: hsl(0, 100%, 40%);">-- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00</span><br><span style="color: hsl(0, 100%, 40%);">-- TXT port=666</span><br><span style="color: hsl(0, 100%, 40%);">-- A 42.42.42.42</span><br><span style="color: hsl(0, 100%, 40%);">-DLGLOBAL ERROR missing resource records in mDNS answer</span><br><span style="color: hsl(0, 100%, 40%);">-=> OK</span><br><span>diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c</span><br><span>deleted file mode 100644</span><br><span>index 6091e3c..0000000</span><br><span>--- a/tests/mslookup/mslookup_client_mdns_test.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,220 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Copyright 2019 by sysmocom s.f.m.c. GmbH <info@sysmocom.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 Affero General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 3 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 Affero 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 Affero General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * along 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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdbool.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.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/application.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/mslookup/mslookup.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.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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void *ctx = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define TEST_IP OSMO_MSLOOKUP_MDNS_IP4</span><br><span style="color: hsl(0, 100%, 40%);">-#define TEST_PORT OSMO_MSLOOKUP_MDNS_PORT</span><br><span style="color: hsl(0, 100%, 40%);">-#define TEST_DOMAIN_SUFFIX "mslookup_client_mdns_test.dgsm.osmocom.org"</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%);">- * Test server (emulates the mDNS server in OsmoHLR) and client</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mdns_sock *server_mc;</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 server_reply(struct osmo_mslookup_query *query, uint16_t packet_id)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_result result = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- result.rc = OSMO_MSLOOKUP_RC_RESULT;</span><br><span style="color: hsl(0, 100%, 40%);">- result.age = 3;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_from_str(&result.host_v4, "42.42.42.42", 444);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_from_str(&result.host_v6, "1122:3344:5566:7788:99aa:bbcc:ddee:ff00", 666);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msg = osmo_mdns_result_encode(ctx, packet_id, query, &result, TEST_DOMAIN_SUFFIX);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(osmo_mdns_sock_send(server_mc, msg) == 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%);">-static int server_recv(struct osmo_fd *osmo_fd, unsigned int what)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int n;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buffer[1024];</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t packet_id;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query *query;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "%s\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Parse the message and print it */</span><br><span style="color: hsl(0, 100%, 40%);">- n = read(osmo_fd->fd, buffer, sizeof(buffer));</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(n >= 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- query = osmo_mdns_query_decode(ctx, buffer, n, &packet_id, TEST_DOMAIN_SUFFIX);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!query)</span><br><span style="color: hsl(0, 100%, 40%);">- return -1; /* server receiving own answer is expected */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "received request\n");</span><br><span style="color: hsl(0, 100%, 40%);">- server_reply(query, packet_id);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(query);</span><br><span style="color: hsl(0, 100%, 40%);">- return 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 server_init()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "%s\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- server_mc = osmo_mdns_sock_init(ctx, TEST_IP, TEST_PORT, server_recv, NULL, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(server_mc);</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 server_stop()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "%s\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(server_mc);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mdns_sock_cleanup(server_mc);</span><br><span style="color: hsl(0, 100%, 40%);">- server_mc = 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 osmo_mslookup_client* client;</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_mslookup_client_method* client_method;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void client_init()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "%s\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- client = osmo_mslookup_client_new(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(client);</span><br><span style="color: hsl(0, 100%, 40%);">- client_method = osmo_mslookup_client_add_mdns(client, TEST_IP, TEST_PORT, 1337, TEST_DOMAIN_SUFFIX);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(client_method);</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 client_recv(struct osmo_mslookup_client *client, uint32_t request_handle,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mslookup_query *query, const struct osmo_mslookup_result *result)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[256];</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "%s\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "client_recv(): %s\n", osmo_mslookup_result_name_b(buf, sizeof(buf), query, result));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_client_request_cancel(client, request_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%);">-static void client_query()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_id id = {.type = OSMO_MSLOOKUP_ID_IMSI,</span><br><span style="color: hsl(0, 100%, 40%);">- .imsi = "123456789012345"};</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_mslookup_query query = {</span><br><span style="color: hsl(0, 100%, 40%);">- .service = "gsup.hlr",</span><br><span style="color: hsl(0, 100%, 40%);">- .id = id,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mslookup_query_handling handling = {</span><br><span style="color: hsl(0, 100%, 40%);">- .result_timeout_milliseconds = 2000,</span><br><span style="color: hsl(0, 100%, 40%);">- .result_cb = client_recv,</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%);">- fprintf(stderr, "%s\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_client_request(client, &query, &handling);</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 client_stop()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "%s\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mslookup_client_free(client);</span><br><span style="color: hsl(0, 100%, 40%);">- client = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-const struct timeval fake_time_start_time = { 0, 0 };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define fake_time_passes(secs, usecs) do \</span><br><span style="color: hsl(0, 100%, 40%);">-{ \</span><br><span style="color: hsl(0, 100%, 40%);">- struct timeval diff; \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gettimeofday_override_add(secs, usecs); \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \</span><br><span style="color: hsl(0, 100%, 40%);">- timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSLOOKUP, LOGL_DEBUG, "Total time passed: %d.%06d s\n", \</span><br><span style="color: hsl(0, 100%, 40%);">- (int)diff.tv_sec, (int)diff.tv_usec); \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timers_prepare(); \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timers_update(); \</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%);">-static void fake_time_start()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct timespec *clock_override;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gettimeofday_override_time = fake_time_start_time;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gettimeofday_override = true;</span><br><span style="color: hsl(0, 100%, 40%);">- clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(clock_override);</span><br><span style="color: hsl(0, 100%, 40%);">- clock_override->tv_sec = fake_time_start_time.tv_sec;</span><br><span style="color: hsl(0, 100%, 40%);">- clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_clock_override_enable(CLOCK_MONOTONIC, true);</span><br><span style="color: hsl(0, 100%, 40%);">- fake_time_passes(0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-static void test_server_client()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "-- %s --\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- server_init();</span><br><span style="color: hsl(0, 100%, 40%);">- client_init();</span><br><span style="color: hsl(0, 100%, 40%);">- client_query();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Let the server receive the query and indirectly call server_recv(). As side effect of using the same IP and</span><br><span style="color: hsl(0, 100%, 40%);">- * port, the client will also receive its own question. The client will dismiss its own question, as it is just</span><br><span style="color: hsl(0, 100%, 40%);">- * looking for answers. */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(osmo_select_main_ctx(1) == 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Let the mslookup client receive the answer (also same side effect as above). It does not call the callback</span><br><span style="color: hsl(0, 100%, 40%);">- * (client_recv()) just yet, because it is waiting for the best result within two seconds. */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(osmo_select_main_ctx(1) == 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Time flies by, client_recv() gets called. */</span><br><span style="color: hsl(0, 100%, 40%);">- fake_time_passes(5, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- server_stop();</span><br><span style="color: hsl(0, 100%, 40%);">- client_stop();</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%);">- * Run all tests</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int main()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_enable_null_tracking();</span><br><span style="color: hsl(0, 100%, 40%);">- ctx = talloc_named_const(NULL, 0, "main");</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(ctx, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_level(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_category(osmo_stderr_target, 0);</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_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_category_filter(osmo_stderr_target, DMSLOOKUP, true, LOGL_DEBUG);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fake_time_start();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- test_server_client();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- log_fini();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(talloc_total_blocks(ctx) == 1);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(talloc_total_blocks(NULL) == 1);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_disable_null_tracking();</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>diff --git a/tests/mslookup/mslookup_client_mdns_test.err b/tests/mslookup/mslookup_client_mdns_test.err</span><br><span>deleted file mode 100644</span><br><span>index b4ea269..0000000</span><br><span>--- a/tests/mslookup/mslookup_client_mdns_test.err</span><br><span>+++ /dev/null</span><br><span>@@ -1,14 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Total time passed: 0.000000 s</span><br><span>--- test_server_client --</span><br><span style="color: hsl(0, 100%, 40%);">-server_init</span><br><span style="color: hsl(0, 100%, 40%);">-client_init</span><br><span style="color: hsl(0, 100%, 40%);">-client_query</span><br><span style="color: hsl(0, 100%, 40%);">-sending mDNS query: gsup.hlr.123456789012345.imsi</span><br><span style="color: hsl(0, 100%, 40%);">-server_recv</span><br><span style="color: hsl(0, 100%, 40%);">-received request</span><br><span style="color: hsl(0, 100%, 40%);">-server_recv</span><br><span style="color: hsl(0, 100%, 40%);">-client_recv</span><br><span style="color: hsl(0, 100%, 40%);">-client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last)</span><br><span style="color: hsl(0, 100%, 40%);">-Total time passed: 5.000000 s</span><br><span style="color: hsl(0, 100%, 40%);">-server_stop</span><br><span style="color: hsl(0, 100%, 40%);">-client_stop</span><br><span>diff --git a/tests/testsuite.at b/tests/testsuite.at</span><br><span>index 827e9f8..39df7aa 100644</span><br><span>--- a/tests/testsuite.at</span><br><span>+++ b/tests/testsuite.at</span><br><span>@@ -40,12 +40,6 @@</span><br><span> AT_CHECK([$abs_srcdir/db_upgrade/db_upgrade_test.sh $abs_srcdir/db_upgrade $abs_builddir/db_upgrade], [], [expout], [experr])</span><br><span> AT_CLEANUP</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AT_SETUP([mdns])</span><br><span style="color: hsl(0, 100%, 40%);">-AT_KEYWORDS([mdns])</span><br><span style="color: hsl(0, 100%, 40%);">-cat $abs_srcdir/mslookup/mdns_test.err > experr</span><br><span style="color: hsl(0, 100%, 40%);">-AT_CHECK([$abs_top_builddir/tests/mslookup/mdns_test], [0], [ignore], [experr])</span><br><span style="color: hsl(0, 100%, 40%);">-AT_CLEANUP</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> AT_SETUP([mslookup])</span><br><span> AT_KEYWORDS([mslookup])</span><br><span> cat $abs_srcdir/mslookup/mslookup_test.err > experr</span><br><span>@@ -57,9 +51,3 @@</span><br><span> cat $abs_srcdir/mslookup/mslookup_client_test.err > experr</span><br><span> AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr])</span><br><span> AT_CLEANUP</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-AT_SETUP([mslookup_client_mdns])</span><br><span style="color: hsl(0, 100%, 40%);">-AT_KEYWORDS([mslookup_client_mdns])</span><br><span style="color: hsl(0, 100%, 40%);">-cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr</span><br><span style="color: hsl(0, 100%, 40%);">-AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr])</span><br><span style="color: hsl(0, 100%, 40%);">-AT_CLEANUP</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16828">change 16828</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/+/16828"/><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: I5aec5b59f304c7f732c4a31131beedf29c966d9d </div>
<div style="display:none"> Gerrit-Change-Number: 16828 </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-MessageType: newchange </div>