Changeset 5406 for source/ariba/utility/addressing

Timestamp:

Jul 29, 2009, 10:25:32 AM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/utility/addressing

Files:

• endpoint_set.hpp (modified) (3 diffs)
• ip_address.hpp (modified) (4 diffs)

source/ariba/utility/addressing/endpoint_set.hpp

@@ -247 +247 @@
         /// checks whether two end-points are disjoint
         /// (only check lower level addresses)
-        bool is_disjoint_to( const endpoint_set& set ) const {
+        bool disjoint_to( const endpoint_set& set ) const {
                 scoped_lock lock(const_cast<boost::mutex&>(io_mutex));
                 BOOST_FOREACH( const mac_address& mac, bluetooth )
@@ -254 +254 @@
                         if (set.ip.count(ip_) !=0 ) return false;
                 return true;
+        }
+
+        bool intersects_with( const endpoint_set& set ) const {
+                return !disjoint_to(set);
+        }
+
+        bool is_subset_of( const endpoint_set& set ) const {
+                throw "Not implemented!";
+                return false;
         }
 
@@ -387 +396 @@
                 this->tcp = rhs.tcp;
         }
+
+        /// checks wheter the two endpoint sets are identical
+        bool operator== ( const endpoint_set& rhs ) const {
+                return (rhs.rfcomm == rfcomm && rhs.ip == ip && rhs.tcp == tcp &&
+                                rhs.bluetooth == bluetooth);
+        }
+
+        bool operator!= ( const endpoint_set& rhs ) const {
+                return !(*this==rhs);
+        }
 };
 

source/ariba/utility/addressing/ip_address.hpp

@@ -128 +128 @@
         //--- address info --------------------------------------------------------
 
-        const std::string& type_name() const {
+        static const std::string& type_name() {
                 return type_name_ip;
         }
 
-        const uint16_t type_id() const {
+        static const uint16_t type_id() {
                 return 0x81DD;
         }
@@ -148 +148 @@
         }
 
+        bool is_link_local() const {
+                if (addr.is_v4()) return false;
+                return addr.to_v6().is_link_local();
+        }
+
+        bool is_multicast_link_local() const {
+                if (addr.is_v4()) return false;
+                return addr.to_v6().is_multicast_link_local();
+
+        }
+
+        bool is_multicast_node_local() const {
+                if (addr.is_v4()) return false;
+                return addr.to_v6().is_multicast_node_local();
+        }
+
+
+        bool is_multicast_site_local() const {
+                if (addr.is_v4()) return false;
+                return addr.to_v6().is_multicast_site_local();
+        }
+
         bool is_any() const {
                 if (addr.is_v4()) return addr.to_v4() == address_v4::any();
@@ -153 +175 @@
         }
 
+        bool is_v4_compatible() const {
+                if (addr.is_v4()) return true;
+                return addr.to_v6().is_v4_compatible();
+        }
+
+        bool is_v4_mapped() {
+                if (addr.is_v4()) return true;
+                return addr.to_v6().is_v4_mapped();
+        }
+
         bool is_v4() const {
                 return addr.is_v4();
@@ -176 +208 @@
 namespace boost {
 
+// boost hash function
 template<>
 struct hash<ariba::addressing::ip_address>: public std::unary_function<ariba::addressing::ip_address, std::size_t> {