Merge branch 'master' into sysmocom/iu, with tweakssysmocom/iu_orig_history

Numerous manual adjustments are included to make sense on the sysmocom/iu branch:

* gsm_04_08_gprs.h has moved to libosmocore on the master branch, but
  sysmocom/iu has added some entries. Until it is clear whether to move the
  additions to libosmocore as well, keep gsm_04_08_gprs.h on sysmocom/iu with
  merely the additions.
* Thus, keep using the old gsm_04_08_gprs.[hc] from openbsc in the Makefiles,
  but only where the sysmocom/iu additions are needed.
* In openbsc's gsm_04_08_gprs.h,
  * include the libosmocore gsm_04_08_gprs.h,
  * use '#pragma once' instead of #ifndef and
  * add a TODO comment about moving the rest to libosmocore.

* Apply the addition of an osmo_auth_vector to gsm_auth_tuple: in the Iu auth
  vector hacks, use the gsm_auth_tuple.vec instead of a local struct.
  See iu_hack__get_hardcoded_auth_tuple() and gsm48_rx_gmm_att_req().

* In the si2q tests, pass NULL as ctx to gsm_network_init().

* In cscn_main.c, add a debug log that was originally added to osmo-nitb.

* openbsc/.gitignore: keep only one addition of 'writtenconfig'

Conflicts:
	openbsc/include/openbsc/gprs_sgsn.h
	openbsc/include/openbsc/gsm_04_08_gprs.h
	openbsc/src/gprs/gsm_04_08_gprs.c
	openbsc/src/libmsc/gsm_04_08.c
	openbsc/src/osmo-cscn/cscn_main.c
	openbsc/tests/gsm0408/Makefile.am

1 files changed, 0 insertions, 26 deletions

diff --git a/openbsc/include/openbsc/utils.h b/openbsc/include/openbsc/utils.h
deleted file mode 100644
index d6054873b..000000000
--- a/openbsc/include/openbsc/utils.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* OpenBSC kitchen sink */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdlib.h>
-
-/* Compare count bytes of exp to rel. Return 0 if they are identical, 1
- * otherwise. Do not return a mismatch on the first mismatching byte,
- * but always compare all bytes, regardless. The idea is that the amount of
- * matching bytes cannot be inferred from the time the comparison took.*/
-int constant_time_cmp(const uint8_t *exp, const uint8_t *rel, const int count);
-
-/* This is like osmo_load64be_ext, except that if data_len is less than
- * sizeof(uint64_t), the data is interpreted as the least significant bytes
- * (osmo_load64be_ext loads them as the most significant bytes into the
- * returned uint64_t). In this way, any integer size up to 64 bits can be
- * decoded conveniently by using sizeof(), without the need to call specific
- * numbered functions (osmo_load16, 32, ...). */
-uint64_t decode_big_endian(const uint8_t *data, size_t data_len);
-
-/* This is like osmo_store64be_ext, except that this returns a static buffer of
- * the result (for convenience, but not threadsafe). If data_len is less than
- * sizeof(uint64_t), only the least significant bytes of value are encoded. */
-uint8_t *encode_big_endian(uint64_t value, size_t data_len);
-