F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Raj Bhattacharjea
2008-06-06 16:30:28 -04:00
parent 6c4692ea55 97d98fa1ce
commit a37b419abd
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/internet-node/udp-header.cc
View File

@@ -51,22 +51,22 @@ UdpHeader::EnableChecksums (void)
}
void
UdpHeader::SetDestination (uint16_t port)
UdpHeader::SetDestinationPort (uint16_t port)
{
m_destinationPort = port;
}
void
UdpHeader::SetSource (uint16_t port)
UdpHeader::SetSourcePort (uint16_t port)
{
m_sourcePort = port;
}
uint16_t
UdpHeader::GetSource (void) const
UdpHeader::GetSourcePort (void) const
{
return m_sourcePort;
}
uint16_t
UdpHeader::GetDestination (void) const
UdpHeader::GetDestinationPort (void) const
{
return m_destinationPort;
}

8
src/internet-node/udp-header.h
View File

@@ -49,19 +49,19 @@ public:
/**
* \param port the destination port for this UdpHeader
*/
void SetDestination (uint16_t port);
void SetDestinationPort (uint16_t port);
/**
* \param port The source port for this UdpHeader
*/
void SetSource (uint16_t port);
void SetSourcePort (uint16_t port);
/**
* \return The source port for this UdpHeader
*/
uint16_t GetSource (void) const;
uint16_t GetSourcePort (void) const;
/**
* \return the destination port for this UdpHeader
*/
uint16_t GetDestination (void) const;
uint16_t GetDestinationPort (void) const;
/**
* \param size The payload size in bytes
*/

10
src/internet-node/udp-l4-protocol.cc
View File

@@ -155,12 +155,12 @@ UdpL4Protocol::Receive(Ptr<Packet> packet,
UdpHeader udpHeader;
packet->RemoveHeader (udpHeader);
Ipv4EndPointDemux::EndPoints endPoints =
m_endPoints->Lookup (destination, udpHeader.GetDestination (),
source, udpHeader.GetSource (), interface);
m_endPoints->Lookup (destination, udpHeader.GetDestinationPort (),
source, udpHeader.GetSourcePort (), interface);
for (Ipv4EndPointDemux::EndPointsI endPoint = endPoints.begin ();
endPoint != endPoints.end (); endPoint++)
{
(*endPoint)->ForwardUp (packet->Copy (), source, udpHeader.GetSource ());
(*endPoint)->ForwardUp (packet->Copy (), source, udpHeader.GetSourcePort ());
}
}
@@ -172,8 +172,8 @@ UdpL4Protocol::Send (Ptr<Packet> packet,
NS_LOG_FUNCTION (this << packet << saddr << daddr << sport << dport);
UdpHeader udpHeader;
udpHeader.SetDestination (dport);
udpHeader.SetSource (sport);
udpHeader.SetDestinationPort (dport);
udpHeader.SetSourcePort (sport);
udpHeader.SetPayloadSize (packet->GetSize ());
udpHeader.InitializeChecksum (saddr,
daddr,