--- a/src/contrib/brite/brite-topology-helper.cc Tue Nov 02 17:19:16 2010 -0400
+++ b/src/contrib/brite/brite-topology-helper.cc Thu Nov 04 11:21:48 2010 -0400
@@ -16,6 +16,24 @@
* Author: Josh Pelkey <jpelkey@gatech.edu>
*/
+#include "ns3/log.h"
+#include "ns3/abort.h"
+
+#include "Brite.h"
+#include "brite-topology-helper.h"
+
namespace ns3 {
+BriteTopologyHelper::BriteTopologyHelper ()
+ : m_member (0)
+{
+}
+
+void
+BriteTopologyHelper::TestMethod (void)
+{
+ Topology* topology;
+ Model* model;
+}
+
} // namespace ns3
--- a/src/contrib/brite/brite-topology-helper.h Tue Nov 02 17:19:16 2010 -0400
+++ b/src/contrib/brite/brite-topology-helper.h Thu Nov 04 11:21:48 2010 -0400
@@ -19,9 +19,24 @@
#ifndef BRITE_TOPOLOGY_HELPER_H
#define BRITE_TOPOLOGY_HELPER_H
+#include "ns3/channel.h"
+#include "ns3/node-container.h"
+#include "ns3/node-list.h"
+#include "ns3/net-device-container.h"
+
namespace ns3 {
+class BriteTopologyHelper
+{
+ public:
+ BriteTopologyHelper ();
+ ~BriteTopologyHelper () {};
+ void TestMethod ();
+
+ private:
+ int m_member;
+};
} // namespace ns3
-#endif /* SIMULATOR_H */
+#endif /* BRITE_TOPOLOGY_HELPER_H */
--- a/src/contrib/brite/wscript Tue Nov 02 17:19:16 2010 -0400
+++ b/src/contrib/brite/wscript Thu Nov 04 11:21:48 2010 -0400
@@ -28,9 +28,23 @@
"BRITE not found (see option --with-brite)")
return
-## Will need to add some stuff here to check that the library exists, etc
+ conf.env.append_value('CXXDEFINES', 'BRITE_INTEGRATION')
+ conf.check(mandatory=True, lib='dl', define_name='HAVE_DL', uselib='DL')
+
+ lib_to_check = 'libbrite.so'
+
+ if not os.path.exists(os.path.join(conf.env['WITH_BRITE'], lib_to_check)):
+ conf.env['BRITE_ENABLED'] = False
+ conf.report_optional_feature("brite", "BRITE Integration", False,
+ "BRITE library %s is missing: BRITE has not been built?" % lib_to_check)
+ return
+
+ for brite_module in ['.']:
+ conf.env.append_value('NS3_MODULE_PATH',
+ os.path.abspath(os.path.join(conf.env['WITH_BRITE'], brite_module)))
+
+ conf.env['BRITE_ENABLED'] = True
conf.report_optional_feature("brite", "BRITE Integration", True, "")
- return
def build(bld):
@@ -48,3 +62,4 @@
if bld.env['BRITE_ENABLED']:
module.source.append ('brite-topology-helper.cc')
headers.source.append ('brite-topology-helper.h')
+ module.uselib = 'DL'