Changing name of serialization funmctions; added functions for contract id, status...

[frescor/fwp.git] / fwp / lib / mngt / fwp_msg.c

diff --git a/fwp/lib/mngt/fwp_msg.c b/fwp/lib/mngt/fwp_msg.c
index 25302a5752c9315ba107dbf7f268101a8786100a..0314d38620ad4e7d4cfb17e510cfd7191278f05d 100644 (file)
--- a/fwp/lib/mngt/fwp_msg.c
+++ b/fwp/lib/mngt/fwp_msg.c
@@ -5,8 +5,8 @@
  *
  */
 
-void fwp_msg_header_deflate(unsigned char *data, fwp_msg_type_t type, 
-                               fwp_participant_id_t participant_id)
+void fwp_msg_header_in(unsigned char *data, fwp_msg_type_t type, 
+                       fwp_participant_id_t participant_id)
 {
        struct fwp_msg_header* msg_header;
 
@@ -19,8 +19,8 @@ void fwp_msg_header_deflate(unsigned char *data, fwp_msg_type_t type,
        msg_header->app_id = htonl(participant_id.app_id);
 }
 
-void fwp_msg_header_inflate(unsigned char *data, fwp_msg_type_t *type, 
-                               fwp_participant_id_t *participant_id)
+void fwp_msg_header_out(unsigned char *data, fwp_msg_type_t *type, 
+                       fwp_participant_id_t *participant_id)
 {
        struct fwp_msg_header *msg_header;
        
@@ -31,7 +31,29 @@ void fwp_msg_header_inflate(unsigned char *data, fwp_msg_type_t *type,
        participant_id->app_id = ntohl(msg_header->app_id);
 }
 
-void fwp_msg_contract_deflate(unsigned char *data, fwp_contract_t *cont)
+void fwp_msg_contracthdr_in(unsigned char *data, fwp_contract_id_t id, 
+                               fwp_contract_status_t status)
+{
+       struct fwp_msg_contracthdr* msg_contracthdr;
+
+       msg_contracthdr = (struct fwp_msg_contracthdr*) data;
+
+       msg_contracthdr->id = htonl(id);
+       msg_contracthdr->status = status;
+}
+
+void fwp_msg_contracthdr_out(unsigned char *data, fwp_contract_id_t *id, 
+                               fwp_contract_status_t *status)
+{
+       struct fwp_msg_contracthdr* msg_contracthdr;
+
+       msg_contracthdr = (struct fwp_msg_contracthdr*) data;
+
+       *id = ntohl(msg_contracthdr->id);       
+       *status = msg_contracthdr->status;      
+}
+
+void fwp_msg_contract_in(unsigned char *data, fwp_contract_t *cont)
 {
        struct fwp_msg_contract* msg_contract;
 
@@ -43,7 +65,7 @@ void fwp_msg_contract_deflate(unsigned char *data, fwp_contract_t *cont)
        msg_contract->period_usec = htonl(cont->period_usec);
 }
 
-void fwp_msg_contract_inflate(unsigned char *data, fwp_contract_t *cont)
+void fwp_msg_contract_out(unsigned char *data, fwp_contract_t *cont)
 {
        struct fwp_msg_contract* msg_contract;
 
@@ -54,8 +76,7 @@ void fwp_msg_contract_inflate(unsigned char *data, fwp_contract_t *cont)
        cont->period_usec = ntohl(msg_contract->period_usec);
 }
 
-void fwp_msg_vres_params_deflate(unsigned char *data,
-                                       fwp_vres_params_t *vparams)
+void fwp_msg_vres_params_in(unsigned char *data, fwp_vres_params_t *vparams)
 {
        struct fwp_msg_vres_params* msg_vparams;
 
@@ -68,8 +89,7 @@ void fwp_msg_vres_params_deflate(unsigned char *data,
        msg_vparams->period_usec = htonl(vparams->period_usec);
 }
 
-void fwp_msg_vres_params_inflate(unsigned char *data, 
-                                       fwp_vres_params_t *vparams)
+void fwp_msg_vres_params_out(unsigned char *data, fwp_vres_params_t *vparams)
 {
        struct fwp_msg_vres_params* msg_vparams;
 
@@ -81,8 +101,8 @@ void fwp_msg_vres_params_inflate(unsigned char *data,
        vparams->period_usec = ntohl(msg_vparams->period_usec);
 }
 
-void fwp_msg_hello_deflate(unsigned char *data, 
-                               fwp_participant_info_t *participant_info)
+void fwp_msg_hello_in(unsigned char *data, 
+                       fwp_participant_info_t *participant_info)
 {
        struct fwp_msg_hello* msg_hello;
 
@@ -95,8 +115,8 @@ void fwp_msg_hello_deflate(unsigned char *data,
        msg_hello->stream_id= htons(participant_info->stream_id);
 }
 
-void fwp_msg_hello_inflate(unsigned char *data,
-                                fwp_participant_info_t *participant_info)
+void fwp_msg_hello_out(unsigned char *data,
+                        fwp_participant_info_t *participant_info)
 {
        struct fwp_msg_hello *msg_hello;