Merge branch 'zecke/mgcp-transactions'
diff --git a/openbsc/include/openbsc/mgcp.h b/openbsc/include/openbsc/mgcp.h
index bb21e68..858a29d 100644
--- a/openbsc/include/openbsc/mgcp.h
+++ b/openbsc/include/openbsc/mgcp.h
@@ -83,7 +83,7 @@
typedef int (*mgcp_change)(struct mgcp_trunk_config *cfg, int endpoint, int state);
typedef int (*mgcp_policy)(struct mgcp_trunk_config *cfg, int endpoint, int state, const char *transactio_id);
typedef int (*mgcp_reset)(struct mgcp_trunk_config *cfg);
-typedef int (*mgcp_rqnt)(struct mgcp_endpoint *endp, char tone, const char *data);
+typedef int (*mgcp_rqnt)(struct mgcp_endpoint *endp, char tone);
#define PORT_ALLOC_STATIC 0
#define PORT_ALLOC_DYNAMIC 1
@@ -176,7 +176,6 @@
* format helper functions
*/
struct msgb *mgcp_handle_message(struct mgcp_config *cfg, struct msgb *msg);
-struct msgb *mgcp_create_response_with_data(int code, const char *txt, const char *msg, const char *trans, const char *data);
/* adc helper */
static inline int mgcp_timeslot_to_endpoint(int multiplex, int timeslot)
diff --git a/openbsc/include/openbsc/mgcp_internal.h b/openbsc/include/openbsc/mgcp_internal.h
index 025b813..bcef872 100644
--- a/openbsc/include/openbsc/mgcp_internal.h
+++ b/openbsc/include/openbsc/mgcp_internal.h
@@ -126,6 +126,10 @@
/* SSRC/seq/ts patching for loop */
int allow_patch;
+ /* fields for re-transmission */
+ char *last_trans;
+ char *last_response;
+
/* tap for the endpoint */
struct mgcp_rtp_tap taps[MGCP_TAP_COUNT];
};
diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c
index 54af15b..63fee5f 100644
--- a/openbsc/src/libmgcp/mgcp_protocol.c
+++ b/openbsc/src/libmgcp/mgcp_protocol.c
@@ -36,31 +36,41 @@
#include <openbsc/mgcp.h>
#include <openbsc/mgcp_internal.h>
-#define for_each_line(input, line, save) \
- for (line = strtok_r(input, "\r\n", &save); line; \
+#define for_each_line(line, save) \
+ for (line = strtok_r(NULL, "\r\n", &save); line;\
line = strtok_r(NULL, "\r\n", &save))
static void mgcp_rtp_end_reset(struct mgcp_rtp_end *end);
+struct mgcp_parse_data {
+ struct mgcp_config *cfg;
+ struct mgcp_endpoint *endp;
+ char *trans;
+ char *save;
+ int found;
+};
+
struct mgcp_request {
char *name;
- struct msgb *(*handle_request) (struct mgcp_config *cfg, struct msgb *msg);
+ struct msgb *(*handle_request) (struct mgcp_parse_data *data);
char *debug_name;
};
#define MGCP_REQUEST(NAME, REQ, DEBUG_NAME) \
{ .name = NAME, .handle_request = REQ, .debug_name = DEBUG_NAME },
-static struct msgb *handle_audit_endpoint(struct mgcp_config *cfg, struct msgb *msg);
-static struct msgb *handle_create_con(struct mgcp_config *cfg, struct msgb *msg);
-static struct msgb *handle_delete_con(struct mgcp_config *cfg, struct msgb *msg);
-static struct msgb *handle_modify_con(struct mgcp_config *cfg, struct msgb *msg);
-static struct msgb *handle_rsip(struct mgcp_config *cfg, struct msgb *msg);
-static struct msgb *handle_noti_req(struct mgcp_config *cfg, struct msgb *msg);
+static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *data);
+static struct msgb *handle_create_con(struct mgcp_parse_data *data);
+static struct msgb *handle_delete_con(struct mgcp_parse_data *data);
+static struct msgb *handle_modify_con(struct mgcp_parse_data *data);
+static struct msgb *handle_rsip(struct mgcp_parse_data *data);
+static struct msgb *handle_noti_req(struct mgcp_parse_data *data);
static void create_transcoder(struct mgcp_endpoint *endp);
static void delete_transcoder(struct mgcp_endpoint *endp);
+static int mgcp_analyze_header(struct mgcp_parse_data *parse, char *data);
+
static uint32_t generate_call_id(struct mgcp_config *cfg)
{
int i;
@@ -107,7 +117,19 @@
return msg;
}
-static struct msgb *create_resp(int code, const char *txt, const char *msg,
+static struct msgb *do_retransmission(const struct mgcp_endpoint *endp)
+{
+ struct msgb *msg = mgcp_msgb_alloc();
+ if (!msg)
+ return NULL;
+
+ msg->l2h = msgb_put(msg, strlen(endp->last_response));
+ memcpy(msg->l2h, endp->last_response, msgb_l2len(msg));
+ return msg;
+}
+
+static struct msgb *create_resp(struct mgcp_endpoint *endp, int code,
+ const char *txt, const char *msg,
const char *trans, const char *param,
const char *sdp)
{
@@ -127,31 +149,41 @@
}
res->l2h = msgb_put(res, len);
- LOGP(DMGCP, LOGL_DEBUG, "Sending response: code: %d for '%s'\n", code, res->l2h);
+ LOGP(DMGCP, LOGL_DEBUG, "Generated response: code: %d for '%s'\n", code, res->l2h);
+
+ /*
+ * Remember the last transmission per endpoint.
+ */
+ if (endp) {
+ struct mgcp_trunk_config *tcfg = endp->tcfg;
+ talloc_free(endp->last_response);
+ talloc_free(endp->last_trans);
+ endp->last_trans = talloc_strdup(tcfg->endpoints, trans);
+ endp->last_response = talloc_strndup(tcfg->endpoints,
+ (const char *) res->l2h,
+ msgb_l2len(res));
+ }
+
return res;
}
-struct msgb *mgcp_create_response_with_data(int code, const char *txt,
- const char *msg, const char *trans,
- const char *data)
-{
- return create_resp(code, txt, msg, trans, NULL, data);
-}
-
-static struct msgb *create_ok_resp_with_param(int code, const char *msg,
+static struct msgb *create_ok_resp_with_param(struct mgcp_endpoint *endp,
+ int code, const char *msg,
const char *trans, const char *param)
{
- return create_resp(code, " OK", msg, trans, param, NULL);
+ return create_resp(endp, code, " OK", msg, trans, param, NULL);
}
-static struct msgb *create_ok_response(int code, const char *msg, const char *trans)
+static struct msgb *create_ok_response(struct mgcp_endpoint *endp,
+ int code, const char *msg, const char *trans)
{
- return create_ok_resp_with_param(code, msg, trans, NULL);
+ return create_ok_resp_with_param(endp, code, msg, trans, NULL);
}
-static struct msgb *create_err_response(int code, const char *msg, const char *trans)
+static struct msgb *create_err_response(struct mgcp_endpoint *endp,
+ int code, const char *msg, const char *trans)
{
- return mgcp_create_response_with_data(code, " FAIL", msg, trans, NULL);
+ return create_resp(endp, code, " FAIL", msg, trans, NULL, NULL);
}
static struct msgb *create_response_with_sdp(struct mgcp_endpoint *endp,
@@ -174,7 +206,7 @@
endp->ci, endp->ci, addr, addr,
endp->net_end.local_port, endp->bts_end.payload_type,
endp->bts_end.payload_type, endp->tcfg->audio_name);
- return mgcp_create_response_with_data(200, " OK", msg, trans_id, sdp_record);
+ return create_resp(endp, 200, " OK", msg, trans_id, NULL, sdp_record);
}
/*
@@ -184,31 +216,50 @@
*/
struct msgb *mgcp_handle_message(struct mgcp_config *cfg, struct msgb *msg)
{
- int code;
+ struct mgcp_parse_data pdata;
+ int i, code, handled = 0;
struct msgb *resp = NULL;
+ char *data;
if (msgb_l2len(msg) < 4) {
- LOGP(DMGCP, LOGL_ERROR, "mgs too short: %d\n", msg->len);
+ LOGP(DMGCP, LOGL_ERROR, "msg too short: %d\n", msg->len);
return NULL;
}
/* attempt to treat it as a response */
if (sscanf((const char *)&msg->l2h[0], "%3d %*s", &code) == 1) {
LOGP(DMGCP, LOGL_DEBUG, "Response: Code: %d\n", code);
- } else {
- int i, handled = 0;
- msg->l3h = &msg->l2h[4];
- for (i = 0; i < ARRAY_SIZE(mgcp_requests); ++i)
- if (strncmp(mgcp_requests[i].name, (const char *) &msg->l2h[0], 4) == 0) {
- handled = 1;
- resp = mgcp_requests[i].handle_request(cfg, msg);
- break;
- }
- if (!handled) {
- LOGP(DMGCP, LOGL_NOTICE, "MSG with type: '%.4s' not handled\n", &msg->l2h[0]);
+ return NULL;
+ }
+
+ msg->l3h = &msg->l2h[4];
+
+
+ /*
+ * Check for a duplicate message and respond.
+ * FIXME: Verify that the msg->l3h is NULL terminated.
+ */
+ memset(&pdata, 0, sizeof(pdata));
+ pdata.cfg = cfg;
+ data = strtok_r((char *) msg->l3h, "\r\n", &pdata.save);
+ pdata.found = mgcp_analyze_header(&pdata, data);
+ if (pdata.endp && pdata.trans
+ && pdata.endp->last_trans
+ && strcmp(pdata.endp->last_trans, pdata.trans) == 0) {
+ return do_retransmission(pdata.endp);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(mgcp_requests); ++i) {
+ if (strncmp(mgcp_requests[i].name, (const char *) &msg->l2h[0], 4) == 0) {
+ handled = 1;
+ resp = mgcp_requests[i].handle_request(&pdata);
+ break;
}
}
+ if (!handled)
+ LOGP(DMGCP, LOGL_NOTICE, "MSG with type: '%.4s' not handled\n", &msg->l2h[0]);
+
return resp;
}
@@ -280,29 +331,25 @@
* @returns 0 when the status line was complete and transaction_id and
* endp out parameters are set.
*/
-static int mgcp_analyze_header(struct mgcp_config *cfg, char *data,
- const char **transaction_id, struct mgcp_endpoint **endp)
+static int mgcp_analyze_header(struct mgcp_parse_data *pdata, char *data)
{
int i = 0;
char *elem, *save;
- *transaction_id = "000000";
+ pdata->trans = "000000";
for (elem = strtok_r(data, " ", &save); elem;
elem = strtok_r(NULL, " ", &save)) {
switch (i) {
case 0:
- *transaction_id = elem;
+ pdata->trans = elem;
break;
case 1:
- if (endp) {
- *endp = find_endpoint(cfg, elem);
- if (!*endp) {
- LOGP(DMGCP, LOGL_ERROR,
- "Unable to find Endpoint `%s'\n",
- elem);
- return -1;
- }
+ pdata->endp = find_endpoint(pdata->cfg, elem);
+ if (!pdata->endp) {
+ LOGP(DMGCP, LOGL_ERROR,
+ "Unable to find Endpoint `%s'\n", elem);
+ return -1;
}
break;
case 2:
@@ -325,8 +372,8 @@
if (i != 4) {
LOGP(DMGCP, LOGL_ERROR, "MGCP status line too short.\n");
- *transaction_id = "000000";
- *endp = NULL;
+ pdata->trans = "000000";
+ pdata->endp = NULL;
return -1;
}
@@ -359,18 +406,12 @@
return 0;
}
-static struct msgb *handle_audit_endpoint(struct mgcp_config *cfg, struct msgb *msg)
+static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *p)
{
- int found;
- const char *trans_id;
- struct mgcp_endpoint *endp;
- char *data = strtok((char *) msg->l3h, "\r\n");
-
- found = mgcp_analyze_header(cfg, data, &trans_id, &endp);
- if (found != 0)
- return create_err_response(500, "AUEP", trans_id);
+ if (p->found != 0)
+ return create_err_response(NULL, 500, "AUEP", p->trans);
else
- return create_ok_response(200, "AUEP", trans_id);
+ return create_ok_response(p->endp, 200, "AUEP", p->trans);
}
static int parse_conn_mode(const char *msg, int *conn_mode)
@@ -462,28 +503,22 @@
return 0;
}
-static struct msgb *handle_create_con(struct mgcp_config *cfg, struct msgb *msg)
+static struct msgb *handle_create_con(struct mgcp_parse_data *p)
{
- const char *trans_id;
struct mgcp_trunk_config *tcfg;
- struct mgcp_endpoint *endp;
+ struct mgcp_endpoint *endp = p->endp;
int error_code = 400;
const char *local_options = NULL;
const char *callid = NULL;
const char *mode = NULL;
- char *line, *save;
+ char *line;
+
+ if (p->found != 0)
+ return create_err_response(NULL, 510, "CRCX", p->trans);
/* parse CallID C: and LocalParameters L: */
- for_each_line((char *) msg->l3h, line, save) {
- /* skip first line */
- if (line == (char *) msg->l3h) {
- int found = mgcp_analyze_header(cfg, line, &trans_id, &endp);
- if (found != 0)
- return create_err_response(510, "CRCX", trans_id);
- continue;
- }
-
+ for_each_line(line, p->save) {
switch (line[0]) {
case 'L':
local_options = (const char *) line + 3;
@@ -501,31 +536,26 @@
}
}
- tcfg = endp->tcfg;
+ tcfg = p->endp->tcfg;
/* Check required data */
if (!callid || !mode) {
LOGP(DMGCP, LOGL_ERROR, "Missing callid and mode in CRCX on 0x%x\n",
ENDPOINT_NUMBER(endp));
- return create_err_response(400, "CRCX", trans_id);
+ return create_err_response(endp, 400, "CRCX", p->trans);
}
- /* this appears to be a retransmission, maybe check trans id */
- if (endp->allocated &&
- memcmp(endp->callid, callid, strlen(endp->callid)) == 0)
- return create_response_with_sdp(endp, "CRCX", trans_id);
-
if (endp->allocated) {
if (tcfg->force_realloc) {
LOGP(DMGCP, LOGL_NOTICE, "Endpoint 0x%x already allocated. Forcing realloc.\n",
ENDPOINT_NUMBER(endp));
mgcp_free_endp(endp);
- if (cfg->realloc_cb)
- cfg->realloc_cb(tcfg, ENDPOINT_NUMBER(endp));
+ if (p->cfg->realloc_cb)
+ p->cfg->realloc_cb(tcfg, ENDPOINT_NUMBER(endp));
} else {
LOGP(DMGCP, LOGL_ERROR, "Endpoint is already used. 0x%x\n",
ENDPOINT_NUMBER(endp));
- return create_err_response(400, "CRCX", trans_id);
+ return create_err_response(endp, 400, "CRCX", p->trans);
}
}
@@ -551,7 +581,7 @@
goto error2;
/* assign a local call identifier or fail */
- endp->ci = generate_call_id(cfg);
+ endp->ci = generate_call_id(p->cfg);
if (endp->ci == CI_UNUSED)
goto error2;
@@ -559,13 +589,16 @@
endp->bts_end.payload_type = tcfg->audio_payload;
/* policy CB */
- if (cfg->policy_cb) {
- switch (cfg->policy_cb(tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_CRCX, trans_id)) {
+ if (p->cfg->policy_cb) {
+ int rc;
+ rc = p->cfg->policy_cb(tcfg, ENDPOINT_NUMBER(endp),
+ MGCP_ENDP_CRCX, p->trans);
+ switch (rc) {
case MGCP_POLICY_REJECT:
LOGP(DMGCP, LOGL_NOTICE, "CRCX rejected by policy on 0x%x\n",
ENDPOINT_NUMBER(endp));
mgcp_free_endp(endp);
- return create_err_response(400, "CRCX", trans_id);
+ return create_err_response(endp, 400, "CRCX", p->trans);
break;
case MGCP_POLICY_DEFER:
/* stop processing */
@@ -581,42 +614,34 @@
LOGP(DMGCP, LOGL_DEBUG, "Creating endpoint on: 0x%x CI: %u port: %u/%u\n",
ENDPOINT_NUMBER(endp), endp->ci,
endp->net_end.local_port, endp->bts_end.local_port);
- if (cfg->change_cb)
- cfg->change_cb(tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_CRCX);
+ if (p->cfg->change_cb)
+ p->cfg->change_cb(tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_CRCX);
create_transcoder(endp);
- return create_response_with_sdp(endp, "CRCX", trans_id);
+ return create_response_with_sdp(endp, "CRCX", p->trans);
error2:
mgcp_free_endp(endp);
LOGP(DMGCP, LOGL_NOTICE, "Resource error on 0x%x\n", ENDPOINT_NUMBER(endp));
- return create_err_response(error_code, "CRCX", trans_id);
+ return create_err_response(endp, error_code, "CRCX", p->trans);
}
-static struct msgb *handle_modify_con(struct mgcp_config *cfg, struct msgb *msg)
+static struct msgb *handle_modify_con(struct mgcp_parse_data *p)
{
- const char *trans_id;
- struct mgcp_endpoint *endp;
+ struct mgcp_endpoint *endp = p->endp;
int error_code = 500;
int silent = 0;
- char *line, *save;
+ char *line;
- for_each_line((char *) msg->l3h, line, save) {
- /* skip first line */
- if (line == (char *) msg->l3h) {
- int found = mgcp_analyze_header(cfg, line, &trans_id,
- &endp);
- if (found != 0)
- return create_err_response(510, "MDCX",
- trans_id);
+ if (p->found != 0)
+ return create_err_response(NULL, 510, "MDCX", p->trans);
- if (endp->ci == CI_UNUSED) {
- LOGP(DMGCP, LOGL_ERROR, "Endpoint is not "
- "holding a connection. 0x%x\n",
- ENDPOINT_NUMBER(endp));
- return create_err_response(400, "MDCX", trans_id);
- }
- }
+ if (endp->ci == CI_UNUSED) {
+ LOGP(DMGCP, LOGL_ERROR, "Endpoint is not "
+ "holding a connection. 0x%x\n", ENDPOINT_NUMBER(endp));
+ return create_err_response(endp, 400, "MDCX", p->trans);
+ }
+ for_each_line(line, p->save) {
switch (line[0]) {
case 'C': {
if (verify_call_id(endp, line + 3) != 0)
@@ -678,14 +703,17 @@
}
/* policy CB */
- if (cfg->policy_cb) {
- switch (cfg->policy_cb(endp->tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_MDCX, trans_id)) {
+ if (p->cfg->policy_cb) {
+ int rc;
+ rc = p->cfg->policy_cb(endp->tcfg, ENDPOINT_NUMBER(endp),
+ MGCP_ENDP_MDCX, p->trans);
+ switch (rc) {
case MGCP_POLICY_REJECT:
LOGP(DMGCP, LOGL_NOTICE, "MDCX rejected by policy on 0x%x\n",
ENDPOINT_NUMBER(endp));
if (silent)
goto out_silent;
- return create_err_response(400, "MDCX", trans_id);
+ return create_err_response(endp, 400, "MDCX", p->trans);
break;
case MGCP_POLICY_DEFER:
/* stop processing */
@@ -700,47 +728,39 @@
/* modify */
LOGP(DMGCP, LOGL_DEBUG, "Modified endpoint on: 0x%x Server: %s:%u\n",
ENDPOINT_NUMBER(endp), inet_ntoa(endp->net_end.addr), ntohs(endp->net_end.rtp_port));
- if (cfg->change_cb)
- cfg->change_cb(endp->tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_MDCX);
+ if (p->cfg->change_cb)
+ p->cfg->change_cb(endp->tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_MDCX);
if (silent)
goto out_silent;
- return create_response_with_sdp(endp, "MDCX", trans_id);
+ return create_response_with_sdp(endp, "MDCX", p->trans);
error3:
- return create_err_response(error_code, "MDCX", trans_id);
+ return create_err_response(endp, error_code, "MDCX", p->trans);
out_silent:
return NULL;
}
-static struct msgb *handle_delete_con(struct mgcp_config *cfg, struct msgb *msg)
+static struct msgb *handle_delete_con(struct mgcp_parse_data *p)
{
- const char *trans_id;
- struct mgcp_endpoint *endp;
+ struct mgcp_endpoint *endp = p->endp;
int error_code = 400;
int silent = 0;
- char *line, *save;
+ char *line;
char stats[1048];
- for_each_line((char *) msg->l3h, line, save) {
- /* skip first line */
- if ((char *) msg->l3h == line) {
- int found = mgcp_analyze_header(cfg, line, &trans_id,
- &endp);
- if (found != 0)
- return create_err_response(error_code, "DLCX",
- trans_id);
+ if (p->found != 0)
+ return create_err_response(NULL, error_code, "DLCX", p->trans);
- if (!endp->allocated) {
- LOGP(DMGCP, LOGL_ERROR, "Endpoint is not "
- "used. 0x%x\n", ENDPOINT_NUMBER(endp));
- return create_err_response(400, "DLCX",
- trans_id);
- }
- }
+ if (!p->endp->allocated) {
+ LOGP(DMGCP, LOGL_ERROR, "Endpoint is not used. 0x%x\n",
+ ENDPOINT_NUMBER(endp));
+ return create_err_response(endp, 400, "DLCX", p->trans);
+ }
+ for_each_line(line, p->save) {
switch (line[0]) {
case 'C':
if (verify_call_id(endp, line + 3) != 0)
@@ -761,14 +781,17 @@
}
/* policy CB */
- if (cfg->policy_cb) {
- switch (cfg->policy_cb(endp->tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_DLCX, trans_id)) {
+ if (p->cfg->policy_cb) {
+ int rc;
+ rc = p->cfg->policy_cb(endp->tcfg, ENDPOINT_NUMBER(endp),
+ MGCP_ENDP_DLCX, p->trans);
+ switch (rc) {
case MGCP_POLICY_REJECT:
LOGP(DMGCP, LOGL_NOTICE, "DLCX rejected by policy on 0x%x\n",
ENDPOINT_NUMBER(endp));
if (silent)
goto out_silent;
- return create_err_response(400, "DLCX", trans_id);
+ return create_err_response(endp, 400, "DLCX", p->trans);
break;
case MGCP_POLICY_DEFER:
/* stop processing */
@@ -790,35 +813,29 @@
delete_transcoder(endp);
mgcp_free_endp(endp);
- if (cfg->change_cb)
- cfg->change_cb(endp->tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_DLCX);
+ if (p->cfg->change_cb)
+ p->cfg->change_cb(endp->tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_DLCX);
if (silent)
goto out_silent;
- return create_ok_resp_with_param(250, "DLCX", trans_id, stats);
+ return create_ok_resp_with_param(endp, 250, "DLCX", p->trans, stats);
error3:
- return create_err_response(error_code, "DLCX", trans_id);
+ return create_err_response(endp, error_code, "DLCX", p->trans);
out_silent:
return NULL;
}
-static struct msgb *handle_rsip(struct mgcp_config *cfg, struct msgb *msg)
+static struct msgb *handle_rsip(struct mgcp_parse_data *p)
{
- const char *trans_id;
- struct mgcp_endpoint *endp;
- int found;
- char *data = strtok((char *) msg->l3h, "\r\n");
-
- found = mgcp_analyze_header(cfg, data, &trans_id, &endp);
- if (found != 0) {
+ if (p->found != 0) {
LOGP(DMGCP, LOGL_ERROR, "Failed to find the endpoint.\n");
return NULL;
}
- if (cfg->reset_cb)
- cfg->reset_cb(endp->tcfg);
+ if (p->cfg->reset_cb)
+ p->cfg->reset_cb(p->endp->tcfg);
return NULL;
}
@@ -836,32 +853,16 @@
* can also request when the notification should be send and such. We don't
* do this right now.
*/
-static struct msgb *handle_noti_req(struct mgcp_config *cfg, struct msgb *msg)
+static struct msgb *handle_noti_req(struct mgcp_parse_data *p)
{
- const char *trans_id;
- struct mgcp_endpoint *endp;
- int found, res = 0;
- char *line, *save;
+ int res = 0;
+ char *line;
char tone = 0;
- for_each_line((char *) msg->l3h, line, save) {
- /* skip first line */
- if ((char *) msg->l3h == line) {
- found = mgcp_analyze_header(cfg, line, &trans_id,
- &endp);
- if (found != 0)
- return create_err_response(400, "RQNT",
- trans_id);
+ if (p->found != 0)
+ return create_err_response(NULL, 400, "RQNT", p->trans);
- if (!endp->allocated) {
- LOGP(DMGCP, LOGL_ERROR,
- "Endpoint is not used. 0x%x\n",
- ENDPOINT_NUMBER(endp));
- return create_err_response(400, "RQNT",
- trans_id);
- }
- }
-
+ for_each_line(line, p->save) {
switch (line[0]) {
case 'S':
tone = extract_tone(line);
@@ -871,14 +872,14 @@
/* we didn't see a signal request with a tone */
if (tone == CHAR_MAX)
- return create_ok_response(200, "RQNT", trans_id);
+ return create_ok_response(p->endp, 200, "RQNT", p->trans);
- if (cfg->rqnt_cb)
- res = cfg->rqnt_cb(endp, tone, (const char *) msg->l3h);
+ if (p->cfg->rqnt_cb)
+ res = p->cfg->rqnt_cb(p->endp, tone);
return res == 0 ?
- create_ok_response(200, "RQNT", trans_id) :
- create_err_response(res, "RQNT", trans_id);
+ create_ok_response(p->endp, 200, "RQNT", p->trans) :
+ create_err_response(p->endp, res, "RQNT", p->trans);
}
struct mgcp_config *mgcp_config_alloc(void)
@@ -996,15 +997,11 @@
endp->ci = CI_UNUSED;
endp->allocated = 0;
- if (endp->callid) {
- talloc_free(endp->callid);
- endp->callid = NULL;
- }
+ talloc_free(endp->callid);
+ endp->callid = NULL;
- if (endp->local_options) {
- talloc_free(endp->local_options);
- endp->local_options = NULL;
- }
+ talloc_free(endp->local_options);
+ endp->local_options = NULL;
mgcp_rtp_end_reset(&endp->bts_end);
mgcp_rtp_end_reset(&endp->net_end);
diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c
index 74f5efe..4dfd2ab 100644
--- a/openbsc/tests/mgcp/mgcp_test.c
+++ b/openbsc/tests/mgcp/mgcp_test.c
@@ -34,6 +34,21 @@
#define SHORT "CRCX \r\n"
#define SHORT_RET "510 000000 FAIL\r\n"
+#define MDCX_WRONG_EP "MDCX 18983213 ds/e1-3/1@172.16.6.66 MGCP 1.0\r\n"
+#define MDCX_ERR_RET "510 18983213 FAIL\r\n"
+#define MDCX_UNALLOCATED "MDCX 18983214 ds/e1-1/2@172.16.6.66 MGCP 1.0\r\n"
+#define MDCX_RET "400 18983214 FAIL\r\n"
+#define MDCX3 "MDCX 18983215 1@mgw MGCP 1.0\r\n"
+#define MDCX3_RET "200 18983215 OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 23 IN IP4 0.0.0.0\r\n" \
+ "c=IN IP4 0.0.0.0\r\n" \
+ "t=0 0\r\n" \
+ "m=audio 0 RTP/AVP 126\r\n" \
+ "a=rtpmap:126 AMR/8000\r\n"
+
#define SHORT2 "CRCX 1"
#define SHORT2_RET "510 000000 FAIL\r\n"
#define SHORT3 "CRCX 1 1@mgw"
@@ -68,6 +83,16 @@
"m=audio 5904 RTP/AVP 97\r" \
"a=rtpmap:97 GSM-EFR/8000\r"
+#define CRCX_ZYN_RET "200 2 OK\r\n" \
+ "I: 2\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 2 23 IN IP4 0.0.0.0\r\n" \
+ "c=IN IP4 0.0.0.0\r\n" \
+ "t=0 0\r\n" \
+ "m=audio 0 RTP/AVP 126\r\n" \
+ "a=rtpmap:126 AMR/8000\r\n"
+
#define DLCX "DLCX 7 1@mgw MGCP 1.0\r\n" \
"C: 2\r\n"
@@ -78,11 +103,12 @@
"X: B244F267488\r\n" \
"S: D/9\r\n"
-#define RQNT2 "RQNT 186908780 1@mgw MGCP 1.0\r\n" \
+#define RQNT2 "RQNT 186908781 1@mgw MGCP 1.0\r\n" \
"X: ADD4F26746F\r\n" \
"R: D/[0-9#*](N), G/ft, fxr/t38\r\n"
-#define RQNT_RET "200 186908780 OK\r\n"
+#define RQNT1_RET "200 186908780 OK\r\n"
+#define RQNT2_RET "200 186908781 OK\r\n"
struct mgcp_test {
const char *name;
@@ -90,18 +116,30 @@
const char *exp_resp;
};
-const struct mgcp_test tests[] = {
+static const struct mgcp_test tests[] = {
{ "AUEP1", AUEP1, AUEP1_RET },
{ "AUEP2", AUEP2, AUEP2_RET },
+ { "MDCX1", MDCX_WRONG_EP, MDCX_ERR_RET },
+ { "MDCX2", MDCX_UNALLOCATED, MDCX_RET },
{ "CRCX", CRCX, CRCX_RET },
- { "CRCX_ZYN", CRCX_ZYN, CRCX_RET },
+ { "MDCX3", MDCX3, MDCX3_RET },
+ { "DLCX", DLCX, DLCX_RET },
+ { "CRCX_ZYN", CRCX_ZYN, CRCX_ZYN_RET },
{ "EMPTY", EMPTY, EMPTY_RET },
{ "SHORT1", SHORT, SHORT_RET },
{ "SHORT2", SHORT2, SHORT2_RET },
{ "SHORT3", SHORT3, SHORT2_RET },
{ "SHORT4", SHORT4, SHORT2_RET },
- { "RQNT1", RQNT, RQNT_RET },
- { "RQNT2", RQNT2, RQNT_RET },
+ { "RQNT1", RQNT, RQNT1_RET },
+ { "RQNT2", RQNT2, RQNT2_RET },
+ { "DLCX", DLCX, DLCX_RET },
+};
+
+static const struct mgcp_test retransmit[] = {
+ { "CRCX", CRCX, CRCX_RET },
+ { "RQNT1", RQNT, RQNT1_RET },
+ { "RQNT2", RQNT2, RQNT2_RET },
+ { "MDCX3", MDCX3, MDCX3_RET },
{ "DLCX", DLCX, DLCX_RET },
};
@@ -148,7 +186,46 @@
talloc_free(cfg);
}
-static int rqnt_cb(struct mgcp_endpoint *endp, char _tone, const char *data)
+static void test_retransmission(void)
+{
+ struct mgcp_config *cfg;
+ int i;
+
+ cfg = mgcp_config_alloc();
+
+ cfg->trunk.number_endpoints = 64;
+ mgcp_endpoints_allocate(&cfg->trunk);
+
+ mgcp_endpoints_allocate(mgcp_trunk_alloc(cfg, 1));
+
+ for (i = 0; i < ARRAY_SIZE(retransmit); i++) {
+ const struct mgcp_test *t = &retransmit[i];
+ struct msgb *inp;
+ struct msgb *msg;
+
+ printf("Testing %s\n", t->name);
+
+ inp = create_msg(t->req);
+ msg = mgcp_handle_message(cfg, inp);
+ msgb_free(inp);
+ if (strcmp((char *) msg->data, t->exp_resp) != 0)
+ printf("%s failed '%s'\n", t->name, (char *) msg->data);
+ msgb_free(msg);
+
+ /* Retransmit... */
+ printf("Re-transmitting %s\n", t->name);
+ inp = create_msg(t->req);
+ msg = mgcp_handle_message(cfg, inp);
+ msgb_free(inp);
+ if (strcmp((char *) msg->data, t->exp_resp) != 0)
+ printf("%s failed '%s'\n", t->name, (char *) msg->data);
+ msgb_free(msg);
+ }
+
+ talloc_free(cfg);
+}
+
+static int rqnt_cb(struct mgcp_endpoint *endp, char _tone)
{
ptrdiff_t tone = _tone;
endp->cfg->data = (void *) tone;
@@ -251,6 +328,7 @@
osmo_init_logging(&log_info);
test_messages();
+ test_retransmission();
test_packet_loss_calc();
test_rqnt_cb();
diff --git a/openbsc/tests/mgcp/mgcp_test.ok b/openbsc/tests/mgcp/mgcp_test.ok
index 1143a04..224bba8 100644
--- a/openbsc/tests/mgcp/mgcp_test.ok
+++ b/openbsc/tests/mgcp/mgcp_test.ok
@@ -1,6 +1,10 @@
Testing AUEP1
Testing AUEP2
+Testing MDCX1
+Testing MDCX2
Testing CRCX
+Testing MDCX3
+Testing DLCX
Testing CRCX_ZYN
Testing EMPTY
Testing SHORT1
@@ -10,5 +14,15 @@
Testing RQNT1
Testing RQNT2
Testing DLCX
+Testing CRCX
+Re-transmitting CRCX
+Testing RQNT1
+Re-transmitting RQNT1
+Testing RQNT2
+Re-transmitting RQNT2
+Testing MDCX3
+Re-transmitting MDCX3
+Testing DLCX
+Re-transmitting DLCX
Testing packet loss calculation.
Done