Fix name of structure on asp-session-peer.c

Change-Id: Ia4fd80bf63ab6d26b96f285e8b059a5e991bad7a
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/packaging/asp-manager.spec b/packaging/asp-manager.spec
index f3beb02..2a228f4 100755 (executable)
--- a/packaging/asp-manager.spec
+++ b/packaging/asp-manager.spec
@@ -1,6 +1,6 @@
 Name:       asp-manager
 Summary:    ASP(application service platform) manager
-Version:    0.0.4
+Version:    0.0.5
 Release:    2
 Group:      Network & Connectivity/Other
 License:    Apache-2.0

diff --git a/src/session/asp-session-peer.c b/src/session/asp-session-peer.c
index f7b0785..3974e4d 100644 (file)
--- a/src/session/asp-session-peer.c
+++ b/src/session/asp-session-peer.c
@@ -15,18 +15,18 @@ typedef struct asp_sess_peer {
        guint timer_id;
        void *p_sending_msg_data;
        GTree *p_sess_tree;
-} asp_sess_peer_t;
+} asp_sess_peer_s;
 
 typedef struct asp_sess_peer_key {
        guint8 ip_addr[16];
        guint8 ip_addr_len;
        guint16 port;
-} asp_sess_peer_key_t;
+} asp_sess_peer_key_s;
 
 typedef struct asp_sess_peer_sess_key {
        guint32 sess_id;
        guint8 sess_mac[6];
-} asp_sess_peer_sess_key_t;
+} asp_sess_peer_sess_key_s;
 
 enum asp_sess_peer_state_t {
        ASP_S_PEER_STATE_INIT,
@@ -57,28 +57,28 @@ enum asp_sess_peer_event_t {
        ASP_S_PEER_EVENT_MAX,
 };
 
-static asp_sess_peer_t *_asp_sess_peer_create_peer(GSocketAddress *p_sock_addr);
+static asp_sess_peer_s *_asp_sess_peer_create_peer(GSocketAddress *p_sock_addr);
 static void _asp_sess_peer_destroy_peer(void *p_peer);
-static asp_sess_peer_t *_asp_sess_peer_tree_find_peer(GSocketAddress
+static asp_sess_peer_s *_asp_sess_peer_tree_find_peer(GSocketAddress
                *p_sock_addr);
 static gboolean _asp_sess_peer_tree_insert_peer(GSocketAddress *p_sock_addr,
-               asp_sess_peer_t *p_peer);
+               asp_sess_peer_s *p_peer);
 /*static gboolean _asp_sess_peer_tree_remove_peer(GSocketAddress* p_sock_addr); */
 static gint _asp_sess_peer_tree_compare_cb(gconstpointer a, gconstpointer b,
                gpointer p_user_data);
 static void _asp_sess_peer_tree_key_destructor_cb(gpointer a);
 static void _asp_sess_peer_tree_value_destructor_cb(gpointer a);
 static void *asp_sess_peer_dup_msg_data(void *p_msg);
-static void _asp_sess_peer_set_sending_msg_data(asp_sess_peer_t *p_peer,
+static void _asp_sess_peer_set_sending_msg_data(asp_sess_peer_s *p_peer,
                void *p_msg);
-static asp_sess_peer_sess_key_t *_asp_sess_peer_sess_tree_create_key(
+static asp_sess_peer_sess_key_s *_asp_sess_peer_sess_tree_create_key(
        guint8 session_mac[], guint32 session_id);
 static gint _asp_sess_peer_sess_tree_compare_cb(gconstpointer a,
                gconstpointer b, gpointer user_data);
 static void _asp_sess_peer_sess_tree_key_destructor_cb(gpointer p_data);
 static void _asp_sess_peer_sess_tree_value_destructor_cb(gpointer p_value);
-static void _asp_sess_peer_stop_timer(asp_sess_peer_t *p_peer);
-static void _asp_sess_peer_start_timer(asp_sess_peer_t *p_peer, guint sec);
+static void _asp_sess_peer_stop_timer(asp_sess_peer_s *p_peer);
+static void _asp_sess_peer_start_timer(asp_sess_peer_s *p_peer, guint sec);
 
 static gboolean _asp_sess_peer_send_req(GSocketAddress *p_sock_addr,
                                        void *p_msg);
@@ -275,7 +275,7 @@ gboolean _asp_sess_peer_send_req(GSocketAddress *p_sock_addr, void *p_msg)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
+       asp_sess_peer_s *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
 
        if (NULL == p_peer) {
                p_peer = _asp_sess_peer_create_peer(p_sock_addr);
@@ -295,7 +295,7 @@ gboolean _asp_sess_peer_send_ack(GSocketAddress *p_sock_addr, void *p_msg)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
+       asp_sess_peer_s *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
 
        if (NULL == p_peer)
                return FALSE;
@@ -310,7 +310,7 @@ gboolean _asp_sess_peer_send_nack(GSocketAddress *p_sock_addr, void *p_msg)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
+       asp_sess_peer_s *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
 
        if (NULL == p_peer)
                return FALSE;
@@ -326,7 +326,7 @@ gboolean _asp_sess_peer_recv_version(GSocketAddress *p_sock_addr, void *p_msg)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
+       asp_sess_peer_s *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
 
        if (NULL == p_peer) {
                p_peer = _asp_sess_peer_create_peer(p_sock_addr);
@@ -358,7 +358,7 @@ gboolean _asp_sess_peer_recv_req(GSocketAddress *p_sock_addr, void *p_msg)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
+       asp_sess_peer_s *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
        asp_coord_header_s *p_header = (asp_coord_header_s *)p_msg;
 
        if (NULL == p_peer) {
@@ -377,7 +377,7 @@ gboolean _asp_sess_peer_recv_ack(GSocketAddress *p_sock_addr, void *p_msg)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
+       asp_sess_peer_s *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
 
        if (NULL == p_peer)
                return FALSE;
@@ -397,7 +397,7 @@ gboolean _asp_sess_peer_recv_nack(GSocketAddress *p_sock_addr, void *p_msg)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
+       asp_sess_peer_s *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
 
        if (NULL == p_peer)
                return FALSE;
@@ -414,7 +414,7 @@ gboolean asp_sess_peer_add_session(GSocketAddress *p_sock_addr,
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
+       asp_sess_peer_s *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
 
        if (NULL == p_peer) {
                p_peer = _asp_sess_peer_create_peer(p_sock_addr);
@@ -436,7 +436,7 @@ gboolean asp_sess_peer_del_session(GSocketAddress *p_sock_addr,
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
+       asp_sess_peer_s *p_peer = _asp_sess_peer_tree_find_peer(p_sock_addr);
 
        if (NULL == p_peer)
                return TRUE;
@@ -449,9 +449,11 @@ gboolean asp_sess_peer_del_session(GSocketAddress *p_sock_addr,
        return TRUE;
 }
 
-asp_sess_peer_key_t *_asp_sess_peer_tree_create_peer_key(
+asp_sess_peer_key_s *_asp_sess_peer_tree_create_peer_key(
        GSocketAddress *p_sock_addr)
 {
+       INFO_MSG;
+
        GInetSocketAddress *p_inet_sock_addr = G_INET_SOCKET_ADDRESS(p_sock_addr);
 
        g_assert(p_inet_sock_addr);
@@ -460,8 +462,8 @@ asp_sess_peer_key_t *_asp_sess_peer_tree_create_peer_key(
 
        g_assert(p_inet_addr);
 
-       asp_sess_peer_key_t *p_key = (asp_sess_peer_key_t *) g_malloc(sizeof(
-                                            asp_sess_peer_key_t));
+       asp_sess_peer_key_s *p_key = (asp_sess_peer_key_s *) g_malloc(sizeof(
+                                            asp_sess_peer_key_s));
 
        g_assert(p_key);
 
@@ -477,19 +479,23 @@ asp_sess_peer_key_t *_asp_sess_peer_tree_create_peer_key(
        return p_key;
 }
 
-asp_sess_peer_t *_asp_sess_peer_tree_find_peer(GSocketAddress *p_sock_addr)
+asp_sess_peer_s *_asp_sess_peer_tree_find_peer(GSocketAddress *p_sock_addr)
 {
-       asp_sess_peer_key_t *p_key = _asp_sess_peer_tree_create_peer_key(p_sock_addr);
+       INFO_MSG;
+
+       asp_sess_peer_key_s *p_key = _asp_sess_peer_tree_create_peer_key(p_sock_addr);
 
        g_assert(p_key);
 
-       return (asp_sess_peer_t *) g_tree_lookup(gp_peer_tree, p_key);
+       return (asp_sess_peer_s *) g_tree_lookup(gp_peer_tree, p_key);
 }
 
 gboolean _asp_sess_peer_tree_insert_peer(GSocketAddress *p_sock_addr,
-               asp_sess_peer_t *p_peer)
+               asp_sess_peer_s *p_peer)
 {
-       asp_sess_peer_key_t *p_key = _asp_sess_peer_tree_create_peer_key(p_sock_addr);
+       INFO_MSG;
+
+       asp_sess_peer_key_s *p_key = _asp_sess_peer_tree_create_peer_key(p_sock_addr);
 
        g_assert(p_key);
 
@@ -501,7 +507,7 @@ gboolean _asp_sess_peer_tree_insert_peer(GSocketAddress *p_sock_addr,
 /* not used
 gboolean _asp_sess_peer_tree_remove_peer(GSocketAddress* p_sock_addr)
 {
-    asp_sess_peer_key_t* p_key = _asp_sess_peer_tree_create_peer_key(p_sock_addr);
+    asp_sess_peer_key_s* p_key = _asp_sess_peer_tree_create_peer_key(p_sock_addr);
 
     g_assert(p_key);
 
@@ -514,8 +520,8 @@ gboolean _asp_sess_peer_tree_remove_peer(GSocketAddress* p_sock_addr)
 gint _asp_sess_peer_tree_compare_cb(gconstpointer a, gconstpointer b,
                                    gpointer p_user_data)
 {
-       asp_sess_peer_key_t *p_l = (asp_sess_peer_key_t *) a;
-       asp_sess_peer_key_t *p_r = (asp_sess_peer_key_t *) b;
+       asp_sess_peer_key_s *p_l = (asp_sess_peer_key_s *) a;
+       asp_sess_peer_key_s *p_r = (asp_sess_peer_key_s *) b;
 
        g_assert(p_l->ip_addr_len == 4 || p_l->ip_addr_len == 16);
 
@@ -541,11 +547,11 @@ void _asp_sess_peer_tree_value_destructor_cb(gpointer a)
        g_free(a);
 }
 
-asp_sess_peer_t *_asp_sess_peer_create_peer(GSocketAddress *p_sock_addr)
+asp_sess_peer_s *_asp_sess_peer_create_peer(GSocketAddress *p_sock_addr)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) g_malloc(sizeof(asp_sess_peer_t));
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) g_malloc(sizeof(asp_sess_peer_s));
 
        g_assert(p_peer);
 
@@ -569,7 +575,7 @@ asp_sess_peer_t *_asp_sess_peer_create_peer(GSocketAddress *p_sock_addr)
 
 void _asp_sess_peer_destroy_peer(void *p_context_data)
 {
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        if (p_peer->p_sock_addr) {
                g_object_unref(p_peer->p_sock_addr);
@@ -589,7 +595,7 @@ void _asp_sess_peer_destroy_peer(void *p_context_data)
        g_free(p_peer);
 }
 
-void _asp_sess_peer_set_sending_msg_data(asp_sess_peer_t *p_peer, void *p_msg)
+void _asp_sess_peer_set_sending_msg_data(asp_sess_peer_s *p_peer, void *p_msg)
 {
        INFO_MSG;
 
@@ -605,7 +611,7 @@ void _asp_sess_peer_set_sending_msg_data(asp_sess_peer_t *p_peer, void *p_msg)
        p_peer->p_sending_msg_data = p_msg;
 }
 
-void _asp_sess_peer_clear_sending_msg_data(asp_sess_peer_t *p_peer)
+void _asp_sess_peer_clear_sending_msg_data(asp_sess_peer_s *p_peer)
 {
        INFO_MSG;
 
@@ -615,13 +621,13 @@ void _asp_sess_peer_clear_sending_msg_data(asp_sess_peer_t *p_peer)
        }
 }
 
-void _asp_sess_peer_forward_req_to_sessmgmt(asp_sess_peer_t *p_peer,
+void _asp_sess_peer_forward_req_to_sessmgmt(asp_sess_peer_s *p_peer,
                void *p_msg_data)
 {
        asp_session_recv_req(p_peer->p_sock_addr, p_msg_data);
 }
 
-void _asp_sess_peer_forward_ack_to_sessmgmt(asp_sess_peer_t *p_peer,
+void _asp_sess_peer_forward_ack_to_sessmgmt(asp_sess_peer_s *p_peer,
                void *p_msg_data)
 {
        asp_request_header_s *p_header = (asp_request_header_s *)
@@ -630,7 +636,7 @@ void _asp_sess_peer_forward_ack_to_sessmgmt(asp_sess_peer_t *p_peer,
                             p_header->session_id, p_msg_data);
 }
 
-void _asp_sess_peer_forward_nack_to_sessmgmt(asp_sess_peer_t *p_peer,
+void _asp_sess_peer_forward_nack_to_sessmgmt(asp_sess_peer_s *p_peer,
                void *p_msg_data)
 {
        asp_request_header_s *p_header = (asp_request_header_s *)
@@ -641,7 +647,7 @@ void _asp_sess_peer_forward_nack_to_sessmgmt(asp_sess_peer_t *p_peer,
 
 gboolean _asp_sess_peer_notify_timeout_cb(gpointer p_user_data)
 {
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_user_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_user_data;
 
        p_peer->timer_id = 0;
 
@@ -651,7 +657,7 @@ gboolean _asp_sess_peer_notify_timeout_cb(gpointer p_user_data)
        return FALSE;
 }
 
-void _asp_sess_peer_start_timer(asp_sess_peer_t *p_peer, guint sec)
+void _asp_sess_peer_start_timer(asp_sess_peer_s *p_peer, guint sec)
 {
        INFO_MSG;
 
@@ -662,7 +668,7 @@ void _asp_sess_peer_start_timer(asp_sess_peer_t *p_peer, guint sec)
                           p_peer);
 }
 
-void _asp_sess_peer_stop_timer(asp_sess_peer_t *p_peer)
+void _asp_sess_peer_stop_timer(asp_sess_peer_s *p_peer)
 {
        INFO_MSG;
 
@@ -672,16 +678,16 @@ void _asp_sess_peer_stop_timer(asp_sess_peer_t *p_peer)
        }
 }
 
-void _asp_sess_peer_increase_seq_num(asp_sess_peer_t *p_peer)
+void _asp_sess_peer_increase_seq_num(asp_sess_peer_s *p_peer)
 {
        ++p_peer->retry;
 }
 
-asp_sess_peer_sess_key_t *_asp_sess_peer_sess_tree_create_key(
+asp_sess_peer_sess_key_s *_asp_sess_peer_sess_tree_create_key(
        guint8 session_mac[], guint32 session_id)
 {
-       asp_sess_peer_sess_key_t *p_key = (asp_sess_peer_sess_key_t *) g_malloc(sizeof(
-                       asp_sess_peer_sess_key_t));
+       asp_sess_peer_sess_key_s *p_key = (asp_sess_peer_sess_key_s *) g_malloc(sizeof(
+                       asp_sess_peer_sess_key_s));
 
        g_assert(p_key);
 
@@ -691,10 +697,10 @@ asp_sess_peer_sess_key_t *_asp_sess_peer_sess_tree_create_key(
        return p_key;
 }
 
-void _asp_sess_peer_insert_session(asp_sess_peer_t *p_peer,
-                                  asp_sess_peer_sess_key_t *p_key)
+void _asp_sess_peer_insert_session(asp_sess_peer_s *p_peer,
+                                  asp_sess_peer_sess_key_s *p_key)
 {
-       asp_sess_peer_sess_key_t *p_value = (asp_sess_peer_sess_key_t *) g_tree_lookup(
+       asp_sess_peer_sess_key_s *p_value = (asp_sess_peer_sess_key_s *) g_tree_lookup(
                        p_peer->p_sess_tree, p_key);
 
        if (p_value)
@@ -703,8 +709,8 @@ void _asp_sess_peer_insert_session(asp_sess_peer_t *p_peer,
        g_tree_insert(p_peer->p_sess_tree, p_key, p_key);
 }
 
-void _asp_sess_peer_remove_session(asp_sess_peer_t *p_peer,
-                                  asp_sess_peer_sess_key_t *p_key)
+void _asp_sess_peer_remove_session(asp_sess_peer_s *p_peer,
+                                  asp_sess_peer_sess_key_s *p_key)
 {
        g_tree_remove(p_peer->p_sess_tree, p_key);
 }
@@ -712,8 +718,8 @@ void _asp_sess_peer_remove_session(asp_sess_peer_t *p_peer,
 gint _asp_sess_peer_sess_tree_compare_cb(gconstpointer a, gconstpointer b,
                gpointer user_data)
 {
-       asp_sess_peer_sess_key_t *p_l = (asp_sess_peer_sess_key_t *) a;
-       asp_sess_peer_sess_key_t *p_r = (asp_sess_peer_sess_key_t *) b;
+       asp_sess_peer_sess_key_s *p_l = (asp_sess_peer_sess_key_s *) a;
+       asp_sess_peer_sess_key_s *p_r = (asp_sess_peer_sess_key_s *) b;
 
        if (p_l->sess_id < p_r->sess_id)
                return -1;
@@ -725,7 +731,7 @@ gint _asp_sess_peer_sess_tree_compare_cb(gconstpointer a, gconstpointer b,
 
 void _asp_sess_peer_sess_tree_key_destructor_cb(gpointer p_data)
 {
-       asp_sess_peer_sess_key_t *p_key = (asp_sess_peer_sess_key_t *) p_data;
+       asp_sess_peer_sess_key_s *p_key = (asp_sess_peer_sess_key_s *) p_data;
        asp_session_peer_destroyed(p_key->sess_mac, p_key->sess_id);
        g_free(p_key);
 }
@@ -983,7 +989,7 @@ void _asp_sess_peer_state_init_entry_action(void *p_context_data)
 
        ASP_SESS_PEER_FSM_TRACE_ENTER();
 
-       /*    asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*    asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 
        /*p_peer->seq_num = 0; */
        /*p_peer->p_sending_msg_data = NULL; */
@@ -997,7 +1003,7 @@ void _asp_sess_peer_state_init_exit_action(void *p_context_data)
 
        ASP_SESS_PEER_FSM_TRACE_ENTER();
 
-       /*asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 
        ASP_SESS_PEER_FSM_TRACE_LEAVE();
 }
@@ -1009,7 +1015,7 @@ gfsm_state_id_t _asp_sess_peer_state_init_reaction_start(void *p_context_data,
 
        ASP_SESS_PEER_FSM_TRACE_ENTER();
 
-       /*    asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*    asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 
        ASP_SESS_PEER_FSM_TRACE_LEAVE();
 
@@ -1020,14 +1026,14 @@ void _asp_sess_peer_state_created_entry_action(void *p_context_data)
 {
        INFO_MSG;
 
-       /*    asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*    asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 }
 
 void _asp_sess_peer_state_created_exit_action(void *p_context_data)
 {
        INFO_MSG;
 
-       /*    asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*    asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 }
 
 gfsm_state_id_t _asp_sess_peer_state_created_reaction_add_session(
@@ -1037,8 +1043,8 @@ gfsm_state_id_t _asp_sess_peer_state_created_reaction_add_session(
 
        ASP_SESS_PEER_FSM_TRACE_ENTER();
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
-       asp_sess_peer_sess_key_t *p_key = (asp_sess_peer_sess_key_t *) p_event_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
+       asp_sess_peer_sess_key_s *p_key = (asp_sess_peer_sess_key_s *) p_event_data;
 
        _asp_sess_peer_insert_session(p_peer, p_key);
 
@@ -1054,8 +1060,8 @@ gfsm_state_id_t _asp_sess_peer_state_created_reaction_del_session(
 
        ASP_SESS_PEER_FSM_TRACE_ENTER();
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
-       asp_sess_peer_sess_key_t *p_key = (asp_sess_peer_sess_key_t *) p_event_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
+       asp_sess_peer_sess_key_s *p_key = (asp_sess_peer_sess_key_s *) p_event_data;
 
        _asp_sess_peer_remove_session(p_peer, p_key);
 
@@ -1071,7 +1077,7 @@ gfsm_state_id_t _asp_sess_peer_state_created_reaction_close(
 
        ASP_SESS_PEER_FSM_TRACE_ENTER();
 
-       /*    asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*    asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 
        ASP_SESS_PEER_FSM_TRACE_LEAVE();
 
@@ -1085,7 +1091,7 @@ gfsm_state_id_t _asp_sess_peer_state_created_reaction_send_ack(
 
        ASP_SESS_PEER_FSM_TRACE_ENTER();
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        asp_coordination_protocol_send_msg(p_peer->p_sock_addr, p_event_data);
 
@@ -1101,7 +1107,7 @@ gfsm_state_id_t _asp_sess_peer_state_created_reaction_send_nack(
 
        ASP_SESS_PEER_FSM_TRACE_ENTER();
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        asp_coordination_protocol_send_msg(p_peer->p_sock_addr, p_event_data);
 
@@ -1116,7 +1122,7 @@ void _asp_sess_peer_state_version_sent_entry_action(void *p_context_data)
 
        ASP_SESS_PEER_FSM_TRACE_ENTER();
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
        asp_version_s *p_msg_version = (asp_version_s *)g_malloc(sizeof(
                                               asp_version_s));
 
@@ -1139,7 +1145,7 @@ void _asp_sess_peer_state_version_sent_exit_action(void *p_context_data)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        _asp_sess_peer_clear_sending_msg_data(p_peer);
        _asp_sess_peer_stop_timer(p_peer);
@@ -1150,7 +1156,7 @@ gfsm_state_id_t _asp_sess_peer_state_version_sent_reaction_recv_ack(
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
        asp_ack_s *p_ack = (asp_ack_s *)p_event_data;
 
        if (p_peer->seq_num != p_ack->seq_num)
@@ -1166,7 +1172,7 @@ gfsm_state_id_t _asp_sess_peer_state_version_sent_reaction_recv_nack(
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
        asp_nack_s *p_nack = (asp_nack_s *)p_event_data;
 
        if (p_peer->seq_num != p_nack->seq_num)
@@ -1180,7 +1186,7 @@ gfsm_state_id_t _asp_sess_peer_state_version_sent_reaction_timeout(
 {
        INFO_MSG;
 
-       /*asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 
        return ASP_S_PEER_STATE_VERSION_SENT;
 }
@@ -1189,7 +1195,7 @@ void _asp_sess_peer_state_wait_version_entry_action(void *p_context_data)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        _asp_sess_peer_start_timer(p_peer, 10);
 }
@@ -1198,7 +1204,7 @@ void _asp_sess_peer_state_wait_version_exit_action(void *p_context_data)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        _asp_sess_peer_stop_timer(p_peer);
 }
@@ -1208,7 +1214,7 @@ gfsm_state_id_t _asp_sess_peer_state_wait_version_reaction_recv_version(
 {
        INFO_MSG;
 
-       /*    asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*    asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
        /*    asp_coord_header_s* p_header = (asp_coord_header_s*)p_event_data; */
 
        return ASP_S_PEER_STATE_IDLE;
@@ -1219,7 +1225,7 @@ gfsm_state_id_t _asp_sess_peer_state_wait_version_reaction_recv_req(
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
        asp_coord_header_s *p_header = (asp_coord_header_s *)p_event_data;
 
        _asp_sess_peer_send_nack_to_protocol(p_peer->p_sock_addr, p_header->seq_num,
@@ -1233,7 +1239,7 @@ gfsm_state_id_t _asp_sess_peer_state_wait_version_reaction_timeout(
 {
        INFO_MSG;
 
-       /*asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
        return ASP_S_PEER_STATE_CLOSED;
 }
 
@@ -1241,14 +1247,14 @@ void _asp_sess_peer_state_opened_entry_action(void *p_context_data)
 {
        INFO_MSG;
 
-       /*asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 }
 
 void _asp_sess_peer_state_opened_exit_action(void *p_context_data)
 {
        INFO_MSG;
 
-       /*asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 }
 
 gfsm_state_id_t _asp_sess_peer_state_opened_reaction_recv_version(
@@ -1256,7 +1262,7 @@ gfsm_state_id_t _asp_sess_peer_state_opened_reaction_recv_version(
 {
        INFO_MSG;
 
-       /*asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
        /*_asp_sess_peer_forward_req_to_sessmgmt(p_peer,p_event_data); */
 
        return GFSM_DISCARD_EVENT;
@@ -1267,7 +1273,7 @@ gfsm_state_id_t _asp_sess_peer_state_opened_reaction_recv_req(
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
        _asp_sess_peer_forward_req_to_sessmgmt(p_peer, p_event_data);
 
        return GFSM_DISCARD_EVENT;
@@ -1277,14 +1283,14 @@ void _asp_sess_peer_state_idle_entry_action(void *p_context_data)
 {
        INFO_MSG;
 
-       /*asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 }
 
 void _asp_sess_peer_state_idle_exit_action(void *p_context_data)
 {
        INFO_MSG;
 
-       /*asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 }
 
 gfsm_state_id_t _asp_sess_peer_state_idle_reaction_send_req(
@@ -1292,7 +1298,7 @@ gfsm_state_id_t _asp_sess_peer_state_idle_reaction_send_req(
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
        void *p_msg_data = asp_sess_peer_dup_msg_data(p_event_data);
 
        /*asp_sess_peer_add_sess_list(p_msg_data); */
@@ -1307,7 +1313,7 @@ void _asp_sess_peer_state_wait_ack_entry_action(void *p_context_data)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        _asp_sess_peer_start_timer(p_peer, 1);
 }
@@ -1316,7 +1322,7 @@ void _asp_sess_peer_state_wait_ack_exit_action(void *p_context_data)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        _asp_sess_peer_stop_timer(p_peer);
 }
@@ -1326,7 +1332,7 @@ gfsm_state_id_t _asp_sess_peer_state_wait_ack_reaction_recv_ack(
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
        asp_ack_s *p_ack = (asp_ack_s *)p_event_data;
 
        if (p_ack->seq_num != p_peer->seq_num)
@@ -1346,7 +1352,7 @@ gfsm_state_id_t _asp_sess_peer_state_wait_ack_reaction_recv_nack(
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
        asp_nack_s *p_nack = (asp_nack_s *)p_event_data;
 
        if (p_nack->seq_num != p_peer->seq_num)
@@ -1364,7 +1370,7 @@ gfsm_state_id_t _asp_sess_peer_state_wait_ack_reaction_timeout(
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        if (p_peer->retry < 5) {
                ++p_peer->retry;
@@ -1382,7 +1388,7 @@ void _asp_sess_peer_state_close_entry_action(void *p_context_data)
 {
        INFO_MSG;
 
-       asp_sess_peer_t *p_peer = (asp_sess_peer_t *) p_context_data;
+       asp_sess_peer_s *p_peer = (asp_sess_peer_s *) p_context_data;
 
        gfsm_destroy_context(p_peer->context);
 }
@@ -1391,5 +1397,5 @@ void _asp_sess_peer_state_close_exit_action(void *p_context_data)
 {
        INFO_MSG;
 
-       /*asp_sess_peer_t* p_peer = (asp_sess_peer_t*)p_context_data; */
+       /*asp_sess_peer_s* p_peer = (asp_sess_peer_s*)p_context_data; */
 }