diff -r fc08a4cc768f example/dce-quagga-ospfd-rocketfuel.cc

--- a/example/dce-quagga-ospfd-rocketfuel.cc	Thu Mar 29 13:55:22 2012 +0900

+++ b/example/dce-quagga-ospfd-rocketfuel.cc	Thu Mar 29 13:55:54 2012 +0900

@@ -13,15 +13,18 @@

 #include <sys/resource.h>

+#define NS3_OPENMPI

+#define NS3_MPI

 #ifdef NS3_MPI

 #include <mpi.h>

+#include "ns3/mpi-interface.h"

 #endif

 using namespace ns3;

 NS_LOG_COMPONENT_DEFINE ("quagga-ospfd-rocketfuel");

 // Parameters

-uint32_t stopTime = 60;

+uint32_t stopTime = 3600;

 static void

 SetRlimit ()

@@ -148,7 +151,7 @@

       p2p.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));

       ndc[i] = p2p.Install (nc[i]);

     }

-  //  p2p.EnablePcapAll ("quagga-rocketfuel");

+//  p2p.EnablePcapAll ("quagga-rocketfuel");

   NS_LOG_INFO ("creating ipv4 interfaces");

   Ipv4InterfaceContainer ipic[totlinks];

@@ -166,6 +169,7 @@

   NS_LOG_INFO ("creating quagga process");

   //run quagga programs in every node

   DceManagerHelper processManager;

+  processManager.SetLoader ("ns3::DlmLoaderFactory");

   QuaggaHelper quagga;

   // 

@@ -195,6 +199,7 @@

           //     std::cout << "[" << systemId << "] start quagga Node " << i << std::endl;

           processManager.Install (nodes.Get (i));

           quagga.EnableOspf (nodes.Get (i));

+          quagga.EnableOspfDebug (nodes.Get (i));

           quagga.Install (nodes.Get (i));

         }

     }

diff -r fc08a4cc768f helper/quagga-helper.cc

--- a/helper/quagga-helper.cc	Thu Mar 29 13:55:22 2012 +0900

+++ b/helper/quagga-helper.cc	Thu Mar 29 13:55:54 2012 +0900

@@ -829,9 +829,9 @@

       process.SetBinary ("ospfd");

       process.AddArguments ("-f", ospf_conf->GetFilename ());

-      process.AddArguments ("-i", "/usr/local/etc/ospfd.pid");

+//      process.AddArguments ("-i", "/usr/local/etc/ospfd.pid");

       apps.Add (process.Install (node));

-      apps.Get(1)->SetStartTime (Seconds (2.0 + 0.1 * node->GetId ()));

+      apps.Get(1)->SetStartTime (Seconds (20.0 + 0.1 * node->GetId ()));

       node->AddApplication (apps.Get (1));

     }

diff -r fc08a4cc768f utils/setenv.zsh

--- a/utils/setenv.zsh	Thu Mar 29 13:55:22 2012 +0900

+++ b/utils/setenv.zsh	Thu Mar 29 13:55:54 2012 +0900

@@ -3,7 +3,7 @@

 # Set environnement for ns3 dce

 cd `dirname ${BASH_SOURCE:-$0}`/../..

 BASE=$PWD

-LD_LIBRARY_PATH="$BASE/ns-3-dce/build/lib:$BASE/build/lib:$BASE/build/bin:$BASE/ns-3-dce/build/bin:."

+LD_LIBRARY_PATH="$BASE/ns-3-dce/build/lib:$BASE/build/lib:$BASE/build/bin:$BASE/ns-3-dce/build/bin:.:/usr/local/mpi/gcc/openmpi-1.4.3/lib/"

 PKG_CONFIG_PATH="$BASE/build/lib/pkgconfig"

 PATH="$BASE/build/bin:$BASE/build/sbin:/home/tazaki/hgworks/ns-3-dce-thehajime/build/bin:/home/tazaki/hgworks/ns-3-dce-thehajime/build/sbin:$PATH"

 PYTHONPATH=$BASE/ns-3-dev/build/debug/bindings/python:$BASE/ns-3-dev/src/visualizer:$BASE/pybindgen-0.15.0.795:$BASE/build/lib/python2.6/site-packages/

diff -r fc08a4cc768f wscript

--- a/wscript	Thu Mar 29 13:55:22 2012 +0900

+++ b/wscript	Thu Mar 29 13:55:54 2012 +0900

@@ -248,7 +248,7 @@

                        target='bin/dce-bash-simple',

                        source=['example/bash/dce-bash-simple.cc'])

-    module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'applications', 'topology-read'],

+    module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'applications', 'topology-read', 'visualizer'],

                        target='bin/dce-quagga-ospfd-rocketfuel',

                        source=['example/dce-quagga-ospfd-rocketfuel.cc'])