From c63c3a0cc52cb9fd9455f08b6a57cae99293bafd Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 24 May 2023 10:48:07 +0200 Subject: transaction: move cc.codecs.result -> cc.local Prepare for CSD where this will be used too. Related: OS#4394 Change-Id: Iaf954be0455625faa06a64c19905b79b7045f8e4 --- include/osmocom/msc/codec_filter.h | 14 +++++--------- include/osmocom/msc/transaction.h | 3 +++ 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/osmocom/msc/codec_filter.h b/include/osmocom/msc/codec_filter.h index c0d8f329c..da4a67e04 100644 --- a/include/osmocom/msc/codec_filter.h +++ b/include/osmocom/msc/codec_filter.h @@ -42,20 +42,16 @@ struct codec_filter { /* After a channel was assigned, this reflects the chosen codec. */ struct sdp_audio_codec assignment; - - /* Resulting choice of supported codecs, usually the intersection of the above, - * and the local RTP address to be sent to the remote call leg. - * The RTP address:port in result.rtp is not modified by codec_filter_run() -- set it once. */ - struct sdp_msg result; }; void codec_filter_set_ran(struct codec_filter *codec_filter, enum osmo_rat_type ran_type); void codec_filter_set_bss(struct codec_filter *codec_filter, const struct gsm0808_speech_codec_list *codec_list_bss_supported); -void codec_filter_set_local_rtp(struct codec_filter *codec_filter, const struct osmo_sockaddr_str *rtp); -int codec_filter_run(struct codec_filter *codec_filter, const struct sdp_msg *remote); +int codec_filter_run(struct codec_filter *codec_filter, struct sdp_msg *result, const struct sdp_msg *remote); int codec_filter_to_str_buf(char *buf, size_t buflen, const struct codec_filter *codec_filter, + const struct sdp_msg *result, const struct sdp_msg *remote); +char *codec_filter_to_str_c(void *ctx, const struct codec_filter *codec_filter, const struct sdp_msg *result, const struct sdp_msg *remote); -char *codec_filter_to_str_c(void *ctx, const struct codec_filter *codec_filter, const struct sdp_msg *remote); -const char *codec_filter_to_str(const struct codec_filter *codec_filter, const struct sdp_msg *remote); +const char *codec_filter_to_str(const struct codec_filter *codec_filter, const struct sdp_msg *result, + const struct sdp_msg *remote); diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index bfb32ad4f..36aab7874 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -109,6 +109,9 @@ struct gsm_trans { struct sdp_msg remote; /* Track codec choices from BSS and remote call leg */ struct codec_filter codecs; + /* Resulting choice from codecs/bearer services and the + * local RTP address to be sent to the remote call leg. */ + struct sdp_msg local; } cc; struct { struct gsm411_smc_inst smc_inst; -- cgit v1.2.3