Request Osmux CID and forward it in Assign Req and Assign Compl

Related: OS#2551
Depends: osmo-mgw.git I73b4c62baf39050da81d65553cbea07bc51163de
Change-Id: I5b14e34481e890669c9ee02dba81eba84293cebb
diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h
index 4d0485d..af0822b 100644
--- a/include/osmocom/msc/ran_msg.h
+++ b/include/osmocom/msc/ran_msg.h
@@ -84,6 +84,8 @@
 	const struct osmo_sockaddr_str *cn_rtp;
 	const struct gsm0808_channel_type *channel_type;
 	enum nsap_addr_enc rab_assign_addr_enc;
+	bool osmux_present;
+	uint8_t osmux_cid;
 };
 
 struct ran_cipher_mode_command {
@@ -223,6 +225,8 @@
 			struct osmo_sockaddr_str remote_rtp;
 			bool codec_present;
 			enum mgcp_codecs codec;
+			bool osmux_present;
+			uint8_t osmux_cid;
 		} assignment_complete;
 		struct {
 			enum gsm0808_cause bssap_cause;