rename UdpSocket to UdpSocketImpl
This commit is contained in:
@@ -22,47 +22,47 @@
|
||||
#include "ns3/log.h"
|
||||
#include "ns3/uinteger.h"
|
||||
#include "ns3/trace-source-accessor.h"
|
||||
#include "udp-socketx.h"
|
||||
#include "udp-socket.h"
|
||||
|
||||
NS_LOG_COMPONENT_DEFINE ("UdpSocketx");
|
||||
NS_LOG_COMPONENT_DEFINE ("UdpSocket");
|
||||
|
||||
namespace ns3 {
|
||||
|
||||
NS_OBJECT_ENSURE_REGISTERED (UdpSocketx);
|
||||
NS_OBJECT_ENSURE_REGISTERED (UdpSocket);
|
||||
|
||||
TypeId
|
||||
UdpSocketx::GetTypeId (void)
|
||||
UdpSocket::GetTypeId (void)
|
||||
{
|
||||
static TypeId tid = TypeId ("ns3::UdpSocketx")
|
||||
static TypeId tid = TypeId ("ns3::UdpSocket")
|
||||
.SetParent<Socket> ()
|
||||
.AddAttribute ("RcvBufSize",
|
||||
"UdpSocket maximum receive buffer size (bytes)",
|
||||
UintegerValue (0xffffffffl),
|
||||
MakeUintegerAccessor (&UdpSocketx::GetRcvBufSize,
|
||||
&UdpSocketx::SetRcvBufSize),
|
||||
MakeUintegerAccessor (&UdpSocket::GetRcvBufSize,
|
||||
&UdpSocket::SetRcvBufSize),
|
||||
MakeUintegerChecker<uint32_t> ())
|
||||
.AddAttribute ("IpTtl",
|
||||
"socket-specific TTL for unicast IP packets (if non-zero)",
|
||||
UintegerValue (0),
|
||||
MakeUintegerAccessor (&UdpSocketx::GetIpTtl,
|
||||
&UdpSocketx::SetIpTtl),
|
||||
MakeUintegerAccessor (&UdpSocket::GetIpTtl,
|
||||
&UdpSocket::SetIpTtl),
|
||||
MakeUintegerChecker<uint32_t> ())
|
||||
.AddAttribute ("IpMulticastTtl",
|
||||
"socket-specific TTL for multicast IP packets (if non-zero)",
|
||||
UintegerValue (0),
|
||||
MakeUintegerAccessor (&UdpSocketx::GetIpMulticastTtl,
|
||||
&UdpSocketx::SetIpMulticastTtl),
|
||||
MakeUintegerAccessor (&UdpSocket::GetIpMulticastTtl,
|
||||
&UdpSocket::SetIpMulticastTtl),
|
||||
MakeUintegerChecker<uint32_t> ())
|
||||
;
|
||||
return tid;
|
||||
}
|
||||
|
||||
UdpSocketx::UdpSocketx ()
|
||||
UdpSocket::UdpSocket ()
|
||||
{
|
||||
NS_LOG_FUNCTION_NOARGS ();
|
||||
}
|
||||
|
||||
UdpSocketx::~UdpSocketx ()
|
||||
UdpSocket::~UdpSocket ()
|
||||
{
|
||||
NS_LOG_FUNCTION_NOARGS ();
|
||||
}
|
||||
@@ -20,8 +20,8 @@
|
||||
* Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
|
||||
*/
|
||||
|
||||
#ifndef __UDP_SOCKETX_H__
|
||||
#define __UDP_SOCKETX_H__
|
||||
#ifndef __UDP_SOCKET_H__
|
||||
#define __UDP_SOCKET_H__
|
||||
|
||||
#include "socket.h"
|
||||
#include "ns3/traced-callback.h"
|
||||
@@ -40,13 +40,13 @@ class Packet;
|
||||
* This class exists solely for hosting UdpSocket attributes that can
|
||||
* be reused across different implementations.
|
||||
*/
|
||||
class UdpSocketx : public Socket
|
||||
class UdpSocket : public Socket
|
||||
{
|
||||
public:
|
||||
static TypeId GetTypeId (void);
|
||||
|
||||
UdpSocketx (void);
|
||||
virtual ~UdpSocketx (void);
|
||||
UdpSocket (void);
|
||||
virtual ~UdpSocket (void);
|
||||
|
||||
virtual enum Socket::SocketErrno GetErrno (void) const = 0;
|
||||
virtual Ptr<Node> GetNode (void) const = 0;
|
||||
@@ -25,7 +25,7 @@ def build(bld):
|
||||
'socket-factory.cc',
|
||||
'packet-socket-factory.cc',
|
||||
'packet-socket.cc',
|
||||
'udp-socketx.cc',
|
||||
'udp-socket.cc',
|
||||
'udp-socket-factory.cc',
|
||||
'tcp.cc',
|
||||
'ipv4.cc',
|
||||
@@ -58,7 +58,7 @@ def build(bld):
|
||||
'socket.h',
|
||||
'socket-factory.h',
|
||||
'packet-socket-factory.h',
|
||||
'udp-socketx.h',
|
||||
'udp-socket.h',
|
||||
'udp-socket-factory.h',
|
||||
'tcp.h',
|
||||
'ipv4.h',
|
||||
|
||||
Reference in New Issue
Block a user