Attachment #1523 for bug #1595

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

(-)a/src/dsr/helper/dsr-main-helper.h (-2 lines)

Lines 58-65	Link Here

  DsrMainHelper (const DsrMainHelper &);

  DsrMainHelper (const DsrMainHelper &);

  void Install (DsrHelper &dsrHelper, NodeContainer nodes);

  void Install (DsrHelper &dsrHelper, NodeContainer nodes);

  void SetDsrHelper (DsrHelper &dsrHelper);

  void SetDsrHelper (DsrHelper &dsrHelper);

  void SetRouteCache (Ptr<dsr::RouteCache> routeCache);

  void SetRreqTable (Ptr<dsr::RreqTable> rreqTable);

private:

private:

  void Install (Ptr<Node> node);

  void Install (Ptr<Node> node);

(-)a/src/dsr/model/dsr-maintain-buff.h (-1 lines)

Lines 213-219	Link Here

213

  bool Dequeue (Ipv4Address dst, MaintainBuffEntry & entry);

213

  bool Dequeue (Ipv4Address dst, MaintainBuffEntry & entry);

214

  // / Remove all packets with destination IP address dst

214

  // / Remove all packets with destination IP address dst

215

  void DropPacketWithNextHop (Ipv4Address nextHop);

215

  void DropPacketWithNextHop (Ipv4Address nextHop);

216

  bool FindMaintainEntry (Ptr<Packet> packet, Ipv4Address ourAdd, Ipv4Address src, Ipv4Address nextHop, Ipv4Address dst, NetworkKey networkKey);

217

  // / Finds whether a packet with destination dst exists in the queue

216

  // / Finds whether a packet with destination dst exists in the queue

218

  bool Find (Ipv4Address nextHop);

217

  bool Find (Ipv4Address nextHop);

219

  // / Number of entries

218

  // / Number of entries




   */
  Ipv4Address GetNodeAddress (uint8_t index) const;
  /**
   * \brief Set the data length.
   * \param dataLength the data length
   */
  void SetDataLength (uint32_t dataLength);
  /**
   * \brief Get the data length.
   * \return the data length
   */
  uint32_t GetDataLength () const;
  /**
   * \brief Set the request id number.
   * \param the identification number
   */

   * \return the router IPv4 Address
   */
  Ipv4Address GetNodeAddress (uint8_t index) const;
  /*
   * \brief Search the next hop Ipv4 address
   * \param Our own IP address
   * \return The next hop address of the route
   */
  Ipv4Address SearchNextHop (Ipv4Address ipv4Address);
  /**
   * \brief Print some informations about the packet.
   * \param os output stream




   */
  void RemoveDuplicates (std::vector<Ipv4Address>& vec);
  /*
   * \brief Schedule the intermediate node route request broadcast
   * \param the original packet
   * \param rrepHeader The rrep header
   * \param source address
   * \param destination address
   */
  void ScheduleReply (Ptr<Packet> &packet, std::vector<Ipv4Address> &nodeList, Ipv4Address &source, Ipv4Address &destination);
  /*
   * \brief Get the node id with Ipv4Address
   * \return the id of the node
   */




  void RemoveLastEntry (std::list<RouteCacheEntry> & rtVector);
  // / Define the vector of route entries.
  typedef std::list<RouteCacheEntry::IP_VECTOR> routeVector;
  // / Get the destination address of the route.
  Ipv4Address GetDestination (void) const;
  // / Remove all packets with destination IP address dst
  void DropPathWithDst (Ipv4Address dst);
  // / To know if the two entries are the same
  bool IsEqual (RouteCacheEntry ca);
  // /\name Fields
  // \{
  bool GetSubRoute () const




   */
  void SendErrorRequest (DsrOptionRerrUnreachHeader &rerr, uint8_t protocol);
  /*
   * \brief Send the route request and increment the request count
   * \param the original packet
   * \param source address
   * \param destination address
   */
  void SendRequestAndIncrement (Ptr<Packet> packet,
                                Ipv4Address source,
                                Ipv4Address destination);
  /*
   * \brief Forward the route request if the node is not the destination
   * \param the original packet
   * \param source address

                  Ipv4Address realDst,
                  uint8_t protocol,
                  Ptr<Ipv4Route> route);
  /*
   * Get the node using the ip address
   */
  Ptr<Node> GetNodeWithAddress (Ipv4Address ipv4Address);
  /**
   * \param p packet to forward up
   * \param header IPv4 Header information

  IpL4Protocol::DownTargetCallback GetDownTarget (void) const;
  IpL4Protocol::DownTargetCallback6 GetDownTarget6 (void) const;
  /**
   * \brief Get the extension number.
   * \return extension number
   */
  uint8_t GetExtensionNumber () const;
  /**
   * \brief Process method
   * Called from Ipv4L3Protocol::Receive.
   *

Return to bug 1595