Added service contract

diff --git a/fwp/lib/core/fwp_vres.c b/fwp/lib/core/fwp_vres.c
index b8912369572bba3857ce427246cb328cae7589c4..78e988dfc8d96a79449bbcf5088f56c3928bf379 100644 (file)
--- a/fwp/lib/core/fwp_vres.c
+++ b/fwp/lib/core/fwp_vres.c
@@ -169,7 +169,6 @@ fwp_vres_d_t fwp_vres_alloc()
        return (&fwp_vres_table.entry[i]);
 }
 
-
 int fwp_vres_set_params(fwp_vres_d_t vresd, fwp_vres_params_t *params)
 {
        fwp_vres_t *vres = vresd;

diff --git a/fwp/lib/mngt/fwp_contract.c b/fwp/lib/mngt/fwp_contract.c
index 52bd01ba154e5145ad0d6934afa5770913fd5641..3d6954e4c503c9afc4e4753d5b9dfa34630fc6ff 100644 (file)
--- a/fwp/lib/mngt/fwp_contract.c
+++ b/fwp/lib/mngt/fwp_contract.c
@@ -133,6 +133,8 @@ int fwp_contract_commit(fwp_contract_d_t contractd, fwp_vres_d_t *vresdp)
        contdata->status = FWP_CONT_NEGOTIATED;
        /* Set parameters of vres 
         * and activate it if needed */
+       fwp_vres_set_params(contdata->vresd, &contdata->vres_params);
+       *vresdp = contdata->vresd;
 
        /*TODO: error handling */
        return 0;

diff --git a/fwp/lib/mngt/fwp_mngt.c b/fwp/lib/mngt/fwp_mngt.c
index fcd85f4127de7bd9ab454920fe3cd76c67d9ab3a..e8fef7cbfae4133644ae64d0ebb111c034bb4783 100644 (file)
--- a/fwp/lib/mngt/fwp_mngt.c
+++ b/fwp/lib/mngt/fwp_mngt.c
@@ -61,20 +61,26 @@ int fwp_mngt_recv(fwp_msg_type_t *type, fwp_participant_id_t *participant_id,
        return 0;
 } 
 
-int fwp_mngt_service_vres_create(fwp_vres_d_t* fwp_service_vresd)
+int fwp_mngt_service_vres_create(fwp_vres_d_t* vresdp)
 {
+       fwp_contract_d_t        contractd;
+       fwp_contract_data_t*    contdata;
        
-       /* TODO: Add to contract table */
-       /* create service vres */
-       
-       fwp_contract_create(&fwp_service_contact);
-       if ((fwp_vres_create(&fwp_service_vres_params, fwp_service_vresd) < 0)) {
+       //contractd = fwp_contract_create(&fwp_service_contract);
+       if ((fwp_vres_create(&fwp_service_vres_params, vresdp) < 0)) {
                fprintf(stderr,"Unable to open service vres\n");
                return -1;
        }
+       //contdata = contractd;
+               
+       /* TODO: Consider to call _fwp_contract_commit */
+       //contdata->status = FWP_CONT_NEGOTIATED;
+       /* Set parameters of vres 
+        * and activate it if needed */
+       //fwp_vres_set_params(contdata->vresd, &fwp_service_vres_params);
+       //*vresdp = contdata->vresd;
        
        FWP_DEBUG("Service vres negotiated\n");
-       
        return 0;
 }
 
@@ -131,7 +137,7 @@ int fwp_mngt_connect()
        FWP_DEBUG("Received HELLO msg contains nodeid= %d appid= %d\n", 
                        mngr_info.id.node_id, mngr_info.id.app_id);
        
-       /* unbind and delete discovery mngr send endoint */
+       /* unbind and delete discovery mngr send endpoint */
        fwp_send_endpoint_unbind(fwp_participant_mngr->epointd);
        fwp_endpoint_destroy(fwp_participant_mngr->epointd);
 

diff --git a/fwp/tests/fwp_mngrtest/fwp_mngrtest.c b/fwp/tests/fwp_mngrtest/fwp_mngrtest.c
index b0e5ff3ea21ebaa6c4dc53486a4b6cdde975fea3..76e9fe1039494eb92bb8dcb597b33889983758e7 100644 (file)
--- a/fwp/tests/fwp_mngrtest/fwp_mngrtest.c
+++ b/fwp/tests/fwp_mngrtest/fwp_mngrtest.c
@@ -105,6 +105,7 @@ int main()
        fwp_send(sepoint_d1, msg2, sizeof(msg2), 0);
        printf("Sent msg 2\n");
 
+       /*      sleep(1);
        fwp_contract_cancel(cnt1d);
        printf("Contract 1 is CANCELED\n"); 
        
@@ -117,7 +118,7 @@ int main()
        }
 
        fwp_mngt_disconnect();
-       
+       */
        printf("Test PASSED!\n");
        scanf("Press key");