paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

osmux: Make sure to always use the right dummy sending method

Browse Source 
Make sure to re-use the right method for nat traversal. Found
by Roch while looking at traces.
This commit is contained in:
Holger Hans Peter Freyther
2014-07-08 13:01:56 +02:00
parent 768580b3ec
commit 6b0ba01bf3
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
openbsc/src/libmgcp/mgcp_protocol.c
View File

@@ -344,6 +344,14 @@ static struct msgb *create_response_with_sdp(struct mgcp_endpoint *endp,
return create_resp(endp, 200, " OK", msg, trans_id, NULL, sdp_record);
}
static void send_dummy(struct mgcp_endpoint *endp)
{
if (endp->osmux)
osmux_send_dummy(endp);
else
mgcp_send_dummy(endp);
}
/*
* handle incoming messages:
* - this can be a command (four letters, space, transaction id)
@@ -1019,10 +1027,7 @@ mgcp_header_done:
p->cfg->change_cb(tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_CRCX);
if (endp->conn_mode & MGCP_CONN_RECV_ONLY && tcfg->keepalive_interval != 0) {
if (endp->osmux)
osmux_send_dummy(endp);
else
mgcp_send_dummy(endp);
send_dummy(endp);
}
create_transcoder(endp);
@@ -1156,7 +1161,7 @@ static struct msgb *handle_modify_con(struct mgcp_parse_data *p)
if (endp->conn_mode & MGCP_CONN_RECV_ONLY &&
endp->tcfg->keepalive_interval != 0)
mgcp_send_dummy(endp);
send_dummy(endp);
if (silent)
goto out_silent;
@@ -1326,7 +1331,7 @@ static void mgcp_keepalive_timer_cb(void *_tcfg)
for (i = 1; i < tcfg->number_endpoints; ++i) {
struct mgcp_endpoint *endp = &tcfg->endpoints[i];
if (endp->conn_mode == MGCP_CONN_RECV_ONLY)
mgcp_send_dummy(endp);
send_dummy(endp);
}
LOGP(DMGCP, LOGL_DEBUG, "Rescheduling trunk %d keepalive timer.\n",