sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs

Change-Id: Ie68794c309e548279381d044a3e34dcdf405084f
Related: SYS#6603, OS#6294
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 0907c5e..2eb1d7e 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -341,7 +341,8 @@
 	/* 7.7.28 MM Context */
 	template (value) MM_Context ts_MM_ContextGSM(template (value) OCT8 kc,
 						     template (value) BIT3 cksn := '000'B,
-						     template (value) BIT3 gea := '000'B) := {
+						     template (value) BIT3 gea := '000'B,
+						     template (value) octetstring triplet := ''O) := {
 		type_gtpc := '81'O,
 		context := {
 			mmcontGSM := {
@@ -352,7 +353,7 @@
 				noofVectors := 0, /* overwritten */
 				security := '01'B, /* GSM key and triplets */
 				kc := kc,
-				triplet := ''O,
+				triplet := triplet,
 				drx_par := '0000'O,
 				msNetW_cap_length := 0, /* overwritten */
 				msNetw_cap := omit,
@@ -363,6 +364,32 @@
 			}
 		}
 	}
+	template (present) MM_Context tr_MM_ContextGSM(template (present) OCT8 kc := ?,
+						       template (present) BIT3 cksn := ?,
+						       template (present) BIT3 gea := ?,
+						       template (present) octetstring triplet := ?) := {
+		type_gtpc := '81'O,
+		context := {
+			mmcontGSM := {
+				lengthf := ?,
+				cksn := cksn,
+				spare := ?,
+				usedCipher := gea,
+				noofVectors := ?,
+				security := '01'B, /* GSM key and triplets */
+				kc := kc,
+				triplet := triplet,
+				drx_par := ?,
+				msNetW_cap_length := ?,
+				msNetw_cap := *,
+				containerLength := ?,
+				container := *,
+				access_restriction_data_length := ?,
+				access_restriction_data := *
+			}
+		}
+	}
+
 	template (value) MM_Context ts_MM_ContextUMTS(template (value) OCT16 ck,
 						      template (value) OCT16 ik) := {
 		type_gtpc := '81'O,