aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2015-08-16 15:23:32 +0200
committerHarald Welte <laforge@gnumonks.org>2015-08-18 19:35:01 +0200
commit22df4ac8481abb112025166bd58d6652094a749b (patch)
tree85ee6fad2c2a42c091c052bf97b2b1ad84de4560
parent78fa99103d2de97a44d277befe3d7dc9ea00c267 (diff)
LLC: Don't dispatch XID frames into GMM
For some odd reasons the XID is not a separate SAPI but has been kludged into the GMM SAPI. This means we ahve to be careful not to dispatch XID frames into GMM. We do this by introducing an explicit check for UI frames before the dispatch to GMM. The previous code already was doing "the right thing" but printed occasional messages like "gprs_gmm.c:2082 Unknown GSM 04.08 discriminator 0x01: 01 00 0e 00 32 11 03 16 01 90 63 28 0b". Those should be gone after this patch.
-rw-r--r--openbsc/src/gprs/gprs_llc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c
index 2d5d9be52..936354a09 100644
--- a/openbsc/src/gprs/gprs_llc.c
+++ b/openbsc/src/gprs/gprs_llc.c
@@ -679,7 +679,7 @@ int gprs_llc_rcvmsg(struct msgb *msg, struct tlv_parsed *tv)
return rc;
/* llhp.data is only set when we need to send LL_[UNIT]DATA_IND up */
- if (llhp.data && llhp.data_len) {
+ if (llhp.cmd == GPRS_LLC_UI && llhp.data && llhp.data_len) {
msgb_gmmh(msg) = llhp.data;
switch (llhp.sapi) {
case GPRS_SAPI_GMM: