mgcp: Group the state for bts/net into a struct and have two instances
Group the data that each end (network/bts) have into a struct and use
this struct throughout the sourcecode.
diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c
index 7f3c11e..8ffc266 100644
--- a/openbsc/src/mgcp/mgcp_network.c
+++ b/openbsc/src/mgcp/mgcp_network.c
@@ -90,8 +90,8 @@
{
static char buf[] = { DUMMY_LOAD };
- return udp_send(endp->local_rtp.fd, &endp->remote,
- endp->net_rtp, buf, 1);
+ return udp_send(endp->local_rtp.fd, &endp->net_end.addr,
+ endp->net_end.rtp_port, buf, 1);
}
static void patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state,
@@ -189,26 +189,26 @@
* able to tell if this is legitimate.
*/
#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)
+ dest = memcmp(&addr.sin_addr, &endp->net_end.addr, sizeof(addr.sin_addr)) == 0 &&
+ (endp->net_end.rtp_port == addr.sin_port || endp->net_end.rtcp_port == addr.sin_port)
? DEST_BTS : DEST_NETWORK;
proto = fd == &endp->local_rtp ? PROTO_RTP : PROTO_RTCP;
/* We have no idea who called us, maybe it is the BTS. */
- if (dest == DEST_NETWORK && endp->bts_rtp == 0) {
+ if (dest == DEST_NETWORK && endp->bts_end.rtp_port == 0) {
/* it was the BTS... */
if (!cfg->bts_ip
|| memcmp(&addr.sin_addr, &cfg->bts_in, sizeof(cfg->bts_in)) == 0
- || memcmp(&addr.sin_addr, &endp->bts, sizeof(endp->bts)) == 0) {
+ || memcmp(&addr.sin_addr, &endp->bts_end.addr, sizeof(endp->bts_end.addr)) == 0) {
if (fd == &endp->local_rtp) {
- endp->bts_rtp = addr.sin_port;
+ endp->bts_end.rtp_port = addr.sin_port;
} else {
- endp->bts_rtcp = addr.sin_port;
+ endp->bts_end.rtcp_port = addr.sin_port;
}
- endp->bts = addr.sin_addr;
+ endp->bts_end.addr = addr.sin_addr;
LOGP(DMGCP, LOGL_NOTICE, "Found BTS for endpoint: 0x%x on port: %d/%d of %s\n",
- ENDPOINT_NUMBER(endp), ntohs(endp->bts_rtp), ntohs(endp->bts_rtcp),
+ ENDPOINT_NUMBER(endp), ntohs(endp->bts_end.rtp_port), ntohs(endp->bts_end.rtcp_port),
inet_ntoa(addr.sin_addr));
}
@@ -223,9 +223,9 @@
/* do this before the loop handling */
if (dest == DEST_NETWORK)
- ++endp->in_bts;
+ ++endp->bts_end.packets;
else
- ++endp->in_remote;
+ ++endp->net_end.packets;
/* For loop toggle the destination and then dispatch. */
if (cfg->audio_loop)
@@ -238,18 +238,18 @@
if (dest == DEST_NETWORK) {
if (proto == PROTO_RTP)
patch_and_count(endp, &endp->bts_state,
- endp->net_payload_type,
+ endp->net_end.payload_type,
&addr, buf, rc);
- return udp_send(fd->fd, &endp->remote,
- proto == PROTO_RTP ? endp->net_rtp : endp->net_rtcp,
+ return udp_send(fd->fd, &endp->net_end.addr,
+ proto == PROTO_RTP ? endp->net_end.rtp_port : endp->net_end.rtcp_port,
buf, rc);
} else {
if (proto == PROTO_RTP)
patch_and_count(endp, &endp->net_state,
- endp->bts_payload_type,
+ endp->bts_end.payload_type,
&addr, buf, rc);
- return udp_send(fd->fd, &endp->bts,
- proto == PROTO_RTP ? endp->bts_rtp : endp->bts_rtcp,
+ return udp_send(fd->fd, &endp->bts_end.addr,
+ proto == PROTO_RTP ? endp->bts_end.rtp_port : endp->bts_end.rtcp_port,
buf, rc);
}
}
diff --git a/openbsc/src/mgcp/mgcp_protocol.c b/openbsc/src/mgcp/mgcp_protocol.c
index 12b7fc4..5ef57cc 100644
--- a/openbsc/src/mgcp/mgcp_protocol.c
+++ b/openbsc/src/mgcp/mgcp_protocol.c
@@ -175,7 +175,7 @@
"m=audio %d RTP/AVP %d\r\n"
"a=rtpmap:%d %s\r\n",
endp->ci, addr, endp->rtp_port,
- endp->bts_payload_type, endp->bts_payload_type,
+ endp->bts_end.payload_type, endp->bts_end.payload_type,
endp->cfg->audio_name);
return mgcp_create_response_with_data(200, msg, trans_id, sdp_record);
}
@@ -421,10 +421,10 @@
MSG_TOKENIZE_END
/* initialize */
- endp->net_rtp = endp->net_rtcp = endp->bts_rtp = endp->bts_rtcp = 0;
+ endp->net_end.rtp_port = endp->net_end.rtcp_port = endp->bts_end.rtp_port = endp->bts_end.rtcp_port = 0;
/* set to zero until we get the info */
- memset(&endp->remote, 0, sizeof(endp->remote));
+ memset(&endp->net_end.addr, 0, sizeof(endp->net_end.addr));
/* bind to the port now */
port = rtp_calculate_port(ENDPOINT_NUMBER(endp), cfg->rtp_base_port);
@@ -438,7 +438,7 @@
if (endp->ci == CI_UNUSED)
goto error2;
- endp->bts_payload_type = cfg->audio_payload;
+ endp->bts_end.payload_type = cfg->audio_payload;
/* policy CB */
if (cfg->policy_cb) {
@@ -536,9 +536,9 @@
const char *param = (const char *)&msg->l3h[line_start];
if (sscanf(param, "m=audio %d RTP/AVP %d", &port, &payload) == 2) {
- endp->net_rtp = htons(port);
- endp->net_rtcp = htons(port + 1);
- endp->net_payload_type = payload;
+ endp->net_end.rtp_port = htons(port);
+ endp->net_end.rtcp_port = htons(port + 1);
+ endp->net_end.payload_type = payload;
}
break;
}
@@ -547,7 +547,7 @@
const char *param = (const char *)&msg->l3h[line_start];
if (sscanf(param, "c=IN IP4 %15s", ipv4) == 1) {
- inet_aton(ipv4, &endp->remote);
+ inet_aton(ipv4, &endp->net_end.addr);
}
break;
}
@@ -581,7 +581,7 @@
/* modify */
LOGP(DMGCP, LOGL_NOTICE, "Modified endpoint on: 0x%x Server: %s:%u\n",
- ENDPOINT_NUMBER(endp), inet_ntoa(endp->remote), ntohs(endp->net_rtp));
+ ENDPOINT_NUMBER(endp), inet_ntoa(endp->net_end.addr), ntohs(endp->net_end.rtp_port));
if (cfg->change_cb)
cfg->change_cb(cfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_MDCX, endp->rtp_port);
if (silent)
@@ -666,7 +666,7 @@
/* free the connection */
LOGP(DMGCP, LOGL_NOTICE, "Deleted endpoint on: 0x%x Server: %s:%u\n",
- ENDPOINT_NUMBER(endp), inet_ntoa(endp->remote), ntohs(endp->net_rtp));
+ ENDPOINT_NUMBER(endp), inet_ntoa(endp->net_end.addr), ntohs(endp->net_end.rtp_port));
mgcp_free_endp(endp);
if (cfg->change_cb)
cfg->change_cb(cfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_DLCX, endp->rtp_port);
@@ -714,6 +714,12 @@
return cfg;
}
+static void mgcp_rtp_end_reset(struct mgcp_rtp_end *end)
+{
+ memset(end, 0, sizeof(*end));
+ end->payload_type = -1;
+}
+
int mgcp_endpoints_allocate(struct mgcp_config *cfg)
{
int i;
@@ -730,8 +736,8 @@
cfg->endpoints[i].local_rtcp.fd = -1;
cfg->endpoints[i].ci = CI_UNUSED;
cfg->endpoints[i].cfg = cfg;
- cfg->endpoints[i].net_payload_type = -1;
- cfg->endpoints[i].bts_payload_type = -1;
+ mgcp_rtp_end_reset(&cfg->endpoints[i].net_end);
+ mgcp_rtp_end_reset(&cfg->endpoints[i].bts_end);
}
return 0;
@@ -757,11 +763,8 @@
bsc_unregister_fd(&endp->local_rtcp);
}
- endp->net_rtp = endp->net_rtcp = endp->bts_rtp = endp->bts_rtcp = 0;
- endp->net_payload_type = endp->bts_payload_type = -1;
- endp->in_bts = endp->in_remote = 0;
- memset(&endp->remote, 0, sizeof(endp->remote));
- memset(&endp->bts, 0, sizeof(endp->bts));
+ mgcp_rtp_end_reset(&endp->bts_end);
+ mgcp_rtp_end_reset(&endp->net_end);
memset(&endp->net_state, 0, sizeof(endp->net_state));
memset(&endp->bts_state, 0, sizeof(endp->bts_state));
diff --git a/openbsc/src/mgcp/mgcp_vty.c b/openbsc/src/mgcp/mgcp_vty.c
index 84299d0..c109491 100644
--- a/openbsc/src/mgcp/mgcp_vty.c
+++ b/openbsc/src/mgcp/mgcp_vty.c
@@ -81,10 +81,11 @@
struct mgcp_endpoint *endp = &g_cfg->endpoints[i];
vty_out(vty, " Endpoint 0x%.2x: CI: %d net: %u/%u bts: %u/%u on %s traffic received bts: %u/%u remote: %u/%u%s",
i, endp->ci,
- ntohs(endp->net_rtp), ntohs(endp->net_rtcp),
- ntohs(endp->bts_rtp), ntohs(endp->bts_rtcp),
- inet_ntoa(endp->bts), endp->in_bts, endp->bts_state.lost_no,
- endp->in_remote, endp->net_state.lost_no,
+ ntohs(endp->net_end.rtp_port), ntohs(endp->net_end.rtcp_port),
+ ntohs(endp->bts_end.rtp_port), ntohs(endp->bts_end.rtcp_port),
+ inet_ntoa(endp->bts_end.addr),
+ endp->bts_end.packets, endp->bts_state.lost_no,
+ endp->net_end.packets, endp->net_state.lost_no,
VTY_NEWLINE);
}