cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

msc_mgcp: use more conceise error msg on truncation 

When a truncation check (osmo_strlcpy()) fails handle_error()
is called with MGCP_ERR_NOMEM as cause code. Which finally
results in an "out of memory" message. MGCP_ERR_NOMEM is only
used for failed truncation checks, so it makes sense to choose
a message that describes the cause of the problem better.

- rename MGCP_ERR_NOMEM to MGCP_ERR_TOOLONG
- replace error message string

Change-Id: Ifedb85c1933a30b2aa491b495119919f45782e2c
This commit is contained in:
Philipp Maier 2018-02-22 12:00:00 +01:00 committed by Harald Welte
parent 5c56bc5761
commit 3a77652cd7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libmsc/msc_mgcp.c
View File

@ -63,7 +63,7 @@ enum msc_mgcp_cause_code {
MGCP_ERR_UNSUPP_ADDR_FMT,
MGCP_ERR_RAN_TIMEOUT,
MGCP_ERR_ASS_TIMEOUT,
MGCP_ERR_NOMEM,
MGCP_ERR_TOOLONG,
MGCP_ERR_ASSGMNT_FAIL
};
@ -78,7 +78,7 @@ static const struct value_string msc_mgcp_cause_codes_names[] = {
{MGCP_ERR_UNSUPP_ADDR_FMT, "unsupported network address format used (RAN)"},
{MGCP_ERR_RAN_TIMEOUT, "call could not be completed in time (RAN)"},
{MGCP_ERR_ASS_TIMEOUT, "assignment could not be completed in time (RAN)"},
{MGCP_ERR_NOMEM, "out of memory"},
{MGCP_ERR_TOOLONG, "string value too long"},
{MGCP_ERR_ASSGMNT_FAIL, "assignment failure (RAN)"},
{0, NULL}
};
@ -285,7 +285,7 @@ static void fsm_crcx_ran_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data
};
if (snprintf(mgcp_msg.endpoint, MGCP_ENDPOINT_MAXLEN, MGCP_ENDPOINT_FORMAT, mgcp_ctx->rtp_endpoint) >=
MGCP_ENDPOINT_MAXLEN) {
handle_error(mgcp_ctx, MGCP_ERR_NOMEM, true);
handle_error(mgcp_ctx, MGCP_ERR_TOOLONG, true);
return;
}
msg = mgcp_msg_gen(mgcp, &mgcp_msg);
@ -378,7 +378,7 @@ static void fsm_crcx_cn_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data)
};
if (snprintf(mgcp_msg.endpoint, MGCP_ENDPOINT_MAXLEN, MGCP_ENDPOINT_FORMAT, mgcp_ctx->rtp_endpoint) >=
MGCP_ENDPOINT_MAXLEN) {
handle_error(mgcp_ctx, MGCP_ERR_NOMEM, true);
handle_error(mgcp_ctx, MGCP_ERR_TOOLONG, true);
return;
}
msg = mgcp_msg_gen(mgcp, &mgcp_msg);
@ -541,7 +541,7 @@ static void fsm_mdcx_cn_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data)
};
if (snprintf(mgcp_msg.endpoint, MGCP_ENDPOINT_MAXLEN, MGCP_ENDPOINT_FORMAT, mgcp_ctx->rtp_endpoint) >=
MGCP_ENDPOINT_MAXLEN) {
handle_error(mgcp_ctx, MGCP_ERR_NOMEM, true);
handle_error(mgcp_ctx, MGCP_ERR_TOOLONG, true);
return;
}
msg = mgcp_msg_gen(mgcp, &mgcp_msg);
@ -657,7 +657,7 @@ static void fsm_mdcx_ran_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data
};
if (snprintf(mgcp_msg.endpoint, MGCP_ENDPOINT_MAXLEN, MGCP_ENDPOINT_FORMAT, mgcp_ctx->rtp_endpoint) >=
MGCP_ENDPOINT_MAXLEN) {
handle_error(mgcp_ctx, MGCP_ERR_NOMEM, true);
handle_error(mgcp_ctx, MGCP_ERR_TOOLONG, true);
return;
}
msg = mgcp_msg_gen(mgcp, &mgcp_msg);
@ -741,7 +741,7 @@ static void fsm_call_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data)
};
if (snprintf(mgcp_msg.endpoint, MGCP_ENDPOINT_MAXLEN, MGCP_ENDPOINT_FORMAT, mgcp_ctx->rtp_endpoint) >=
MGCP_ENDPOINT_MAXLEN) {
handle_error(mgcp_ctx, MGCP_ERR_NOMEM, true);
handle_error(mgcp_ctx, MGCP_ERR_TOOLONG, true);
return;
}
msg = mgcp_msg_gen(mgcp, &mgcp_msg);