<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20332">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add GAD coding for Location Services<br><br>GAD, Universal Geographical Area Description:<br>- raw coding for all GAD elements.<br>- SI-units encoding and decoding for Ellipsoid point with uncertainty circle,<br> which I presume is the typical "at most N meters away from cell tower located<br> at X,Y", which corresponds to the TA positioning currently being implemented.<br>- other SI-units GAD element encodings are so far not implemented.<br><br>Add encoding and decoding tests.<br><br>In gsm/protocol/gsm_23_032.h are the raw coding structs as defined in 3GPP TS<br>23.032.<br><br>In gsm/gad.h are structs carrying consistent units based on meters and degrees,<br>for convenient / less error prone handling of GAD data, and for human readable<br>representations of the GAD data.<br><br>The separation of the two is desirable because OsmoBSC will receive GAD data<br>from OsmoSMLC on the Lb interface, and pass on this data to the MSC via the A<br>interface. It is better to pass the GAD data as-is without de/encoding.<br><br>Change-Id: I7a9dd805a91b1ebb6353bde0cd169218acbf223c<br>---<br>M include/Makefile.am<br>A include/osmocom/gsm/gad.h<br>A include/osmocom/gsm/protocol/gsm_23_032.h<br>M src/gsm/Makefile.am<br>A src/gsm/gad.c<br>M src/gsm/libosmogsm.map<br>M tests/Makefile.am<br>A tests/gad/gad_test.c<br>A tests/gad/gad_test.ok<br>M tests/testsuite.at<br>10 files changed, 1,030 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/Makefile.am b/include/Makefile.am</span><br><span>index a6341f1..fc1eec3 100644</span><br><span>--- a/include/Makefile.am</span><br><span>+++ b/include/Makefile.am</span><br><span>@@ -92,6 +92,7 @@</span><br><span> osmocom/coding/gsm0503_interleaving.h \</span><br><span> osmocom/coding/gsm0503_coding.h \</span><br><span> osmocom/coding/gsm0503_amr_dtx.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmocom/gsm/gad.h \</span><br><span> osmocom/gsm/gsm0808.h \</span><br><span> osmocom/gsm/gsm29205.h \</span><br><span> osmocom/gsm/gsm0808_utils.h \</span><br><span>@@ -115,6 +116,7 @@</span><br><span> osmocom/gsm/l1sap.h \</span><br><span> osmocom/gsm/oap.h \</span><br><span> osmocom/gsm/oap_client.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmocom/gsm/protocol/gsm_23_032.h \</span><br><span> osmocom/gsm/protocol/gsm_03_40.h \</span><br><span> osmocom/gsm/protocol/gsm_03_41.h \</span><br><span> osmocom/gsm/protocol/gsm_04_08.h \</span><br><span>diff --git a/include/osmocom/gsm/gad.h b/include/osmocom/gsm/gad.h</span><br><span>new file mode 100644</span><br><span>index 0000000..57d0e37</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/gsm/gad.h</span><br><span>@@ -0,0 +1,190 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \addtogroup gad</span><br><span style="color: hsl(120, 100%, 40%);">+ * @{</span><br><span style="color: hsl(120, 100%, 40%);">+ * \file gad.h</span><br><span style="color: hsl(120, 100%, 40%);">+ * Message encoding and decoding for 3GPP TS 23.032 GAD: Universal Geographical Area Description.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Neels Hofmeyr <neels@hofmeyr.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_23_032.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad_ell_point {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Latitude in micro degrees (degrees * 1e6), -90'000'000 (S) .. 90'000'000 (N). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lat;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Longitude in micro degrees (degrees * 1e6), -180'000'000 (W) .. 180'000'000 (E). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lon;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad_ell_point_unc_circle {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Latitude in micro degrees (degrees * 1e6), -90'000'000 (S) .. 90'000'000 (N). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lat;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Longitude in micro degrees (degrees * 1e6), -180'000'000 (W) .. 180'000'000 (E). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lon;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Uncertainty circle radius in millimeters (m * 1e3), 0 .. 18'000'000. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t unc;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad_ell_point_unc_ellipse {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Latitude in micro degrees (degrees * 1e6), -90'000'000 (S) .. 90'000'000 (N). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lat;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Longitude in micro degrees (degrees * 1e6), -180'000'000 (W) .. 180'000'000 (E). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lon;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Uncertainty ellipsoid radius of major axis in millimeters, 0 .. 18'000'000.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Coding of uncertainty is non-linear, use osmo_gad_dec_unc(osmo_gad_enc_unc(val)) to clamp. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t unc_semi_major;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Uncertainty ellipsoid radius of minor axis in millimeters, 0 .. 18'000'000.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Coding of uncertainty is non-linear, use osmo_gad_dec_unc(osmo_gad_enc_unc(val)) to clamp. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t unc_semi_minor;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Major axis orientation in degrees (DEG), 0 (N) .. 90 (E) .. 179 (SSE). */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t major_ori;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Confidence in percent, 0 = no information, 1..100%, 101..128 = no information. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t confidence;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad_polygon {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t num_points;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_ell_point point[15];</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad_ell_point_alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! latitude in micro degrees (degrees * 1e6), -90'000'000 (S) .. 90'000'000 (N). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lat;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! longitude in micro degrees (degrees * 1e6), -180'000'000 (W) .. 180'000'000 (E). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lon;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Altitude in meters, -32767 (depth) .. 32767 (height) */</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t alt;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad_ell_point_alt_unc_ell {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! latitude in micro degrees (degrees * 1e6), -90'000'000 (S) .. 90'000'000 (N). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lat;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! longitude in micro degrees (degrees * 1e6), -180'000'000 (W) .. 180'000'000 (E). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lon;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Altitude in meters, -32767 (depth) .. 32767 (height) */</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t alt;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Uncertainty ellipsoid radius of major axis in millimeters, 0 .. 18'000'000.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Coding of uncertainty is non-linear, use osmo_gad_dec_unc(osmo_gad_enc_unc(val)) to clamp. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t unc_semi_major;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Uncertainty ellipsoid radius of minor axis in millimeters, 0 .. 18'000'000.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Coding of uncertainty is non-linear, use osmo_gad_dec_unc(osmo_gad_enc_unc(val)) to clamp. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t unc_semi_minor;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Major axis orientation in degrees (DEG), 0 (N) .. 90 (E) .. 179 (SSE). */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t major_ori;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Uncertainty altitude in millimeters, 0 .. 990'000.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Coding of uncertainty altitude is non-linear, and distinct from the non-altitude uncertainty coding. Use</span><br><span style="color: hsl(120, 100%, 40%);">+ * osmo_gad_dec_unc_alt(osmo_gad_enc_unc_alt(val)) to clamp. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t unc_alt;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Confidence in percent, 0 = no information, 1..100%, 101..128 = no information. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t confidence;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad_ell_arc {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! latitude in micro degrees (degrees * 1e6), -90'000'000 (S) .. 90'000'000 (N). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lat;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! longitude in micro degrees (degrees * 1e6), -180'000'000 (W) .. 180'000'000 (E). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lon;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! inner circle radius in mm (m * 1e3) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t inner_r;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Uncertainty circle radius in millimeters, 0 .. 18'000'000.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Coding of uncertainty is non-linear, use osmo_gad_dec_unc(osmo_gad_enc_unc(val)) to clamp. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t unc_r;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Offset angle of first arc edge in degrees from North clockwise (eastwards), 0..359.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Angle is coded in increments of 2 degrees. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t ofs_angle;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Included angle defining the angular width of the arc, in degrees clockwise, 1..360.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Angle is coded in increments of 2 degrees. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t incl_angle;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Confidence in percent, 0 = no information, 1..100%, 101..128 = no information. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t confidence;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad_ha_ell_point_alt_unc_ell {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! latitude in micro degrees (degrees * 1e6), -90'000'000 (S) .. 90'000'000 (N). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lat;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! longitude in micro degrees (degrees * 1e6), -180'000'000 (W) .. 180'000'000 (E). */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lon;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Altitude in millimeters, -500'000 (depth) .. 10'000'000 (height) */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t alt;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Uncertainty ellipsoid radius of major axis in millimeters, 0 .. 46'491.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Coding of high-accuracy uncertainty is non-linear, use osmo_gad_dec_ha_unc(osmo_gad_enc_ha_unc(val)) to</span><br><span style="color: hsl(120, 100%, 40%);">+ * clamp. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t unc_semi_major;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Uncertainty ellipsoid radius of minor axis in millimeters, 0 .. 46'491.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Coding of high-accuracy uncertainty is non-linear, use osmo_gad_dec_ha_unc(osmo_gad_enc_ha_unc(val)) to</span><br><span style="color: hsl(120, 100%, 40%);">+ * clamp. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t unc_semi_minor;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Major axis orientation in degrees (DEG), 0 (N) .. 90 (E) .. 179 (SSE). */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t major_ori;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Horizontal confidence in percent, 0 = no information, 1..100%, 101..128 = no information. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t h_confidence;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! High-Accuracy uncertainty altitude */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t unc_alt;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Vertical confidence in percent, 0 = no information, 1..100%, 101..128 = no information. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t v_confidence;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad {</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gad_type type;</span><br><span style="color: hsl(120, 100%, 40%);">+ union {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_ell_point ell_point;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_ell_point_unc_circle ell_point_unc_circle;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_ell_point_unc_ellipse ell_point_unc_ellipse;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_polygon polygon;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_ell_point_alt ell_point_alt;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_ell_point_alt_unc_ell ell_point_alt_unc_ell;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_ell_arc ell_arc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_ell_point_unc_ellipse ha_ell_point_unc_ellipse;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_ha_ell_point_alt_unc_ell ha_ell_point_alt_unc_ell;</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad_err {</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gad_type type;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *logmsg;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string osmo_gad_type_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *osmo_gad_type_name(enum gad_type val)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return get_value_string(osmo_gad_type_names, val); }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_raw_write(struct msgb *msg, const union gad_raw *gad_raw);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_raw_read(union gad_raw *gad_raw, struct osmo_gad_err **err, void *err_ctx, const uint8_t *data, uint8_t len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_enc(union gad_raw *gad_raw, const struct osmo_gad *gad);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_dec(struct osmo_gad *gad, struct osmo_gad_err **err, void *err_ctx, const union gad_raw *gad_raw);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_to_str_buf(char *buf, size_t buflen, const struct osmo_gad *gad);</span><br><span style="color: hsl(120, 100%, 40%);">+char *osmo_gad_to_str_c(void *ctx, const struct osmo_gad *gad);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t osmo_gad_enc_lat(int32_t deg_1e6);</span><br><span style="color: hsl(120, 100%, 40%);">+int32_t osmo_gad_dec_lat(uint32_t lat);</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t osmo_gad_enc_lon(int32_t deg_1e6);</span><br><span style="color: hsl(120, 100%, 40%);">+int32_t osmo_gad_dec_lon(uint32_t lon);</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t osmo_gad_enc_unc(uint32_t mm);</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t osmo_gad_dec_unc(uint8_t unc);</span><br><span style="color: hsl(120, 100%, 40%);">+/*! @} */</span><br><span>diff --git a/include/osmocom/gsm/protocol/gsm_23_032.h b/include/osmocom/gsm/protocol/gsm_23_032.h</span><br><span>new file mode 100644</span><br><span>index 0000000..5be98a2</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_23_032.h</span><br><span>@@ -0,0 +1,172 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \defgroup gad 3GPP TS 23.032 GAD: Universal Geographical Area Description.</span><br><span style="color: hsl(120, 100%, 40%);">+ * @{</span><br><span style="color: hsl(120, 100%, 40%);">+ * \file gsm_23_032.h</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Neels Hofmeyr <neels@hofmeyr.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/endian.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum gad_type {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Ellipsoid point */</span><br><span style="color: hsl(120, 100%, 40%);">+ GAD_TYPE_ELL_POINT = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Ellipsoid point with uncertainty circle. */</span><br><span style="color: hsl(120, 100%, 40%);">+ GAD_TYPE_ELL_POINT_UNC_CIRCLE = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Ellipsoid point with uncertainty ellipse. */</span><br><span style="color: hsl(120, 100%, 40%);">+ GAD_TYPE_ELL_POINT_UNC_ELLIPSE = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ GAD_TYPE_POLYGON = 5,</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Ellipsoid point with altitude. */</span><br><span style="color: hsl(120, 100%, 40%);">+ GAD_TYPE_ELL_POINT_ALT = 8,</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Ellipsoid point with altitude and uncertainty ellipsoid. */</span><br><span style="color: hsl(120, 100%, 40%);">+ GAD_TYPE_ELL_POINT_ALT_UNC_ELL = 9,</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Ellipsoid arc */</span><br><span style="color: hsl(120, 100%, 40%);">+ GAD_TYPE_ELL_ARC = 10,</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! High accuracy ellipsoid point with uncertainty ellipse. */</span><br><span style="color: hsl(120, 100%, 40%);">+ GAD_TYPE_HA_ELL_POINT_UNC_ELLIPSE = 11,</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! High accuracy ellipsoid point with altitude and uncertainty ellipsoid. */</span><br><span style="color: hsl(120, 100%, 40%);">+ GAD_TYPE_HA_ELL_POINT_ALT_UNC_ELL = 12,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_head {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t spare:4,</span><br><span style="color: hsl(120, 100%, 40%);">+ type:4;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_ell_point {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lat[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lon[3];</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_ell_point_unc_circle {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_UNC_CIRCLE */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lat[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lon[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare2:1;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_ell_point_unc_ellipse {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_UNC_ELLIPSE */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lat[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lon[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_semi_major:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare1:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_semi_minor:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare2:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t major_ori;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t confidence:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare3:1;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_polygon {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t num_points:4;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t type:4; /*!< type = GAD_TYPE_POLYGON */</span><br><span style="color: hsl(120, 100%, 40%);">+ } h;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lat[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lon[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ } point[15];</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_ell_point_alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_ALT */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lat[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lon[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t alt[2];</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_ell_point_alt_unc_ell {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_ALT_UNC_ELL */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lat[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lon[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t alt[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_semi_major:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare1:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_semi_minor:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare2:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t major_ori;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_alt:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare3:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t confidence:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare4:1;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_ell_arc {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_ARC */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lat[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lon[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t inner_r[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_r:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare1:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ofs_angle;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t incl_angle;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t confidence:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare2:1;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_ha_ell_point_unc_ell {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_head h; /*!< type = GAD_TYPE_HA_ELL_POINT_UNC_ELLIPSE */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lat[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lon[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t alt[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_semi_major;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_semi_minor;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t major_ori;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t confidence:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare1:1;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gad_raw_ha_ell_point_alt_unc_ell {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_head h; /*!< type = GAD_TYPE_HA_ELL_POINT_ALT_UNC_ELL */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lat[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lon[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t alt[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_semi_major;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_semi_minor;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t major_ori;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t h_confidence:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare1:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc_alt;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t v_confidence:7,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare2:1;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! GAD PDU in network-byte-order according to 3GPP TS 23.032 GAD: Universal Geographical Area Description. */</span><br><span style="color: hsl(120, 100%, 40%);">+union gad_raw {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_head h;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_ell_point ell_point;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_ell_point_unc_circle ell_point_unc_circle;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_ell_point_unc_ellipse ell_point_unc_ellipse;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_polygon polygon;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_ell_point_alt ell_point_alt;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_ell_point_alt_unc_ell ell_point_alt_unc_ell;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_ell_arc ell_arc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_ha_ell_point_unc_ell ha_ell_point_unc_ell;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gad_raw_ha_ell_point_alt_unc_ell ha_ell_point_alt_unc_ell;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! @} */</span><br><span>diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am</span><br><span>index c5232ab..4fa940b 100644</span><br><span>--- a/src/gsm/Makefile.am</span><br><span>+++ b/src/gsm/Makefile.am</span><br><span>@@ -32,7 +32,8 @@</span><br><span> milenage/milenage.c gan.c ipa.c gsm0341.c apn.c \</span><br><span> gsup.c gsup_sms.c gprs_gea.c gsm0503_conv.c oap.c gsm0808_utils.c \</span><br><span> gsm23003.c gsm23236.c mncc.c bts_features.c oap_client.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gsm29118.c gsm48_rest_octets.c cbsp.c gsm48049.c i460_mux.c</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm29118.c gsm48_rest_octets.c cbsp.c gsm48049.c i460_mux.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gad.c</span><br><span> libgsmint_la_LDFLAGS = -no-undefined</span><br><span> libgsmint_la_LIBADD = $(top_builddir)/src/libosmocore.la</span><br><span> </span><br><span>diff --git a/src/gsm/gad.c b/src/gsm/gad.c</span><br><span>new file mode 100644</span><br><span>index 0000000..3ec28f9</span><br><span>--- /dev/null</span><br><span>+++ b/src/gsm/gad.c</span><br><span>@@ -0,0 +1,491 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* 3GPP TS 23.032 GAD: Universal Geographical Area Description */</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Neels Hofmeyr <neels@hofmeyr.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gad.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \addtogroup gad</span><br><span style="color: hsl(120, 100%, 40%);">+ * @{</span><br><span style="color: hsl(120, 100%, 40%);">+ * \file gad.c</span><br><span style="color: hsl(120, 100%, 40%);">+ * Message encoding and decoding for 3GPP TS 23.032 GAD: Universal Geographical Area Description.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string osmo_gad_type_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { GAD_TYPE_ELL_POINT, "Ellipsoid-point" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GAD_TYPE_ELL_POINT_UNC_CIRCLE, "Ellipsoid-point-with-uncertainty-circle" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GAD_TYPE_ELL_POINT_UNC_ELLIPSE, "Ellipsoid-point-with-uncertainty-ellipse" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GAD_TYPE_POLYGON, "Polygon" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GAD_TYPE_ELL_POINT_ALT, "Ellipsoid-point-with-altitude" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GAD_TYPE_ELL_POINT_ALT_UNC_ELL, "Ellipsoid-point-with-altitude-and-uncertainty-ellipsoid" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GAD_TYPE_ELL_ARC, "Ellipsoid-arc" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GAD_TYPE_HA_ELL_POINT_UNC_ELLIPSE, "High-accuracy-ellipsoid-point-with-uncertainty-ellipse" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GAD_TYPE_HA_ELL_POINT_ALT_UNC_ELL, "High-accuracy-ellipsoid-point-with-altitude-and-uncertainty-ellipsoid" },</span><br><span style="color: hsl(120, 100%, 40%);">+ {}</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Encode a latitude value according to 3GPP TS 23.032.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Useful to clamp a latitude to an actually encodable accuracy:</span><br><span style="color: hsl(120, 100%, 40%);">+ * set_lat = osmo_gad_dec_lat(osmo_gad_enc_lat(orig_lat));</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] deg_1e6 Latitude in micro degrees (degrees * 1e6), -90'000'000 (S) .. 90'000'000 (N).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns encoded latitude in host-byte-order (24bit).</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t osmo_gad_enc_lat(int32_t deg_1e6)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* N <= ((2**23)/90)*X < N+1</span><br><span style="color: hsl(120, 100%, 40%);">+ * N: encoded latitude</span><br><span style="color: hsl(120, 100%, 40%);">+ * X: latitude in degrees</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t sign = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int64_t x;</span><br><span style="color: hsl(120, 100%, 40%);">+ deg_1e6 = OSMO_MAX(-90000000, OSMO_MIN(90000000, deg_1e6));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (deg_1e6 < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sign = 1 << 23;</span><br><span style="color: hsl(120, 100%, 40%);">+ deg_1e6 = -deg_1e6;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ x = deg_1e6;</span><br><span style="color: hsl(120, 100%, 40%);">+ x <<= 23;</span><br><span style="color: hsl(120, 100%, 40%);">+ x += (1 << 23) - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ x /= 90 * 1000000;</span><br><span style="color: hsl(120, 100%, 40%);">+ return sign | (x & 0x7fffff);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Decode a latitude value according to 3GPP TS 23.032.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Useful to clamp a latitude to an actually encodable accuracy:</span><br><span style="color: hsl(120, 100%, 40%);">+ * set_lat = osmo_gad_dec_lat(osmo_gad_enc_lat(orig_lat));</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] lat encoded latitude in host-byte-order (24bit).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns decoded latitude in micro degrees (degrees * 1e6), -90'000'000 (S) .. 90'000'000 (N).</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int32_t osmo_gad_dec_lat(uint32_t lat)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int64_t sign = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int64_t x;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lat & 0x800000) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sign = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ lat &= 0x7fffff;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ x = lat;</span><br><span style="color: hsl(120, 100%, 40%);">+ x *= 90 * 1000000;</span><br><span style="color: hsl(120, 100%, 40%);">+ x >>= 23;</span><br><span style="color: hsl(120, 100%, 40%);">+ x *= sign;</span><br><span style="color: hsl(120, 100%, 40%);">+ return x;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Encode a longitude value according to 3GPP TS 23.032.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Useful to clamp a longitude to an actually encodable accuracy:</span><br><span style="color: hsl(120, 100%, 40%);">+ * set_lon = osmo_gad_dec_lon(osmo_gad_enc_lon(orig_lon));</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] deg_1e6 Longitude in micro degrees (degrees * 1e6), -180'000'000 (W) .. 180'000'000 (E).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns encoded longitude in host-byte-order (24bit).</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t osmo_gad_enc_lon(int32_t deg_1e6)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* -180 .. 180 degrees mapped to a signed 24 bit integer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * N <= ((2**24)/360) * X < N+1</span><br><span style="color: hsl(120, 100%, 40%);">+ * N: encoded longitude</span><br><span style="color: hsl(120, 100%, 40%);">+ * X: longitude in degrees</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ int64_t x;</span><br><span style="color: hsl(120, 100%, 40%);">+ deg_1e6 = OSMO_MAX(-180000000, OSMO_MIN(180000000, deg_1e6));</span><br><span style="color: hsl(120, 100%, 40%);">+ x = deg_1e6;</span><br><span style="color: hsl(120, 100%, 40%);">+ x *= (1 << 24);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (deg_1e6 >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ x += (1 << 24) - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ x -= (1 << 24) - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ x /= 360 * 1000000;</span><br><span style="color: hsl(120, 100%, 40%);">+ return (uint32_t)(x & 0xffffff);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Decode a longitude value according to 3GPP TS 23.032.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Normally, encoding and decoding is done via osmo_gad_enc() and osmo_gad_dec() for entire PDUs. But calling this</span><br><span style="color: hsl(120, 100%, 40%);">+ * directly can be useful to clamp a longitude to an actually encodable accuracy:</span><br><span style="color: hsl(120, 100%, 40%);">+ * int32_t set_lon = osmo_gad_dec_lon(osmo_gad_enc_lon(orig_lon));</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] lon Encoded longitude.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns Longitude in micro degrees (degrees * 1e6), -180'000'000 (W) .. 180'000'000 (E).</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int32_t osmo_gad_dec_lon(uint32_t lon)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* -180 .. 180 degrees mapped to a signed 24 bit integer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * N <= ((2**24)/360) * X < N+1</span><br><span style="color: hsl(120, 100%, 40%);">+ * N: encoded longitude</span><br><span style="color: hsl(120, 100%, 40%);">+ * X: longitude in degrees</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t slon;</span><br><span style="color: hsl(120, 100%, 40%);">+ int64_t x;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lon & 0x800000) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* make the 24bit negative number to a 32bit negative number */</span><br><span style="color: hsl(120, 100%, 40%);">+ slon = lon | 0xff000000;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ slon = lon;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ x = slon;</span><br><span style="color: hsl(120, 100%, 40%);">+ x *= 360 * 1000000;</span><br><span style="color: hsl(120, 100%, 40%);">+ x /= (1 << 24);</span><br><span style="color: hsl(120, 100%, 40%);">+ return x;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * r = C((1+x)**K - 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ * C = 10, x = 0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * def r(k):</span><br><span style="color: hsl(120, 100%, 40%);">+ * return 10.*(((1+0.1)**k) -1 )</span><br><span style="color: hsl(120, 100%, 40%);">+ * for k in range(128):</span><br><span style="color: hsl(120, 100%, 40%);">+ * print('%d,' % (r(k) * 1000.))</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t table_uncertainty_1e3[128] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, 1000, 2100, 3310, 4641, 6105, 7715, 9487, 11435, 13579, 15937, 18531, 21384, 24522, 27974, 31772, 35949,</span><br><span style="color: hsl(120, 100%, 40%);">+ 40544, 45599, 51159, 57274, 64002, 71402, 79543, 88497, 98347, 109181, 121099, 134209, 148630, 164494, 181943,</span><br><span style="color: hsl(120, 100%, 40%);">+ 201137, 222251, 245476, 271024, 299126, 330039, 364043, 401447, 442592, 487851, 537636, 592400, 652640, 718904,</span><br><span style="color: hsl(120, 100%, 40%);">+ 791795, 871974, 960172, 1057189, 1163908, 1281299, 1410429, 1552472, 1708719, 1880591, 2069650, 2277615,</span><br><span style="color: hsl(120, 100%, 40%);">+ 2506377, 2758014, 3034816, 3339298, 3674227, 4042650, 4447915, 4893707, 5384077, 5923485, 6516834, 7169517,</span><br><span style="color: hsl(120, 100%, 40%);">+ 7887469, 8677216, 9545938, 10501531, 11552685, 12708953, 13980849, 15379933, 16918927, 18611820, 20474002,</span><br><span style="color: hsl(120, 100%, 40%);">+ 22522402, 24775642, 27254206, 29980627, 32979690, 36278659, 39907525, 43899277, 48290205, 53120226, 58433248,</span><br><span style="color: hsl(120, 100%, 40%);">+ 64277573, 70706330, 77777964, 85556760, 94113436, 103525780, 113879358, 125268293, 137796123, 151576735,</span><br><span style="color: hsl(120, 100%, 40%);">+ 166735409, 183409950, 201751945, 221928139, 244121953, 268535149, 295389664, 324929630, 357423593, 393166952,</span><br><span style="color: hsl(120, 100%, 40%);">+ 432484648, 475734112, 523308524, 575640376, 633205414, 696526955, 766180651, 842799716, 927080688, 1019789756,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1121769732, 1233947705, 1357343476, 1493078824, 1642387706, 1806627477,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Decode an uncertainty circle value according to 3GPP TS 23.032.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Useful to clamp a value to an actually encodable accuracy:</span><br><span style="color: hsl(120, 100%, 40%);">+ * set_unc = osmo_gad_dec_unc(osmo_gad_enc_unc(orig_unc));</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] unc Encoded uncertainty value.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns Uncertainty value in millimeters.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t osmo_gad_dec_unc(uint8_t unc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return table_uncertainty_1e3[unc & 0x7f];</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Encode an uncertainty circle value according to 3GPP TS 23.032.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Normally, encoding and decoding is done via osmo_gad_enc() and osmo_gad_dec() for entire PDUs. But calling this</span><br><span style="color: hsl(120, 100%, 40%);">+ * directly can be useful to clamp a value to an actually encodable accuracy:</span><br><span style="color: hsl(120, 100%, 40%);">+ * uint32_t set_unc = osmo_gad_dec_unc(osmo_gad_enc_unc(orig_unc));</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] mm Uncertainty value in millimeters.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns Encoded uncertainty value.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t osmo_gad_enc_unc(uint32_t mm)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (unc = 0; unc < ARRAY_SIZE(table_uncertainty_1e3); unc++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (table_uncertainty_1e3[unc] > mm)</span><br><span style="color: hsl(120, 100%, 40%);">+ return unc - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 127;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* So far we don't encode a high-accuracy uncertainty anywhere, so these static items would flag as compiler warnings</span><br><span style="color: hsl(120, 100%, 40%);">+ * for unused items. As soon as any HA items get used, remove this ifdef. */</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef GAD_FUTURE</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * r = C((1+x)**K - 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ * C = 0.3, x = 0.02</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * def r(k):</span><br><span style="color: hsl(120, 100%, 40%);">+ * return 0.3*(((1+0.02)**k) -1 )</span><br><span style="color: hsl(120, 100%, 40%);">+ * for k in range(256):</span><br><span style="color: hsl(120, 100%, 40%);">+ * print('%d,' % (r(k) * 1000.))</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t table_ha_uncertainty_1e3[256] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, 6, 12, 18, 24, 31, 37, 44, 51, 58, 65, 73, 80, 88, 95, 103, 111, 120, 128, 137, 145, 154, 163, 173, 182, 192,</span><br><span style="color: hsl(120, 100%, 40%);">+ 202, 212, 222, 232, 243, 254, 265, 276, 288, 299, 311, 324, 336, 349, 362, 375, 389, 402, 417, 431, 445, 460,</span><br><span style="color: hsl(120, 100%, 40%);">+ 476, 491, 507, 523, 540, 556, 574, 591, 609, 627, 646, 665, 684, 703, 724, 744, 765, 786, 808, 830, 853, 876,</span><br><span style="color: hsl(120, 100%, 40%);">+ 899, 923, 948, 973, 998, 1024, 1051, 1078, 1105, 1133, 1162, 1191, 1221, 1252, 1283, 1314, 1347, 1380, 1413,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1447, 1482, 1518, 1554, 1592, 1629, 1668, 1707, 1748, 1788, 1830, 1873, 1916, 1961, 2006, 2052, 2099, 2147,</span><br><span style="color: hsl(120, 100%, 40%);">+ 2196, 2246, 2297, 2349, 2402, 2456, 2511, 2567, 2625, 2683, 2743, 2804, 2866, 2929, 2994, 3060, 3127, 3195,</span><br><span style="color: hsl(120, 100%, 40%);">+ 3265, 3336, 3409, 3483, 3559, 3636, 3715, 3795, 3877, 3961, 4046, 4133, 4222, 4312, 4404, 4498, 4594, 4692,</span><br><span style="color: hsl(120, 100%, 40%);">+ 4792, 4894, 4998, 5104, 5212, 5322, 5435, 5549, 5666, 5786, 5907, 6032, 6158, 6287, 6419, 6554, 6691, 6830,</span><br><span style="color: hsl(120, 100%, 40%);">+ 6973, 7119, 7267, 7418, 7573, 7730, 7891, 8055, 8222, 8392, 8566, 8743, 8924, 9109, 9297, 9489, 9685, 9884,</span><br><span style="color: hsl(120, 100%, 40%);">+ 10088, 10296, 10508, 10724, 10944, 11169, 11399, 11633, 11871, 12115, 12363, 12616, 12875, 13138, 13407, 13681,</span><br><span style="color: hsl(120, 100%, 40%);">+ 13961, 14246, 14537, 14834, 15136, 15445, 15760, 16081, 16409, 16743, 17084, 17431, 17786, 18148, 18517, 18893,</span><br><span style="color: hsl(120, 100%, 40%);">+ 19277, 19669, 20068, 20475, 20891, 21315, 21747, 22188, 22638, 23096, 23564, 24042, 24529, 25025, 25532, 26048,</span><br><span style="color: hsl(120, 100%, 40%);">+ 26575, 27113, 27661, 28220, 28791, 29372, 29966, 30571, 31189, 31818, 32461, 33116, 33784, 34466, 35161, 35871,</span><br><span style="color: hsl(120, 100%, 40%);">+ 36594, 37332, 38085, 38852, 39635, 40434, 41249, 42080, 42927, 43792, 44674, 45573, 46491,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t osmo_gad_dec_ha_unc(uint8_t unc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return table_uncertainty_1e3[unc];</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static uint8_t osmo_gad_enc_ha_unc(uint32_t mm)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t unc;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (unc = 0; unc < ARRAY_SIZE(table_ha_uncertainty_1e3); unc++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (table_uncertainty_1e3[unc] > mm)</span><br><span style="color: hsl(120, 100%, 40%);">+ return unc - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 255;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* GAD_FUTURE */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Return error code, and, if required, allocate and populate struct osmo_gad_err. */</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEC_ERR(RC, TYPE, fmt, args...) do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (err) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ *err = talloc_zero(err_ctx, struct osmo_gad_err); \</span><br><span style="color: hsl(120, 100%, 40%);">+ **err = (struct osmo_gad_err){ \</span><br><span style="color: hsl(120, 100%, 40%);">+ .rc = (RC), \</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = (TYPE), \</span><br><span style="color: hsl(120, 100%, 40%);">+ .logmsg = talloc_asprintf(*err, "Error decoding GAD%s%s: " fmt, \</span><br><span style="color: hsl(120, 100%, 40%);">+ (TYPE) >= 0 ? " " : "", \</span><br><span style="color: hsl(120, 100%, 40%);">+ (TYPE) >= 0 ? osmo_gad_type_name(TYPE) : "", ##args), \</span><br><span style="color: hsl(120, 100%, 40%);">+ }; \</span><br><span style="color: hsl(120, 100%, 40%);">+ } \</span><br><span style="color: hsl(120, 100%, 40%);">+ return RC; \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int osmo_gad_enc_ell_point_unc_circle(struct gad_raw_ell_point_unc_circle *raw, const struct osmo_gad_ell_point_unc_circle *v)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (v->lat < -90000000 || v->lat > 90000000)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (v->lon < -180000000 || v->lon > 180000000)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ *raw = (struct gad_raw_ell_point_unc_circle){</span><br><span style="color: hsl(120, 100%, 40%);">+ .h = { .type = GAD_TYPE_ELL_POINT_UNC_CIRCLE },</span><br><span style="color: hsl(120, 100%, 40%);">+ .unc = osmo_gad_enc_unc(v->unc),</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_store32be_ext(osmo_gad_enc_lat(v->lat), raw->lat, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_store32be_ext(osmo_gad_enc_lon(v->lon), raw->lon, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(&raw);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int osmo_gad_dec_ell_point_unc_circle(struct osmo_gad_ell_point_unc_circle *v,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_err **err, void *err_ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gad_raw_ell_point_unc_circle *raw)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Load 24bit big endian */</span><br><span style="color: hsl(120, 100%, 40%);">+ v->lat = osmo_gad_dec_lat(osmo_load32be_ext_2(raw->lat, 3));</span><br><span style="color: hsl(120, 100%, 40%);">+ v->lon = osmo_gad_dec_lon(osmo_load32be_ext_2(raw->lon, 3));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (raw->spare2)</span><br><span style="color: hsl(120, 100%, 40%);">+ DEC_ERR(-EINVAL, raw->h.type, "Bit 8 of Uncertainty code should be zero");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ v->unc = osmo_gad_dec_unc(raw->unc);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int osmo_gad_raw_len(const union gad_raw *gad_raw)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gad_raw->h.type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_POINT:</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(gad_raw->ell_point);</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_POINT_UNC_CIRCLE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(gad_raw->ell_point_unc_circle);</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_POINT_UNC_ELLIPSE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(gad_raw->ell_point_unc_ellipse);</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_POLYGON:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gad_raw->polygon.h.num_points < 3)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(gad_raw->polygon.h)</span><br><span style="color: hsl(120, 100%, 40%);">+ + gad_raw->polygon.h.num_points * sizeof(gad_raw->polygon.point[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_POINT_ALT:</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(gad_raw->ell_point_alt);</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_POINT_ALT_UNC_ELL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(gad_raw->ell_point_alt_unc_ell);</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_ARC:</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(gad_raw->ell_arc);</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_HA_ELL_POINT_UNC_ELLIPSE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(gad_raw->ha_ell_point_unc_ell);</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_HA_ELL_POINT_ALT_UNC_ELL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return sizeof(gad_raw->ha_ell_point_alt_unc_ell);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Append a GAD PDU to the msgb.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Write the correct number of bytes depending on the GAD type and possibly on variable length attributes.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] msg Append to this msgb.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] gad_raw GAD data to write.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns number of bytes appended to msgb, or negative on failure.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_raw_write(struct msgb *msg, const union gad_raw *gad_raw)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int len;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *dst;</span><br><span style="color: hsl(120, 100%, 40%);">+ len = osmo_gad_raw_len(gad_raw);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (len < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return len;</span><br><span style="color: hsl(120, 100%, 40%);">+ dst = msgb_put(msg, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(dst, (void*)gad_raw, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return len;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Read a GAD PDU and validate structure.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Memcpy from data to gad_raw struct, and validate correct length depending on the GAD type and possibly on variable</span><br><span style="color: hsl(120, 100%, 40%);">+ * length attributes.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] gad_raw Copy GAD PDU here.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] err Returned pointer to error info, dynamically allocated; NULL to not return any.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] err_ctx Talloc context to allocate err from, if required.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] data Encoded GAD bytes buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] len Length of data in bytes.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, negative on error. If returning negative and err was non-NULL, *err is guaranteed to point to</span><br><span style="color: hsl(120, 100%, 40%);">+ * an allocated struct osmo_gad_err.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_raw_read(union gad_raw *gad_raw, struct osmo_gad_err **err, void *err_ctx, const uint8_t *data, uint8_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int gad_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ const union gad_raw *src;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (err)</span><br><span style="color: hsl(120, 100%, 40%);">+ *err = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (len < sizeof(src->h))</span><br><span style="color: hsl(120, 100%, 40%);">+ DEC_ERR(-EINVAL, -1, "GAD data too short for header (%u bytes)", len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ src = (void*)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ gad_len = osmo_gad_raw_len(src);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gad_len < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ DEC_ERR(-EINVAL, src->h.type, "GAD data invalid (rc=%d)", gad_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gad_len != len)</span><br><span style="color: hsl(120, 100%, 40%);">+ DEC_ERR(-EINVAL, src->h.type, "GAD data with unexpected length: expected %d bytes, got %u",</span><br><span style="color: hsl(120, 100%, 40%);">+ gad_len, len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy((void*)gad_raw, data, gad_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Write GAD values with consistent units to raw GAD PDU representation.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] gad_raw Write to this buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] gad GAD values to encode.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns number of bytes written, or negative on failure.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_enc(union gad_raw *gad_raw, const struct osmo_gad *gad)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gad->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_POINT_UNC_CIRCLE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gad_enc_ell_point_unc_circle(&gad_raw->ell_point_unc_circle, &gad->ell_point_unc_circle);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Decode GAD raw PDU to values with consistent units.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] gad Decoded GAD values are written here.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] err Returned pointer to error info, dynamically allocated; NULL to not return any.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] err_ctx Talloc context to allocate err from, if required.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] raw Raw GAD data in network-byte-order.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, negative on error. If returning negative and err was non-NULL, *err is guaranteed to point to</span><br><span style="color: hsl(120, 100%, 40%);">+ * an allocated struct osmo_gad_err.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_dec(struct osmo_gad *gad, struct osmo_gad_err **err, void *err_ctx, const union gad_raw *raw)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *gad = (struct osmo_gad){</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = raw->h.type,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (raw->h.type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_POINT_UNC_CIRCLE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gad_dec_ell_point_unc_circle(&gad->ell_point_unc_circle, err, err_ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+ &raw->ell_point_unc_circle);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ DEC_ERR(-ENOTSUP, raw->h.type, "unsupported GAD type");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Return a human readable representation of a raw GAD PDU.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Convert to GAD values and feed the result to osmo_gad_to_str_buf().</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] buf Buffer to write string to.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buflen sizeof(buf).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] gad Location data.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns number of chars that would be written, like snprintf().</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_raw_to_str_buf(char *buf, size_t buflen, const union gad_raw *raw)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad gad;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_gad_dec(&gad, NULL, NULL, raw)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "invalid");</span><br><span style="color: hsl(120, 100%, 40%);">+ return sb.chars_needed;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gad_to_str_buf(buf, buflen, &gad);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Return a human readable representation of a raw GAD PDU.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Convert to GAD values and feed the result to osmo_gad_to_str_buf().</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ctx Talloc ctx to allocate string buffer from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] raw GAD data in network-byte-order.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns resulting string, dynamically allocated.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+char *osmo_gad_raw_to_str_c(void *ctx, const union gad_raw *raw)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_NAME_C_IMPL(ctx, 128, "ERROR", osmo_gad_raw_to_str_buf, raw)</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Return a human readable representation of GAD (location estimate) values.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] buf Buffer to write string to.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buflen sizeof(buf).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] gad Location data.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns number of chars that would be written, like snprintf().</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gad_to_str_buf(char *buf, size_t buflen, const struct osmo_gad *gad)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gad) {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "null");</span><br><span style="color: hsl(120, 100%, 40%);">+ return sb.chars_needed;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "%s{", osmo_gad_type_name(gad->type));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gad->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_POINT:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "lat=");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_APPEND(sb, osmo_int_to_float_str_buf, gad->ell_point.lat, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, ",lon=");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_APPEND(sb, osmo_int_to_float_str_buf, gad->ell_point.lon, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case GAD_TYPE_ELL_POINT_UNC_CIRCLE:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "lat=");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_APPEND(sb, osmo_int_to_float_str_buf, gad->ell_point_unc_circle.lat, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, ",lon=");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_APPEND(sb, osmo_int_to_float_str_buf, gad->ell_point_unc_circle.lon, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, ",unc=");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_APPEND(sb, osmo_int_to_float_str_buf, gad->ell_point_unc_circle.unc, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "m");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "to-str-not-implemented");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "}");</span><br><span style="color: hsl(120, 100%, 40%);">+ return sb.chars_needed;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Return a human readable representation of GAD (location estimate) values.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ctx Talloc ctx to allocate string buffer from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] val Value to convert to float.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns resulting string, dynamically allocated.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+char *osmo_gad_to_str_c(void *ctx, const struct osmo_gad *gad)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_NAME_C_IMPL(ctx, 128, "ERROR", osmo_gad_to_str_buf, gad)</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! @} */</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 4ece107..a31f73a 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -705,5 +705,16 @@</span><br><span> osmo_nri_ranges_to_str_buf;</span><br><span> osmo_nri_ranges_to_str_c;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_enc;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_dec;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_to_str_buf;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_to_str_c;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_enc_lat;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_dec_lat;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_enc_lon;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_dec_lon;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_enc_unc;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_dec_unc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> local: *;</span><br><span> };</span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index 2d0cf93..c4e6b9f 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -38,6 +38,7 @@</span><br><span> dtx/dtx_gsm0503_test \</span><br><span> i460_mux/i460_mux_test \</span><br><span> bitgen/bitgen_test \</span><br><span style="color: hsl(120, 100%, 40%);">+ gad/gad_test \</span><br><span> $(NULL)</span><br><span> </span><br><span> if ENABLE_MSGFILE</span><br><span>@@ -281,6 +282,9 @@</span><br><span> bitgen_bitgen_test_SOURCES = bitgen/bitgen_test.c</span><br><span> bitgen_bitgen_test_LDADD = $(LDADD)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+gad_gad_test_SOURCES = gad/gad_test.c</span><br><span style="color: hsl(120, 100%, 40%);">+gad_gad_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/gad.o</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # The `:;' works around a Bash 3.2 bug when the output is not writeable.</span><br><span> $(srcdir)/package.m4: $(top_srcdir)/configure.ac</span><br><span> :;{ \</span><br><span>@@ -361,6 +365,7 @@</span><br><span> exec/exec_test.ok exec/exec_test.err \</span><br><span> i460_mux/i460_mux_test.ok \</span><br><span> bitgen/bitgen_test.ok \</span><br><span style="color: hsl(120, 100%, 40%);">+ gad/gad_test.ok \</span><br><span> $(NULL)</span><br><span> </span><br><span> if ENABLE_LIBSCTP</span><br><span>diff --git a/tests/gad/gad_test.c b/tests/gad/gad_test.c</span><br><span>new file mode 100644</span><br><span>index 0000000..ca8c4fa</span><br><span>--- /dev/null</span><br><span>+++ b/tests/gad/gad_test.c</span><br><span>@@ -0,0 +1,143 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdio.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gad.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void test_gad_lat_lon_dec_enc_stability()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t lat_enc;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t lon_enc;</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("--- %s\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (lat_enc = 0x0; lat_enc <= 0xffffff; lat_enc++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lat_dec = osmo_gad_dec_lat(lat_enc);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t enc2 = osmo_gad_enc_lat(lat_dec);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t want_enc = lat_enc;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* "-0" == 0, because the highest bit is defined as a sign bit. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lat_enc == 0x800000)</span><br><span style="color: hsl(120, 100%, 40%);">+ want_enc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (enc2 != want_enc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("ERR: lat=%u --> %d --> %u\n", lat_enc, lat_dec, enc2);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%d -> %u\n", lat_dec + 1, osmo_gad_enc_lat(lat_dec + 1));</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_gad_dec_lat() -> osmo_gad_enc_lat() of %u values successful\n", lat_enc);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (lon_enc = 0; lon_enc <= 0xffffff; lon_enc++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t lon_dec = osmo_gad_dec_lon(lon_enc);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t enc2 = osmo_gad_enc_lon(lon_dec);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t want_enc = lon_enc;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (enc2 != want_enc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("ERR: lon=%u 0x%x --> %d --> %u\n", lon_enc, lon_enc, lon_dec, enc2);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%d -> %u\n", lon_dec + 1, osmo_gad_enc_lon(lon_dec + 1));</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%d -> %u\n", lon_dec - 1, osmo_gad_enc_lon(lon_dec - 1));</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_gad_dec_lon() -> osmo_gad_enc_lon() of %u values successful\n", lon_enc);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gad gad_test_values[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = GAD_TYPE_ELL_POINT_UNC_CIRCLE,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ell_point_unc_circle = {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Values rounded to the nearest encodable value, for test result matching */</span><br><span style="color: hsl(120, 100%, 40%);">+ .lat = 23000006,</span><br><span style="color: hsl(120, 100%, 40%);">+ .lon = 42000002,</span><br><span style="color: hsl(120, 100%, 40%);">+ .unc = 442592,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void test_gad_enc_dec()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("--- %s\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(gad_test_values); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad *t = &gad_test_values[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc(1024, __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ union gad_raw raw_write;</span><br><span style="color: hsl(120, 100%, 40%);">+ union gad_raw raw_read;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad dec_pdu;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad_err *err;</span><br><span style="color: hsl(120, 100%, 40%);">+ void *loop_ctx = msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gad_enc(&raw_write, t);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%d] %s: ERROR: osmo_gad_enc() failed\n", i, osmo_gad_type_name(t->type));</span><br><span style="color: hsl(120, 100%, 40%);">+ goto loop_end;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gad_raw_write(msg, &raw_write);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%d] %s: ERROR: osmo_gad_raw_write() failed\n", i, osmo_gad_type_name(t->type));</span><br><span style="color: hsl(120, 100%, 40%);">+ goto loop_end;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != msg->len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%d] %s: ERROR: osmo_gad_raw_write() returned length %d but msgb has %d bytes\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ i, osmo_gad_type_name(t->type),</span><br><span style="color: hsl(120, 100%, 40%);">+ rc, msg->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto loop_end;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&raw_read, 0xff, sizeof(raw_read));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gad_raw_read(&raw_read, &err, loop_ctx, msg->data, msg->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%d] ERROR: osmo_gad_raw_read() failed: %s\n", i, err->logmsg);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" encoded data: %s\n", osmo_hexdump(msg->data, msg->len));</span><br><span style="color: hsl(120, 100%, 40%);">+ goto loop_end;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&dec_pdu, 0xff, sizeof(dec_pdu));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gad_dec(&dec_pdu, &err, loop_ctx, &raw_read);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%d] ERROR: failed to decode pdu: %s\n", i, err->logmsg);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" encoded data: %s\n", osmo_hexdump(msg->data, msg->len));</span><br><span style="color: hsl(120, 100%, 40%);">+ goto loop_end;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (memcmp(t, &dec_pdu, sizeof(dec_pdu))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ char strbuf[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%d] %s: ERROR: decoded PDU != encoded PDU\n", i,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gad_type_name(t->type));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gad_to_str_buf(strbuf, sizeof(strbuf), t);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" original struct: %s\n", strbuf);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gad_to_str_buf(strbuf, sizeof(strbuf), &dec_pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" decoded struct: %s\n", strbuf);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto loop_end;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%d] %s: ok\n", i, osmo_gad_type_name(t->type));</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" encoded data: %s\n", msgb_hexdump(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+loop_end:</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void test_gad_to_str()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("--- %s\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(gad_test_values); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gad *t = &gad_test_values[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[1024];</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gad_to_str_buf(buf, sizeof(buf), t);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("[%d] ", i);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc <= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s: ERROR: osmo_gad_to_str_buf() failed\n", osmo_gad_type_name(t->type));</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s\n", buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int main()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ test_gad_lat_lon_dec_enc_stability();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_gad_enc_dec();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_gad_to_str();</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/tests/gad/gad_test.ok b/tests/gad/gad_test.ok</span><br><span>new file mode 100644</span><br><span>index 0000000..ec5432a</span><br><span>--- /dev/null</span><br><span>+++ b/tests/gad/gad_test.ok</span><br><span>@@ -0,0 +1,8 @@</span><br><span style="color: hsl(120, 100%, 40%);">+--- test_gad_lat_lon_dec_enc_stability</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_dec_lat() -> osmo_gad_enc_lat() of 16777216 values successful</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gad_dec_lon() -> osmo_gad_enc_lon() of 16777216 values successful</span><br><span style="color: hsl(120, 100%, 40%);">+--- test_gad_enc_dec</span><br><span style="color: hsl(120, 100%, 40%);">+[0] Ellipsoid-point-with-uncertainty-circle: ok</span><br><span style="color: hsl(120, 100%, 40%);">+ encoded data: 10 20 b6 0c 1d dd de 28 </span><br><span style="color: hsl(120, 100%, 40%);">+--- test_gad_to_str</span><br><span style="color: hsl(120, 100%, 40%);">+[0] Ellipsoid-point-with-uncertainty-circle{lat=23.000006,lon=42.000002,unc=442.592m}</span><br><span>diff --git a/tests/testsuite.at b/tests/testsuite.at</span><br><span>index 8b6a20a..e29c131 100644</span><br><span>--- a/tests/testsuite.at</span><br><span>+++ b/tests/testsuite.at</span><br><span>@@ -403,3 +403,9 @@</span><br><span> cat $abs_srcdir/bitgen/bitgen_test.ok > expout</span><br><span> AT_CHECK([$abs_top_builddir/tests/bitgen/bitgen_test], [0], [expout], [ignore])</span><br><span> AT_CLEANUP</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AT_SETUP([gad])</span><br><span style="color: hsl(120, 100%, 40%);">+AT_KEYWORDS([gad])</span><br><span style="color: hsl(120, 100%, 40%);">+cat $abs_srcdir/gad/gad_test.ok > expout</span><br><span style="color: hsl(120, 100%, 40%);">+AT_CHECK([$abs_top_builddir/tests/gad/gad_test], [0], [expout], [ignore])</span><br><span style="color: hsl(120, 100%, 40%);">+AT_CLEANUP</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20332">change 20332</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/libosmocore/+/20332"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7a9dd805a91b1ebb6353bde0cd169218acbf223c </div>
<div style="display:none"> Gerrit-Change-Number: 20332 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>