UdpControlInfo renamed to UdpCommand

inet-framework · Nov 19, 2024 · ef9496c · ef9496c
1 parent 2485a25
commit ef9496c
Show file tree

Hide file tree

Showing 49 changed files with 74 additions and 92 deletions.
diff --git a/src/inet/applications/dhcp/DhcpClient.ned b/src/inet/applications/dhcp/DhcpClient.ned
@@ -30,7 +30,7 @@ simple DhcpClient like IApp
         double stopOperationTimeout @unit(s) = default(2s);    // Timeout value for lifecycle stop operation
         @selfMessageKinds(inet::DhcpTimerType);
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/dhcp/DhcpServer.cc b/src/inet/applications/dhcp/DhcpServer.cc
@@ -16,7 +16,7 @@
 #include "inet/networklayer/common/InterfaceTable.h"
 #include "inet/networklayer/common/L3AddressResolver.h"
 #include "inet/networklayer/ipv4/Ipv4InterfaceData.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/dhcp/DhcpServer.ned b/src/inet/applications/dhcp/DhcpServer.ned
@@ -32,7 +32,7 @@ simple DhcpServer like IApp
         double stopOperationExtraTime @unit(s) = default(-1s);    // Extra time after lifecycle stop operation finished
         double stopOperationTimeout @unit(s) = default(2s);    // Timeout value for lifecycle stop operation
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/netperfmeter/NetPerfMeter.h b/src/inet/applications/netperfmeter/NetPerfMeter.h
@@ -27,7 +27,7 @@
 #include "inet/transportlayer/contract/sctp/SctpSocket.h"
 #include "inet/transportlayer/contract/tcp/TcpCommand_m.h"
 #include "inet/transportlayer/contract/tcp/TcpSocket.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 #include "inet/transportlayer/contract/udp/UdpSocket.h"
 
 namespace inet {

diff --git a/src/inet/applications/tunapp/TunnelApp.cc b/src/inet/applications/tunapp/TunnelApp.cc
@@ -14,7 +14,7 @@
 #include "inet/networklayer/common/L3AddressResolver.h"
 #include "inet/networklayer/common/L3AddressTag_m.h"
 #include "inet/networklayer/contract/IInterfaceTable.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/udpapp/UdpBasicApp.cc b/src/inet/applications/udpapp/UdpBasicApp.cc
@@ -16,7 +16,7 @@
 #include "inet/common/packet/Packet.h"
 #include "inet/networklayer/common/FragmentationTag_m.h"
 #include "inet/networklayer/common/L3AddressResolver.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/udpapp/UdpBasicApp.ned b/src/inet/applications/udpapp/UdpBasicApp.ned
@@ -59,7 +59,7 @@ simple UdpBasicApp like IApp
         @statistic[rcvdPkLifetime](title="received packet lifetime"; source="dataAge(packetReceived)"; unit=s; record=stats,vector; interpolationmode=none);
         @statistic[rcvdPkSeqNo](title="received packet sequence number"; source="appPkSeqNo(packetReceived)"; record=vector; interpolationmode=none);
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/udpapp/UdpBasicBurst.cc b/src/inet/applications/udpapp/UdpBasicBurst.cc
@@ -15,7 +15,7 @@
 #include "inet/common/packet/Packet.h"
 #include "inet/networklayer/common/FragmentationTag_m.h"
 #include "inet/networklayer/common/L3AddressResolver.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/udpapp/UdpBasicBurst.ned b/src/inet/applications/udpapp/UdpBasicBurst.ned
@@ -124,7 +124,7 @@ simple UdpBasicBurst like IApp
         @statistic[outOfOrderPk](title="packets received out of order"; source=outOfOrderPk; record=count,"sum(packetBytes)","vector(packetBytes)"; interpolationmode=none);
         @statistic[endToEndDelay](title="delay"; source="dataAge(packetReceived)"; unit=s; record=histogram,vector; interpolationmode=none);
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/udpapp/UdpEchoApp.cc b/src/inet/applications/udpapp/UdpEchoApp.cc
@@ -11,7 +11,7 @@
 #include "inet/common/Simsignals.h"
 #include "inet/networklayer/common/L3AddressTag_m.h"
 #include "inet/transportlayer/common/L4PortTag_m.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/udpapp/UdpEchoApp.ned b/src/inet/applications/udpapp/UdpEchoApp.ned
@@ -26,7 +26,7 @@ simple UdpEchoApp like IApp
         @signal[packetSent](type=inet::Packet);
         @statistic[echoedPk](title="packets echoed"; source=packetSent; record=count,"sum(packetBytes)","vector(packetBytes)"; interpolationmode=none);
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/udpapp/UdpSink.cc b/src/inet/applications/udpapp/UdpSink.cc
@@ -9,7 +9,7 @@
 #include "inet/common/ModuleAccess.h"
 #include "inet/common/packet/Packet.h"
 #include "inet/networklayer/common/L3AddressResolver.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/udpapp/UdpSink.ned b/src/inet/applications/udpapp/UdpSink.ned
@@ -34,7 +34,7 @@ simple UdpSink like IApp
         @statistic[rcvdPkSeqNo](title="received packet sequence number"; source="appPkSeqNo(packetReceived)"; record=vector; interpolationmode=none);
 
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/udpapp/UdpVideoStreamClient.cc b/src/inet/applications/udpapp/UdpVideoStreamClient.cc
@@ -12,7 +12,7 @@
 #include "inet/common/ModuleAccess.h"
 #include "inet/common/packet/chunk/ByteCountChunk.h"
 #include "inet/networklayer/common/L3AddressResolver.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/udpapp/UdpVideoStreamClient.ned b/src/inet/applications/udpapp/UdpVideoStreamClient.ned
@@ -33,7 +33,7 @@ simple UdpVideoStreamClient like IApp
         @statistic[throughput](title="throughput"; unit=bps; source="throughput(packetReceived)"; record=vector);
         @statistic[endToEndDelay](title="end-to-end delay"; source="dataAge(packetReceived)"; unit=s; record=histogram,vector; interpolationmode=none);
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/udpapp/UdpVideoStreamServer.cc b/src/inet/applications/udpapp/UdpVideoStreamServer.cc
@@ -15,7 +15,7 @@
 #include "inet/common/packet/chunk/ByteCountChunk.h"
 #include "inet/networklayer/common/L3AddressTag_m.h"
 #include "inet/transportlayer/common/L4PortTag_m.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/udpapp/UdpVideoStreamServer.ned b/src/inet/applications/udpapp/UdpVideoStreamServer.ned
@@ -44,7 +44,7 @@ simple UdpVideoStreamServer like IApp
         @statistic[reqStreamBytes](title="requested stream bytes"; record=count,sum,vector; interpolationmode=none);
         @statistic[packetSent](title="packets sent"; source=packetSent; record=count,"sum(packetBytes)","vector(packetBytes)"; interpolationmode=none);
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/voip/SimpleVoipReceiver.ned b/src/inet/applications/voip/SimpleVoipReceiver.ned
@@ -53,7 +53,7 @@ simple SimpleVoipReceiver like IApp
 
         @display("i=block/source");
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/voip/SimpleVoipSender.ned b/src/inet/applications/voip/SimpleVoipSender.ned
@@ -48,7 +48,7 @@ simple SimpleVoipSender like IApp
 
         @display("i=block/source");
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/voipstream/VoipStreamReceiver.cc b/src/inet/applications/voipstream/VoipStreamReceiver.cc
@@ -16,7 +16,7 @@
 #include "inet/networklayer/common/L3AddressResolver.h"
 #include "inet/networklayer/common/L3AddressTag_m.h"
 #include "inet/transportlayer/common/L4PortTag_m.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/voipstream/VoipStreamReceiver.ned b/src/inet/applications/voipstream/VoipStreamReceiver.ned
@@ -44,7 +44,7 @@ simple VoipStreamReceiver like IApp
         @statistic[numSessions](title="total number of sessions"; source="sum(connState+1)/2"; record=last);
         @display("i=block/arrival");
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/applications/voipstream/VoipStreamSender.cc b/src/inet/applications/voipstream/VoipStreamSender.cc
@@ -14,7 +14,7 @@
 #include "inet/common/ModuleAccess.h"
 #include "inet/common/lifecycle/NodeStatus.h"
 #include "inet/networklayer/common/L3AddressResolver.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/applications/voipstream/VoipStreamSender.ned b/src/inet/applications/voipstream/VoipStreamSender.ned
@@ -44,7 +44,7 @@ simple VoipStreamSender like IApp
         @statistic[packetSent](title="packets sent"; source=packetSent; record=count,"sum(packetBytes)","vector(packetBytes)"; interpolationmode=none);
         @display("i=block/departure");
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/emulation/transportlayer/udp/ExtLowerUdp.cc b/src/inet/emulation/transportlayer/udp/ExtLowerUdp.cc
@@ -18,7 +18,7 @@
 #include "inet/common/socket/SocketTag_m.h"
 #include "inet/networklayer/common/L3AddressTag_m.h"
 #include "inet/transportlayer/common/L4PortTag_m.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/emulation/transportlayer/udp/ExtLowerUdp.ned b/src/inet/emulation/transportlayer/udp/ExtLowerUdp.ned
@@ -28,8 +28,8 @@ simple ExtLowerUdp like IUdp
         @statistic[packetReceived](title="packets received"; source=packetReceived; record=count,"sum(packetBytes)","vector(packetBytes)"; interpolationmode=none);
 
     gates:
-        input appIn @labels(UdpControlInfo/down);
+        input appIn @labels(UdpCommand/down);
         input ipIn @labels(UdpHeader,Ipv4ControlInfo/up,Ipv6ControlInfo/up) @loose;
-        output appOut @labels(UdpControlInfo/up);
+        output appOut @labels(UdpCommand/up);
         output ipOut @labels(UdpHeader,Ipv4ControlInfo/down,Ipv6ControlInfo/down) @loose;
 }
diff --git a/src/inet/networklayer/ldp/Ldp.cc b/src/inet/networklayer/ldp/Ldp.cc
@@ -20,7 +20,7 @@
 #include "inet/networklayer/ipv4/Ipv4InterfaceData.h"
 #include "inet/networklayer/mpls/LibTable.h"
 #include "inet/networklayer/ted/Ted.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 #include "inet/transportlayer/tcp_common/TcpHeader.h"
 #include "inet/transportlayer/udp/UdpHeader_m.h"
 namespace inet {

diff --git a/src/inet/networklayer/ldp/Ldp.ned b/src/inet/networklayer/ldp/Ldp.ned
@@ -42,7 +42,7 @@ simple Ldp like IApp
         double stopOperationTimeout @unit(s) = default(2s);    // Timeout value for lifecycle stop operation
 
     gates:
-        input socketIn @labels(TcpCommand/up,UdpControlInfo/up);
-        output socketOut @labels(TcpCommand/down,UdpControlInfo/down);
+        input socketIn @labels(TcpCommand/up,UdpCommand/up);
+        output socketOut @labels(TcpCommand/down,UdpCommand/down);
 }
 
diff --git a/src/inet/routing/aodv/Aodv.cc b/src/inet/routing/aodv/Aodv.cc
@@ -21,7 +21,7 @@
 #include "inet/networklayer/ipv4/Ipv4Header_m.h"
 #include "inet/networklayer/ipv4/Ipv4Route.h"
 #include "inet/transportlayer/common/L4PortTag_m.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 namespace aodv {

diff --git a/src/inet/routing/dymo/Dymo.cc b/src/inet/routing/dymo/Dymo.cc
@@ -20,7 +20,7 @@
 #include "inet/networklayer/common/L3Tools.h"
 #include "inet/networklayer/contract/IInterfaceTable.h"
 #include "inet/networklayer/ipv4/Ipv4Header_m.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 

diff --git a/src/inet/routing/rip/Rip.ned b/src/inet/routing/rip/Rip.ned
@@ -91,7 +91,7 @@ simple Rip like IApp
         @statistic[badResponse](title="bad response received"; source=badResponse; record=count,"vector(constant1)"; interpolationmode=none);
         @statistic[numRoutes](title="number of routes"; source=numRoutes; record=last,vector; interpolationmode=none);
     gates:
-        input socketIn @labels(UdpControlInfo/up);
-        output socketOut @labels(UdpControlInfo/down);
+        input socketIn @labels(UdpCommand/up);
+        output socketOut @labels(UdpCommand/down);
 }
 
diff --git a/src/inet/transportlayer/contract/IUdp.ned b/src/inet/transportlayer/contract/IUdp.ned
@@ -15,14 +15,14 @@ package inet.transportlayer.contract;
 // <b>Communication with clients (applications)</b>
 //
 // The module can (should) be connected to several applications.
-// For sending a UDP packet, the application should attach an ~UdpControlInfo
+// For sending a UDP packet, the application should attach an ~UdpCommand
 // object to the payload, and send it to ~Udp.
-// ~Udp will also attach an ~UdpControlInfo object to any payload
+// ~Udp will also attach an ~UdpCommand object to any payload
 // message it sends up to the application.
 //
 // For receiving UDP packets, the connected applications should first
 // "bind" to the given UDP port. This can be done by sending an
-// arbitrary message with message kind UDP_C_BIND and an ~UdpControlInfo
+// arbitrary message with message kind UDP_C_BIND and an ~UdpCommand
 // attached with `srcPort` filled in.
 //
 // If there is only one app which doesn't bind to any port, it will
@@ -33,17 +33,17 @@ package inet.transportlayer.contract;
 // The ~Udp model relies on sending and receiving ~L3AddressReq/~L3AddressInd
 // objects attached to packets.
 //
-// @see ~Udp, ~UdpHeader, ~UdpControlInfo, ~UdpCommandCode
+// @see ~Udp, ~UdpHeader, ~UdpCommand, ~UdpCommandCode
 //
 moduleinterface IUdp
 {
     parameters:
         @display("i=block/transport");
 
     gates:
-        input appIn @labels(UdpControlInfo/down);
+        input appIn @labels(UdpCommand/down);
         input ipIn @labels(UdpHeader,Ipv4ControlInfo/up,Ipv6ControlInfo/up);
-        output appOut @labels(UdpControlInfo/up);
+        output appOut @labels(UdpCommand/up);
         output ipOut @labels(UdpHeader,Ipv4ControlInfo/down,Ipv6ControlInfo/down);
 }
 
diff --git a/...portlayer/contract/udp/UdpControlInfo.msg → ...ransportlayer/contract/udp/UdpCommand.msg b/...portlayer/contract/udp/UdpControlInfo.msg → ...ransportlayer/contract/udp/UdpCommand.msg
diff --git a/src/inet/transportlayer/contract/udp/UdpControlInfo.h b/src/inet/transportlayer/contract/udp/UdpControlInfo.h
diff --git a/src/inet/transportlayer/contract/udp/UdpSocket.cc b/src/inet/transportlayer/contract/udp/UdpSocket.cc
@@ -19,7 +19,7 @@
 #endif // ifdef INET_WITH_IPv4
 
 #include "inet/transportlayer/common/L4PortTag_m.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 #include "inet/transportlayer/contract/udp/UdpSocket.h"
 
 namespace inet {

diff --git a/src/inet/transportlayer/contract/udp/UdpSocket.h b/src/inet/transportlayer/contract/udp/UdpSocket.h
@@ -15,7 +15,7 @@
 #include "inet/common/socket/ISocket.h"
 #include "inet/networklayer/common/L3Address.h"
 #include "inet/networklayer/contract/IInterfaceTable.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 
 namespace inet {
 
@@ -267,7 +267,7 @@ class INET_API UdpSocket : public ISocket
     //@{
     /**
      * Returns true if the message belongs to this socket instance (message
-     * has a UdpControlInfo as getControlInfo(), and the socketId in it matches
+     * has an UdpCommand as getControlInfo(), and the socketId in it matches
      * that of the socket.)
      */
     virtual bool belongsToSocket(cMessage *msg) const override;

diff --git a/src/inet/transportlayer/rtp/Rtcp.cc b/src/inet/transportlayer/rtp/Rtcp.cc
@@ -11,7 +11,7 @@
 #include "inet/common/Simsignals.h"
 #include "inet/common/lifecycle/NodeStatus.h"
 #include "inet/networklayer/contract/ipv4/Ipv4Address.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 #include "inet/transportlayer/contract/udp/UdpSocket.h"
 #include "inet/transportlayer/rtp/RtcpPacket_m.h"
 #include "inet/transportlayer/rtp/RtpInnerPacket_m.h"

diff --git a/src/inet/transportlayer/rtp/Rtp.cc b/src/inet/transportlayer/rtp/Rtp.cc
@@ -12,7 +12,7 @@
 #include "inet/networklayer/common/NetworkInterface.h"
 #include "inet/networklayer/contract/ipv4/Ipv4Address.h"
 #include "inet/networklayer/ipv4/IIpv4RoutingTable.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 #include "inet/transportlayer/contract/udp/UdpSocket.h"
 #include "inet/transportlayer/rtp/RtpInnerPacket_m.h"
 #include "inet/transportlayer/rtp/RtpInterfacePacket_m.h"

diff --git a/src/inet/transportlayer/sctp/Sctp.cc b/src/inet/transportlayer/sctp/Sctp.cc
@@ -19,7 +19,7 @@
 #include "inet/transportlayer/common/L4Tools.h"
 #include "inet/transportlayer/contract/sctp/SctpCommand_m.h"
 #include "inet/transportlayer/contract/sctp/SctpSocket.h"
-#include "inet/transportlayer/contract/udp/UdpControlInfo_m.h"
+#include "inet/transportlayer/contract/udp/UdpCommand_m.h"
 #include "inet/transportlayer/contract/udp/UdpSocket.h"
 #include "inet/transportlayer/sctp/SctpAssociation.h"
 #include "inet/transportlayer/sctp/SctpHeaderSerializer.h"