diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-05-14 02:42:15 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-05-14 02:42:15 +0800 |
| commit | 7373109abc9829c49eabf26e951a0ec6647666ac (patch) | |
| tree | f508489f955c15fc36376374072cfb8ce6a9e6de /openbsc/src/mgcp | |
| parent | c1cb5eb38d5199de9049c59dc080051deba7aa53 (diff) | |
| parent | cf5cc5bb5b472f470eb9584a32dee3c38413f93a (diff) | |
Merge branch 'master' into on-waves/mgcp
Diffstat (limited to 'openbsc/src/mgcp')
| -rw-r--r-- | openbsc/src/mgcp/mgcp_network.c | 2 | ||||
| -rw-r--r-- | openbsc/src/mgcp/mgcp_vty.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index e9c067ebc..1f51233d3 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -151,7 +151,7 @@ static int rtp_data_cb(struct bsc_fd *fd, unsigned int what) */ #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." dest = memcmp(&addr.sin_addr, &endp->remote, sizeof(addr.sin_addr)) == 0 && - (endp->net_rtp == addr.sin_port || endp->net_rtcp == addr.sin_port) + (endp->net_rtp == addr.sin_port || endp->net_rtcp == addr.sin_port) ? DEST_BTS : DEST_NETWORK; proto = fd == &endp->local_rtp ? PROTO_RTP : PROTO_RTCP; diff --git a/openbsc/src/mgcp/mgcp_vty.c b/openbsc/src/mgcp/mgcp_vty.c index b05888284..38d3daf5f 100644 --- a/openbsc/src/mgcp/mgcp_vty.c +++ b/openbsc/src/mgcp/mgcp_vty.c @@ -286,8 +286,8 @@ int mgcp_parse_config(const char *config_file, struct mgcp_config *cfg) /* * This application supports two modes. - * 1.) a true MGCP gateway with support for AUEP, CRCX, MDCX, DLCX - * 2.) plain forwarding of RTP packets on the endpoints. + * 1.) a true MGCP gateway with support for AUEP, CRCX, MDCX, DLCX + * 2.) plain forwarding of RTP packets on the endpoints. * both modes are mutual exclusive */ if (g_cfg->forward_ip) { |