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

(-)a/src/node/ipv4-routing-protocol.h (-1 / +1 lines)
 Lines 92-98    Link Here 
92 
   * \returns true if the Ipv4RoutingProtocol takes responsibility for
92 
   * \returns true if the Ipv4RoutingProtocol takes responsibility for
93 
   *          forwarding or delivering the packet, false otherwise
 93 
   *          forwarding or delivering the packet, false otherwise
94 
   */
94 
   */
95 
  virtual bool RouteInput  (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,
95 
  virtual bool RouteInput  (Ptr<Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,
96 
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,
96 
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,
97 
                             LocalDeliverCallback lcb, ErrorCallback ecb) = 0;
 97 
                             LocalDeliverCallback lcb, ErrorCallback ecb) = 0;
98 

          98
          

        



(-)a/src/routing/global-routing/ipv4-global-routing.cc
      (-1 / +1 lines)




  

    

    

       Lines 288-294
       
    
  Link Here 
    

  

        

          288
          
}

          288
          
}

        

        

          289
          

          289
          

        

        

          290
          
bool 

          290
          
bool 

        

          
            

              291
              
Ipv4GlobalRouting::RouteInput  (Ptr<const Packet> p, const Ipv4Header &ipHeader, Ptr<const NetDevice> idev,                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,


              291
              
Ipv4GlobalRouting::RouteInput  (Ptr<Packet> p, const Ipv4Header &ipHeader, Ptr<const NetDevice> idev,                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

            

        

          292
          
                             LocalDeliverCallback lcb, ErrorCallback ecb) 

          292
          
                             LocalDeliverCallback lcb, ErrorCallback ecb) 

        

        

          293
          
{ 

          293
          
{ 

        

        

          294
          

          294
          

        



(-)a/src/routing/global-routing/ipv4-global-routing.h
      (-1 / +1 lines)




  

    

    

       Lines 82-88
       
    
  Link Here 
    

  

        

          82
          

          82
          

        

        

          83
          
  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr);

          83
          
  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr);

        

        

          84
          

          84
          

        

          
            

              85
              
  virtual bool RouteInput  (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,


              85
              
  virtual bool RouteInput  (Ptr<Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,

            

        

          86
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

          86
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

        

        

          87
          
                             LocalDeliverCallback lcb, ErrorCallback ecb);

          87
          
                             LocalDeliverCallback lcb, ErrorCallback ecb);

        

        

          88
          
  virtual void NotifyInterfaceUp (uint32_t interface);

          88
          
  virtual void NotifyInterfaceUp (uint32_t interface);

        



(-)a/src/routing/list-routing/ipv4-list-routing.cc
      (-3 / +3 lines)




  

    

    

       Lines 95-101
       
    
  Link Here 
    

  

        

          95
          

          95
          

        

        

          96
          
// Patterned after Linux ip_route_input and ip_route_input_slow

          96
          
// Patterned after Linux ip_route_input and ip_route_input_slow

        

        

          97
          
bool 

          97
          
bool 

        

          
            

              98
              
Ipv4ListRouting::RouteInput (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev, 


              98
              
Ipv4ListRouting::RouteInput (Ptr<Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev, 

            

        

          99
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb, 

          99
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb, 

        

        

          100
          
                             LocalDeliverCallback lcb, ErrorCallback ecb)

          100
          
                             LocalDeliverCallback lcb, ErrorCallback ecb)

        

        

          101
          
{

          101
          
{

        

  

    

    

       Lines 324-330
       
    
  Link Here 
    

  

        

          324
          
class Ipv4ARouting : public Ipv4RoutingProtocol {

          324
          
class Ipv4ARouting : public Ipv4RoutingProtocol {

        

        

          325
          
public:

          325
          
public:

        

        

          326
          
  Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr)  { return 0;}

          326
          
  Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr)  { return 0;}

        

          
            

              327
              
  bool RouteInput  (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,


              327
              
  bool RouteInput  (Ptr<Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,

            

        

          328
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

          328
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

        

        

          329
          
                             LocalDeliverCallback lcb, ErrorCallback ecb) {return false;}

          329
          
                             LocalDeliverCallback lcb, ErrorCallback ecb) {return false;}

        

        

          330
          
  void NotifyInterfaceUp (uint32_t interface) {}

          330
          
  void NotifyInterfaceUp (uint32_t interface) {}

        

  

    

    

       Lines 337-343
       
    
  Link Here 
    

  

        

          337
          
class Ipv4BRouting : public Ipv4RoutingProtocol {

          337
          
class Ipv4BRouting : public Ipv4RoutingProtocol {

        

        

          338
          
public:

          338
          
public:

        

        

          339
          
  Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr)  { return 0;}

          339
          
  Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr)  { return 0;}

        

          
            

              340
              
  bool RouteInput  (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,


              340
              
  bool RouteInput  (Ptr<Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,

            

        

          341
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

          341
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

        

        

          342
          
                             LocalDeliverCallback lcb, ErrorCallback ecb) {return false;}

          342
          
                             LocalDeliverCallback lcb, ErrorCallback ecb) {return false;}

        

        

          343
          
  void NotifyInterfaceUp (uint32_t interface) {}

          343
          
  void NotifyInterfaceUp (uint32_t interface) {}

        



(-)a/src/routing/list-routing/ipv4-list-routing.h
      (-1 / +1 lines)




  

    

    

       Lines 73-79
       
    
  Link Here 
    

  

        

          73
          
  // Below are from Ipv4RoutingProtocol

          73
          
  // Below are from Ipv4RoutingProtocol

        

        

          74
          
  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr);

          74
          
  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr);

        

        

          75
          

          75
          

        

          
            

              76
              
  virtual bool RouteInput (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,


              76
              
  virtual bool RouteInput (Ptr<Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,

            

        

          77
          
                           UnicastForwardCallback ucb, MulticastForwardCallback mcb,

          77
          
                           UnicastForwardCallback ucb, MulticastForwardCallback mcb,

        

        

          78
          
                           LocalDeliverCallback lcb, ErrorCallback ecb);

          78
          
                           LocalDeliverCallback lcb, ErrorCallback ecb);

        

        

          79
          
  virtual void NotifyInterfaceUp (uint32_t interface);

          79
          
  virtual void NotifyInterfaceUp (uint32_t interface);

        



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




  

    

    

       Lines 2598-2604
       
    
  Link Here 
    

  

        

          2598
          
  return rtentry;

          2598
          
  return rtentry;

        

        

          2599
          
}

          2599
          
}

        

        

          2600
          

          2600
          

        

          
            

              2601
              
bool RoutingProtocol::RouteInput  (Ptr<const Packet> p, 


              2601
              
bool RoutingProtocol::RouteInput  (Ptr<Packet> p, 

            

        

          2602
          
  const Ipv4Header &header, Ptr<const NetDevice> idev,                            UnicastForwardCallback ucb, MulticastForwardCallback mcb,             

          2602
          
  const Ipv4Header &header, Ptr<const NetDevice> idev,                            UnicastForwardCallback ucb, MulticastForwardCallback mcb,             

        

        

          2603
          
  LocalDeliverCallback lcb, ErrorCallback ecb)

          2603
          
  LocalDeliverCallback lcb, ErrorCallback ecb)

        

        

          2604
          
{   

          2604
          
{   

        



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




  

    

    

       Lines 120-126
       
    
  Link Here 
    

  

        

          120
          

          120
          

        

        

          121
          
  // From Ipv4RoutingProtocol

          121
          
  // From Ipv4RoutingProtocol

        

        

          122
          
  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr);

          122
          
  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr);

        

          
            

              123
              
   virtual bool RouteInput  (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,


              123
              
   virtual bool RouteInput  (Ptr<Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,

            

        

          124
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

          124
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

        

        

          125
          
                             LocalDeliverCallback lcb, ErrorCallback ecb);  

          125
          
                             LocalDeliverCallback lcb, ErrorCallback ecb);  

        

        

          126
          
  virtual void NotifyInterfaceUp (uint32_t interface);

          126
          
  virtual void NotifyInterfaceUp (uint32_t interface);

        



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




  

    

    

       Lines 469-475
       
    
  Link Here 
    

  

        

          469
          
// XXX this method not robust enough to work outside of ListRouting context

          469
          
// XXX this method not robust enough to work outside of ListRouting context

        

        

          470
          
// because it will not perform local delivery

          470
          
// because it will not perform local delivery

        

        

          471
          
bool 

          471
          
bool 

        

          
            

              472
              
Ipv4StaticRouting::RouteInput  (Ptr<const Packet> p, const Ipv4Header &ipHeader, Ptr<const NetDevice> idev,


              472
              
Ipv4StaticRouting::RouteInput  (Ptr<Packet> p, const Ipv4Header &ipHeader, Ptr<const NetDevice> idev,

            

        

          473
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

          473
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

        

        

          474
          
                             LocalDeliverCallback lcb, ErrorCallback ecb)

          474
          
                             LocalDeliverCallback lcb, ErrorCallback ecb)

        

        

          475
          
{

          475
          
{

        



(-)a/src/routing/static-routing/ipv4-static-routing.h
      (-1 / +1 lines)




  

    

    

       Lines 72-78
       
    
  Link Here 
    

  

        

          72
          

          72
          

        

        

          73
          
  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr);

          73
          
  virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &sockerr);

        

        

          74
          

          74
          

        

          
            

              75
              
  virtual bool RouteInput  (Ptr<const Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,


              75
              
  virtual bool RouteInput  (Ptr<Packet> p, const Ipv4Header &header, Ptr<const NetDevice> idev,

            

        

          76
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

          76
          
                             UnicastForwardCallback ucb, MulticastForwardCallback mcb,

        

        

          77
          
                             LocalDeliverCallback lcb, ErrorCallback ecb);

          77
          
                             LocalDeliverCallback lcb, ErrorCallback ecb);

        

        

          78
          

          78
          

        






  

  Return to bug 624