FW-867. Rename openudp to udp

lanyangyang · May 28, 2020 · 7102b58 · 7102b58
1 parent 5962edc
commit 7102b58
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 28 deletions.
diff --git a/bsp/boards/python/openwsnmodule_obj.h b/bsp/boards/python/openwsnmodule_obj.h
@@ -28,7 +28,7 @@
 #include "icmpv6rpl_obj.h"
 #include "coap_obj.h"
 #include "oscore_obj.h"
-#include "openudp_obj.h"
+#include "udp_obj.h"
 #include "idmanager_obj.h"
 #include "openqueue_obj.h"
 #include "openrandom_obj.h"

diff --git a/inc/check_config.h b/inc/check_config.h
@@ -45,7 +45,7 @@
 #error "A CoAP dependent application is defined, but CoAP is not included in the build."
 #endif
 
-#if !defined(OPENWSN_OPENUDP_C) && (\
+#if !defined(OPENWSN_UDP_C) && (\
     defined(OPENWSN_USERIALBRIDGE_C) || \
     defined(OPENWN_UECHO_C) || \
     defined(OPENWSN_UINJECT_C) || \
@@ -69,7 +69,7 @@
 #endif
 
 #if defined(OPENWSN_COAP_C) && (\
-    !defined(OPENWSN_OPENUDP_C) && !defined(OPEWSN_TCP_C))
+    !defined(OPENWSN_UDP_C) && !defined(OPEWSN_TCP_C))
 
 #error "CoAP requires a transport layer, i.e. UDP or TCP."
 #endif

diff --git a/inc/config.h b/inc/config.h
@@ -151,7 +151,7 @@
  *
  *
  *
- * Requires: OPENWSN_OPENUDP_C
+ * Requires: OPENWSN_UDP_C
  *
  */
 
@@ -181,13 +181,13 @@
 // ======================== Stack configuration ========================
 
 /**
- * \def OPENWSN_OPENUDP_C
+ * \def OPENWSN_UDP_C
  *
  * Implementation of the UDP protocol.
  *
  */
 
-#define OPENWSN_OPENUDP_C
+#define OPENWSN_UDP_C
 
 /**
  * \def OPENWSN_6LO_FRAGMENTATION_C

diff --git a/openapps/uecho/uecho.h b/openapps/uecho/uecho.h
@@ -9,7 +9,7 @@
 */
 
 #include "config.h"
-#include "openudp.h"
+#include "udp.h"
 
 //=========================== define ==========================================
 

diff --git a/openapps/uexpiration/uexpiration.h b/openapps/uexpiration/uexpiration.h
@@ -10,7 +10,7 @@
 
 #include "config.h"
 #include "opentimers.h"
-#include "openudp.h"
+#include "udp.h"
 
 //=========================== define ==========================================
 //=========================== typedef =========================================

diff --git a/openapps/uexpiration_monitor/uexpiration_monitor.h b/openapps/uexpiration_monitor/uexpiration_monitor.h
@@ -9,7 +9,7 @@
 */
 
 #include "config.h"
-#include "openudp.h"
+#include "udp.h"
 
 //=========================== define ==========================================
 

diff --git a/openapps/uinject/uinject.h b/openapps/uinject/uinject.h
@@ -10,7 +10,7 @@
 
 #include "config.h"
 #include "opentimers.h"
-#include "openudp.h"
+#include "udp.h"
 
 //=========================== define ==========================================
 

diff --git a/openapps/userialbridge/userialbridge.h b/openapps/userialbridge/userialbridge.h
@@ -10,7 +10,7 @@
 
 #include "config.h"
 #include "openserial.h"
-#include "openudp.h"
+#include "udp.h"
 
 
 //=========================== define ==========================================

diff --git a/openstack/03b-IPv6/forwarding.c b/openstack/03b-IPv6/forwarding.c
@@ -8,7 +8,7 @@
 #include "neighbors.h"
 #include "icmpv6.h"
 #include "icmpv6rpl.h"
-#include "openudp.h"
+#include "udp.h"
 #include "debugpins.h"
 #include "scheduler.h"
 
@@ -246,7 +246,7 @@ void forwarding_sendDone(OpenQueueEntry_t *msg, owerror_t error) {
 
         // indicate sendDone to upper layer
         switch (msg->l4_protocol) {
-#ifdef OPENWSN_OPENUDP_C
+#ifdef OPENWSN_UDP_C
             case IANA_UDP:
                 openudp_sendDone(msg, error);
                 break;
@@ -318,7 +318,7 @@ void forwarding_receive(
         packetfunctions_tossHeader(msg, ipv6_inner_header->header_length);
         // indicate received packet to upper layer
         switch (msg->l4_protocol) {
-#ifdef OPENWSN_OPENUDP_C
+#ifdef OPENWSN_UDP_C
             case IANA_UDP:
                 openudp_receive(msg);
                 break;

diff --git a/openstack/04-TRAN/openudp.c → openstack/04-TRAN/udp.c b/openstack/04-TRAN/openudp.c → openstack/04-TRAN/udp.c
@@ -1,9 +1,9 @@
 #include "config.h"
 
-#if defined(OPENWSN_OPENUDP_C)
+#if defined(OPENWSN_UDP_C)
 
 #include "opendefs.h"
-#include "openudp.h"
+#include "udp.h"
 #include "openserial.h"
 #include "packetfunctions.h"
 #include "forwarding.h"
@@ -245,4 +245,4 @@ static void openudp_receive_default_handler(OpenQueueEntry_t* msg) {
    openqueue_freePacketBuffer(msg);
 }
 
-#endif /* OPENWSN_OPENUDP_C */
+#endif /* OPENWSN_UDP_C */
diff --git a/openstack/04-TRAN/openudp.dox → openstack/04-TRAN/udp.dox b/openstack/04-TRAN/openudp.dox → openstack/04-TRAN/udp.dox
@@ -1,5 +1,5 @@
 /**
-\defgroup OpenUdp OpenUdp
+\defgroup Udp Udp
 
 \brief UDP implementation.
 

diff --git a/openstack/04-TRAN/openudp.h → openstack/04-TRAN/udp.h b/openstack/04-TRAN/openudp.h → openstack/04-TRAN/udp.h
@@ -1,10 +1,10 @@
-#ifndef __OPENUDP_H
-#define __OPENUDP_H
+#ifndef OPENWSN_UDP_H
+#define OPENWSN_UDP_H
 
 /**
 \addtogroup Transport
 \{
-\addtogroup OpenUdp
+\addtogroup Udp
 \{
 */
 
@@ -77,4 +77,4 @@ bool    openudp_debugPrint(void);
 \}
 */
 
-#endif
+#endif /* OPENWSN_UDP_H */
diff --git a/openstack/SConscript b/openstack/SConscript
@@ -28,7 +28,7 @@ sources_c = [
     os.path.join('03b-IPv6','icmpv6echo.c'),
     os.path.join('03b-IPv6','icmpv6rpl.c'),
     #=== 04-TRAN
-    os.path.join('04-TRAN','openudp.c'),
+    os.path.join('04-TRAN','udp.c'),
     #=== cross-layers
     os.path.join('cross-layers','idmanager.c'),
     os.path.join('cross-layers','openqueue.c'),
@@ -58,7 +58,7 @@ sources_h = [
     os.path.join('03b-IPv6','icmpv6echo.h'),
     os.path.join('03b-IPv6','icmpv6rpl.h'),
     #=== 04-TRAN
-    os.path.join('04-TRAN','openudp.h'),
+    os.path.join('04-TRAN','udp.h'),
     #=== cross-layers
     os.path.join('cross-layers','idmanager.h'),
     os.path.join('cross-layers','openqueue.h'),

diff --git a/openstack/openstack.c b/openstack/openstack.c
@@ -33,7 +33,7 @@
 #include "icmpv6echo.h"
 #include "icmpv6rpl.h"
 //-- 04-TRAN
-#include "openudp.h"
+#include "udp.h"
 
 //===== coap-layer
 #include "openweb.h"
@@ -85,7 +85,7 @@ void openstack_init(void) {
     icmpv6rpl_init();
     //-- 04-TRAN
 
-#if defined(OPEWSN_OPENUDP_C)
+#if defined(OPENWSN_UDP_C)
     openudp_init();
 #endif
 

diff --git a/openweb/opencoap/coap.h b/openweb/opencoap/coap.h
@@ -10,7 +10,7 @@
 
 #include "config.h"
 #include "opentimers.h"
-#include "openudp.h"
+#include "udp.h"
 
 //=========================== define ==========================================
 

diff --git a/projects/python/SConscript.env b/projects/python/SConscript.env
@@ -978,7 +978,7 @@ headerFiles = [
     'icmpv6echo',
     'icmpv6rpl',
     # 04-TRAN
-    'openudp',
+    'udp',
     # cross-layers
     'idmanager',
     'openqueue',