Implement operator == for all tipc objects

[software/posixx.git] / src / linux / tipc.hpp

diff --git a/src/linux/tipc.hpp b/src/linux/tipc.hpp
index aa450b814ca2856f5a5872f4f8f65f168f156e30..26bae1d8def8e421bc1a5fc6f70f7eb8ec8ab84f 100644 (file)
--- a/src/linux/tipc.hpp
+++ b/src/linux/tipc.hpp
@@ -1,7 +1,7 @@
 #ifndef POSIXX_LINUX_TIPC_HPP_
 #define POSIXX_LINUX_TIPC_HPP_
 
 #ifndef POSIXX_LINUX_TIPC_HPP_
 #define POSIXX_LINUX_TIPC_HPP_
 

-#include "../basic_socket.hpp" // posixx::socket
+#include "../socket/basic_socket.hpp" // posixx::socket

 
 #include <linux/tipc.h> // all tipc stuff
 #include <cstring> // memcpy
 
 #include <linux/tipc.h> // all tipc stuff
 #include <cstring> // memcpy


@@ -96,6 +96,9 @@ struct portid: tipc_portid
         */
        portid(__u32 ref, addr node) throw ();
 
         */
        portid(__u32 ref, addr node) throw ();
 

+       /// Compares 2 port ids.
+       bool operator == (const portid& other) const throw ();
+

 };
 
 /**
 };
 
 /**


@@ -105,6 +108,7 @@ struct portid: tipc_portid
  */
 struct name: tipc_name
 {
  */
 struct name: tipc_name
 {

+

        /**
         * Constructor.
         *
        /**
         * Constructor.
         *


@@ -112,16 +116,20 @@ struct name: tipc_name
         * @param instance Instance of the named port.
         */
        name(__u32 type, __u32 instance) throw ();
         * @param instance Instance of the named port.
         */
        name(__u32 type, __u32 instance) throw ();

+
+       /// Compares 2 port names.
+       bool operator == (const name& other) const throw ();
+

 };
 
 /**
  * Port sequence.
  *
 };
 
 /**
  * Port sequence.
  *

- * @see Multicast

  * @see tipc_name_seq struct from linux/tipc.h.
  */
 struct nameseq: tipc_name_seq
 {
  * @see tipc_name_seq struct from linux/tipc.h.
  */
 struct nameseq: tipc_name_seq
 {

+

        /**
         * Constructor.
         *
        /**
         * Constructor.
         *


@@ -129,6 +137,7 @@ struct nameseq: tipc_name_seq
         * @param lower Lower bound.
         * @param upper Upper bound.
         */
         * @param lower Lower bound.
         * @param upper Upper bound.
         */

+

        nameseq(__u32 type, __u32 lower, __u32 upper) throw ();
        /**
         * Constructor.
        nameseq(__u32 type, __u32 lower, __u32 upper) throw ();
        /**
         * Constructor.


@@ -137,34 +146,10 @@ struct nameseq: tipc_name_seq
         * @param instance Lower and upper bound.
         */
        nameseq(__u32 type, __u32 instance) throw ();
         * @param instance Lower and upper bound.
         */
        nameseq(__u32 type, __u32 instance) throw ();

-};

 
 

-/**
- * Multicast port sequence.
- *
- * It's a port sequence just like nameseq used to simplify the use of the
- * sockaddr.
- *
- * @see nameseq
- * @see Estructura tipc_name_seq de linux/tipc.h
- */
-struct multicast: tipc_name_seq
-{
-       /**
-        * Constructor.
-        *
-        * @param type Type of the multicast sequence.
-        * @param lower Lower bound.
-        * @param upper Upper bound.
-        */
-       multicast(__u32 type, __u32 lower, __u32 upper) throw ();
-       /**
-        * Constructor.
-        *
-        * @param type Type of the multicast sequence.
-        * @param instance Lower and upper bound.
-        */
-       multicast(__u32 type, __u32 instance) throw ();
+       /// Compares 2 port name sequences.
+       bool operator == (const nameseq& other) const throw ();
+

 };
 
 /**
 };
 
 /**


@@ -193,18 +178,20 @@ enum reason_t
  *
  * @see TIPC documentation: 1.4.3 Name Subscriptions
  */
  *
  * @see TIPC documentation: 1.4.3 Name Subscriptions
  */

-enum subcription_t
+enum subscr_t

 {
 {

+

        /**
        /**

-        * Causes the topology service to generate a event::PUBLISHED event
+        * Causes the topology service to generate a PUBLISHED event

         * for each port name or port name sequence it finds that overlaps
         * for each port name or port name sequence it finds that overlaps

-        * the specified port name sequence; a TIPC_WITHDRAWN event is issued
+        * the specified port name sequence; a WITHDRAWN event is issued

         * each time a previously reported name becomes unavailable.
         *
         * Allows the topology service to inform the application if there
         * are @b any ports of interest.
         */
        SUB_PORTS = TIPC_SUB_PORTS,
         * each time a previously reported name becomes unavailable.
         *
         * Allows the topology service to inform the application if there
         * are @b any ports of interest.
         */
        SUB_PORTS = TIPC_SUB_PORTS,

+

        /**
         * Causes the topology service to generate a single publish event for
         * the first port it finds with an overlapping name and a single
        /**
         * Causes the topology service to generate a single publish event for
         * the first port it finds with an overlapping name and a single


@@ -213,7 +200,20 @@ enum subcription_t
         * Allows the topology service to inform the application about
         * @b all ports of interest.
         */
         * Allows the topology service to inform the application about
         * @b all ports of interest.
         */

-       SUB_SERVICE = TIPC_SUB_SERVICE
+       SUB_SERVICE = TIPC_SUB_SERVICE,
+
+       /**
+        * Instruct the topology service to cancel a previously requested
+        * subscription.
+        *
+        * The application simply resends the original subscription request
+        * with SUB_CANCEL logically OR'd into the event filter.
+        *
+        * @note This is implemented in TIPC 1.7+ only (according to TIPC
+        *       documentation).
+        */
+       SUB_CANCEL = TIPC_SUB_CANCEL
+

 };
 
 /**
 };
 
 /**


@@ -221,8 +221,9 @@ enum subcription_t
  *
  * @see TIPC documentation: 1.4.3 Name Subscriptions
  */
  *
  * @see TIPC documentation: 1.4.3 Name Subscriptions
  */

-struct subscription: tipc_subscr
+struct subscr: tipc_subscr

 {
 {

+

        /**
         * Constructor.
         *
        /**
         * Constructor.
         *


@@ -230,11 +231,54 @@ struct subscription: tipc_subscr
         * @param timeout A subscription timeout value, in ms
         *                (or WAIT_FOREVER).
         * @param filter An event filter specifying which events are of
         * @param timeout A subscription timeout value, in ms
         *                (or WAIT_FOREVER).
         * @param filter An event filter specifying which events are of

-        *               interest to the application (see subscription_t).
-        * @param usr_handle An 8 byte user handle that is application-defined.
+        *               interest to the application (see subscr_t).
+        * @param usr_handle An 8 byte user handle that is application-defined,
+        *                   (treated as a string).

         */
         */

-       subscription(nameseq seq, __u32 timeout, __u32 filter,
+       subscr(nameseq seq, __u32 timeout, __u32 filter,

                        const char* usr_handle = "") throw ();
                        const char* usr_handle = "") throw ();

+
+       /**
+        * Constructor.
+        *
+        * @param seq The port name sequence of interest to the application.
+        * @param timeout A subscription timeout value, in ms
+        *                (or WAIT_FOREVER).
+        * @param filter An event filter specifying which events are of
+        *               interest to the application (see subscr_t).
+        * @param usr_handle An 8 byte user handle that is application-defined.
+        *                   (treated as binary data).
+        * @param handle_size Size of the usr_handle buffer (it should be at
+        *                    most 8)
+        */
+       subscr(nameseq seq, __u32 timeout, __u32 filter,
+                       const char* usr_handle, size_t handle_size)
+                       throw ();
+
+       /// Set the user handle as a string.
+       void handle(const char* usr_handle) throw ();
+
+       /// Set the user handle as binary data.
+       void handle(const char* usr_handle, size_t handle_size) throw ();
+
+       /// Compares 2 subscription request messages.
+       bool operator == (const subscr& other) const throw ();
+
+};
+
+/// Type of events.
+enum event_t
+{
+
+       /// The port has been published.
+       PUBLISHED = TIPC_PUBLISHED,
+
+       /// The port has been withdrawn.
+       WITHDRAWN = TIPC_WITHDRAWN,
+
+       /// The event has timed out.
+       TIMEOUT = TIPC_SUBSCR_TIMEOUT
+

 };
 
 /**
 };
 
 /**


@@ -242,18 +286,8 @@ struct subscription: tipc_subscr
  *
  * @see TIPC documentation: 1.4.3 Name Subscriptions
  */
  *
  * @see TIPC documentation: 1.4.3 Name Subscriptions
  */

-struct event: tipc_event
+struct subscr_event: tipc_event

 {
 {

-       /// Type of events.
-       enum type_t
-       {
-               /// The port has been published.
-               PUBLISHED = TIPC_PUBLISHED,
-               /// The port has been withdrawn.
-               WITHDRAWN = TIPC_WITHDRAWN,
-               /// The event has timed out.
-               TIMEOUT = TIPC_SUBSCR_TIMEOUT
-       };

 };
 
 /**
 };
 
 /**


@@ -322,14 +356,6 @@ struct sockaddr: sockaddr_tipc
         */
        sockaddr(nameseq nameseq, scope_t scope = ZONE) throw ();
 
         */
        sockaddr(nameseq nameseq, scope_t scope = ZONE) throw ();
 

-       /**
-        * Constructor using a multicast port name sequence.
-        *
-        * @param mcast Multicast port name sequence.
-        * @param scope Bind scope.
-        */
-       sockaddr(multicast mcast, scope_t scope = ZONE) throw ();
-

        /// Type of TIPC address
        type_t type() const throw ();
 
        /// Type of TIPC address
        type_t type() const throw ();
 


@@ -425,6 +451,13 @@ posixx::linux::tipc::portid::portid(__u32 r, addr n) throw ()
        node = n;
 }
 
        node = n;
 }
 

+inline
+bool posixx::linux::tipc::portid::operator == (
+               const posixx::linux::tipc::portid& other) const throw ()
+{
+       return memcmp(this, &other, sizeof(*this)) == 0;
+}
+

 inline
 posixx::linux::tipc::name::name(__u32 t, __u32 i) throw ()
 {
 inline
 posixx::linux::tipc::name::name(__u32 t, __u32 i) throw ()
 {


@@ -432,6 +465,13 @@ posixx::linux::tipc::name::name(__u32 t, __u32 i) throw ()
        instance = i;
 }
 
        instance = i;
 }
 

+inline
+bool posixx::linux::tipc::name::operator == (
+               const posixx::linux::tipc::name& other) const throw ()
+{
+       return memcmp(this, &other, sizeof(*this)) == 0;
+}
+

 inline
 posixx::linux::tipc::nameseq::nameseq(__u32 t, __u32 low, __u32 up) throw ()
 {
 inline
 posixx::linux::tipc::nameseq::nameseq(__u32 t, __u32 low, __u32 up) throw ()
 {


@@ -449,30 +489,50 @@ posixx::linux::tipc::nameseq::nameseq(__u32 t, __u32 instance) throw ()
 }
 
 inline
 }
 
 inline

-posixx::linux::tipc::multicast::multicast(__u32 t, __u32 low, __u32 up)
-       throw ()
+bool posixx::linux::tipc::nameseq::operator == (
+               const posixx::linux::tipc::nameseq& other) const throw ()

 {
 {

-       type = t;
-       lower = low;
-       upper = up;
+       return memcmp(this, &other, sizeof(*this)) == 0;

 }
 
 inline
 }
 
 inline

-posixx::linux::tipc::multicast::multicast(__u32 t, __u32 instance) throw ()
+posixx::linux::tipc::subscr::subscr(nameseq s, __u32 t, __u32 f,
+               const char* uh) throw ()

 {
 {

-       type = t;
-       lower = instance;
-       upper = instance;
+       seq = s;
+       timeout = t;
+       filter = f;
+       handle(uh);

 }
 
 inline
 }
 
 inline

-posixx::linux::tipc::subscription::subscription(nameseq s, __u32 t, __u32 f,
-               const char* uh) throw ()
+posixx::linux::tipc::subscr::subscr(nameseq s, __u32 t, __u32 f,
+               const char* uh, size_t uh_size) throw ()

 {
        seq = s;
        timeout = t;
        filter = f;
 {
        seq = s;
        timeout = t;
        filter = f;

-       std::memcpy(usr_handle, uh, sizeof(usr_handle));
+       handle(uh, uh_size);
+}
+
+inline
+void posixx::linux::tipc::subscr::handle(const char* uh) throw ()
+{
+       std::strncpy(usr_handle, uh, sizeof(usr_handle));
+}
+
+inline
+void posixx::linux::tipc::subscr::handle(const char* uh, size_t uh_size)
+               throw ()
+{
+       std::memcpy(usr_handle, uh, uh_size);
+}
+
+inline
+bool posixx::linux::tipc::subscr::operator == (const subscr& other) const
+               throw ()
+{
+       return memcmp(this, &other, sizeof(*this)) == 0;

 }
 
 inline
 }
 
 inline


@@ -509,15 +569,6 @@ posixx::linux::tipc::sockaddr::sockaddr(nameseq nameseq, scope_t s) throw ()
        addr.nameseq = nameseq;
 }
 
        addr.nameseq = nameseq;
 }
 

-inline
-posixx::linux::tipc::sockaddr::sockaddr(multicast mcast, scope_t s) throw ()
-{
-       family = AF_TIPC;
-       addrtype = TIPC_ADDR_MCAST;
-       scope = s;
-       addr.nameseq = mcast;
-}
-

 inline
 posixx::linux::tipc::sockaddr::type_t posixx::linux::tipc::sockaddr::type()
                const throw ()
 inline
 posixx::linux::tipc::sockaddr::type_t posixx::linux::tipc::sockaddr::type()
                const throw ()