Resolved merge conflicts

Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>
magma · May 27, 2022 · 9ea686e · 9ea686e
1 parent 2e15f62
commit 9ea686e
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lte/gateway/c/core/oai/common/conversions.c b/lte/gateway/c/core/oai/common/conversions.c
@@ -367,3 +367,11 @@ char* bytes_to_hex(char* byte_array, int length, char* hex_array) {
   }
   return hex_array;
 }
+
+void convert_guti_to_string(guti_t* guti_p, char (*guti_str)[]) {
+  snprintf(*guti_str, GUTI_STRING_LEN, "%x%x%x%x%x%x%04x%02x%08x",
+           guti_p->gummei.plmn.mcc_digit1, guti_p->gummei.plmn.mcc_digit2,
+           guti_p->gummei.plmn.mcc_digit3, guti_p->gummei.plmn.mnc_digit1,
+           guti_p->gummei.plmn.mnc_digit2, guti_p->gummei.plmn.mnc_digit3,
+           guti_p->gummei.mme_gid, guti_p->gummei.mme_code, guti_p->m_tmsi);
+}