mirror of
https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git
synced 2025-10-23 08:12:01 +00:00
cc2f7937ed
codecs[] is an array of enum osmo_mgcp_codecs.
ptmap[] is an array of { enum osmo_mgcp_codecs, unsigned int ptmap }.
MGCP lists first a bunch of payload type numbers and then specifies them
again for details, like the numbers 112, 96, 3 in this example:
m=audio <port> RTP/AVP 112 96 3
a=rtpmap:112 AMR/8000
a=rtpmap:96 VND.3GPP.IUFP/16000
a=rtpmap:3 GSM-FR/8000
So far we keep these lists in two separate arrays:
- codecs[], codecs_len stores the 'm=audio' list
- ptmap[], ptmap_len stores the 'a=rtpmap' list (and may omit some
elements present in codecs[])
This applies to both struct mgcp_response and struct mgcp_msg.
These are semantically identical, and the separation leads to checks,
conversions and dear hopes of correct ordering.
So let's keep only one list with both codec and payload type number in
it. The 'm=audio' list establishes the order of the pt numbers, and the
'a=rtpmap' list adds codec information to the established entries.
In the internal API structs mgcp_msg and mgcp_response, just drop the
codecs[] entirely.
In public API struct mgcp_conn_peer, keep the codecs[] array, mark it
deprecated, and provide a backwards compat conversion: if any caller
invokes mgcp_conn_create() or mgcp_conn_modify() with codecs[] still
present in the verb_info arg, then move codecs[] entries over to the
ptmap[] array in a sensible way.
(BTW, even mgcp_conn_create() and mgcp_conn_modify() are never called
from outside of libosmo-mgcp-client in any of our osmo-cni programs;
users call osmo_mgcpc_ep_ci_add() and osmo_mgcpc_ep_ci_request(), which
in turn may pass user-provided codecs[] lists on to mgcp_conn_create() or
mgcp_conn_modify().)
Tests for parsing the MGCP response are mostly missing. They will be
added in upcoming patch I842ce65a9a70f313570857b7df53727cc572b9e6,
because they will be using only the new ptmap API.
Related: OS#6171
Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed
79 lines
3.3 KiB
C
79 lines
3.3 KiB
C
#pragma once
|
|
|
|
#include <osmocom/mgcp_client/mgcp_common.h>
|
|
#include <osmocom/mgcp_client/mgcp_client.h>
|
|
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
|
|
|
/*! This struct organizes the connection infromation one connection side
|
|
* (either remote or local). It is used to pass parameters (local) to the FSM
|
|
* and get responses (remote) from the FSM as pointer attached to the FSM
|
|
* event.
|
|
*
|
|
* When modifiying a connection, the endpoint and call_id members may be left
|
|
* unpopulated. The call_id field is ignored in this case. If an endpoint
|
|
* identifier is supplied it is checked against the internal state to make
|
|
* sure it is correct. */
|
|
struct mgcp_conn_peer {
|
|
/*! RTP connection IP-Address (optional, string e.g. "127.0.0.1") */
|
|
char addr[INET6_ADDRSTRLEN];
|
|
|
|
/*! RTP connection IP-Port (optional) */
|
|
uint16_t port;
|
|
|
|
/*! RTP endpoint */
|
|
char endpoint[MGCP_ENDPOINT_MAXLEN];
|
|
|
|
/*! CALL ID (unique per connection) */
|
|
unsigned int call_id;
|
|
|
|
/*! RTP packetization interval (optional) */
|
|
unsigned int ptime;
|
|
|
|
/*! Deprecated. Use only ptmap[].codec in new code. */
|
|
enum mgcp_codecs codecs[MGCP_MAX_CODECS]
|
|
OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use ptmap[i].codec instead");
|
|
unsigned int codecs_len
|
|
OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use ptmap[] and ptmap_len instead");
|
|
|
|
/*! RTP payload type map (optional, only needed when payload types are
|
|
* used that differ from what IANA/3GPP defines) */
|
|
struct ptmap ptmap[MGCP_MAX_CODECS];
|
|
|
|
/*! RTP payload type map length (optional, only needed when payload
|
|
* types are used that differ from what IANA/3GPP defines) */
|
|
unsigned int ptmap_len;
|
|
|
|
/*! If nonzero, send 'X-Osmo-IGN:' header. This is useful e.g. for SCCPlite MSCs where the MSC is
|
|
* known to issue incoherent or unknown CallIDs / to issue CRCX commands with a different domain
|
|
* name than the BSC. An OsmoMGW will then ignore these and not fail on mismatches. */
|
|
uint32_t x_osmo_ign;
|
|
|
|
/*! send 'X-Osmux: %d' header (or "*" as wildcard). */
|
|
bool x_osmo_osmux_use;
|
|
/*! -1 means send wildcard. */
|
|
int x_osmo_osmux_cid;
|
|
|
|
/*! If left MGCP_CONN_NONE, use MGCP_CONN_RECV_ONLY or MGCP_CONN_RECV_SEND, depending on whether an audio RTP
|
|
* address is set. If != MGCP_CONN_NONE, force this conn mode. */
|
|
enum mgcp_connection_mode conn_mode;
|
|
|
|
/*! If the codec requires additional format parameters (fmtp), those cann be set here, see also
|
|
* mgcp_common.h */
|
|
bool param_present;
|
|
struct mgcp_codec_param param;
|
|
};
|
|
|
|
struct osmo_fsm_inst *mgcp_conn_create(struct mgcp_client *mgcp, struct osmo_fsm_inst *parent_fi, uint32_t parent_term_evt,
|
|
uint32_t parent_evt, struct mgcp_conn_peer *conn_peer)
|
|
OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use osmo_mgcpc_ep_alloc() and osmo_mgcpc_ep_ci_add() instead");
|
|
int mgcp_conn_modify(struct osmo_fsm_inst *fi, uint32_t parent_evt, struct mgcp_conn_peer *conn_peer)
|
|
OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use osmo_mgcpc_ep_ci_request() instead");
|
|
void mgcp_conn_delete(struct osmo_fsm_inst *fi)
|
|
OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use osmo_mgcpc_ep_ci_dlcx() instead");
|
|
|
|
const char *mgcp_conn_get_ci(struct osmo_fsm_inst *fi)
|
|
OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use osmo_mgcpc_ep_ci.mgcp_ci_str instead");
|
|
struct mgcp_client *mgcp_conn_get_client(struct osmo_fsm_inst *fi);
|
|
|
|
const char *osmo_mgcpc_conn_peer_name(const struct mgcp_conn_peer *info);
|