X-Git-Url: https://git.llucax.com/software/posixx.git/blobdiff_plain/6f13e47380788948b958309c89df400fea6b32fb..8e9d621e4cf9a60cbf238df92fc60022a1d941cd:/src/linux/tipc.hpp

diff --git a/src/linux/tipc.hpp b/src/linux/tipc.hpp
index 26bae1d..7c1535a 100644
--- a/src/linux/tipc.hpp
+++ b/src/linux/tipc.hpp
@@ -96,6 +96,12 @@ struct portid: tipc_portid
 	 */
 	portid(__u32 ref, addr node) throw ();
 
+	/// Access to the node addr.
+	addr& node_addr() throw ();
+
+	/// Access to the node addr.
+	const addr& node_addr() const throw ();
+
 	/// Compares 2 port ids.
 	bool operator == (const portid& other) const throw ();
 
@@ -255,6 +261,12 @@ struct subscr: tipc_subscr
 			const char* usr_handle, size_t handle_size)
 			throw ();
 
+	/// Access to the subscribed name sequence.
+	nameseq& name_seq() throw ();
+
+	/// Access to the subscribed name sequence.
+	const nameseq& name_seq() const throw ();
+
 	/// Set the user handle as a string.
 	void handle(const char* usr_handle) throw ();
 
@@ -288,6 +300,19 @@ enum event_t
  */
 struct subscr_event: tipc_event
 {
+
+	/// Access to the subscribed name sequence.
+	portid& port_id() throw ();
+
+	/// Access to the subscribed name sequence.
+	const portid& port_id() const throw ();
+
+	/// Access to the subscribed name sequence.
+	subscr& subscription() throw ();
+
+	/// Access to the subscribed name sequence.
+	const subscr& subscription() const throw ();
+
 };
 
 /**
@@ -365,6 +390,30 @@ struct sockaddr: sockaddr_tipc
 	/// Compare two TIPC socket addresses
 	bool operator == (const sockaddr& other) const throw ();
 
+	/// Access to the port ID (only valid if addrtype == ID)
+	portid& port_id() throw ();
+
+	/// Access to the port ID (only valid if addrtype == ID)
+	const portid& port_id() const throw ();
+
+	/// Access to the port name (only valid if addrtype == NAME)
+	name& port_name() throw ();
+
+	/// Access to the port name (only valid if addrtype == NAME)
+	const name& port_name() const throw ();
+
+	/// Access to the port name domain (only valid if addrtype == NAME)
+	tipc::addr& name_domain() throw ();
+
+	/// Access to the port name domain (only valid if addrtype == NAME)
+	const tipc::addr& name_domain() const throw ();
+
+	/// Access to the port name sequence (only valid if addrtype == NAMESEQ)
+	nameseq& name_seq() throw ();
+
+	/// Access to the port name sequence (only valid if addrtype == NAMESEQ)
+	const nameseq& name_seq() const throw ();
+
 };
 
 /// TIPC socket traits.
@@ -451,6 +500,19 @@ posixx::linux::tipc::portid::portid(__u32 r, addr n) throw ()
 	node = n;
 }
 
+inline
+posixx::linux::tipc::addr& posixx::linux::tipc::portid::node_addr() throw ()
+{
+	return *reinterpret_cast<addr*>(&node);
+}
+
+inline
+const posixx::linux::tipc::addr& posixx::linux::tipc::portid::node_addr() const
+		throw ()
+{
+	return *reinterpret_cast<const addr*>(&node);
+}
+
 inline
 bool posixx::linux::tipc::portid::operator == (
 		const posixx::linux::tipc::portid& other) const throw ()
@@ -515,6 +577,19 @@ posixx::linux::tipc::subscr::subscr(nameseq s, __u32 t, __u32 f,
 	handle(uh, uh_size);
 }
 
+inline
+posixx::linux::tipc::nameseq& posixx::linux::tipc::subscr::name_seq() throw ()
+{
+	return *reinterpret_cast<nameseq*>(&seq);
+}
+
+inline
+const posixx::linux::tipc::nameseq&
+posixx::linux::tipc::subscr::name_seq() const throw ()
+{
+	return *reinterpret_cast<const nameseq*>(&seq);
+}
+
 inline
 void posixx::linux::tipc::subscr::handle(const char* uh) throw ()
 {
@@ -535,6 +610,34 @@ bool posixx::linux::tipc::subscr::operator == (const subscr& other) const
 	return memcmp(this, &other, sizeof(*this)) == 0;
 }
 
+inline
+posixx::linux::tipc::portid& posixx::linux::tipc::subscr_event::port_id()
+		throw ()
+{
+	return *reinterpret_cast<portid*>(&port);
+}
+
+inline
+const posixx::linux::tipc::portid& posixx::linux::tipc::subscr_event::port_id()
+		const throw ()
+{
+	return *reinterpret_cast<const portid*>(&port);
+}
+
+inline
+posixx::linux::tipc::subscr& posixx::linux::tipc::subscr_event::subscription()
+		throw ()
+{
+	return *reinterpret_cast<subscr*>(&s);
+}
+
+inline
+const posixx::linux::tipc::subscr&
+posixx::linux::tipc::subscr_event::subscription() const throw ()
+{
+	return *reinterpret_cast<const subscr*>(&s);
+}
+
 inline
 posixx::linux::tipc::sockaddr::sockaddr() throw ()
 {
@@ -589,4 +692,58 @@ bool posixx::linux::tipc::sockaddr::operator == (const sockaddr& other) const
 	return !memcmp(this, &other, sizeof(*this));
 }
 
+inline
+posixx::linux::tipc::portid& posixx::linux::tipc::sockaddr::port_id() throw ()
+{
+	return *reinterpret_cast<portid*>(&addr.id);
+}
+
+inline
+const posixx::linux::tipc::portid& posixx::linux::tipc::sockaddr::port_id()
+		const throw ()
+{
+	return *reinterpret_cast<const portid*>(&addr.id);
+}
+
+inline
+posixx::linux::tipc::name& posixx::linux::tipc::sockaddr::port_name() throw ()
+{
+	return *reinterpret_cast<name*>(&addr.name.name);
+}
+
+inline
+const posixx::linux::tipc::name& posixx::linux::tipc::sockaddr::port_name()
+		const throw ()
+{
+	return *reinterpret_cast<const name*>(&addr.name.name);
+}
+
+inline
+posixx::linux::tipc::addr& posixx::linux::tipc::sockaddr::name_domain()
+		throw ()
+{
+	return *reinterpret_cast<tipc::addr*>(&addr.name.domain);
+}
+
+inline
+const posixx::linux::tipc::addr& posixx::linux::tipc::sockaddr::name_domain()
+		const throw ()
+{
+	return *reinterpret_cast<const tipc::addr*>(&addr.name.domain);
+}
+
+inline
+posixx::linux::tipc::nameseq& posixx::linux::tipc::sockaddr::name_seq()
+		throw ()
+{
+	return *reinterpret_cast<nameseq*>(&addr.nameseq);
+}
+
+inline
+const posixx::linux::tipc::nameseq& posixx::linux::tipc::sockaddr::name_seq()
+		const throw ()
+{
+	return *reinterpret_cast<const nameseq*>(&addr.nameseq);
+}
+
 #endif // POSIXX_LINUX_TIPC_HPP_