diff options
| -rw-r--r-- | openbsc/src/libmgcp/mgcp_network.c | 20 | ||||
| -rw-r--r-- | openbsc/src/libmsc/msc_ifaces.c | 8 |
2 files changed, 19 insertions, 9 deletions
diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index 4902fdd0a..5d6de01ec 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -652,14 +652,15 @@ int mgcp_send(struct mgcp_endpoint *endp, int dest, int is_rtp, break; mgcp_patch_and_count(endp, rtp_state, rtp_end, addr, buf, len); - LOGP(DMGCP, LOGL_DEBUG, - "endpoint %x process/send to %s %s %d %d\n", - ENDPOINT_NUMBER(endp), - (dest == MGCP_DEST_NET)? "net" : "bts", - inet_ntoa(rtp_end->addr), - ntohs(rtp_end->rtp_port), - ntohs(rtp_end->rtcp_port) - ); + + LOGP(DMGCP, LOGL_DEBUG, + "endpoint %x process/send to %s %s %d %d\n", + ENDPOINT_NUMBER(endp), + (dest == MGCP_DEST_NET)? "net" : "bts", + inet_ntoa(rtp_end->addr), + ntohs(rtp_end->rtp_port), + ntohs(rtp_end->rtcp_port) + ); forward_data(rtp_end->rtp.fd, &endp->taps[tap_idx], buf, len); rc = mgcp_udp_send(rtp_end->rtp.fd, @@ -770,8 +771,9 @@ static int rtp_data_net(struct osmo_fd *fd, unsigned int what) } LOGP(DMGCP, LOGL_DEBUG, - "rtp_data_net: Endpoint %x data from %s %d\n", + "rtp_data_net: Endpoint %x %s data from %s %d\n", ENDPOINT_NUMBER(endp), + (fd == &endp->net_end.rtp) ? "RTP" : "RTPC", inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); diff --git a/openbsc/src/libmsc/msc_ifaces.c b/openbsc/src/libmsc/msc_ifaces.c index 9bfaf79b8..f579e1fb2 100644 --- a/openbsc/src/libmsc/msc_ifaces.c +++ b/openbsc/src/libmsc/msc_ifaces.c @@ -157,6 +157,8 @@ static void mgcp_response_rab_act_cs_crcx(struct mgcp_response *r, void *priv) } conn->iu.mgcp_rtp_port_cn = r->audio_port; + DEBUGP(DMGCP, "MGCP audio port %u for %s\n", + conn->iu.mgcp_rtp_port_cn, subscr_name(trans->subscr)); rtp_ip = mgcpgw_client_remote_addr_n(conn->network->mgcpgw.client); iu_rab_act_cs(uectx, conn->iu.rab_id, rtp_ip, @@ -237,6 +239,8 @@ static void mgcp_bridge(struct gsm_trans *from, struct gsm_trans *to, OSMO_ASSERT(mgcp); + DEBUGP(DMGCP, "mgcpgw_client_tx(trans=%p) in state %d -> %d\n", from, from->bridge.state, state); + from->bridge.peer = to; from->bridge.state = state; @@ -258,9 +262,12 @@ static void mgcp_response_bridge_mdcx(struct mgcp_response *r, void *priv) struct gsm_trans *trans = priv; struct gsm_trans *peer = trans->bridge.peer; + DEBUGP(DMGCP, "mgcp_response_bridge_mdcx(trans=%p) in state %d\n", trans, trans->bridge.state); + switch (trans->bridge.state) { case BRIDGE_STATE_LOOPBACK_PENDING: trans->bridge.state = BRIDGE_STATE_LOOPBACK_ESTABLISHED; + DEBUGP(DMGCP, "trans=%p --> state %d\n", trans, trans->bridge.state); switch (peer->bridge.state) { case BRIDGE_STATE_LOOPBACK_PENDING: @@ -284,6 +291,7 @@ static void mgcp_response_bridge_mdcx(struct mgcp_response *r, void *priv) case BRIDGE_STATE_BRIDGE_PENDING: trans->bridge.state = BRIDGE_STATE_BRIDGE_ESTABLISHED; + DEBUGP(DMGCP, "trans=%p --> state %d\n", trans, trans->bridge.state); break; default: |