cellular-infrastructure
/
osmo-mgw
mirror of https://gerrit.osmocom.org/osmo-mgw
10
0
Fork 0
Code Issues Releases Wiki Activity

drop get_net_downlink_format_cb 

It seems to be a remnant from early openbsc_mgcp. There is only the
default implementation for this callback and it simply returns two
pointers. Simplify that.

Change-Id: I18dfd44c931540caf4ac360c08ed10e5f65b2165
This commit is contained in:
Neels Hofmeyr 2023-12-23 03:53:18 +01:00
parent afbe872045
commit 35a738214c
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmocom/mgcp/mgcp.h
View File

@ -138,8 +138,6 @@ struct mgcp_config {
mgcp_processing rtp_processing_cb;
mgcp_processing_setup setup_rtp_processing_cb;
mgcp_get_format get_net_downlink_format_cb;
struct osmo_wqueue gw_fd;
struct mgcp_port_range net_ports;

12
src/libosmo-mgcp/mgcp_network.c
View File

@ -429,18 +429,6 @@ int mgcp_setup_rtp_processing_default(struct mgcp_endpoint *endp,
return 0;
}
void mgcp_get_net_downlink_format_default(struct mgcp_endpoint *endp,
const struct mgcp_rtp_codec **codec,
const char **fmtp_extra,
struct mgcp_conn_rtp *conn)
{
LOGPENDP(endp, DRTP, LOGL_DEBUG, "conn:%s using format defaults\n",
mgcp_conn_dump(conn->conn));
*codec = conn->end.codec;
*fmtp_extra = conn->end.fmtp_extra;
}
void mgcp_rtp_annex_count(const struct mgcp_endpoint *endp,
struct mgcp_rtp_state *state, const uint16_t seq,
const int32_t transit, const uint32_t ssrc,

2
src/libosmo-mgcp/mgcp_protocol.c
View File

@ -1712,8 +1712,6 @@ struct mgcp_config *mgcp_config_alloc(void)
cfg->rtp_processing_cb = &mgcp_rtp_processing_default;
cfg->setup_rtp_processing_cb = &mgcp_setup_rtp_processing_default;
cfg->get_net_downlink_format_cb = &mgcp_get_net_downlink_format_default;
INIT_LLIST_HEAD(&cfg->trunks);
/* Allocate virtual trunk */

6
src/libosmo-mgcp/mgcp_sdp.c
View File

@ -574,10 +574,8 @@ int mgcp_write_response_sdp(const struct mgcp_endpoint *endp,
OSMO_ASSERT(sdp);
OSMO_ASSERT(addr);
/* FIXME: constify endp and conn args in get_net_donwlink_format_cb() */
endp->trunk->cfg->get_net_downlink_format_cb((struct mgcp_endpoint *)endp,
&codec, &fmtp_extra,
(struct mgcp_conn_rtp *)conn);
codec = conn->end.codec;
fmtp_extra = conn->end.fmtp_extra;
audio_name = codec->audio_name;
payload_type = codec->payload_type;