From e2d91c81959e19a5b20db0098ff96ed421fde748 Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Tue, 20 Oct 2009 16:05:49 +0200 Subject: [PATCH] Remove old stuff. --- examples/ipv6/loose-routing-ipv6.cc | 13 ++----------- src/internet-stack/ipv6-l3-protocol.cc | 1 - src/routing/static-routing/ipv6-static-routing.cc | 2 -- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/examples/ipv6/loose-routing-ipv6.cc b/examples/ipv6/loose-routing-ipv6.cc index 5c25073ba..16c963bb0 100644 --- a/examples/ipv6/loose-routing-ipv6.cc +++ b/examples/ipv6/loose-routing-ipv6.cc @@ -49,23 +49,14 @@ NS_LOG_COMPONENT_DEFINE ("LooseRoutingIpv6Example"); int main (int argc, char **argv) { +#if 0 LogComponentEnable("Ipv6ExtensionLooseRouting", LOG_LEVEL_ALL); LogComponentEnable("Ipv6Extension", LOG_LEVEL_ALL); -#if 0 - LogComponentEnable("Ipv6EndPointDemux", LOG_LEVEL_ALL); - LogComponentEnable("Udp6Socket", LOG_LEVEL_ALL); - LogComponentEnable("Udp6L4Protocol", LOG_LEVEL_ALL); LogComponentEnable("Ipv6L3Protocol", LOG_LEVEL_ALL); LogComponentEnable("Ipv6StaticRouting", LOG_LEVEL_ALL); LogComponentEnable("Ipv6Interface", LOG_LEVEL_ALL); - LogComponentEnable("NdiscIpv6Interface", LOG_LEVEL_ALL); - LogComponentEnable("Ipv6LoopbackInterface", LOG_LEVEL_ALL); - LogComponentEnable("OnOffApplication", LOG_LEVEL_ALL); - LogComponentEnable("PacketSinkApplication", LOG_LEVEL_ALL); - LogComponentEnable("UdpEcho6ClientApplication", LOG_LEVEL_ALL); - LogComponentEnable("UdpEcho6ServerApplication", LOG_LEVEL_ALL); + LogComponentEnable("Ipv6Interface", LOG_LEVEL_ALL); LogComponentEnable("NdiscCache", LOG_LEVEL_ALL); - LogComponentEnable("Ipv6Socket", LOG_LEVEL_ALL); #endif CommandLine cmd; diff --git a/src/internet-stack/ipv6-l3-protocol.cc b/src/internet-stack/ipv6-l3-protocol.cc index 3ab44c212..57c3ec334 100644 --- a/src/internet-stack/ipv6-l3-protocol.cc +++ b/src/internet-stack/ipv6-l3-protocol.cc @@ -119,7 +119,6 @@ void Ipv6L3Protocol::DoDispose () } m_prefixes.clear (); - m_node = 0; m_routingProtocol = 0; Object::DoDispose (); diff --git a/src/routing/static-routing/ipv6-static-routing.cc b/src/routing/static-routing/ipv6-static-routing.cc index 5706efe1c..7317d7824 100644 --- a/src/routing/static-routing/ipv6-static-routing.cc +++ b/src/routing/static-routing/ipv6-static-routing.cc @@ -99,7 +99,6 @@ void Ipv6StaticRouting::AddNetworkRouteTo (Ipv6Address network, Ipv6Prefix netwo m_networkRoutes.push_back (std::make_pair (route, metric)); } - void Ipv6StaticRouting::AddNetworkRouteTo (Ipv6Address network, Ipv6Prefix networkPrefix, uint32_t interface, uint32_t metric) { NS_LOG_FUNCTION (this << network << networkPrefix << interface); @@ -449,7 +448,6 @@ uint32_t Ipv6StaticRouting::GetMetric (uint32_t index) return 0; } - void Ipv6StaticRouting::RemoveRoute (uint32_t index) { NS_LOG_FUNCTION (this << index);