neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/35436?usp=email )
Change subject: drop get_net_downlink_format_cb
......................................................................
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
---
M include/osmocom/mgcp/mgcp.h
M src/libosmo-mgcp/mgcp_network.c
M src/libosmo-mgcp/mgcp_protocol.c
M src/libosmo-mgcp/mgcp_sdp.c
4 files changed, 15 insertions(+), 20 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/36/35436/1
diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h
index 224d756..42d67cf 100644
--- a/include/osmocom/mgcp/mgcp.h
+++ b/include/osmocom/mgcp/mgcp.h
@@ -138,8 +138,6 @@
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;
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index 346d017..5c890aa 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -429,18 +429,6 @@
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,
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index d106730..0146815 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -1713,8 +1713,6 @@
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 */
diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c
index 351c6db..a6536f2 100644
--- a/src/libosmo-mgcp/mgcp_sdp.c
+++ b/src/libosmo-mgcp/mgcp_sdp.c
@@ -544,10 +544,8 @@
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;
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35436?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I18dfd44c931540caf4ac360c08ed10e5f65b2165
Gerrit-Change-Number: 35436
Gerrit-PatchSet: 1
Gerrit-Owner: neels <[email protected]>
Gerrit-MessageType: newchange
