diff --git a/src/base/inet.hh b/src/base/inet.hh --- a/src/base/inet.hh +++ b/src/base/inet.hh @@ -93,9 +93,18 @@ uint8_t *bytes() { return &data[0]; } const uint8_t *addr() const { return &data[0]; } - bool unicast() const { return data[0] == 0x00; } - bool multicast() const { return data[0] == 0x01; } - bool broadcast() const { return data[0] == 0xff; } + bool unicast() const { return !(data[0] & 0x01); } + bool multicast() const { return !unicast() && !broadcast(); } + bool broadcast() const + { + bool isBroadcast = true; + for (int i = 0; i < ETH_ADDR_LEN; ++i) { + isBroadcast = isBroadcast && data[i] == 0xff; + } + + return isBroadcast; + } + std::string string() const; operator uint64_t() const # Node ID 177ddbf6d5cd05703914ccb4e7afbc1706c2bbad # Parent 6bbb7ae309accedfb251aae3c4095acd6b57832d diff --git a/src/base/inet.cc b/src/base/inet.cc --- a/src/base/inet.cc +++ b/src/base/inet.cc @@ -62,12 +62,14 @@ EthAddr::EthAddr(const uint8_t ea[ETH_ADDR_LEN]) { - *data = *ea; + for (int i = 0; i < ETH_ADDR_LEN; ++i) + data[i] = ea[i]; } EthAddr::EthAddr(const eth_addr &ea) { - *data = *ea.data; + for (int i = 0; i < ETH_ADDR_LEN; ++i) + data[i] = ea.data[i]; } EthAddr::EthAddr(const std::string &addr)