merge with ns-3-dev
authorJosh Pelkey <jpelkey@ece.gatech.edu>
Wed Aug 05 14:12:19 2009 -0400 (6 months ago)
changeset 47175940d8156b3c
parent 4716 a1b6bd8eb43a
child 4718 14a43ea8305a
merge with ns-3-dev
src/internet-stack/tcp-socket-impl.cc
src/routing/static-routing/ipv4-static-routing.cc
     1.1 --- a/src/internet-stack/tcp-socket-impl.cc	Wed Aug 05 14:03:54 2009 -0400
     1.2 +++ b/src/internet-stack/tcp-socket-impl.cc	Wed Aug 05 14:12:19 2009 -0400
     1.3 @@ -362,8 +362,6 @@
     1.4    
     1.5    if (ipv4->GetRoutingProtocol () != 0)
     1.6      {
     1.7 -       
     1.8 -      Ptr<Packet> p = 0;
     1.9        Ipv4Header header;
    1.10        header.SetDestination (m_remoteAddress);
    1.11        Socket::SocketErrno errno_;
     2.1 --- a/src/routing/static-routing/ipv4-static-routing.cc	Wed Aug 05 14:03:54 2009 -0400
     2.2 +++ b/src/routing/static-routing/ipv4-static-routing.cc	Wed Aug 05 14:12:19 2009 -0400
     2.3 @@ -230,7 +230,8 @@
     2.4            rtentry->SetGateway (route->GetGateway ());
     2.5            rtentry->SetOutputDevice (m_ipv4->GetNetDevice (interfaceIdx));
     2.6            return rtentry;
     2.7 -        } }
     2.8 +        } 
     2.9 +    }
    2.10    for (NetworkRoutesI j = m_networkRoutes.begin (); 
    2.11         j != m_networkRoutes.end (); 
    2.12         j++)