Rename new ETSI OID constants to avoid clash with OpenLI

LibtraceTeam · Sep 18, 2024 · 97f0e78 · 97f0e78
1 parent 916bedd
commit 97f0e78
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/src/libwandder_etsili.c b/src/libwandder_etsili.c
@@ -58,15 +58,15 @@
 const uint8_t etsi_lipsdomainid[8] = {
         0x00, 0x04, 0x00, 0x02, 0x02, 0x05, 0x01, 0x11};
 
-const uint8_t etsi_ipccoid[4] = {0x05, 0x03, 0x0a, 0x02};
-const uint8_t etsi_ipirioid[4] = {0x05, 0x03, 0x0a, 0x01};
-const uint8_t etsi_ipmmccoid[4] = {0x05, 0x05, 0x06, 0x02};
-const uint8_t etsi_ipmmirioid[4] = {0x05, 0x05, 0x06, 0x01};
-const uint8_t etsi_umtsirioid[9] =
+const uint8_t wandder_etsi_ipccoid[4] = {0x05, 0x03, 0x0a, 0x02};
+const uint8_t wandder_etsi_ipirioid[4] = {0x05, 0x03, 0x0a, 0x01};
+const uint8_t wandder_etsi_ipmmccoid[4] = {0x05, 0x05, 0x06, 0x02};
+const uint8_t wandder_etsi_ipmmirioid[4] = {0x05, 0x05, 0x06, 0x01};
+const uint8_t wandder_etsi_umtsirioid[9] =
         {0x00, 0x04, 0x00, 0x02, 0x02, 0x04, 0x01, 0x0f, 0x05};
-const uint8_t etsi_epsirioid[9] =
+const uint8_t wandder_etsi_epsirioid[9] =
         {0x00, 0x04, 0x00, 0x02, 0x02, 0x04, 0x08, 0x11, 0x00};
-const uint8_t etsi_epsccoid[9] =
+const uint8_t wandder_etsi_epsccoid[9] =
         {0x00, 0x04, 0x00, 0x02, 0x02, 0x04, 0x09, 0x11, 0x00};
 
 static void init_dumpers(wandder_etsispec_t *dec);

diff --git a/src/libwandder_etsili.h b/src/libwandder_etsili.h
@@ -38,13 +38,13 @@
 #define ENDCONSTRUCTEDBLOCK(ptr,num) memset(ptr, 0, num*2);ptr+=num*2;
 
 extern const uint8_t etsi_lipsdomainid[8];
-extern const uint8_t etsi_ipmmirioid[4];
-extern const uint8_t etsi_ipirioid[4];
-extern const uint8_t etsi_ipccoid[4];
-extern const uint8_t etsi_ipmmccoid[4];
-extern const uint8_t etsi_epsirioid[9];
-extern const uint8_t etsi_umtsirioid[9];
-extern const uint8_t etsi_epsccoid[9];
+extern const uint8_t wandder_etsi_ipmmirioid[4];
+extern const uint8_t wandder_etsi_ipirioid[4];
+extern const uint8_t wandder_etsi_ipccoid[4];
+extern const uint8_t wandder_etsi_ipmmccoid[4];
+extern const uint8_t wandder_etsi_epsirioid[9];
+extern const uint8_t wandder_etsi_umtsirioid[9];
+extern const uint8_t wandder_etsi_epsccoid[9];
 
 typedef struct wandder_etsistack {
 

diff --git a/src/libwandder_etsili_ber.c b/src/libwandder_etsili_ber.c
@@ -472,36 +472,36 @@ static wandder_buf_t ** wandder_etsili_preencode_static_fields_ber(
             WANDDER_CLASS_CONTEXT_PRIMITIVE, 
             0,
             WANDDER_TAG_RELATIVEOID,
-            (uint8_t *)etsi_ipmmirioid, 
-            sizeof etsi_ipmmirioid);
+            (uint8_t *)wandder_etsi_ipmmirioid, 
+            sizeof wandder_etsi_ipmmirioid);
 
     pendarray[WANDDER_PREENCODE_IPCCOID] =  wandder_encode_new_ber( 
             WANDDER_CLASS_CONTEXT_PRIMITIVE, 
             0,
             WANDDER_TAG_RELATIVEOID,
-            (uint8_t *)etsi_ipccoid, 
-            sizeof etsi_ipccoid);
+            (uint8_t *)wandder_etsi_ipccoid, 
+            sizeof wandder_etsi_ipccoid);
 
     pendarray[WANDDER_PREENCODE_IPIRIOID] =  wandder_encode_new_ber( 
             WANDDER_CLASS_CONTEXT_PRIMITIVE, 
             0,
             WANDDER_TAG_RELATIVEOID,
-            (uint8_t *)etsi_ipirioid, 
-            sizeof etsi_ipirioid);
+            (uint8_t *)wandder_etsi_ipirioid, 
+            sizeof wandder_etsi_ipirioid);
 
     pendarray[WANDDER_PREENCODE_UMTSIRIOID] =  wandder_encode_new_ber( 
             WANDDER_CLASS_CONTEXT_PRIMITIVE, 
             0,
             WANDDER_TAG_OID,
-            (uint8_t *)etsi_umtsirioid, 
-            sizeof etsi_umtsirioid);
+            (uint8_t *)wandder_etsi_umtsirioid, 
+            sizeof wandder_etsi_umtsirioid);
 
     pendarray[WANDDER_PREENCODE_IPMMCCOID] =  wandder_encode_new_ber( 
             WANDDER_CLASS_CONTEXT_PRIMITIVE, 
             0,
             WANDDER_TAG_RELATIVEOID,
-            (uint8_t *)etsi_ipmmccoid, 
-            sizeof etsi_ipmmccoid);
+            (uint8_t *)wandder_etsi_ipmmccoid, 
+            sizeof wandder_etsi_ipmmccoid);
 
     pendarray[WANDDER_PREENCODE_DIRFROM] =  wandder_encode_new_ber( 
             WANDDER_CLASS_CONTEXT_PRIMITIVE,