paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: use heap to store mgcp_response

Browse Source 
The struct that holds the parsing results of the MGCP response is
allocated on the stack. However, it would make sense to allocate
the struct dynamically on the heap. This also would provide a
talloc context that is in reach on most places of the code.

- Allocate struct mgcp_response dynamically in mgcp_client_rx()

- Use struct mgcp_response as talloc context for temporary
  allocated memory while parsing the response.

Change-Id: I5099abe68b580c75b47bc797bf93f01084f0c4db
This commit is contained in:
Philipp Maier
2018-01-31 15:32:55 +01:00
parent 220f487238
commit 1fc6999a77
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libosmo-mgcp-client/mgcp_client.c
View File

@@ -257,7 +257,7 @@ int mgcp_response_parse_params(struct mgcp_response *r)
/* Since this functions performs a destructive parsing, we create a
* local copy of the body data */
data = talloc_zero_size(NULL, strlen(r->body)+1);
data = talloc_zero_size(r, strlen(r->body)+1);
OSMO_ASSERT(data);
data_ptr = data;
osmo_strlcpy(data, r->body, strlen(r->body));
@@ -336,7 +336,7 @@ static int parse_head_params(struct mgcp_response *r)
/* Since this functions performs a destructive parsing, we create a
* local copy of the body data */
data = talloc_zero_size(NULL, strlen(r->body)+1);
data = talloc_zero_size(r, strlen(r->body)+1);
OSMO_ASSERT(data);
data_ptr = data;
osmo_strlcpy(data, r->body, strlen(r->body));
@@ -410,32 +410,42 @@ static struct mgcp_response_pending *mgcp_client_response_pending_get(
*/
int mgcp_client_rx(struct mgcp_client *mgcp, struct msgb *msg)
{
struct mgcp_response r = { 0 };
struct mgcp_response *r;
struct mgcp_response_pending *pending;
int rc;
rc = mgcp_response_parse_head(&r, msg);
r = talloc_zero(mgcp, struct mgcp_response);
OSMO_ASSERT(r);
rc = mgcp_response_parse_head(r, msg);
if (rc) {
LOGP(DLMGCP, LOGL_ERROR, "Cannot parse MGCP response (head)\n");
return -1;
rc = 1;
goto error;
}
rc = parse_head_params(&r);
rc = parse_head_params(r);
if (rc) {
LOGP(DLMGCP, LOGL_ERROR, "Cannot parse MGCP response (head parameters)\n");
return -1;
rc = 1;
goto error;
}
pending = mgcp_client_response_pending_get(mgcp, r.head.trans_id);
pending = mgcp_client_response_pending_get(mgcp, r->head.trans_id);
if (!pending) {
LOGP(DLMGCP, LOGL_ERROR,
"Cannot find matching MGCP transaction for trans_id %d\n",
r.head.trans_id);
return -ENOENT;
r->head.trans_id);
rc = -ENOENT;
goto error;
}
mgcp_client_handle_response(mgcp, pending, &r);
return 0;
mgcp_client_handle_response(mgcp, pending, r);
rc = 0;
error:
talloc_free(r);
return rc;
}
static int mgcp_do_read(struct osmo_fd *fd)