# HG changeset patch
# User Josh Pelkey <jpelkey@gatech.edu>
# Date 1305313289 14400
# Node ID 04871cc0be94cb22a823e11a873cbb8f9d9e54fd
# Parent  618768dcbbac7ddd8123d3a5b4e32f22be6b786c
virtual-net-device coding style changes

diff -r 618768dcbbac -r 04871cc0be94 src/virtual-net-device/examples/virtual-net-device.cc
--- a/src/virtual-net-device/examples/virtual-net-device.cc	Fri May 13 15:00:49 2011 -0400
+++ b/src/virtual-net-device/examples/virtual-net-device.cc	Fri May 13 15:01:29 2011 -0400
@@ -75,8 +75,8 @@
   Ptr<VirtualNetDevice> m_n0Tap;
   Ptr<VirtualNetDevice> m_n1Tap;
   Ptr<VirtualNetDevice> m_n3Tap;
-  
-  
+
+
   bool
   N0VirtualSend (Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber)
   {
@@ -137,23 +137,23 @@
   }
 
 public:
-  
+
   Tunnel (Ptr<Node> n3, Ptr<Node> n0, Ptr<Node> n1,
           Ipv4Address n3Addr, Ipv4Address n0Addr, Ipv4Address n1Addr)
     : m_n3Address (n3Addr), m_n0Address (n0Addr), m_n1Address (n1Addr)
   {
     m_n3Socket = Socket::CreateSocket (n3, TypeId::LookupByName ("ns3::UdpSocketFactory"));
     m_n3Socket->Bind (InetSocketAddress (Ipv4Address::GetAny (), 667));
-    m_n3Socket->SetRecvCallback (MakeCallback (&Tunnel::N3SocketRecv, this));    
-    
+    m_n3Socket->SetRecvCallback (MakeCallback (&Tunnel::N3SocketRecv, this));
+
     m_n0Socket = Socket::CreateSocket (n0, TypeId::LookupByName ("ns3::UdpSocketFactory"));
     m_n0Socket->Bind (InetSocketAddress (Ipv4Address::GetAny (), 667));
-    m_n0Socket->SetRecvCallback (MakeCallback (&Tunnel::N0SocketRecv, this));    
-    
+    m_n0Socket->SetRecvCallback (MakeCallback (&Tunnel::N0SocketRecv, this));
+
     m_n1Socket = Socket::CreateSocket (n1, TypeId::LookupByName ("ns3::UdpSocketFactory"));
     m_n1Socket->Bind (InetSocketAddress (Ipv4Address::GetAny (), 667));
     m_n1Socket->SetRecvCallback (MakeCallback (&Tunnel::N1SocketRecv, this));
-    
+
     // n0 tap device
     m_n0Tap = CreateObject<VirtualNetDevice> ();
     m_n0Tap->SetAddress (Mac48Address ("11:00:01:02:03:01"));
@@ -163,7 +163,7 @@
     uint32_t i = ipv4->AddInterface (m_n0Tap);
     ipv4->AddAddress (i, Ipv4InterfaceAddress (Ipv4Address ("11.0.0.1"), Ipv4Mask ("255.255.255.0")));
     ipv4->SetUp (i);
-    
+
     // n1 tap device
     m_n1Tap = CreateObject<VirtualNetDevice> ();
     m_n1Tap->SetAddress (Mac48Address ("11:00:01:02:03:02"));
@@ -183,13 +183,13 @@
     i = ipv4->AddInterface (m_n3Tap);
     ipv4->AddAddress (i, Ipv4InterfaceAddress (Ipv4Address ("11.0.0.254"), Ipv4Mask ("255.255.255.0")));
     ipv4->SetUp (i);
-    
+
   }
-  
-  
+
+
 };
 
-  
+
 
 int 
 main (int argc, char *argv[])
@@ -200,13 +200,13 @@
   LogComponentEnable ("VirtualNetDeviceExample", LOG_LEVEL_INFO);
 #endif
   Packet::EnablePrinting ();
-  
+
 
   // Set up some default values for the simulation.  Use the 
   Config::SetDefault ("ns3::OnOffApplication::PacketSize", UintegerValue (210));
   Config::SetDefault ("ns3::OnOffApplication::DataRate", StringValue ("448kb/s"));
 
-  //DefaultValue::Bind ("DropTailQueue::m_maxPackets", 30);   
+  //DefaultValue::Bind ("DropTailQueue::m_maxPackets", 30);
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
@@ -233,12 +233,12 @@
   NetDeviceContainer d0d2 = p2p.Install (n0n2);
 
   NetDeviceContainer d1d2 = p2p.Install (n1n2);
-  
+
   p2p.SetDeviceAttribute ("DataRate", StringValue ("1500kbps"));
   p2p.SetChannelAttribute ("Delay", StringValue ("10ms"));
   NetDeviceContainer d3d2 = p2p.Install (n3n2);
-  
-  // Later, we add IP addresses.  
+
+  // Later, we add IP addresses.
   NS_LOG_INFO ("Assign IP Addresses.");
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
@@ -246,7 +246,7 @@
 
   ipv4.SetBase ("10.1.2.0", "255.255.255.0");
   Ipv4InterfaceContainer i1i2 = ipv4.Assign (d1d2);
-  
+
   ipv4.SetBase ("10.1.3.0", "255.255.255.0");
   Ipv4InterfaceContainer i3i2 = ipv4.Assign (d3d2);
 
@@ -272,7 +272,7 @@
 
   // Create a packet sink to receive these packets
   PacketSinkHelper sink ("ns3::UdpSocketFactory",
-    Address (InetSocketAddress (Ipv4Address::GetAny (), port)));
+                         Address (InetSocketAddress (Ipv4Address::GetAny (), port)));
   apps = sink.Install (c.Get (3));
   apps.Start (Seconds (1.0));
   //apps.Stop (Seconds (10.0));
diff -r 618768dcbbac -r 04871cc0be94 src/virtual-net-device/model/virtual-net-device.cc
--- a/src/virtual-net-device/model/virtual-net-device.cc	Fri May 13 15:00:49 2011 -0400
+++ b/src/virtual-net-device/model/virtual-net-device.cc	Fri May 13 15:01:29 2011 -0400
@@ -46,7 +46,7 @@
                    UintegerValue (1500),
                    MakeUintegerAccessor (&VirtualNetDevice::SetMtu,
                                          &VirtualNetDevice::GetMtu),
-                   MakeUintegerChecker<uint16_t> ())                   
+                   MakeUintegerChecker<uint16_t> ())
     .AddTraceSource ("MacTx", 
                      "Trace source indicating a packet has arrived for transmission by this device",
                      MakeTraceSourceAccessor (&VirtualNetDevice::m_macTxTrace))
@@ -67,7 +67,7 @@
     .AddTraceSource ("PromiscSniffer", 
                      "Trace source simulating a promiscuous packet sniffer attached to the device",
                      MakeTraceSourceAccessor (&VirtualNetDevice::m_promiscSnifferTrace))
-    ;
+  ;
   return tid;
 }
 
@@ -228,7 +228,7 @@
 
 Address VirtualNetDevice::GetMulticast (Ipv6Address addr) const
 {
-  return Mac48Address ("ff:ff:ff:ff:ff:ff");  
+  return Mac48Address ("ff:ff:ff:ff:ff:ff");
 }