summaryrefslogtreecommitdiff
path: root/src/base/inet.hh
diff options
context:
space:
mode:
authorAnthony Gutierrez <atgutier@umich.edu>2014-07-02 13:19:13 -0400
committerAnthony Gutierrez <atgutier@umich.edu>2014-07-02 13:19:13 -0400
commit3956ec0a893f2fe37fe9239c3c790de570e1eb8b (patch)
treee84c35f355967e4b0c4141796274c9225198ea99 /src/base/inet.hh
parentb998a0c6acdda83aefa8b6e0a182c75d73332a13 (diff)
downloadgem5-3956ec0a893f2fe37fe9239c3c790de570e1eb8b.tar.xz
base: fix some bugs in EthAddr
per the IEEE 802 spec: 1) fixed broadcast() to ensure that all bytes are equal to 0xff. 2) fixed unicast() to ensure that bit 0 of the first byte is equal to 0 3) fixed multicast() to ensure that bit 0 of the first byte is equal to 1, and that it is not a broadcast. also the constructors in EthAddr are fixed so that all bytes of data are initialized.
Diffstat (limited to 'src/base/inet.hh')
-rw-r--r--src/base/inet.hh15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/base/inet.hh b/src/base/inet.hh
index afa6c402a..5130a072c 100644
--- a/src/base/inet.hh
+++ b/src/base/inet.hh
@@ -93,9 +93,18 @@ struct EthAddr : protected eth_addr
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