From b54048fe25a28c47149f916ae293654b5330ff78 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 1 Nov 2010 19:57:50 +0100 Subject: mgcp: Make transcoding a per Endpoint configuration This allows to switch off transcoding on the fly, or only enable it for certain vessels with known problems. --- openbsc/src/mgcp/mgcp_network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openbsc/src/mgcp/mgcp_network.c') diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index 28a27ca55..6c6c33646 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -383,7 +383,7 @@ static int rtp_data_bts(struct bsc_fd *fd, unsigned int what) endp->bts_end.packets += 1; forward_data(fd->fd, &endp->taps[MGCP_TAP_BTS_IN], buf, rc); - if (cfg->transcoder_ip) + if (endp->is_transcoded) return send_transcoder(endp, proto == PROTO_RTP, &buf[0], rc); else return send_to(endp, DEST_NETWORK, proto == PROTO_RTP, &addr, &buf[0], rc); -- cgit v1.2.3 From 21262335907f2aa621742e87d596e4278b0f3d86 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 1 Nov 2010 20:53:31 +0100 Subject: mgcp: Rename transcoder_end to trans_net Packets arriving for trans_net will be send out to the networking. We will introduce a trans_bts in a second. --- openbsc/src/mgcp/mgcp_network.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'openbsc/src/mgcp/mgcp_network.c') diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index 6c6c33646..f78e42abb 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -176,7 +176,7 @@ static int send_transcoder(struct mgcp_endpoint *endp, int is_rtp, struct mgcp_config *cfg = endp->cfg; struct sockaddr_in addr; - if (endp->transcoder_end.rtp_port == 0) { + if (endp->trans_net.rtp_port == 0) { LOGP(DMGCP, LOGL_ERROR, "Transcoder port not known on 0x%x\n", ENDPOINT_NUMBER(endp)); return -1; @@ -404,7 +404,7 @@ static int rtp_data_transcoder(struct bsc_fd *fd, unsigned int what) if (rc <= 0) return -1; - proto = fd == &endp->transcoder_end.rtp ? PROTO_RTP : PROTO_RTCP; + proto = fd == &endp->trans_net.rtp ? PROTO_RTP : PROTO_RTCP; if (memcmp(&addr.sin_addr, &cfg->transcoder_in, sizeof(addr.sin_addr)) != 0) { LOGP(DMGCP, LOGL_ERROR, @@ -413,8 +413,8 @@ static int rtp_data_transcoder(struct bsc_fd *fd, unsigned int what) return -1; } - if (endp->transcoder_end.rtp_port != addr.sin_port && - endp->transcoder_end.rtcp_port != addr.sin_port) { + if (endp->trans_net.rtp_port != addr.sin_port && + endp->trans_net.rtcp_port != addr.sin_port) { LOGP(DMGCP, LOGL_ERROR, "Data from wrong transcoder source port %d on 0x%x\n", ntohs(addr.sin_port), ENDPOINT_NUMBER(endp)); @@ -428,7 +428,7 @@ static int rtp_data_transcoder(struct bsc_fd *fd, unsigned int what) return 0; } - endp->transcoder_end.packets += 1; + endp->trans_net.packets += 1; return send_to(endp, DEST_NETWORK, proto == PROTO_RTP, &addr, &buf[0], rc); } @@ -545,18 +545,18 @@ int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) int mgcp_bind_transcoder_rtp_port(struct mgcp_endpoint *endp, int rtp_port) { - if (endp->transcoder_end.rtp.fd != -1 || endp->transcoder_end.rtcp.fd != -1) { + if (endp->trans_net.rtp.fd != -1 || endp->trans_net.rtcp.fd != -1) { LOGP(DMGCP, LOGL_ERROR, "Previous net-port was still bound on %d\n", ENDPOINT_NUMBER(endp)); - mgcp_free_rtp_port(&endp->transcoder_end); + mgcp_free_rtp_port(&endp->trans_net); } - endp->transcoder_end.local_port = rtp_port; - endp->transcoder_end.rtp.cb = rtp_data_transcoder; - endp->transcoder_end.rtp.data = endp; - endp->transcoder_end.rtcp.data = endp; - endp->transcoder_end.rtcp.cb = rtp_data_transcoder; - return bind_rtp(endp->cfg, &endp->transcoder_end, ENDPOINT_NUMBER(endp)); + endp->trans_net.local_port = rtp_port; + endp->trans_net.rtp.cb = rtp_data_transcoder; + endp->trans_net.rtp.data = endp; + endp->trans_net.rtcp.data = endp; + endp->trans_net.rtcp.cb = rtp_data_transcoder; + return bind_rtp(endp->cfg, &endp->trans_net, ENDPOINT_NUMBER(endp)); } int mgcp_free_rtp_port(struct mgcp_rtp_end *end) -- cgit v1.2.3 From bd7b3c5e45426efc79b4dd685d1e818de3550d0a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 1 Nov 2010 21:04:54 +0100 Subject: mgcp: Introduce trans_bts and send BTS packets from this port Introduce the trans_bts. Right now only a port is allocated and the packets from the BTS are sent from this socket. --- openbsc/src/mgcp/mgcp_network.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'openbsc/src/mgcp/mgcp_network.c') diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index f78e42abb..ae0504ff9 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -191,8 +191,8 @@ static int send_transcoder(struct mgcp_endpoint *endp, int is_rtp, addr.sin_port = htons(port); rc = sendto(is_rtp ? - endp->bts_end.rtp.fd : - endp->bts_end.rtcp.fd, buf, len, 0, + endp->trans_bts.rtp.fd : + endp->trans_bts.rtcp.fd, buf, len, 0, (struct sockaddr *) &addr, sizeof(addr)); if (rc != len) @@ -543,7 +543,7 @@ int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) return bind_rtp(endp->cfg, &endp->net_end, ENDPOINT_NUMBER(endp)); } -int mgcp_bind_transcoder_rtp_port(struct mgcp_endpoint *endp, int rtp_port) +int mgcp_bind_trans_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) { if (endp->trans_net.rtp.fd != -1 || endp->trans_net.rtcp.fd != -1) { LOGP(DMGCP, LOGL_ERROR, "Previous net-port was still bound on %d\n", @@ -559,6 +559,22 @@ int mgcp_bind_transcoder_rtp_port(struct mgcp_endpoint *endp, int rtp_port) return bind_rtp(endp->cfg, &endp->trans_net, ENDPOINT_NUMBER(endp)); } +int mgcp_bind_trans_bts_rtp_port(struct mgcp_endpoint *endp, int rtp_port) +{ + if (endp->trans_bts.rtp.fd != -1 || endp->trans_bts.rtcp.fd != -1) { + LOGP(DMGCP, LOGL_ERROR, "Previous net-port was still bound on %d\n", + ENDPOINT_NUMBER(endp)); + mgcp_free_rtp_port(&endp->trans_bts); + } + + endp->trans_bts.local_port = rtp_port; + endp->trans_bts.rtp.cb = rtp_data_transcoder; + endp->trans_bts.rtp.data = endp; + endp->trans_bts.rtcp.data = endp; + endp->trans_bts.rtcp.cb = rtp_data_transcoder; + return bind_rtp(endp->cfg, &endp->trans_bts, ENDPOINT_NUMBER(endp)); +} + int mgcp_free_rtp_port(struct mgcp_rtp_end *end) { if (end->rtp.fd != -1) { -- cgit v1.2.3 From 386a940736d5f8c65ba5d5409c4858f5c829a338 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 1 Nov 2010 21:15:22 +0100 Subject: mgcp: Refactor the network binding routines Create another wrapper function that takes most of the arguments from the caller. --- openbsc/src/mgcp/mgcp_network.c | 73 +++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 47 deletions(-) (limited to 'openbsc/src/mgcp/mgcp_network.c') diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index ae0504ff9..c90219774 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -511,68 +511,47 @@ cleanup0: return -1; } -int mgcp_bind_bts_rtp_port(struct mgcp_endpoint *endp, int rtp_port) +static int int_bind(const char *port, + struct mgcp_rtp_end *end, int (*cb)(struct bsc_fd *, unsigned), + struct mgcp_endpoint *_endp, int rtp_port) { - if (endp->bts_end.rtp.fd != -1 || endp->bts_end.rtcp.fd != -1) { - LOGP(DMGCP, LOGL_ERROR, "Previous bts-port was still bound on %d\n", - ENDPOINT_NUMBER(endp)); - mgcp_free_rtp_port(&endp->bts_end); + if (end->rtp.fd != -1 || end->rtcp.fd != -1) { + LOGP(DMGCP, LOGL_ERROR, "Previous %s was still bound on %d\n", + port, ENDPOINT_NUMBER(_endp)); + mgcp_free_rtp_port(end); } - endp->bts_end.local_port = rtp_port; - endp->bts_end.rtp.cb = rtp_data_bts; - endp->bts_end.rtp.data = endp; - endp->bts_end.rtcp.data = endp; - endp->bts_end.rtcp.cb = rtp_data_bts; - return bind_rtp(endp->cfg, &endp->bts_end, ENDPOINT_NUMBER(endp)); + end->local_port = rtp_port; + end->rtp.cb = cb; + end->rtp.data = _endp; + end->rtcp.data = _endp; + end->rtcp.cb = cb; + return bind_rtp(_endp->cfg, end, ENDPOINT_NUMBER(_endp)); } -int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) + +int mgcp_bind_bts_rtp_port(struct mgcp_endpoint *endp, int rtp_port) { - if (endp->net_end.rtp.fd != -1 || endp->net_end.rtcp.fd != -1) { - LOGP(DMGCP, LOGL_ERROR, "Previous net-port was still bound on %d\n", - ENDPOINT_NUMBER(endp)); - mgcp_free_rtp_port(&endp->net_end); - } + return int_bind("bts-port", &endp->bts_end, + rtp_data_bts, endp, rtp_port); +} - endp->net_end.local_port = rtp_port; - endp->net_end.rtp.cb = rtp_data_net; - endp->net_end.rtp.data = endp; - endp->net_end.rtcp.data = endp; - endp->net_end.rtcp.cb = rtp_data_net; - return bind_rtp(endp->cfg, &endp->net_end, ENDPOINT_NUMBER(endp)); +int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) +{ + return int_bind("net-port", &endp->net_end, + rtp_data_net, endp, rtp_port); } int mgcp_bind_trans_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) { - if (endp->trans_net.rtp.fd != -1 || endp->trans_net.rtcp.fd != -1) { - LOGP(DMGCP, LOGL_ERROR, "Previous net-port was still bound on %d\n", - ENDPOINT_NUMBER(endp)); - mgcp_free_rtp_port(&endp->trans_net); - } - - endp->trans_net.local_port = rtp_port; - endp->trans_net.rtp.cb = rtp_data_transcoder; - endp->trans_net.rtp.data = endp; - endp->trans_net.rtcp.data = endp; - endp->trans_net.rtcp.cb = rtp_data_transcoder; - return bind_rtp(endp->cfg, &endp->trans_net, ENDPOINT_NUMBER(endp)); + return int_bind("trans-net", &endp->trans_net, + rtp_data_transcoder, endp, rtp_port); } int mgcp_bind_trans_bts_rtp_port(struct mgcp_endpoint *endp, int rtp_port) { - if (endp->trans_bts.rtp.fd != -1 || endp->trans_bts.rtcp.fd != -1) { - LOGP(DMGCP, LOGL_ERROR, "Previous net-port was still bound on %d\n", - ENDPOINT_NUMBER(endp)); - mgcp_free_rtp_port(&endp->trans_bts); - } - - endp->trans_bts.local_port = rtp_port; - endp->trans_bts.rtp.cb = rtp_data_transcoder; - endp->trans_bts.rtp.data = endp; - endp->trans_bts.rtcp.data = endp; - endp->trans_bts.rtcp.cb = rtp_data_transcoder; - return bind_rtp(endp->cfg, &endp->trans_bts, ENDPOINT_NUMBER(endp)); + return int_bind("trans-bts", &endp->trans_bts, + rtp_data_transcoder, endp, rtp_port); } int mgcp_free_rtp_port(struct mgcp_rtp_end *end) -- cgit v1.2.3 From 3f29cc8303ecca6ba9f814abd9d5241f51d25533 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 1 Nov 2010 21:25:33 +0100 Subject: mgcp: Make the transcoding forwarding work for BTS/NET Share the implementation for the transcoded packets and forward them to the network and the bts. --- openbsc/src/mgcp/mgcp_network.c | 52 ++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 19 deletions(-) (limited to 'openbsc/src/mgcp/mgcp_network.c') diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index c90219774..aeaafc8af 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -389,47 +389,61 @@ static int rtp_data_bts(struct bsc_fd *fd, unsigned int what) return send_to(endp, DEST_NETWORK, proto == PROTO_RTP, &addr, &buf[0], rc); } -static int rtp_data_transcoder(struct bsc_fd *fd, unsigned int what) +static int rtp_data_transcoder(struct mgcp_rtp_end *end, struct mgcp_endpoint *_endp, + int dest, struct bsc_fd *fd) { char buf[4096]; struct sockaddr_in addr; - struct mgcp_endpoint *endp; struct mgcp_config *cfg; int rc, proto; - endp = (struct mgcp_endpoint *) fd->data; - cfg = endp->cfg; - - rc = recevice_from(endp, fd->fd, &addr, buf, sizeof(buf)); + cfg = _endp->cfg; + rc = recevice_from(_endp, fd->fd, &addr, buf, sizeof(buf)); if (rc <= 0) return -1; - proto = fd == &endp->trans_net.rtp ? PROTO_RTP : PROTO_RTCP; + proto = fd == &end->rtp ? PROTO_RTP : PROTO_RTCP; if (memcmp(&addr.sin_addr, &cfg->transcoder_in, sizeof(addr.sin_addr)) != 0) { LOGP(DMGCP, LOGL_ERROR, - "Data not coming from transcoder: %s on 0x%x\n", - inet_ntoa(addr.sin_addr), ENDPOINT_NUMBER(endp)); + "Data not coming from transcoder dest: %d %s on 0x%x\n", + dest, inet_ntoa(addr.sin_addr), ENDPOINT_NUMBER(_endp)); return -1; } - if (endp->trans_net.rtp_port != addr.sin_port && - endp->trans_net.rtcp_port != addr.sin_port) { + if (end->rtp_port != addr.sin_port && + end->rtcp_port != addr.sin_port) { LOGP(DMGCP, LOGL_ERROR, - "Data from wrong transcoder source port %d on 0x%x\n", - ntohs(addr.sin_port), ENDPOINT_NUMBER(endp)); + "Data from wrong transcoder dest %d source port %d on 0x%x\n", + dest, ntohs(addr.sin_port), ENDPOINT_NUMBER(_endp)); return -1; } /* throw away the dummy message */ if (rc == 1 && buf[0] == DUMMY_LOAD) { - LOGP(DMGCP, LOGL_NOTICE, "Filtered dummy from transcoder on 0x%x\n", - ENDPOINT_NUMBER(endp)); + LOGP(DMGCP, LOGL_NOTICE, "Filtered dummy from transcoder dest %d on 0x%x\n", + dest, ENDPOINT_NUMBER(_endp)); return 0; } - endp->trans_net.packets += 1; - return send_to(endp, DEST_NETWORK, proto == PROTO_RTP, &addr, &buf[0], rc); + end->packets += 1; + return send_to(_endp, dest, proto == PROTO_RTP, &addr, &buf[0], rc); +} + +static int rtp_data_trans_net(struct bsc_fd *fd, unsigned int what) +{ + struct mgcp_endpoint *endp; + endp = (struct mgcp_endpoint *) fd->data; + + return rtp_data_transcoder(&endp->trans_net, endp, DEST_NETWORK, fd); +} + +static int rtp_data_trans_bts(struct bsc_fd *fd, unsigned int what) +{ + struct mgcp_endpoint *endp; + endp = (struct mgcp_endpoint *) fd->data; + + return rtp_data_transcoder(&endp->trans_bts, endp, DEST_BTS, fd); } static int create_bind(const char *source_addr, struct bsc_fd *fd, int port) @@ -545,13 +559,13 @@ int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) int mgcp_bind_trans_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) { return int_bind("trans-net", &endp->trans_net, - rtp_data_transcoder, endp, rtp_port); + rtp_data_trans_net, endp, rtp_port); } int mgcp_bind_trans_bts_rtp_port(struct mgcp_endpoint *endp, int rtp_port) { return int_bind("trans-bts", &endp->trans_bts, - rtp_data_transcoder, endp, rtp_port); + rtp_data_trans_bts, endp, rtp_port); } int mgcp_free_rtp_port(struct mgcp_rtp_end *end) -- cgit v1.2.3 From 5f2cd842818a8809865d1caacc78bdf92c823e40 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 1 Nov 2010 21:53:39 +0100 Subject: mgcp: Use the calculated remote port from the mgcp_rtp_end --- openbsc/src/mgcp/mgcp_network.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'openbsc/src/mgcp/mgcp_network.c') diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index aeaafc8af..f8c552c8f 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -182,13 +182,11 @@ static int send_transcoder(struct mgcp_endpoint *endp, int is_rtp, return -1; } - port = rtp_calculate_port(ENDPOINT_NUMBER(endp), cfg->transcoder_remote_base); - if (!is_rtp) - port += 1; + port = is_rtp ? endp->trans_bts.rtp_port : endp->trans_bts.rtcp_port; addr.sin_family = AF_INET; addr.sin_addr = cfg->transcoder_in; - addr.sin_port = htons(port); + addr.sin_port = port; rc = sendto(is_rtp ? endp->trans_bts.rtp.fd : -- cgit v1.2.3 From 8b19dee437cdd73f75413d5f936e768939e3db71 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 1 Nov 2010 22:38:25 +0100 Subject: mgcp: Send data from the network to the transcoder too We now should be able to transcode in both directions. --- openbsc/src/mgcp/mgcp_network.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'openbsc/src/mgcp/mgcp_network.c') diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index f8c552c8f..8a73e376e 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -168,29 +168,22 @@ static int forward_data(int fd, struct mgcp_rtp_tap *tap, const char *buf, int l (struct sockaddr *)&tap->forward, sizeof(tap->forward)); } -static int send_transcoder(struct mgcp_endpoint *endp, int is_rtp, - const char *buf, int len) +static int send_transcoder(struct mgcp_rtp_end *end, struct mgcp_config *cfg, + int is_rtp, const char *buf, int len) { int rc; int port; - struct mgcp_config *cfg = endp->cfg; struct sockaddr_in addr; - if (endp->trans_net.rtp_port == 0) { - LOGP(DMGCP, LOGL_ERROR, "Transcoder port not known on 0x%x\n", - ENDPOINT_NUMBER(endp)); - return -1; - } - - port = is_rtp ? endp->trans_bts.rtp_port : endp->trans_bts.rtcp_port; + port = is_rtp ? end->rtp_port : end->rtcp_port; addr.sin_family = AF_INET; addr.sin_addr = cfg->transcoder_in; addr.sin_port = port; rc = sendto(is_rtp ? - endp->trans_bts.rtp.fd : - endp->trans_bts.rtcp.fd, buf, len, 0, + end->rtp.fd : + end->rtcp.fd, buf, len, 0, (struct sockaddr *) &addr, sizeof(addr)); if (rc != len) @@ -304,7 +297,10 @@ static int rtp_data_net(struct bsc_fd *fd, unsigned int what) endp->net_end.packets += 1; forward_data(fd->fd, &endp->taps[MGCP_TAP_NET_IN], buf, rc); - return send_to(endp, DEST_BTS, proto == PROTO_RTP, &addr, &buf[0], rc); + if (endp->is_transcoded) + return send_transcoder(&endp->trans_net, endp->cfg, proto == PROTO_RTP, &buf[0], rc); + else + return send_to(endp, DEST_BTS, proto == PROTO_RTP, &addr, &buf[0], rc); } static void discover_bts(struct mgcp_endpoint *endp, int proto, struct sockaddr_in *addr) @@ -382,7 +378,7 @@ static int rtp_data_bts(struct bsc_fd *fd, unsigned int what) forward_data(fd->fd, &endp->taps[MGCP_TAP_BTS_IN], buf, rc); if (endp->is_transcoded) - return send_transcoder(endp, proto == PROTO_RTP, &buf[0], rc); + return send_transcoder(&endp->trans_bts, endp->cfg, proto == PROTO_RTP, &buf[0], rc); else return send_to(endp, DEST_NETWORK, proto == PROTO_RTP, &addr, &buf[0], rc); } -- cgit v1.2.3