[MERGED] osmo-ttcn3-hacks[master]: BSSGP/LLC: Fix LLCC SAPI for SM

Harald Welte gerrit-no-reply at lists.osmocom.org
Sun Feb 18 09:54:29 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: BSSGP/LLC: Fix LLCC SAPI for SM
......................................................................


BSSGP/LLC: Fix LLCC SAPI for SM

While in TS 24.007 there is a separate L3 SAPI for GMM and SM,
this only applies to messages sent over LAPDm, and not LLC.

In LLC, both GMM and SM are sent via the same LLGMM LLC-SAPI.

Change-Id: I7814c952cd7f6032222b190d396aaa0570571bfc
---
M library/BSSGP_Emulation.ttcn
M library/LLC_Templates.ttcn
2 files changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn
index fb3f7d4..1ced242 100644
--- a/library/BSSGP_Emulation.ttcn
+++ b/library/BSSGP_Emulation.ttcn
@@ -562,7 +562,7 @@
 	if (ischosen(l3_mo.msgs.gprs_mm)) {
 		return c_LLC_SAPI_LLGMM;
 	} else if (ischosen(l3_mo.msgs.gprs_sm)) {
-		return c_LLC_SAPI_LLSM;
+		return c_LLC_SAPI_LLGMM;
 	} else if (ischosen(l3_mo.msgs.sms)) {
 		return c_LLC_SAPI_LLSMS;
 	}
@@ -574,7 +574,7 @@
 	if (ischosen(l3_mt.msgs.gprs_mm)) {
 		return c_LLC_SAPI_LLGMM;
 	} else if (ischosen(l3_mt.msgs.gprs_sm)) {
-		return c_LLC_SAPI_LLSM;
+		return c_LLC_SAPI_LLGMM;
 	} else if (ischosen(l3_mt.msgs.sms)) {
 		return c_LLC_SAPI_LLSMS;
 	}
diff --git a/library/LLC_Templates.ttcn b/library/LLC_Templates.ttcn
index e387b36..cfe97f8 100644
--- a/library/LLC_Templates.ttcn
+++ b/library/LLC_Templates.ttcn
@@ -58,7 +58,6 @@
 const BIT4 c_LLC_SAPI_LLSMS := '0111'B;
 const BIT4 c_LLC_SAPI_TOM8 := '1000'B;
 const BIT4 c_LLC_SAPI_LL9 := '1001'B;
-const BIT4 c_LLC_SAPI_LLSM := '1010'B;
 const BIT4 c_LLC_SAPI_LL11 := '1011'B;
 
 const BIT1 LLC_CR_DL_CMD := '1'B;
@@ -67,7 +66,7 @@
 const BIT1 LLC_CR_UL_RSP := '1'B;
 
 /* LLC UI frame with SAPI for L3 payload */
-template PDU_LLC tr_LLC_UI_L3 := ( tr_LLC_UI(?, c_LLC_SAPI_LLGMM), tr_LLC_UI(?, c_LLC_SAPI_LLSM) );
+template PDU_LLC tr_LLC_UI_L3 := ( tr_LLC_UI(?, c_LLC_SAPI_LLGMM) );
 
 
 }

-- 
To view, visit https://gerrit.osmocom.org/6565
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7814c952cd7f6032222b190d396aaa0570571bfc
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder


More information about the gerrit-log mailing list