branch merge
This commit is contained in:
@@ -187,7 +187,7 @@ for forwarded packets) is still the same.
|
||||
+ typedef Callback<void, Ptr<const Packet>, const Ipv4Header &, uint32_t > LocalDeliverCallback;
|
||||
+ typedef Callback<void, Ptr<const Packet>, const Ipv4Header &> ErrorCallback;
|
||||
- virtual bool RequestInterface (Ipv4Address destination, uint32_t& interface) = 0;
|
||||
+ virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &errno) = 0;
|
||||
+ virtual Ptr<Ipv4Route> RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, Socket::SocketErrno &errno) = 0;
|
||||
- virtual bool RequestRoute (uint32_t interface,
|
||||
- const Ipv4Header &ipHeader,
|
||||
- Ptr<Packet> packet,
|
||||
|
||||
Reference in New Issue
Block a user