network: (fixes #1047) Adds IANA protocol numbers

smrsodhi · GallegosAlberto · commit d76618d2e206 · 2026-06-30T15:30:00.000+09:00
diff --git a/AUTHORS b/AUTHORS
@@ -412,3 +412,5 @@ ra1nst0rm3d (GCI 2019)
 SaiMyGuy (GCI 2019)
 TheBear (25639689-thebear132@users.noreply.gitlab.com)
 Lorenzo Bartolini (l.bartolini02@gmail.com)
+Samar Sodhi (smrsodhi@gmail.com)
+
diff --git a/CHANGES.md b/CHANGES.md
@@ -21,6 +21,7 @@ This file is a best-effort approach to solving this issue; we will do our best b
 ### Changes to existing API
 
 * Pcap helpers now use ``LinkType`` enum contained in the ``iana`` namespace (``iana-link-type-numbers.h``).
+* Centralization of ``PPP`` and ``IEEE802`` numbers. These are now contained in network model in ``iana-ppp-numbers.h`` and ``iana-ieee802-numbers.h`` respectively.
 
 ### Changes to build system
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -36,6 +36,8 @@ been tested on Linux. As of this release, the latest known version to work with
 
 ### New user-visible features
 
+- (network) IANA protocol and link types are now centralized in network module headers.
+
 ### Bugs fixed
 
 - (lr-wpan) !2916 Pcap files are now correctly generated with and without FCS cases.
diff --git a/src/click/model/ipv4-l3-click-protocol.cc b/src/click/model/ipv4-l3-click-protocol.cc
@@ -29,8 +29,6 @@ namespace ns3
 
 NS_LOG_COMPONENT_DEFINE("Ipv4L3ClickProtocol");
 
-const uint16_t Ipv4L3ClickProtocol::PROT_NUMBER = 0x0800;
-
 NS_OBJECT_ENSURE_REGISTERED(Ipv4L3ClickProtocol);
 
 TypeId
diff --git a/src/click/model/ipv4-l3-click-protocol.h b/src/click/model/ipv4-l3-click-protocol.h
@@ -11,6 +11,7 @@
 #define IPV4_L3_CLICK_PROTOCOL_H
 
 #include "ns3/deprecated.h"
+#include "ns3/iana-ieee802-numbers.h"
 #include "ns3/ipv4-interface.h"
 #include "ns3/ipv4-routing-protocol.h"
 #include "ns3/ipv4.h"
@@ -59,9 +60,9 @@ class Ipv4L3ClickProtocol : public Ipv4
     static TypeId GetTypeId();
 
     /**
-     * Protocol number for Ipv4 L3 (0x0800).
+     * Protocol number for Ipv4 L3
      */
-    static const uint16_t PROT_NUMBER;
+    static constexpr uint16_t PROT_NUMBER = iana::ieee802::IPV4;
 
     Ipv4L3ClickProtocol();
     ~Ipv4L3ClickProtocol() override;
diff --git a/src/internet/model/arp-header.cc b/src/internet/model/arp-header.cc
@@ -10,6 +10,7 @@
 
 #include "ns3/address-utils.h"
 #include "ns3/assert.h"
+#include "ns3/iana-ieee802-numbers.h"
 #include "ns3/log.h"
 
 namespace ns3
@@ -180,7 +181,7 @@ ArpHeader::Serialize(Buffer::Iterator start) const
 
     i.WriteHtonU16(static_cast<uint16_t>(m_hardwareType));
     /* ipv4 */
-    i.WriteHtonU16(0x0800);
+    i.WriteHtonU16(iana::Ieee802Numbers::IPV4);
     i.WriteU8(m_macSource.GetLength());
     i.WriteU8(4);
     i.WriteHtonU16(m_type);
diff --git a/src/internet/model/arp-l3-protocol.cc b/src/internet/model/arp-l3-protocol.cc
@@ -28,8 +28,6 @@ namespace ns3
 
 NS_LOG_COMPONENT_DEFINE("ArpL3Protocol");
 
-const uint16_t ArpL3Protocol::PROT_NUMBER = 0x0806;
-
 NS_OBJECT_ENSURE_REGISTERED(ArpL3Protocol);
 
 TypeId
diff --git a/src/internet/model/arp-l3-protocol.h b/src/internet/model/arp-l3-protocol.h
@@ -11,6 +11,7 @@
 #include "ipv4-header.h"
 
 #include "ns3/address.h"
+#include "ns3/iana-ieee802-numbers.h"
 #include "ns3/internet-export.h"
 #include "ns3/net-device.h"
 #include "ns3/ptr.h"
@@ -50,7 +51,7 @@ class INTERNET_EXPORT ArpL3Protocol : public Object
      * @return the object TypeId
      */
     static TypeId GetTypeId();
-    static const uint16_t PROT_NUMBER; //!< ARP protocol number (0x0806)
+    static constexpr uint16_t PROT_NUMBER = iana::Ieee802Numbers::ARP; //!< ARP protocol number
 
     ArpL3Protocol();
     ~ArpL3Protocol() override;
diff --git a/src/internet/model/ipv4-l3-protocol.h b/src/internet/model/ipv4-l3-protocol.h
@@ -14,6 +14,7 @@
 #include "ipv4.h"
 
 #include "ns3/deprecated.h"
+#include "ns3/iana-ieee802-numbers.h"
 #include "ns3/ipv4-address.h"
 #include "ns3/net-device.h"
 #include "ns3/nstime.h"
@@ -77,8 +78,7 @@ class Ipv4L3Protocol : public Ipv4
      * @return the object TypeId
      */
     static TypeId GetTypeId();
-
-    static constexpr uint16_t PROT_NUMBER = 0x0800; //!< Protocol number
+    static constexpr uint16_t PROT_NUMBER = iana::Ieee802Numbers::IPV4; //!< Protocol number
 
     Ipv4L3Protocol();
     ~Ipv4L3Protocol() override;
diff --git a/src/internet/model/ipv6-l3-protocol.h b/src/internet/model/ipv6-l3-protocol.h
@@ -14,6 +14,7 @@
 #include "ipv6-routing-protocol.h"
 #include "ipv6.h"
 
+#include "ns3/iana-ieee802-numbers.h"
 #include "ns3/ipv6-address.h"
 #include "ns3/net-device.h"
 #include "ns3/traced-callback.h"
@@ -59,9 +60,9 @@ class Ipv6L3Protocol : public Ipv6
     static TypeId GetTypeId();
 
     /**
-     * @brief The protocol number for IPv6 (0x86DD).
+     * @brief The protocol number for IPv6
      */
-    static constexpr uint16_t PROT_NUMBER = 0x86DD;
+    static constexpr uint16_t PROT_NUMBER = iana::Ieee802Numbers::IPV6;
 
     /**
      * @enum DropReason
diff --git a/src/lte/model/epc-pgw-application.cc b/src/lte/model/epc-pgw-application.cc
@@ -12,6 +12,7 @@
 #include "epc-gtpu-header.h"
 
 #include "ns3/abort.h"
+#include "ns3/iana-ieee802-numbers.h"
 #include "ns3/inet-socket-address.h"
 #include "ns3/ipv4-l3-protocol.h"
 #include "ns3/ipv4.h"
@@ -438,11 +439,11 @@ EpcPgwApplication::SendToTunDevice(Ptr<Packet> packet, uint32_t teid)
     uint16_t protocol = 0;
     if (ipType == 0x04)
     {
-        protocol = 0x0800;
+        protocol = iana::Ieee802Numbers::IPV4;
     }
     else if (ipType == 0x06)
     {
-        protocol = 0x86DD;
+        protocol = iana::Ieee802Numbers::IPV6;
     }
     else
     {
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
@@ -116,6 +116,8 @@ set(header_files
     utils/generic-phy.h
     utils/header-serialization-test.h
     utils/iana-link-type-numbers.h
+    utils/iana-ieee802-numbers.h
+    utils/iana-ppp-numbers.h
     utils/inet-socket-address.h
     utils/inet6-socket-address.h
     utils/ipv4-address.h
diff --git a/src/network/utils/iana-ieee802-numbers.h b/src/network/utils/iana-ieee802-numbers.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2026 Tokushima University, Japan
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Authors: Samar Sodhi <smrsodhi@gmail.com>
+ *          Alberto Gallegos Ramonet <alramonet@is.tokushima-u.ac.jp>
+ */
+
+#ifndef IANA_IEEE_802_NUMBERS_H
+#define IANA_IEEE_802_NUMBERS_H
+
+#include <cstdint>
+
+namespace ns3
+{
+namespace iana
+{
+/**
+ * Centralized definitions for IEEE 802 protocol numbers.
+ * This enumeration contains the IEEE 802 protocol numbers as defined by IANA.
+ * References:
+ * - https://www.iana.org/assignments/ieee-802-numbers/ieee-802-numbers.xhtml
+ * - IPV4 RFC894
+ * - ARP RFC1700
+ * - IPV6 RFC2464
+ * - LoWPAN RFC7973
+ */
+enum Ieee802Numbers : uint16_t
+{
+    IPV4 = 0x0800,   //!< IPv4 EtherType [RFC894]
+    ARP = 0x0806,    //!< ARP EtherType [RFC1700]
+    IPV6 = 0x86DD,   //!< IPv6 EtherType [RFC2464]
+    LoWPAN = 0xA0ED, //!< LoWPAN EtherType (e.g., 6LowPan) [RFC7973]
+};
+} // namespace iana
+} // namespace ns3
+
+#endif // IANA_IEEE_802_NUMBERS_H
diff --git a/src/network/utils/iana-link-type-numbers.h b/src/network/utils/iana-link-type-numbers.h
@@ -40,7 +40,7 @@ enum LinkType : uint16_t
     IEEE802_15_4_WITHFCS = 195, //!< IEEE 802.15.4 packets with FCS.
     IEEE802_15_4_NOFCS = 230,   //!< IEEE 802.15.4 packets without FCS.
     NETLINK = 253,              //!< Linux Netlink capture encapsulation [RFC3549].
-    LORATAP = 270               //!< LoRaTap pseudo-header.
+    LORATAP = 270,              //!< LoRaTap pseudo-header.
 };
 } // namespace iana
 } // namespace ns3
diff --git a/src/network/utils/iana-ppp-numbers.h b/src/network/utils/iana-ppp-numbers.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Tokushima University, Japan
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Authors: Samar Sodhi <smrsodhi@gmail.com>
+ *          Alberto Gallegos Ramonet <alramonet@is.tokushima-u.ac.jp>
+ */
+
+#ifndef IANA_PPP_NUMBERS_H
+#define IANA_PPP_NUMBERS_H
+
+#include <cstdint>
+
+namespace ns3
+{
+namespace iana
+{
+/**
+ *
+ * Centralized definitions for PPP protocol numbers.
+ * This enumeration contains the PPP protocol numbers as defined by IANA.
+ * - Reference: https://www.iana.org/assignments/ppp-numbers/ppp-numbers.xhtml
+ */
+enum PppDllNumbers : uint16_t
+{
+    IPV4_DLL = 0x0021, //!< IPv4 PPP protocol number
+    IPV6_DLL = 0x0057, //!< IPv6 PPP protocol number
+};
+} // namespace iana
+} // namespace ns3
+
+#endif // IANA_PPP_NUMBERS_H
diff --git a/src/network/utils/radiotap-header.h b/src/network/utils/radiotap-header.h
@@ -344,8 +344,8 @@ class RadiotapHeader : public Header
         HE_DATA1_STBC_KNOWN = 0x0200,         /**< STBC known */
         HE_DATA1_SPTL_REUSE_KNOWN =
             0x0400, /**< Spatial Reuse known (Spatial Reuse 1 for HE TRIG PPDU format) */
-        HE_DATA1_SPTL_REUSE2_KNOWN = 0x0800, /**< Spatial Reuse 2 known (HE TRIG PPDU format),
-                                                STA-ID known (HE MU PPDU format) */
+        HE_DATA1_SPTL_REUSE2_KNOWN = 0x0800, /**< Spatial Reuse 2 known (HE TRIG
+                                                PPDU format), STA-ID known (HE MU PPDU format) */
         HE_DATA1_SPTL_REUSE3_KNOWN = 0x1000, /**< Spatial Reuse 3 known (HE TRIG PPDU format) */
         HE_DATA1_SPTL_REUSE4_KNOWN = 0x2000, /**< Spatial Reuse 4 known (HE TRIG PPDU format) */
         HE_DATA1_BW_RU_ALLOC_KNOWN = 0x4000, /**< data BW/RU allocation known */
diff --git a/src/point-to-point/model/point-to-point-net-device.cc b/src/point-to-point/model/point-to-point-net-device.cc
@@ -10,6 +10,8 @@
 #include "ppp-header.h"
 
 #include "ns3/error-model.h"
+#include "ns3/iana-ieee802-numbers.h"
+#include "ns3/iana-ppp-numbers.h"
 #include "ns3/llc-snap-header.h"
 #include "ns3/log.h"
 #include "ns3/mac48-address.h"
@@ -643,10 +645,10 @@ PointToPointNetDevice::PppToEther(uint16_t proto)
     NS_LOG_FUNCTION_NOARGS();
     switch (proto)
     {
-    case 0x0021:
-        return 0x0800; // IPv4
-    case 0x0057:
-        return 0x86DD; // IPv6
+    case iana::PppDllNumbers::IPV4_DLL:
+        return iana::Ieee802Numbers::IPV4;
+    case iana::PppDllNumbers::IPV6_DLL:
+        return iana::Ieee802Numbers::IPV6;
     default:
         NS_ASSERT_MSG(false, "PPP Protocol number not defined!");
     }
@@ -659,10 +661,10 @@ PointToPointNetDevice::EtherToPpp(uint16_t proto)
     NS_LOG_FUNCTION_NOARGS();
     switch (proto)
     {
-    case 0x0800:
-        return 0x0021; // IPv4
-    case 0x86DD:
-        return 0x0057; // IPv6
+    case iana::Ieee802Numbers::IPV4:
+        return iana::PppDllNumbers::IPV4_DLL;
+    case iana::Ieee802Numbers::IPV6:
+        return iana::PppDllNumbers::IPV6_DLL;
     default:
         NS_ASSERT_MSG(false, "PPP Protocol number not defined!");
     }
diff --git a/src/point-to-point/model/ppp-header.cc b/src/point-to-point/model/ppp-header.cc
@@ -9,6 +9,7 @@
 #include "ns3/abort.h"
 #include "ns3/assert.h"
 #include "ns3/header.h"
+#include "ns3/iana-ppp-numbers.h"
 #include "ns3/log.h"
 
 #include <iostream>
@@ -51,14 +52,14 @@ PppHeader::Print(std::ostream& os) const
 
     switch (m_protocol)
     {
-    case 0x0021: /* IPv4 */
+    case iana::PppDllNumbers::IPV4_DLL:
         proto = "IP (0x0021)";
         break;
-    case 0x0057: /* IPv6 */
+    case iana::PppDllNumbers::IPV6_DLL:
         proto = "IPv6 (0x0057)";
         break;
     default:
-        NS_ASSERT_MSG(false, "PPP Protocol number not defined!");
+        NS_ASSERT_MSG(false, "PPP DLL Protocol number not defined!");
     }
     os << "Point-to-Point Protocol: " << proto;
 }
diff --git a/src/sixlowpan/model/sixlowpan-net-device.h b/src/sixlowpan/model/sixlowpan-net-device.h
@@ -11,6 +11,7 @@
 #ifndef SIXLOWPAN_NET_DEVICE_H
 #define SIXLOWPAN_NET_DEVICE_H
 
+#include "ns3/iana-ieee802-numbers.h"
 #include "ns3/net-device.h"
 #include "ns3/nstime.h"
 #include "ns3/random-variable-stream.h"
@@ -85,9 +86,9 @@ class SixLowPanNetDevice : public NetDevice
     };
 
     /**
-     * @brief The protocol number for 6LoWPAN (0xA0ED) - see \RFC{7973}.
+     * @brief The protocol number for 6LoWPAN (ns3::iana::Ieee802Numbers::LoWPAN) - see \RFC{7973}.
      */
-    static constexpr uint16_t PROT_NUMBER{0xA0ED};
+    static constexpr uint16_t PROT_NUMBER{iana::Ieee802Numbers::LoWPAN};
 
     /**
      * @brief Get the type ID.
diff --git a/src/uan/model/uan-header-common.cc b/src/uan/model/uan-header-common.cc
diff --git a/src/virtual-net-device/examples/virtual-net-device-example.cc b/src/virtual-net-device/examples/virtual-net-device-example.cc
