gmm: Print IMSI and TLLI in LOGGMME macro

Change-Id: I34145eb83c1678bcf1b32ae6cbf3e4b01c717406
---
M include/osmocom/gprs/gmm/gmm_private.h
M tests/gmm/gmm_prim_test.err
2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h
index f233eb3..0f2bd9f 100644
--- a/include/osmocom/gprs/gmm/gmm_private.h
+++ b/include/osmocom/gprs/gmm/gmm_private.h
@@ -106,6 +106,8 @@
 int gprs_gmm_submit_gmmsm_establish_cnf(struct gprs_gmm_entity *gmme, uint32_t sess_id, bool accepted, uint8_t cause);
 
 #define LOGGMME(snme, level, fmt, args...) \
-	LOGGMM(level, "GMME(PTMSI-%08x) " fmt, \
+	LOGGMM(level, "GMME(IMSI-%s:PTMSI-%08x:TLLI-%08x) " fmt, \
+		 gmme->imsi, \
 		 gmme->ptmsi, \
+		 gmme->tlli, \
 		 ## args)
diff --git a/tests/gmm/gmm_prim_test.err b/tests/gmm/gmm_prim_test.err
index d81765b..ae0d02d 100644
--- a/tests/gmm/gmm_prim_test.err
+++ b/tests/gmm/gmm_prim_test.err
@@ -3,44 +3,44 @@
 DLGLOBAL INFO GMM_MS{Null}: Received Event ENABLE_GPRS_MODE
 DLGLOBAL INFO GMM_MS{Null}: state_chg to Deregistered
 DLGLOBAL INFO GMM_MS{Deregistered}: Received Event ATTACH_REQUESTED
-DLGLOBAL INFO GMME(PTMSI-00001234) Tx GMM ATTACH REQUEST (new TLLI=0x80001234)
+DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM ATTACH REQUEST (new TLLI=0x80001234)
 DLGLOBAL INFO GMM_MS{Deregistered}: state_chg to RegisteredInitiated
 DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication
-DLGLOBAL DEBUG GMME(PTMSI-00001234) Rx GMM IDENTITY REQUEST mi_type=IMEI
-DLGLOBAL INFO GMME(PTMSI-00001234) Tx GMM IDENTITY RESPONSE
+DLGLOBAL DEBUG GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM IDENTITY REQUEST mi_type=IMEI
+DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM IDENTITY RESPONSE
 DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication
-DLGLOBAL DEBUG GMME(PTMSI-00001234) Rx GMM AUTHENTICATION AND CIPHERING REQUEST
-DLGLOBAL INFO GMME(PTMSI-00001234) Tx GMM GMM AUTHENTICATION AND CIPHERING RESPONSE
+DLGLOBAL DEBUG GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM AUTHENTICATION AND CIPHERING REQUEST
+DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM GMM AUTHENTICATION AND CIPHERING RESPONSE
 DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication
-DLGLOBAL DEBUG GMME(PTMSI-00001234) Rx GMM ATTACH ACCEPT
-DLGLOBAL INFO GMME(PTMSI-ea711b41) Tx GMM ATTACH COMPL
+DLGLOBAL DEBUG GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM ATTACH ACCEPT
+DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ea711b41) Tx GMM ATTACH COMPL
 DLGLOBAL INFO GMM_MS{RegisteredInitiated}: Received Event ATTACH_ACCEPTED
 DLGLOBAL INFO GMM_MS{RegisteredInitiated}: state_chg to Registered
 DLGLOBAL INFO Rx from upper layers: GMMREG-DETACH.request
 DLGLOBAL INFO GMM_MS{Registered}: Received Event DETACH_REQUESTED
 DLGLOBAL INFO GMM_MS{Registered}: state_chg to DeregisteredInitiated
-DLGLOBAL INFO GMME(PTMSI-ea711b41) Tx GMM DETACH REQUEST (MO)
+DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ea711b41) Tx GMM DETACH REQUEST (MO)
 DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication
-DLGLOBAL DEBUG GMME(PTMSI-ea711b41) Rx GMM DETACH ACCEPT (MO) force_standby_indicated=false
+DLGLOBAL DEBUG GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ea711b41) Rx GMM DETACH ACCEPT (MO) force_standby_indicated=false
 DLGLOBAL INFO GMM_MS{DeregisteredInitiated}: Received Event DETACH_ACCEPTED
 DLGLOBAL INFO GMM_MS{DeregisteredInitiated}: state_chg to Deregistered
-DLGLOBAL DEBUG GMME(PTMSI-ea711b41) free()
+DLGLOBAL DEBUG GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ffffffff) free()
 DLGLOBAL INFO GMM_MS{Deregistered}: Deallocated
 DLGLOBAL INFO Rx from upper layers: GMMSM-ESTABLISH.request
 DLGLOBAL INFO GMM_MS{Null}: Allocated
 DLGLOBAL INFO GMM_MS{Null}: Received Event ENABLE_GPRS_MODE
 DLGLOBAL INFO GMM_MS{Null}: state_chg to Deregistered
 DLGLOBAL INFO GMM_MS{Deregistered}: Received Event ATTACH_REQUESTED
-DLGLOBAL INFO GMME(PTMSI-00001234) Tx GMM ATTACH REQUEST (new TLLI=0x80001234)
+DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM ATTACH REQUEST (new TLLI=0x80001234)
 DLGLOBAL INFO GMM_MS{Deregistered}: state_chg to RegisteredInitiated
 DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication
-DLGLOBAL DEBUG GMME(PTMSI-00001234) Rx GMM IDENTITY REQUEST mi_type=IMEI
-DLGLOBAL INFO GMME(PTMSI-00001234) Tx GMM IDENTITY RESPONSE
+DLGLOBAL DEBUG GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM IDENTITY REQUEST mi_type=IMEI
+DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM IDENTITY RESPONSE
 DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication
-DLGLOBAL DEBUG GMME(PTMSI-00001234) Rx GMM AUTHENTICATION AND CIPHERING REQUEST
-DLGLOBAL INFO GMME(PTMSI-00001234) Tx GMM GMM AUTHENTICATION AND CIPHERING RESPONSE
+DLGLOBAL DEBUG GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM AUTHENTICATION AND CIPHERING REQUEST
+DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM GMM AUTHENTICATION AND CIPHERING RESPONSE
 DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication
-DLGLOBAL DEBUG GMME(PTMSI-00001234) Rx GMM ATTACH ACCEPT
-DLGLOBAL INFO GMME(PTMSI-ea711b41) Tx GMM ATTACH COMPL
+DLGLOBAL DEBUG GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM ATTACH ACCEPT
+DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ea711b41) Tx GMM ATTACH COMPL
 DLGLOBAL INFO GMM_MS{RegisteredInitiated}: Received Event ATTACH_ACCEPTED
 DLGLOBAL INFO GMM_MS{RegisteredInitiated}: state_chg to Registered

