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

gbproxy: Also handle LLC non UI and LL11 messages 

Currently, these messages lead to a parsing error which prevents them
from being processed any further.

This patch sets the return value of gbprox_parse_llc to 1 in these
cases and fixes a segfault which is triggered by any non-04.08
message.

Sponsored-by: On-Waves ehf
This commit is contained in:
Jacob Erlbeck 2014-08-18 16:50:11 +02:00 committed by Holger Hans Peter Freyther
parent 12496dd7db
commit 3b23d639ab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openbsc/src/gprs/gb_proxy.c
View File

@ -1327,10 +1327,10 @@ static int gbprox_parse_llc(uint8_t *llc, size_t llc_len,
return 0;
if (ghp->sapi != GPRS_SAPI_GMM)
return 0;
return 1;
if (ghp->cmd != GPRS_LLC_UI)
return 0;
return 1;
if (ghp->is_encrypted) {
parse_ctx->need_decryption = 1;
@ -1354,7 +1354,7 @@ static int gbprox_patch_llc(struct msgb *msg, uint8_t *llc, size_t llc_len,
int have_patched = 0;
int fcs;
if (!allow_message_patching(peer, parse_ctx->g48_hdr->msg_type))
if (parse_ctx->g48_hdr && !allow_message_patching(peer, parse_ctx->g48_hdr->msg_type))
return have_patched;
if (parse_ctx->raid_enc) {