contract negotiation rework using rserve and commit contract_ops

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

diff --git a/fwp/lib/mngt/fwp_mngt.c b/fwp/lib/mngt/fwp_mngt.c
index db7b1a9fac921c7e1e6571c7234989b186e4fb74..2bc194c86a4e80a851cc1a12cb8511b86ab04027 100644 (file)
--- a/fwp/lib/mngt/fwp_mngt.c
+++ b/fwp/lib/mngt/fwp_mngt.c
@@ -24,7 +24,7 @@ int fwp_mngt_send(fwp_msg_type_t type,fwp_msgb_t *msgb,
                  fwp_participant_t *source, fwp_participant_t *dest)
 {
        fwp_msgb_push(msgb, sizeof(struct fwp_msg_header));
-       fwp_msg_header_deflate(msgb->data, type, source->id);
+       fwp_msg_header_in(msgb->data, type, source->id);
 
        fwp_send(dest->epointd, msgb->data, msgb->len);
 
@@ -41,7 +41,7 @@ int fwp_mngt_recv(fwp_msg_type_t *type, fwp_participant_id_t *participant_id,
                        msgb->buffer_size);
        fwp_msgb_put(msgb, size);
 
-       fwp_msg_header_inflate(msgb->data, type, participant_id);
+       fwp_msg_header_out(msgb->data, type, participant_id);
        fwp_msgb_pull(msgb, sizeof(struct fwp_msg_header));
        
        FWP_DEBUG("Received msg: type=%d  from nodeid=%d appid=%d\n", *type,
@@ -88,7 +88,7 @@ void fwp_mngt_connect()
        my_info.id = fwp_participant_this->id;
        my_info.stream_id = fwp_participant_this->stream_id;
 
-       fwp_msg_hello_deflate(msgb->tail, &my_info);
+       fwp_msg_hello_in(msgb->tail, &my_info);
        fwp_msgb_put(msgb, sizeof(struct fwp_msg_hello));
 
        /* Send hello to manager */
@@ -103,7 +103,7 @@ void fwp_mngt_connect()
        
        
        /* Process hello msg from manager */
-       fwp_msg_hello_inflate(msgb->data, &mngr_info);
+       fwp_msg_hello_out(msgb->data, &mngr_info);
        fwp_participant_mngr->id  = mngr_info.id;
        fwp_participant_mngr->stream_id  = mngr_info.stream_id;
        FWP_DEBUG("Received HELLO msg contains nodeid= %d appid= %d\n",