Change in libosmocore[master]: gprs_bssgp: move struct bssgp_ran_information_pdu to gprs_bssgp_rim.h

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22442 )


Change subject: gprs_bssgp: move struct bssgp_ran_information_pdu to gprs_bssgp_rim.h
......................................................................

gprs_bssgp: move struct bssgp_ran_information_pdu to gprs_bssgp_rim.h

Change-Id: Icda279452962b06e552cb1361d2a27b7dc8a6b04
Related: SYS#5103
---
M include/osmocom/gprs/gprs_bssgp.h
M include/osmocom/gprs/gprs_bssgp_rim.h
2 files changed, 29 insertions(+), 28 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/22442/1

diff --git a/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h
index a7b363b..59d5e9f 100644
--- a/include/osmocom/gprs/gprs_bssgp.h
+++ b/include/osmocom/gprs/gprs_bssgp.h
@@ -42,34 +42,6 @@
 /* Chapter 10.4.14: Status */
 int bssgp_tx_status(uint8_t cause, uint16_t *bvci, struct msgb *orig_msg);
 
-/* Chapter 10.6.1: RAN-INFORMATION-REQUEST */
-struct bssgp_ran_information_pdu {
-	struct bssgp_rim_routing_info routing_info_dest;
-	struct bssgp_rim_routing_info routing_info_src;
-
-	/* Encoded variant of the RIM container */
-	uint8_t rim_cont_iei;
-	const uint8_t *rim_cont;
-	unsigned int rim_cont_len;
-
-	/* Decoded variant of the RIM container */
-	bool decoded_present;
-	union {
-		struct bssgp_ran_inf_req_rim_cont req_rim_cont;
-		struct bssgp_ran_inf_rim_cont rim_cont;
-		struct bssgp_ran_inf_ack_rim_cont ack_rim_cont;
-		struct bssgp_ran_inf_err_rim_cont err_rim_cont;
-		struct bssgp_ran_inf_app_err_rim_cont app_err_rim_cont;
-	} decoded;
-
-	/* When receiving a PDU from BSSGP the encoded variant of the RIM
-	 * container will always be present. The decoded variant will be
-	 * present in addition whenever BSSGP was able to decode the container.
-	 *
-	 * When sending a PDU to BSSGP, then the decoded variant is used when
-	 * it is available. The encoded variant (if present) will be ignored
-	 * then. */
-};
 int bssgp_tx_rim(const struct bssgp_ran_information_pdu *pdu, uint16_t nsei);
 
 int bssgp_parse_rim_pdu(struct bssgp_ran_information_pdu *pdu, const struct msgb *msg);
diff --git a/include/osmocom/gprs/gprs_bssgp_rim.h b/include/osmocom/gprs/gprs_bssgp_rim.h
index effb136..ca75ee5 100644
--- a/include/osmocom/gprs/gprs_bssgp_rim.h
+++ b/include/osmocom/gprs/gprs_bssgp_rim.h
@@ -236,3 +236,32 @@
 
 int bssgp_dec_ran_inf_app_err_rim_cont(struct bssgp_ran_inf_app_err_rim_cont *cont, const uint8_t *buf, size_t len);
 int bssgp_enc_ran_inf_app_err_rim_cont(uint8_t *buf, size_t len, const struct bssgp_ran_inf_app_err_rim_cont *cont);
+
+/* Chapter 10.6.1: RAN-INFORMATION-REQUEST */
+struct bssgp_ran_information_pdu {
+	struct bssgp_rim_routing_info routing_info_dest;
+	struct bssgp_rim_routing_info routing_info_src;
+
+	/* Encoded variant of the RIM container */
+	uint8_t rim_cont_iei;
+	const uint8_t *rim_cont;
+	unsigned int rim_cont_len;
+
+	/* Decoded variant of the RIM container */
+	bool decoded_present;
+	union {
+		struct bssgp_ran_inf_req_rim_cont req_rim_cont;
+		struct bssgp_ran_inf_rim_cont rim_cont;
+		struct bssgp_ran_inf_ack_rim_cont ack_rim_cont;
+		struct bssgp_ran_inf_err_rim_cont err_rim_cont;
+		struct bssgp_ran_inf_app_err_rim_cont app_err_rim_cont;
+	} decoded;
+
+	/* When receiving a PDU from BSSGP the encoded variant of the RIM
+	 * container will always be present. The decoded variant will be
+	 * present in addition whenever BSSGP was able to decode the container.
+	 *
+	 * When sending a PDU to BSSGP, then the decoded variant is used when
+	 * it is available. The encoded variant (if present) will be ignored
+	 * then. */
+};

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22442
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Icda279452962b06e552cb1361d2a27b7dc8a6b04
Gerrit-Change-Number: 22442
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210126/db824c38/attachment.htm>