Attachment #78 for bug #88

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




  m_address = AsciiToIpv4Host (address);
}

bool 
Ipv4Address::IsEqual (Ipv4Address other) const
{
  if (other.m_address == m_address) {
    return true;
  } else {
    return false;
  }
}

Ipv4Address
Ipv4Address::CombineMask (Ipv4Mask const &mask) const
{

  return loopback;
}

bool operator == (Ipv4Address const &a, Ipv4Address const &b)
{
  return a.IsEqual (b);
}
bool operator != (Ipv4Address const &a, Ipv4Address const &b)
{
  return !a.IsEqual (b);
}
bool operator < (Ipv4Address const &addrA, Ipv4Address const &addrB)
{
  return (addrA.GetHostOrder () < addrB.GetHostOrder ());
}

size_t Ipv4AddressHash::operator()(Ipv4Address const &x) const 
{ 
  return x.GetHostOrder ();

(-)a/src/node/ipv4-address.h (-4 / +21 lines)

Lines 73-79 public:	Link Here

   * \param other address to which to compare this address

   * \param other address to which to compare this address

   * \return True if the addresses are equal. False otherwise.

   * \return True if the addresses are equal. False otherwise.

*/

*/

  bool IsEqual (Ipv4Address other) const;

  bool IsEqual (const Ipv4Address &other) const

    return m_address == other.m_address;

/**

/**

   * \brief Get the host-order 32-bit IP address

   * \brief Get the host-order 32-bit IP address

Lines 142-147 private:	Link Here

142

  Address ConvertTo (void) const;

145

  Address ConvertTo (void) const;

143

  static uint8_t GetType (void);

146

  static uint8_t GetType (void);

144

  uint32_t m_address;

147

  uint32_t m_address;

148

149

  friend bool operator == (Ipv4Address const &a, Ipv4Address const &b);

150

  friend bool operator != (Ipv4Address const &a, Ipv4Address const &b);

151

  friend bool operator < (Ipv4Address const &addrA, Ipv4Address const &addrB);

145

};

152

};

146

153

147

154

Lines 177-185 std::ostream& operator<< (std::ostream&	Link Here

177

std::ostream& operator<< (std::ostream& os, Ipv4Address const& address);

184

std::ostream& operator<< (std::ostream& os, Ipv4Address const& address);

178

std::ostream& operator<< (std::ostream& os, Ipv4Mask const& mask);

185

std::ostream& operator<< (std::ostream& os, Ipv4Mask const& mask);

179

186

180

bool operator == (Ipv4Address const &a, Ipv4Address const &b);

187

inline bool operator == (const Ipv4Address &a, const Ipv4Address &b)

181

bool operator != (Ipv4Address const &a, Ipv4Address const &b);

188

182

bool operator < (Ipv4Address const &addrA, Ipv4Address const &addrB);

189

  return (a.m_address == b.m_address);

190

191

inline bool operator != (const Ipv4Address &a, const Ipv4Address &b)

192

193

  return (a.m_address != b.m_address);

194

195

inline bool operator < (const Ipv4Address &a, const Ipv4Address &b)

196

197

  return (a.m_address < b.m_address);

198

199

183

200

184

class Ipv4AddressHash : public std::unary_function<Ipv4Address, size_t> {

201

class Ipv4AddressHash : public std::unary_function<Ipv4Address, size_t> {

185

public:

202

public:

Return to bug 88