1.1 --- a/src/contrib/packetbb.cc	Thu Sep 10 15:33:23 2009 -0400
     1.2 +++ b/src/contrib/packetbb.cc	Thu Sep 10 15:35:16 2009 -0400
     1.3 @@ -932,7 +932,7 @@
     1.4    return m_type;
     1.5  }
     1.6  
     1.7 -AddressLength
     1.8 +PbbAddressLength
     1.9  PbbMessage::GetAddressLength (void) const
    1.10  {
    1.11    return m_addrSize;
    1.12 @@ -1559,7 +1559,7 @@
    1.13  
    1.14  /* End PbbMessage Class */
    1.15  
    1.16 -AddressLength
    1.17 +PbbAddressLength
    1.18  PbbMessageIpv4::GetAddressLength (void) const
    1.19  {
    1.20    return IPV4;
    1.21 @@ -1597,7 +1597,7 @@
    1.22  
    1.23  /* End PbbMessageIpv4 Class */
    1.24  
    1.25 -AddressLength
    1.26 +PbbAddressLength
    1.27  PbbMessageIpv6::GetAddressLength (void) const
    1.28  {
    1.29    return IPV6;

     2.1 --- a/src/contrib/packetbb.h	Thu Sep 10 15:33:23 2009 -0400
     2.2 +++ b/src/contrib/packetbb.h	Thu Sep 10 15:35:16 2009 -0400
     2.3 @@ -43,7 +43,7 @@
     2.4  class PbbTlv;
     2.5  class PbbAddressTlv;
     2.6  
     2.7 -enum AddressLength {
     2.8 +enum PbbAddressLength {
     2.9    IPV4 = 3,
    2.10    IPV6 = 15,
    2.11  };
    2.12 @@ -382,7 +382,7 @@
    2.13     *
    2.14     * IPv4 = 4 - 1 = 3, IPv6 = 16 - 1 = 15
    2.15     */
    2.16 -  virtual AddressLength GetAddressLength (void) const = 0;
    2.17 +  virtual PbbAddressLength GetAddressLength (void) const = 0;
    2.18  
    2.19    virtual void SerializeOriginatorAddress (Buffer::Iterator &start) const = 0;
    2.20    virtual Address DeserializeOriginatorAddress (Buffer::Iterator &start) const = 0;
    2.21 @@ -395,7 +395,7 @@
    2.22    std::list< Ptr<PbbAddressBlock> > m_addressBlockList;
    2.23  
    2.24    uint8_t m_type;
    2.25 -  AddressLength m_addrSize;
    2.26 +  PbbAddressLength m_addrSize;
    2.27  
    2.28    bool m_hasOriginatorAddress;
    2.29    Address m_originatorAddress;
    2.30 @@ -419,7 +419,7 @@
    2.31   */
    2.32  class PbbMessageIpv4 : public PbbMessage {
    2.33  protected:
    2.34 -  virtual AddressLength GetAddressLength (void) const;
    2.35 +  virtual PbbAddressLength GetAddressLength (void) const;
    2.36  
    2.37    virtual void SerializeOriginatorAddress (Buffer::Iterator &start) const;
    2.38    virtual Address DeserializeOriginatorAddress (Buffer::Iterator &start) const;
    2.39 @@ -435,7 +435,7 @@
    2.40   */
    2.41  class PbbMessageIpv6 : public PbbMessage {
    2.42  protected:
    2.43 -  virtual AddressLength GetAddressLength (void) const;
    2.44 +  virtual PbbAddressLength GetAddressLength (void) const;
    2.45  
    2.46    virtual void SerializeOriginatorAddress (Buffer::Iterator &start) const;
    2.47    virtual Address DeserializeOriginatorAddress (Buffer::Iterator &start) const;