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

osmux: Make func handling dummy frames independent of endp type 

Port from openbsc 8f321179747f64819d940d72d0212192f69284ca.
Change-Id: I3e16217737fd5ffb95c166c5f7344492cb6a6263
This commit is contained in:
Pau Espin 2018-10-16 15:55:56 +02:00
parent 662fa421c6
commit 852ba86949
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libosmo-mgcp/mgcp_osmux.c
View File

@ -387,30 +387,31 @@ out:
/* This is called from the bsc-nat */
static int osmux_handle_dummy(struct mgcp_config *cfg, struct sockaddr_in *addr,
struct msgb *msg)
struct msgb *msg, int endp_type)
{
struct mgcp_endpoint *endp;
uint8_t osmux_cid;
struct mgcp_conn_rtp *conn_net = NULL;
struct mgcp_conn_rtp *conn = NULL;
if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0)
goto out;
endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS);
endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, endp_type);
if (!endp) {
LOGP(DLMGCP, LOGL_ERROR,
"Cannot find endpoint for Osmux CID %d\n", osmux_cid);
goto out;
}
conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET);
if (!conn_net)
/* FIXME: Get rid of CONN_ID_XXX! */
conn = mgcp_conn_get_rtp(endp, endp_type == MGCP_DEST_BTS ? CONN_ID_NET : CONN_ID_BTS);
if (!conn)
goto out;
if (conn_net->osmux.state == OSMUX_STATE_ENABLED)
if (conn->osmux.state == OSMUX_STATE_ENABLED)
goto out;
if (osmux_enable_conn(endp, conn_net, &addr->sin_addr, addr->sin_port) < 0 ) {
if (osmux_enable_conn(endp, conn, &addr->sin_addr, addr->sin_port) < 0 ) {
LOGP(DLMGCP, LOGL_ERROR,
"Could not enable osmux in endpoint 0x%x\n",
ENDPOINT_NUMBER(endp));
@ -446,7 +447,7 @@ int osmux_read_from_bsc_cb(struct osmo_fd *ofd, unsigned int what)
/* not any further processing dummy messages */
if (msg->data[0] == MGCP_DUMMY_LOAD)
return osmux_handle_dummy(cfg, &addr, msg);
return osmux_handle_dummy(cfg, &addr, msg, MGCP_DEST_BTS);
rem = msg->len;
while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) {