Little clean up

diff --git a/fwp/lib/mngt/fwp_mngt.c b/fwp/lib/mngt/fwp_mngt.c
index e8fef7cbfae4133644ae64d0ebb111c034bb4783..3a28db01817b09a3926447f0d15e4bd663780547 100644 (file)
--- a/fwp/lib/mngt/fwp_mngt.c
+++ b/fwp/lib/mngt/fwp_mngt.c
@@ -66,19 +66,19 @@ int fwp_mngt_service_vres_create(fwp_vres_d_t* vresdp)
        fwp_contract_d_t        contractd;
        fwp_contract_data_t*    contdata;
        
-       //contractd = fwp_contract_create(&fwp_service_contract);
-       if ((fwp_vres_create(&fwp_service_vres_params, vresdp) < 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;
+       }*/
+       contdata = contractd;
                
        /* TODO: Consider to call _fwp_contract_commit */
-       //contdata->status = FWP_CONT_NEGOTIATED;
+       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_vres_set_params(contdata->vresd, &fwp_service_vres_params);
+       *vresdp = contdata->vresd;
        
        FWP_DEBUG("Service vres negotiated\n");
        return 0;

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