Raw socket nearly work

src/internet-stack/ipv4-l3-protocol.cc

@@ -40,6 +40,9 @@
 #include "icmpv4-l4-protocol.h"
 #include "ipv4-interface.h"
 #include "ipv4-raw-socket-impl.h"
+#include "raw-socket-impl.h"
+
+
 
 NS_LOG_COMPONENT_DEFINE ("Ipv4L3Protocol");
 
@@ -125,6 +128,18 @@ Ipv4L3Protocol::CreateRawSocket (void)
   m_sockets.push_back (socket);
   return socket;
 }
+
+Ptr<Socket>
+Ipv4L3Protocol::CreateRawSocket2 (void)
+{
+  NS_LOG_FUNCTION (this);
+  Ptr<RawSocketImpl> socket = CreateObject<RawSocketImpl> ();
+  socket->SetNode (m_node);
+  m_rawSocket.push_back (socket);
+  return socket;
+}
+
+
 void 
 Ipv4L3Protocol::DeleteRawSocket (Ptr<Socket> socket)
 {

src/internet-stack/ipv4-l3-protocol.h

@@ -30,6 +30,8 @@
 #include "ns3/traced-callback.h"
 #include "ns3/ipv4-header.h"
 #include "ns3/ipv4-routing-protocol.h"
+#include "raw-socket-impl.h"
+
 
 namespace ns3 {
 
@@ -71,6 +73,7 @@ public:
   Ptr<Ipv4RoutingProtocol> GetRoutingProtocol (void) const;
 
   Ptr<Socket> CreateRawSocket (void);
+  Ptr<Socket> CreateRawSocket2 (void);
   void DeleteRawSocket (Ptr<Socket> socket);
 
   /**
@@ -206,6 +209,7 @@ private:
 
   typedef std::list<Ptr<Ipv4Interface> > Ipv4InterfaceList;
   typedef std::list<Ptr<Ipv4RawSocketImpl> > SocketList;
+  typedef std::list<Ptr<RawSocketImpl> > RawSocketList;
   typedef std::list<Ptr<Ipv4L4Protocol> > L4List_t;
 
   bool m_ipForward;
@@ -222,6 +226,7 @@ private:
   Ptr<Ipv4RoutingProtocol> m_routingProtocol;
 
   SocketList m_sockets;
+  RawSocketList m_rawSocket;
 };
 
 } // Namespace ns3

src/internet-stack/raw-socket-factory-impl.cc

@@ -0,0 +1,24 @@
+#include "raw-socket-factory-impl.h"
+#include "raw-socket-impl.h"
+#include "ipv4-l3-protocol.h"
+#include "ns3/socket.h"
+#include "ns3/log.h"
+
+namespace ns3 {
+
+void
+RawSocketFactoryImpl::DoDispose (void)
+{
+  m_ipv4 = 0;
+  RawSocketFactory::DoDispose ();
+}
+
+Ptr<Socket> 
+RawSocketFactoryImpl::CreateSocket (void)
+{
+
+  Ptr<Socket> socket = m_ipv4->CreateRawSocket2 ();
+  return socket;
+}
+
+} // namespace ns3

src/internet-stack/raw-socket-factory-impl.h

@@ -0,0 +1,26 @@
+#ifndef RAW_SOCKET_FACTORY_IMPL_H
+#define RAW_SOCKET_FACTORY_IMPL_H
+
+#include "ns3/raw-socket-factory.h"
+#include "ipv4-l3-protocol.h"
+
+
+namespace ns3 {
+
+class Ipv4L3Protocol;
+
+class RawSocketFactoryImpl : public RawSocketFactory
+{
+protected:
+  virtual void DoDispose (void);
+public:
+  virtual Ptr<Socket> CreateSocket (void);
+private:
+  Ptr<Ipv4L3Protocol> m_ipv4;
+
+};
+
+
+} // namespace ns3
+
+#endif /* RAW_SOCKET_FACTORY_IMPL_H */

src/internet-stack/raw-socket-impl.h

@@ -1,5 +1,5 @@
-#ifndef IPV4_RAW_SOCKET_IMPL_H
-#define IPV4_RAW_SOCKET_IMPL_H
+#ifndef RAW_SOCKET_IMPL_H
+#define RAW_SOCKET_IMPL_H
 
 #include "ns3/socket.h"
 #include "ns3/ipv4-header.h"

src/internet-stack/wscript

@@ -94,6 +94,7 @@ def build(bld):
         'pending-data.cc',
         'sequence-number.cc',
         'rtt-estimator.cc',
+        'raw-socket-factory-impl.cc',
         'raw-socket-impl.cc',
         'ipv4-raw-socket-factory-impl.cc',
         'ipv4-raw-socket-impl.cc',