Attachment #480 for bug #600

View | Details | Raw Unified | Return to bug 600
Collapse All | Expand All




    cls.add_method('ConnectWithoutContext', 
                   'void', 
                   [param('ns3::CallbackBase const &', 'cb')])
    ## traced-value.h: void ns3::TracedValue<unsigned int>::Connect(ns3::CallbackBase const & cb, std::string path) [member function]
    cls.add_method('Connect', 
                   'void', 
                   [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])

    cls.add_method('DisconnectWithoutContext', 
                   'void', 
                   [param('ns3::CallbackBase const &', 'cb')])
    ## traced-value.h: void ns3::TracedValue<unsigned int>::Disconnect(ns3::CallbackBase const & cb, std::string path) [member function]
    cls.add_method('Disconnect', 
                   'void', 
                   [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])

    module.add_function('TypeNameGet', 
                        'std::string', 
                        [], 
                        template_parameters=['long long'])
    ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
    module.add_function('TypeNameGet', 
                        'std::string', 

    module.add_function('TypeNameGet', 
                        'std::string', 
                        [], 
                        template_parameters=['unsigned long long'])
    ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
    module.add_function('TypeNameGet', 
                        'std::string', 

(-)a/bindings/python/ns3_module_helper.py (-21 / +53 lines)

Lines 17-24	Link Here

    module.add_class('Ipv4AddressHelper', allow_subclassing=False)

    module.add_class('Ipv4AddressHelper', allow_subclassing=False)

    ## ipv4-interface-container.h: ns3::Ipv4InterfaceContainer [class]

    ## ipv4-interface-container.h: ns3::Ipv4InterfaceContainer [class]

    module.add_class('Ipv4InterfaceContainer')

    module.add_class('Ipv4InterfaceContainer')

    ## internet-stack-helper.h: ns3::Ipv4RoutingHelper [class]

    module.add_class('Ipv4RoutingHelper', allow_subclassing=False)

    ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper [class]

    ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper [class]

    module.add_class('Ipv4StaticRoutingHelper', allow_subclassing=False)

    module.add_class('Ipv4StaticRoutingHelper', allow_subclassing=False, parent=root_module['ns3::Ipv4RoutingHelper'])

    ## mobility-helper.h: ns3::MobilityHelper [class]

    ## mobility-helper.h: ns3::MobilityHelper [class]

    module.add_class('MobilityHelper', allow_subclassing=False)

    module.add_class('MobilityHelper', allow_subclassing=False)

    ## net-device-container.h: ns3::NetDeviceContainer [class]

    ## net-device-container.h: ns3::NetDeviceContainer [class]

Lines 28-34	Link Here

    ## ns2-mobility-helper.h: ns3::Ns2MobilityHelper [class]

    ## ns2-mobility-helper.h: ns3::Ns2MobilityHelper [class]

    module.add_class('Ns2MobilityHelper', allow_subclassing=False)

    module.add_class('Ns2MobilityHelper', allow_subclassing=False)

    ## olsr-helper.h: ns3::OlsrHelper [class]

    ## olsr-helper.h: ns3::OlsrHelper [class]

    module.add_class('OlsrHelper', allow_subclassing=False)

    module.add_class('OlsrHelper', allow_subclassing=False, parent=root_module['ns3::Ipv4RoutingHelper'])

    ## on-off-helper.h: ns3::OnOffHelper [class]

    ## on-off-helper.h: ns3::OnOffHelper [class]

    module.add_class('OnOffHelper', allow_subclassing=False)

    module.add_class('OnOffHelper', allow_subclassing=False)

    ## packet-sink-helper.h: ns3::PacketSinkHelper [class]

    ## packet-sink-helper.h: ns3::PacketSinkHelper [class]

Lines 57-62	Link Here

    module.add_class('YansWifiPhyHelper', allow_subclassing=False, parent=root_module['ns3::WifiPhyHelper'])

    module.add_class('YansWifiPhyHelper', allow_subclassing=False, parent=root_module['ns3::WifiPhyHelper'])

    ## yans-wifi-helper.h: ns3::YansWifiPhyHelper::PcapFormat [enumeration]

    ## yans-wifi-helper.h: ns3::YansWifiPhyHelper::PcapFormat [enumeration]

    module.add_enum('PcapFormat', ['PCAP_FORMAT_80211', 'PCAP_FORMAT_80211_PRISM', 'PCAP_FORMAT_80211_RADIOTAP'], outer_class=root_module['ns3::YansWifiPhyHelper'])

    module.add_enum('PcapFormat', ['PCAP_FORMAT_80211', 'PCAP_FORMAT_80211_PRISM', 'PCAP_FORMAT_80211_RADIOTAP'], outer_class=root_module['ns3::YansWifiPhyHelper'])

    ## internet-stack-helper.h: ns3::Ipv4ListRoutingHelper [class]

    module.add_class('Ipv4ListRoutingHelper', allow_subclassing=False, parent=root_module['ns3::Ipv4RoutingHelper'])

    ## nqos-wifi-mac-helper.h: ns3::NqosWifiMacHelper [class]

    ## nqos-wifi-mac-helper.h: ns3::NqosWifiMacHelper [class]

    module.add_class('NqosWifiMacHelper', allow_subclassing=False, parent=root_module['ns3::WifiMacHelper'])

    module.add_class('NqosWifiMacHelper', allow_subclassing=False, parent=root_module['ns3::WifiMacHelper'])

    ## qos-wifi-mac-helper.h: ns3::QosWifiMacHelper [class]

    ## qos-wifi-mac-helper.h: ns3::QosWifiMacHelper [class]

Lines 120-125	Link Here

120

    register_Ns3InternetStackHelper_methods(root_module, root_module['ns3::InternetStackHelper'])

124

    register_Ns3InternetStackHelper_methods(root_module, root_module['ns3::InternetStackHelper'])

121

    register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper'])

125

    register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper'])

122

    register_Ns3Ipv4InterfaceContainer_methods(root_module, root_module['ns3::Ipv4InterfaceContainer'])

126

    register_Ns3Ipv4InterfaceContainer_methods(root_module, root_module['ns3::Ipv4InterfaceContainer'])

127

    register_Ns3Ipv4RoutingHelper_methods(root_module, root_module['ns3::Ipv4RoutingHelper'])

123

    register_Ns3Ipv4StaticRoutingHelper_methods(root_module, root_module['ns3::Ipv4StaticRoutingHelper'])

128

    register_Ns3Ipv4StaticRoutingHelper_methods(root_module, root_module['ns3::Ipv4StaticRoutingHelper'])

124

    register_Ns3MobilityHelper_methods(root_module, root_module['ns3::MobilityHelper'])

129

    register_Ns3MobilityHelper_methods(root_module, root_module['ns3::MobilityHelper'])

125

    register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])

130

    register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])

Lines 139-144	Link Here

139

    register_Ns3WifiPhyHelper_methods(root_module, root_module['ns3::WifiPhyHelper'])

144

    register_Ns3WifiPhyHelper_methods(root_module, root_module['ns3::WifiPhyHelper'])

140

    register_Ns3YansWifiChannelHelper_methods(root_module, root_module['ns3::YansWifiChannelHelper'])

145

    register_Ns3YansWifiChannelHelper_methods(root_module, root_module['ns3::YansWifiChannelHelper'])

141

    register_Ns3YansWifiPhyHelper_methods(root_module, root_module['ns3::YansWifiPhyHelper'])

146

    register_Ns3YansWifiPhyHelper_methods(root_module, root_module['ns3::YansWifiPhyHelper'])

147

    register_Ns3Ipv4ListRoutingHelper_methods(root_module, root_module['ns3::Ipv4ListRoutingHelper'])

142

    register_Ns3NqosWifiMacHelper_methods(root_module, root_module['ns3::NqosWifiMacHelper'])

148

    register_Ns3NqosWifiMacHelper_methods(root_module, root_module['ns3::NqosWifiMacHelper'])

143

    register_Ns3QosWifiMacHelper_methods(root_module, root_module['ns3::QosWifiMacHelper'])

149

    register_Ns3QosWifiMacHelper_methods(root_module, root_module['ns3::QosWifiMacHelper'])

144

    return

150

    return

Lines 420-425	Link Here

420

    cls.add_constructor([param('ns3::InternetStackHelper const &', 'arg0')])

426

    cls.add_constructor([param('ns3::InternetStackHelper const &', 'arg0')])

421

    ## internet-stack-helper.h: ns3::InternetStackHelper::InternetStackHelper() [constructor]

427

    ## internet-stack-helper.h: ns3::InternetStackHelper::InternetStackHelper() [constructor]

422

    cls.add_constructor([])

428

    cls.add_constructor([])

429

    ## internet-stack-helper.h: void ns3::InternetStackHelper::SetRoutingHelper(ns3::Ipv4RoutingHelper const & routing) [member function]

430

    cls.add_method('SetRoutingHelper',

431

                   'void',

432

                   [param('ns3::Ipv4RoutingHelper const &', 'routing')])

423

    ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(std::string nodeName) const [member function]

433

    ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(std::string nodeName) const [member function]

424

    cls.add_method('Install',

434

    cls.add_method('Install',

425

                   'void',

435

                   'void',

Lines 516-526	Link Here

516

                   [param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])

526

                   [param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])

517

    return

527

    return

518

528

529

def register_Ns3Ipv4RoutingHelper_methods(root_module, cls):

530

    ## internet-stack-helper.h: ns3::Ipv4RoutingHelper::Ipv4RoutingHelper(ns3::Ipv4RoutingHelper const & arg0) [copy constructor]

531

    cls.add_constructor([param('ns3::Ipv4RoutingHelper const &', 'arg0')])

532

    ## internet-stack-helper.h: ns3::Ipv4RoutingHelper::Ipv4RoutingHelper() [constructor]

533

    cls.add_constructor([])

534

    ## internet-stack-helper.h: ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4RoutingHelper::Create(ns3::Ptr<ns3::Node> node) const [member function]

535

    cls.add_method('Create',

536

                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >',

537

                   [param('ns3::Ptr< ns3::Node >', 'node')],

538

                   is_pure_virtual=True, is_const=True, is_virtual=True)

539

    return

540

519

def register_Ns3Ipv4StaticRoutingHelper_methods(root_module, cls):

541

def register_Ns3Ipv4StaticRoutingHelper_methods(root_module, cls):

520

    ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper(ns3::Ipv4StaticRoutingHelper const & arg0) [copy constructor]

542

    ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper(ns3::Ipv4StaticRoutingHelper const & arg0) [copy constructor]

521

    cls.add_constructor([param('ns3::Ipv4StaticRoutingHelper const &', 'arg0')])

543

    cls.add_constructor([param('ns3::Ipv4StaticRoutingHelper const &', 'arg0')])

522

    ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper() [constructor]

544

    ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper() [constructor]

523

    cls.add_constructor([])

545

    cls.add_constructor([])

546

    ## ipv4-static-routing-helper.h: ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4StaticRoutingHelper::Create(ns3::Ptr<ns3::Node> node) const [member function]

547

    cls.add_method('Create',

548

                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >',

549

                   [param('ns3::Ptr< ns3::Node >', 'node')],

550

                   is_const=True, is_virtual=True)

524

    ## ipv4-static-routing-helper.h: ns3::Ptr<ns3::Ipv4StaticRouting> ns3::Ipv4StaticRoutingHelper::GetStaticRouting(ns3::Ptr<ns3::Ipv4> ipv4) const [member function]

551

    ## ipv4-static-routing-helper.h: ns3::Ptr<ns3::Ipv4StaticRouting> ns3::Ipv4StaticRoutingHelper::GetStaticRouting(ns3::Ptr<ns3::Ipv4> ipv4) const [member function]

525

    cls.add_method('GetStaticRouting',

552

    cls.add_method('GetStaticRouting',

526

                   'ns3::Ptr< ns3::Ipv4StaticRouting >',

553

                   'ns3::Ptr< ns3::Ipv4StaticRouting >',

Lines 752-777	Link Here

752

    cls.add_constructor([param('ns3::OlsrHelper const &', 'arg0')])

779

    cls.add_constructor([param('ns3::OlsrHelper const &', 'arg0')])

753

    ## olsr-helper.h: ns3::OlsrHelper::OlsrHelper() [constructor]

780

    ## olsr-helper.h: ns3::OlsrHelper::OlsrHelper() [constructor]

754

    cls.add_constructor([])

781

    cls.add_constructor([])

755

    ## olsr-helper.h: void ns3::OlsrHelper::SetAgent(std::string tid, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]

782

    ## olsr-helper.h: ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::OlsrHelper::Create(ns3::Ptr<ns3::Node> node) const [member function]

756

    cls.add_method('SetAgent',

783

    cls.add_method('Create',

784

                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >',

785

                   [param('ns3::Ptr< ns3::Node >', 'node')],

786

                   is_const=True, is_virtual=True)

787

    ## olsr-helper.h: void ns3::OlsrHelper::Set(std::string name, ns3::AttributeValue const & value) [member function]

788

    cls.add_method('Set',

757

                   'void',

789

                   'void',

758

                   [param('std::string', 'tid'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')])

790

                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])

759

    ## olsr-helper.h: void ns3::OlsrHelper::Install(ns3::NodeContainer container) [member function]

760

    cls.add_method('Install',

761

                   'void',

762

                   [param('ns3::NodeContainer', 'container')])

763

    ## olsr-helper.h: void ns3::OlsrHelper::Install(ns3::Ptr<ns3::Node> node) [member function]

764

    cls.add_method('Install',

765

                   'void',

766

                   [param('ns3::Ptr< ns3::Node >', 'node')])

767

    ## olsr-helper.h: void ns3::OlsrHelper::Install(std::string nodeName) [member function]

768

    cls.add_method('Install',

769

                   'void',

770

                   [param('std::string', 'nodeName')])

771

    ## olsr-helper.h: void ns3::OlsrHelper::InstallAll() [member function]

772

    cls.add_method('InstallAll',

773

                   'void',

774

[])

775

    return

791

    return

776

792

777

def register_Ns3OnOffHelper_methods(root_module, cls):

793

def register_Ns3OnOffHelper_methods(root_module, cls):

Lines 1217-1222	Link Here

1217

                   is_const=True, visibility='private', is_virtual=True)

1233

                   is_const=True, visibility='private', is_virtual=True)

1218

    return

1234

    return

1219

1235

1236

def register_Ns3Ipv4ListRoutingHelper_methods(root_module, cls):

1237

    ## internet-stack-helper.h: ns3::Ipv4ListRoutingHelper::Ipv4ListRoutingHelper(ns3::Ipv4ListRoutingHelper const & arg0) [copy constructor]

1238

    cls.add_constructor([param('ns3::Ipv4ListRoutingHelper const &', 'arg0')])

1239

    ## internet-stack-helper.h: ns3::Ipv4ListRoutingHelper::Ipv4ListRoutingHelper() [constructor]

1240

    cls.add_constructor([])

1241

    ## internet-stack-helper.h: void ns3::Ipv4ListRoutingHelper::Add(ns3::Ipv4RoutingHelper const & routing, int16_t priority) [member function]

1242

    cls.add_method('Add',

1243

                   'void',

1244

                   [param('ns3::Ipv4RoutingHelper const &', 'routing'), param('int16_t', 'priority')])

1245

    ## internet-stack-helper.h: ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4ListRoutingHelper::Create(ns3::Ptr<ns3::Node> node) const [member function]

1246

    cls.add_method('Create',

1247

                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >',

1248

                   [param('ns3::Ptr< ns3::Node >', 'node')],

1249

                   is_const=True, is_virtual=True)

1250

    return

1251

1220

def register_Ns3NqosWifiMacHelper_methods(root_module, cls):

1252

def register_Ns3NqosWifiMacHelper_methods(root_module, cls):

1221

    ## nqos-wifi-mac-helper.h: ns3::NqosWifiMacHelper::NqosWifiMacHelper(ns3::NqosWifiMacHelper const & arg0) [copy constructor]

1253

    ## nqos-wifi-mac-helper.h: ns3::NqosWifiMacHelper::NqosWifiMacHelper(ns3::NqosWifiMacHelper const & arg0) [copy constructor]

1222

    cls.add_constructor([param('ns3::NqosWifiMacHelper const &', 'arg0')])

1254

    cls.add_constructor([param('ns3::NqosWifiMacHelper const &', 'arg0')])

(-)a/bindings/python/ns3_module_internet_stack.py (+5 lines)

Lines 172-177	Link Here

172

                   'uint16_t',

172

                   'uint16_t',

173

[],

173

[],

174

                   is_const=True)

174

                   is_const=True)

175

    ## icmpv4.h: uint32_t ns3::Icmpv4Echo::GetDataSize() const [member function]

176

    cls.add_method('GetDataSize',

177

                   'uint32_t',

178

[],

179

                   is_const=True)

175

    ## icmpv4.h: uint32_t ns3::Icmpv4Echo::GetData(uint8_t * payload) const [member function]

180

    ## icmpv4.h: uint32_t ns3::Icmpv4Echo::GetData(uint8_t * payload) const [member function]

176

    cls.add_method('GetData',

181

    cls.add_method('GetData',

177

                   'uint32_t',

182

                   'uint32_t',




    module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector')
    module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector')
    typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet')
    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet')
    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet')
    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList')
    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet')
    typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet')
    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet')
    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
    typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet')

def register_methods(root_module):

                   is_static=True)
    ## olsr-routing-protocol.h: ns3::olsr::RoutingProtocol::RoutingProtocol() [constructor]
    cls.add_constructor([])
    ## olsr-routing-protocol.h: void ns3::olsr::RoutingProtocol::Start() [member function]
    cls.add_method('Start', 
                   'void', 
                   [])
    ## olsr-routing-protocol.h: void ns3::olsr::RoutingProtocol::SetMainInterface(uint32_t interface) [member function]
    cls.add_method('SetMainInterface', 
                   'void', 

(-)a/examples/mixed-wireless.cc (-6 / +12 lines)

Lines 152-162	Link Here

152

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

152

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

153

  wifiPhy.SetChannel (wifiChannel.Create ());

153

  wifiPhy.SetChannel (wifiChannel.Create ());

154

  NetDeviceContainer backboneDevices = wifi.Install (wifiPhy, mac, backbone);

154

  NetDeviceContainer backboneDevices = wifi.Install (wifiPhy, mac, backbone);

155

156

  // We enable OLSR (which will be consulted at a higher priority than

157

  // the global routing above) on the backbone ad hoc nodes

158

  NS_LOG_INFO ("Enabling OLSR routing on all backbone nodes");

159

  OlsrHelper olsr;

160

161

  Ipv4ListRoutingHelper list;

162

  list.Add (olsr, 10);

163

155

//

164

//

156

  // Add the IPv4 protocol stack to the nodes in our container

165

  // Add the IPv4 protocol stack to the nodes in our container

157

//

166

//

158

  InternetStackHelper internet;

167

  InternetStackHelper internet;

168

  internet.SetRoutingHelper (list);

159

  internet.Install (backbone);

169

  internet.Install (backbone);

170

171

160

//

172

//

161

  // Assign IPv4 addresses to the device drivers (actually to the associated

173

  // Assign IPv4 addresses to the device drivers (actually to the associated

162

  // IPv4 interfaces) we just created.

174

  // IPv4 interfaces) we just created.

Lines 324-335	Link Here

324

  NS_LOG_INFO ("Enabling global routing on all nodes");

336

  NS_LOG_INFO ("Enabling global routing on all nodes");

325

  GlobalRouteManager::PopulateRoutingTables ();

337

  GlobalRouteManager::PopulateRoutingTables ();

326

338

327

  // We enable OLSR (which will be consulted at a higher priority than

328

  // the global routing above) on the backbone ad hoc nodes

329

  NS_LOG_INFO ("Enabling OLSR routing on all backbone nodes");

330

  OlsrHelper olsr;

331

  olsr.Install (backbone);

332

333

  ///////////////////////////////////////////////////////////////////////////

339

  ///////////////////////////////////////////////////////////////////////////

334

  //                                                                       //

340

  //                                                                       //

335

  // Application configuration                                             //

341

  // Application configuration                                             //




  NodeContainer n32 = NodeContainer (c.Get(3), c.Get (2));
  NodeContainer n34 = NodeContainer (c.Get (3), c.Get (4));

  // Enable OLSR
  NS_LOG_INFO ("Enabling OLSR Routing.");
  OlsrHelper olsr;

  Ipv4StaticRoutingHelper staticRouting;

  Ipv4ListRoutingHelper list;
  list.Add (staticRouting, 0);
  list.Add (olsr, 10);

  InternetStackHelper internet;
  internet.SetRoutingHelper (list);
  internet.Install (c);

  // We create the channels first without any IP addressing information

  ipv4.SetBase ("10.1.4.0", "255.255.255.0");
  Ipv4InterfaceContainer i34 = ipv4.Assign (nd34);

  // Enable OLSR
  NS_LOG_INFO ("Enabling OLSR Routing.");
  OlsrHelper olsr;
  olsr.InstallAll ();

  // Create the OnOff application to send UDP datagrams of size
  // 210 bytes at a rate of 448 Kb/s
  NS_LOG_INFO ("Create Applications.");

(-)a/src/helper/internet-stack-helper.cc (-7 / +38 lines)

Lines 153-159	Link Here

153

#include "ns3/object.h"

153

#include "ns3/object.h"

154

#include "ns3/names.h"

154

#include "ns3/names.h"

155

#include "ns3/ipv4.h"

155

#include "ns3/ipv4.h"

156

#include "internet-stack-helper.h"

157

#include "ns3/packet-socket-factory.h"

156

#include "ns3/packet-socket-factory.h"

158

#include "ns3/config.h"

157

#include "ns3/config.h"

159

#include "ns3/simulator.h"

158

#include "ns3/simulator.h"

Lines 164-169	Link Here

164

#include "ns3/core-config.h"

163

#include "ns3/core-config.h"

165

#include "ns3/ipv4-list-routing.h"

164

#include "ns3/ipv4-list-routing.h"

166

#include "ns3/ipv4-static-routing.h"

165

#include "ns3/ipv4-static-routing.h"

166

#include "internet-stack-helper.h"

167

#include "ipv4-static-routing-helper.h"

167

#include <limits>

168

#include <limits>

168

169

namespace ns3 {

170

namespace ns3 {

Lines 171-179	Link Here

171

std::vector<InternetStackHelper::Trace> InternetStackHelper::m_traces;

172

std::vector<InternetStackHelper::Trace> InternetStackHelper::m_traces;

172

std::string InternetStackHelper::m_pcapBaseFilename;

173

std::string InternetStackHelper::m_pcapBaseFilename;

173

174

175

Ipv4RoutingHelper::~Ipv4RoutingHelper ()

176

{}

177

178

Ipv4ListRoutingHelper::Ipv4ListRoutingHelper()

179

{}

180

void

181

Ipv4ListRoutingHelper::Add (const Ipv4RoutingHelper &routing, int16_t priority)

182

183

  m_list.push_back (std::make_pair(&routing,priority));

184

185

Ptr<Ipv4RoutingProtocol>

186

Ipv4ListRoutingHelper::Create (Ptr<Node> node) const

187

188

  Ptr<Ipv4ListRouting> list = CreateObject<Ipv4ListRouting> ();

189

  for (std::list<std::pair<const Ipv4RoutingHelper *,int16_t> >::const_iterator i = m_list.begin ();

190

       i != m_list.end (); ++i)

191

192

      Ptr<Ipv4RoutingProtocol> prot = i->first->Create (node);

193

      list->AddRoutingProtocol (prot,i->second);

194

195

  return list;

196

197

174

InternetStackHelper::InternetStackHelper ()

198

InternetStackHelper::InternetStackHelper ()

175

199

176

  SetTcp ("ns3::TcpL4Protocol");

200

  SetTcp ("ns3::TcpL4Protocol");

201

  static Ipv4StaticRoutingHelper staticRouting;

202

  static Ipv4ListRoutingHelper listRouting;

203

  listRouting.Add (staticRouting,0);

204

  SetRoutingHelper (listRouting);

205

206

207

void

208

InternetStackHelper::SetRoutingHelper (const Ipv4RoutingHelper &routing)

209

210

  m_routing = &routing;

177

211

178

212

179

void

213

void

Lines 213-220	Link Here

213

247

214

248

215

249

216

static void

250

void

217

CreateAndAggregateObjectFromTypeId (Ptr<Node> node, const std::string typeId)

251

InternetStackHelper::CreateAndAggregateObjectFromTypeId (Ptr<Node> node, const std::string typeId)

218

252

219

  ObjectFactory factory;

253

  ObjectFactory factory;

220

  factory.SetTypeId(typeId);

254

  factory.SetTypeId(typeId);

Lines 241-250	Link Here

241

  node->AggregateObject (factory);

275

  node->AggregateObject (factory);

242

  // Set routing

276

  // Set routing

243

  Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();

277

  Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();

244

  // XXX cut this over to use of TypeIds and factories

278

  Ptr<Ipv4RoutingProtocol> ipv4Routing = m_routing->Create (node);

245

  Ptr<Ipv4ListRouting> ipv4Routing = CreateObject<Ipv4ListRouting> ();

246

  Ptr<Ipv4StaticRouting> ipv4staticRouting = CreateObject<Ipv4StaticRouting> ();

247

  ipv4Routing->AddRoutingProtocol (ipv4staticRouting, 0);

248

  ipv4->SetRoutingProtocol (ipv4Routing);

279

  ipv4->SetRoutingProtocol (ipv4Routing);

249

280

250

281




#include "ns3/packet.h"
#include "ns3/ptr.h"
#include "ns3/object-factory.h"
#include <list>

namespace ns3 {

class Node;
class Ipv4RoutingProtocol;

class Ipv4RoutingHelper
{
public:
  virtual ~Ipv4RoutingHelper ();
  virtual Ptr<Ipv4RoutingProtocol> Create (Ptr<Node> node) const = 0;
};

class Ipv4ListRoutingHelper : public Ipv4RoutingHelper
{
public:
  Ipv4ListRoutingHelper();
  void Add (const Ipv4RoutingHelper &routing, int16_t priority);
  virtual Ptr<Ipv4RoutingProtocol> Create (Ptr<Node> node) const;
private:
  std::list<std::pair<const Ipv4RoutingHelper *,int16_t> > m_list;
};

/**
 * \brief aggregate IP/TCP/UDP functionality to existing Nodes.

public:
  InternetStackHelper(void);

  void SetRoutingHelper (const Ipv4RoutingHelper &routing);

  /**
   * Aggregate implementations of the ns3::Ipv4, ns3::Udp, and ns3::Tcp classes
   * onto the provided node.  This method will assert if called on a node that 


private:
  ObjectFactory m_tcpFactory;
  const Ipv4RoutingHelper *m_routing;
  static void CreateAndAggregateObjectFromTypeId (Ptr<Node> node, const std::string typeId);
  static void Cleanup (void);
  static void LogRxIp (std::string context, Ptr<const Packet> packet, uint32_t deviceId);
  static void LogTxIp (std::string context, Ptr<const Packet> packet, uint32_t deviceId);

(-)a/src/helper/ipv4-static-routing-helper.cc (+9 lines)

Lines 33-38	Link Here

namespace ns3 {

namespace ns3 {

Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper()

{}

Ptr<Ipv4RoutingProtocol>

Ipv4StaticRoutingHelper::Create (Ptr<Node> node) const

  return CreateObject<Ipv4StaticRouting> ();

Ptr<Ipv4StaticRouting>

Ptr<Ipv4StaticRouting>

Ipv4StaticRoutingHelper::GetStaticRouting (Ptr<Ipv4> ipv4) const

Ipv4StaticRoutingHelper::GetStaticRouting (Ptr<Ipv4> ipv4) const




#include "ns3/ipv4-address.h"
#include "ns3/node.h"
#include "ns3/net-device.h"
#include "internet-stack-helper.h"
#include "node-container.h"
#include "net-device-container.h"

namespace ns3 {

class Ipv4StaticRoutingHelper : public Ipv4RoutingHelper
{
public:
  Ipv4StaticRoutingHelper();
  virtual Ptr<Ipv4RoutingProtocol> Create (Ptr<Node> node) const;

  Ptr<Ipv4StaticRouting> GetStaticRouting (Ptr<Ipv4> ipv4) const;

  void AddMulticastRoute (Ptr<Node> n, Ipv4Address source, Ipv4Address group,  




  m_agentFactory.SetTypeId ("ns3::olsr::RoutingProtocol");
}

Ptr<Ipv4RoutingProtocol> 
OlsrHelper::Create (Ptr<Node> node) const
                      std::string n0, const AttributeValue &v0,
                      std::string n1, const AttributeValue &v1,
                      std::string n2, const AttributeValue &v2,
                      std::string n3, const AttributeValue &v3,
                      std::string n4, const AttributeValue &v4,
                      std::string n5, const AttributeValue &v5,
                      std::string n6, const AttributeValue &v6,
                      std::string n7, const AttributeValue &v7)
{
  Ptr<olsr::RoutingProtocol> agent = m_agentFactory.Create<olsr::RoutingProtocol> ();
  node->AggregateObject (agent);
  return agent;
  m_agentFactory.Set (n2, v2);
  m_agentFactory.Set (n3, v3);
  m_agentFactory.Set (n4, v4);
  m_agentFactory.Set (n5, v5);
  m_agentFactory.Set (n6, v6);
  m_agentFactory.Set (n7, v7);
}

void 
OlsrHelper::Set (std::string name, const AttributeValue &value)
{
  m_agentFactory.Set (name, value);
    {
      Ptr<Node> node = *i;
      Install (node);
    }
}
void 
OlsrHelper::Install (Ptr<Node> node)
{
  if (node->GetObject<olsr::RoutingProtocol> () != 0)
    {
      NS_FATAL_ERROR ("OlsrHelper::Install(): Aggregating "
         "an Olsr Agent to a node with an existing Olsr RoutingProtocol");
      return;
    }
  Ptr<olsr::RoutingProtocol> agent = m_agentFactory.Create<olsr::RoutingProtocol> ();
  node->AggregateObject (agent);
  Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
  Ptr<Ipv4ListRouting> ipv4Routing = DynamicCast<Ipv4ListRouting> (ipv4->GetRoutingProtocol ());
  NS_ASSERT (ipv4Routing);
  ipv4Routing->AddRoutingProtocol (agent, 10);
  agent->Start ();
}
void 
OlsrHelper::Install (std::string nodeName)
{
  Ptr<Node> node = Names::Find<Node> (nodeName);
  Install (node);
}
void 
OlsrHelper::InstallAll (void)
{
  Install (NodeContainer::GetGlobal ());
}

} // namespace ns3




#define OLSR_HELPER_H

#include "ns3/object-factory.h"
#include "ns3/node-container.h"
#include "ns3/node.h"
#include "node-container.h"
#include "internet-stack-helper.h"

namespace ns3 {

/**
 * \brief Helper class that adds OLSR routing to nodes.
 */
class OlsrHelper : public Ipv4RoutingHelper
{
public:
  OlsrHelper ();
  virtual Ptr<Ipv4RoutingProtocol> Create (Ptr<Node> node) const;

  /**
   * \brief Set default OLSR routing agent attributes
   */
  void Set (std::string name, const AttributeValue &value);
                 std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
                 std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
                 std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
                 std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
                 std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
                 std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
                 std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
                 std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());

  /**
   * \brief Enable OLSR routing for a set of nodes
   */
  void Install (NodeContainer container);
  /**
   * \brief Enable OLSR routing for a single node
   */
  void Install (Ptr<Node> node);
  /**
   * \brief Enable OLSR routing for a single node
   */
  void Install (std::string nodeName);
  /**
   * \brief Enable OLSR routing for all nodes
   */
  void InstallAll (void);
private:
  ObjectFactory m_agentFactory;
};

(-)a/src/internet-stack/ipv4-l3-protocol.cc (-5 / +1 lines)

Lines 187-197	Link Here

187

188

  m_interfaces.clear ();

188

  m_interfaces.clear ();

189

  m_node = 0;

189

  m_node = 0;

190

  if (m_routingProtocol)

190

  m_routingProtocol = 0;

191

192

      m_routingProtocol->Dispose ();

193

      m_routingProtocol = 0;

194

195

  Object::DoDispose ();

191

  Object::DoDispose ();

196

192

197

193

(-)a/src/routing/olsr/olsr-routing-protocol.cc (+2 lines)

Lines 213-218	Link Here

213

  m_linkTupleTimerFirstTime = true;

213

  m_linkTupleTimerFirstTime = true;

214

215

  m_ipv4 = ipv4;

215

  m_ipv4 = ipv4;

216

217

  Simulator::ScheduleNow (&RoutingProtocol::Start, this);

216

218

217

219

218

void RoutingProtocol::DoDispose ()

220

void RoutingProtocol::DoDispose ()

(-)a/src/routing/olsr/olsr-routing-protocol.h (-2 / +1 lines)

Lines 68-74	Link Here

  RoutingProtocol ();

  RoutingProtocol ();

  virtual ~RoutingProtocol ();

  virtual ~RoutingProtocol ();

  void Start ();

  void SetMainInterface (uint32_t interface);

  void SetMainInterface (uint32_t interface);

private:

private:

Lines 101-107	Link Here

101

  Ptr<Ipv4> m_ipv4;

100

  Ptr<Ipv4> m_ipv4;

102

101

103

private:

102

private:

104

103

  void Start ();

105

  void Clear ();

104

  void Clear ();

106

  uint32_t GetSize () const { return m_table.size (); }

105

  uint32_t GetSize () const { return m_table.size (); }

107

  std::vector<RoutingTableEntry> GetEntries () const;

106

  std::vector<RoutingTableEntry> GetEntries () const;

Return to bug 600