.h files: Rename to make dtls specific

mrdeep1 · mrdeep1 · commit db3484f1a7c3 · 2023-04-24T12:59:58.000+01:00
Remove include clashes, in particular with files named as global.h
and session.h when used with other projects.

Signed-off-by: Jon Shallow &lt;supjps-libcoap@jpshallow.com&gt;
diff --git a/ccm.c b/ccm.c
@@ -18,9 +18,9 @@
 #include <string.h>
 
 #include "tinydtls.h"
-#include "global.h"
-#include "numeric.h"
-#include "ccm.h"
+#include "dtls_global.h"
+#include "dtls_numeric.h"
+#include "dtls_ccm.h"
 
 #ifdef HAVE_ASSERT_H
 # include <assert.h>
diff --git a/crypto.c b/crypto.c
@@ -25,15 +25,15 @@
 #define assert(x)
 #endif
 
-#include "global.h"
+#include "dtls_global.h"
 #include "dtls_debug.h"
-#include "numeric.h"
+#include "dtls_numeric.h"
 #include "dtls.h"
-#include "crypto.h"
-#include "ccm.h"
+#include "dtls_crypto.h"
+#include "dtls_ccm.h"
 #include "ecc/ecc.h"
 #include "dtls_prng.h"
-#include "netq.h"
+#include "dtls_netq.h"
 
 #include "dtls_mutex.h"
 
diff --git a/dtls.c b/dtls.c
@@ -27,7 +27,7 @@
 #endif
 #ifndef WITH_CONTIKI
 #include <stdlib.h>
-#include "global.h"
+#include "dtls_global.h"
 #endif /* WITH_CONTIKI */
 #ifdef HAVE_INTTYPES_H
 #define __STDC_FORMAT_MACROS
@@ -47,17 +47,17 @@
 #endif /* DTLS_PEERS_NOHASH */
 
 #include "dtls_debug.h"
-#include "numeric.h"
-#include "netq.h"
+#include "dtls_numeric.h"
+#include "dtls_netq.h"
 #include "dtls.h"
 
-#include "alert.h"
-#include "session.h"
+#include "dtls_alert.h"
+#include "dtls_session.h"
 #include "dtls_prng.h"
 #include "dtls_mutex.h"
 
 #ifdef WITH_SHA256
-#  include "hmac.h"
+#  include "dtls_hmac.h"
 #endif /* WITH_SHA256 */
 
 #ifdef WITH_ZEPHYR
diff --git a/dtls.h b/dtls.h
@@ -28,16 +28,16 @@
 
 #include "tinydtls.h"
 
-#include "state.h"
-#include "peer.h"
+#include "dtls_state.h"
+#include "dtls_peer.h"
 
 #include "uthash.h"
 
-#include "alert.h"
-#include "crypto.h"
-#include "hmac.h"
+#include "dtls_alert.h"
+#include "dtls_crypto.h"
+#include "dtls_hmac.h"
 
-#include "global.h"
+#include "dtls_global.h"
 #include "dtls_time.h"
 
 #ifndef DTLSv12
diff --git a/dtls_alert.h b/dtls_alert.h
@@ -16,7 +16,7 @@
  *******************************************************************************/
 
 /**
- * @file alert.h
+ * @file dtls_alert.h
  * @brief DTLS alert protocol
  */
 
diff --git a/dtls_ccm.h b/dtls_ccm.h
diff --git a/dtls_crypto.h b/dtls_crypto.h
@@ -24,11 +24,11 @@
 #include "aes/rijndael.h"
 
 #include "tinydtls.h"
-#include "global.h"
-#include "state.h"
-#include "numeric.h"
-#include "hmac.h"
-#include "ccm.h"
+#include "dtls_global.h"
+#include "dtls_state.h"
+#include "dtls_numeric.h"
+#include "dtls_hmac.h"
+#include "dtls_ccm.h"
 
 /* TLS_PSK_WITH_AES_128_CCM_8 */
 #define DTLS_MAC_KEY_LENGTH    0
diff --git a/dtls_debug.c b/dtls_debug.c
@@ -39,7 +39,7 @@
 typedef int in_port_t;
 #endif /* WITH_ZEPHYR */
 
-#include "global.h"
+#include "dtls_global.h"
 #include "dtls_debug.h"
 #include "dtls_mutex.h"
 
diff --git a/dtls_debug.h b/dtls_debug.h
@@ -21,8 +21,8 @@
 #include <stdlib.h>
 
 #include "tinydtls.h"
-#include "global.h"
-#include "session.h"
+#include "dtls_global.h"
+#include "dtls_session.h"
 
 #ifdef WITH_ZEPHYR
 #include <logging/log.h>
diff --git a/dtls_global.h b/dtls_global.h
diff --git a/dtls_hmac.h b/dtls_hmac.h
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 
 #include "tinydtls.h"
-#include "global.h"
+#include "dtls_global.h"
 
 #ifdef WITH_SHA256
 #ifdef RIOT_VERSION
diff --git a/dtls_netq.h b/dtls_netq.h
@@ -19,7 +19,7 @@
 #define _DTLS_NETQ_H_
 
 #include "tinydtls.h"
-#include "global.h"
+#include "dtls_global.h"
 #include "dtls.h"
 #include "dtls_time.h"
 
diff --git a/dtls_numeric.h b/dtls_numeric.h
diff --git a/dtls_peer.h b/dtls_peer.h
@@ -16,7 +16,7 @@
  *******************************************************************************/
 
 /**
- * @file peer.h
+ * @file dtls_peer.h
  * @brief information about peers in a DTLS session
  */
 
@@ -26,11 +26,11 @@
 #include <sys/types.h>
 
 #include "tinydtls.h"
-#include "global.h"
-#include "session.h"
+#include "dtls_global.h"
+#include "dtls_session.h"
 
-#include "state.h"
-#include "crypto.h"
+#include "dtls_state.h"
+#include "dtls_crypto.h"
 
 #ifndef DTLS_PEERS_NOHASH
 #include "uthash.h"
diff --git a/dtls_session.h b/dtls_session.h
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "tinydtls.h"
-#include "global.h"
+#include "dtls_global.h"
 
 #ifdef WITH_CONTIKI
 #include "ip/uip.h"
diff --git a/dtls_state.h b/dtls_state.h
@@ -16,7 +16,7 @@
  *******************************************************************************/
 
 /**
- * @file state.h
+ * @file dtls_state.h
  * @brief state information for DTLS FSM
  */
 
@@ -26,8 +26,8 @@
 #include <sys/types.h>
 #include <stdint.h>
 
-#include "global.h"
-#include "hmac.h"
+#include "dtls_global.h"
+#include "dtls_hmac.h"
 
 typedef enum { 
   DTLS_STATE_INIT = 0, DTLS_STATE_WAIT_CLIENTHELLO, DTLS_STATE_WAIT_CLIENTCERTIFICATE,
diff --git a/hmac.c b/hmac.c
@@ -25,7 +25,7 @@
 #endif /* HAVE_ASSERT_H && !assert */
 
 #include "dtls_debug.h"
-#include "hmac.h"
+#include "dtls_hmac.h"
 
 void
 dtls_hmac_update(dtls_hmac_context_t *ctx,
diff --git a/netq.c b/netq.c
@@ -16,7 +16,7 @@
  *******************************************************************************/
 
 #include "dtls_debug.h"
-#include "netq.h"
+#include "dtls_netq.h"
 #include "utlist.h"
 
 #ifdef HAVE_ASSERT_H
diff --git a/peer.c b/peer.c
@@ -15,8 +15,8 @@
  *
  *******************************************************************************/
 
-#include "global.h"
-#include "peer.h"
+#include "dtls_global.h"
+#include "dtls_peer.h"
 #include "dtls_debug.h"
 
 #if !(defined (WITH_CONTIKI)) && !(defined (RIOT_VERSION))
diff --git a/session.c b/session.c
@@ -14,7 +14,7 @@
  *
  *******************************************************************************/
 
-#include "session.h"
+#include "dtls_session.h"
 
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
diff --git a/tests/ccm-test.c b/tests/ccm-test.c
@@ -13,8 +13,8 @@
 
 //#include "dtls_debug.h"
 #include "tinydtls.h"
-#include "numeric.h"
-#include "ccm.h"
+#include "dtls_numeric.h"
+#include "dtls_ccm.h"
 
 #include "ccm-testdata.c"
 
diff --git a/tests/dtls-client.c b/tests/dtls-client.c
@@ -33,7 +33,7 @@
 #include <netdb.h>
 #include <signal.h>
 
-#include "global.h"
+#include "dtls_global.h"
 #include "dtls_debug.h"
 #include "dtls_ciphers_util.h"
 #include "dtls.h"
diff --git a/tests/dtls_ciphers_util.h b/tests/dtls_ciphers_util.h
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-#include "global.h"
+#include "dtls_global.h"
 
 const dtls_cipher_t* init_cipher_suites(const char* arg);
 
diff --git a/tests/unit-tests/test_ccm.c b/tests/unit-tests/test_ccm.c
@@ -16,8 +16,8 @@
 #include "test_ccm.h"
 
 #include "tinydtls.h"
-#include "ccm.h"
-#include "crypto.h"
+#include "dtls_ccm.h"
+#include "dtls_crypto.h"
 #include "../ccm-testdata.c"
 
 #include <stdio.h>
diff --git a/tests/unit-tests/test_ecc.c b/tests/unit-tests/test_ecc.c
@@ -18,7 +18,7 @@
 #include "ecc/ecc.h"
 
 #include "tinydtls.h"
-#include "crypto.h"
+#include "dtls_crypto.h"
 
 #include <stdio.h>
 
diff --git a/tests/unit-tests/test_prf.c b/tests/unit-tests/test_prf.c
@@ -17,7 +17,7 @@
 #include "test_prf.h"
 
 #include "tinydtls.h"
-#include "crypto.h"
+#include "dtls_crypto.h"
 
 #include <stdio.h>
 
