diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2018-02-22 12:00:00 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-03-14 21:04:50 +0000 |
| commit | 3a77652cd7cf30e03de979d55986632189a9c18f (patch) | |
| tree | 8aed27dd2dc1cc1ca073614bf6cccc27a0e71f76 /src/libmsc/msc_mgcp.c | |
| parent | 5c56bc57616bb9cf2c66ec12e312a13e065b237c (diff) | |
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
Diffstat (limited to 'src/libmsc/msc_mgcp.c')
| -rw-r--r-- | src/libmsc/msc_mgcp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 0790b2bc4..541ff0ae6 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -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); |