move p2p to new dir

SConstruct

@@ -189,8 +189,6 @@ node.add_sources ([
     'arp-cache.cc',
     'arp-ipv4-interface.cc',
     'arp.cc',
-    'p2p-net-device.cc',
-    'p2p-channel.cc',
     'ipv4-loopback-interface.cc',
     'llc-snap-header.cc',
     'header-utils.cc',
@@ -228,8 +226,6 @@ node.add_inst_headers ([
     'udp-socket.h',
     'ipv4-address.h',
     'net-device.h',
-    'p2p-net-device.h',
-    'p2p-channel.h',
     'arp-ipv4-interface.h',
     'ipv4-interface.h',
     'mac-address.h',
@@ -248,6 +244,18 @@ node.add_inst_headers ([
     'udp-header.h',
     ])
 
+p2p = build.Ns3Module ('p2p', 'src/devices/p2p')
+ns3.add (p2p)
+p2p.add_deps (['node'])
+p2p.add_sources ([
+    'p2p-net-device.cc',
+    'p2p-channel.cc',
+    ])
+p2p.add_inst_headers ([
+    'p2p-net-device.h',
+    'p2p-channel.h',
+    ])
+
 
 # utils
 run_tests = build.Ns3Module('run-tests', 'utils')
@@ -335,7 +343,7 @@ sample_simple.add_source('main-simple.cc')
 sample_sp2p = build.Ns3Module('sample-simple-p2p', 'samples')
 sample_sp2p.set_executable()
 ns3.add(sample_sp2p)
-sample_sp2p.add_deps(['core', 'simulator', 'node'])
+sample_sp2p.add_deps(['core', 'simulator', 'node', 'p2p'])
 sample_sp2p.add_source('main-simple-p2p.cc')
 
 sample_simple_tcl = build.Ns3Module('sample-simple.tcl', 'samples')

src/devices/p2p/p2p-channel.cc

@@ -24,9 +24,9 @@
 
 #include "ns3/simulator.h"
 #include "ns3/packet.h"
+#include "ns3/node.h"
 #include "p2p-channel.h"
 #include "p2p-net-device.h"
-#include "node.h"
 
 namespace ns3 {
 

src/devices/p2p/p2p-channel.h

@@ -26,7 +26,7 @@
 #define P2P_CHANNEL_H
 
 #include "ns3/nstime.h"
-#include "mac-address.h"
+#include "ns3/mac-address.h"
 
 namespace ns3 {
 

src/devices/p2p/p2p-net-device.h

@@ -25,7 +25,7 @@
 #ifndef P2P_NET_DEVICE_H
 #define P2P_NET_DEVICE_H
 
-#include "net-device.h"
+#include "ns3/net-device.h"
 
 namespace ns3 {