paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-29 02:53:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mgcp] Do not operate on the ->data pointer, use ->l2h instead

Browse Source 
This would have been broken once we attempt to parse encapsulated
MGCP messages.
This commit is contained in:
Holger Hans Peter Freyther
2010-03-31 13:26:46 +02:00
parent c77efdf057
commit f36a11a35d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openbsc/src/mgcp/mgcp_protocol.c
View File

@@ -202,25 +202,25 @@ struct msgb *mgcp_handle_message(struct mgcp_config *cfg, struct msgb *msg)
int code; int code;
struct msgb *resp = NULL; struct msgb *resp = NULL;
if (msg->len < 4) { if (msgb_l2len(msg) < 4) {
LOGP(DMGCP, LOGL_ERROR, "mgs too short: %d\n", msg->len); LOGP(DMGCP, LOGL_ERROR, "mgs too short: %d\n", msg->len);
return NULL; return NULL;
} }
/* attempt to treat it as a response */ /* attempt to treat it as a response */
if (sscanf((const char *)&msg->data[0], "%3d %*s", &code) == 1) { if (sscanf((const char *)&msg->l2h[0], "%3d %*s", &code) == 1) {
LOGP(DMGCP, LOGL_DEBUG, "Response: Code: %d\n", code); LOGP(DMGCP, LOGL_DEBUG, "Response: Code: %d\n", code);
} else { } else {
int i, handled = 0; int i, handled = 0;
msg->l3h = &msg->l2h[4]; msg->l3h = &msg->l2h[4];
for (i = 0; i < ARRAY_SIZE(mgcp_requests); ++i) for (i = 0; i < ARRAY_SIZE(mgcp_requests); ++i)
if (strncmp(mgcp_requests[i].name, (const char *) &msg->data[0], 4) == 0) { if (strncmp(mgcp_requests[i].name, (const char *) &msg->l2h[0], 4) == 0) {
handled = 1; handled = 1;
resp = mgcp_requests[i].handle_request(cfg, msg); resp = mgcp_requests[i].handle_request(cfg, msg);
break; break;
} }
if (!handled) { if (!handled) {
LOGP(DMGCP, LOGL_NOTICE, "MSG with type: '%.4s' not handled\n", &msg->data[0]); LOGP(DMGCP, LOGL_NOTICE, "MSG with type: '%.4s' not handled\n", &msg->l2h[0]);
} }
} }