Don't re-declare pure virtual methods from the parent Socket class. Fixes bug #249.
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Wed, 09 Jul 2008 18:34:42 +0100
changeset 3398 266c6a334762
parent 3397 cad55f67f3fc
child 3399 5782cdf815e1
child 3413 1d46345ab5d7
Don't re-declare pure virtual methods from the parent Socket class. Fixes bug #249.
src/node/tcp-socket.h
src/node/udp-socket.h
--- a/src/node/tcp-socket.h	Tue Jul 08 14:27:45 2008 -0700
+++ b/src/node/tcp-socket.h	Wed Jul 09 18:34:42 2008 +0100
@@ -51,23 +51,6 @@
   TcpSocket (void);
   virtual ~TcpSocket (void);
 
-  virtual enum Socket::SocketErrno GetErrno (void) const = 0;
-  virtual Ptr<Node> GetNode (void) const = 0;
-  virtual int Bind () = 0;
-  virtual int Close (void) = 0;
-  virtual int ShutdownSend (void) = 0;
-  virtual int ShutdownRecv (void) = 0;
-  virtual int Connect (const Address &address) = 0;
-  virtual uint32_t GetTxAvailable (void) const = 0;
-  virtual int Send (Ptr<Packet> p, uint32_t flags) = 0;
-  virtual int SendTo (Ptr<Packet> p, uint32_t flags, 
-    const Address &toAddress) = 0;
-  virtual uint32_t GetRxAvailable (void) const = 0;
-  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags) = 0;
-  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,
-    Address &fromAddress) = 0;
-
-
 private:
   // Indirect the attribute setting and getting through private virtual methods
   virtual void SetSndBufSize (uint32_t size) = 0;
--- a/src/node/udp-socket.h	Tue Jul 08 14:27:45 2008 -0700
+++ b/src/node/udp-socket.h	Wed Jul 09 18:34:42 2008 +0100
@@ -50,22 +50,6 @@
   UdpSocket (void);
   virtual ~UdpSocket (void);
 
-  virtual enum Socket::SocketErrno GetErrno (void) const = 0;
-  virtual Ptr<Node> GetNode (void) const = 0;
-  virtual int Bind () = 0;
-  virtual int Close (void) = 0;
-  virtual int ShutdownSend (void) = 0;
-  virtual int ShutdownRecv (void) = 0;
-  virtual int Connect (const Address &address) = 0;
-  virtual uint32_t GetTxAvailable (void) const = 0;
-  virtual int Send (Ptr<Packet> p, uint32_t flags) = 0;
-  virtual int SendTo (Ptr<Packet> p, uint32_t flags,
-    const Address &toAddress) = 0;
-  virtual uint32_t GetRxAvailable (void) const = 0;
-  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags) = 0;
-  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,
-    Address &fromAddress) = 0;
-
 private:
   // Indirect the attribute setting and getting through private virtual methods
   virtual void SetRcvBufSize (uint32_t size) = 0;