fwp_endpoint_create returns socket descriptor

[frescor/fwp.git] / fwp / lib / frsh_fwp / fwp_fna.c

diff --git a/fwp/lib/frsh_fwp/fwp_fna.c b/fwp/lib/frsh_fwp/fwp_fna.c
index 43e05ae3f2cb3b39993f3887101eefe1c5870612..8f32ca3358cba6602beb9b4b8382fa6c13597ca5 100644 (file)
--- a/fwp/lib/frsh_fwp/fwp_fna.c
+++ b/fwp/lib/frsh_fwp/fwp_fna.c
@@ -58,8 +58,7 @@ int fwp_fna_init(const frsh_resource_id_t resource_id)
        if ((rv = fwp_init()))
                return rv;
 
-       return fra_fwp_init(frsh_forb_global.orb, frsh_forb_global.fcb,
-                               &frsh_forb_global.alloc_executor);
+       return fra_fwp_init();
 }
 
 int fwp_fna_network_budget_to_bytes(const frsh_resource_id_t resource_id,
@@ -88,10 +87,8 @@ int fwp_fna_send_endpoint_created(fna_endpoint_data_t  *endpoint)
        port = (unsigned int) endpoint->stream_id;
        attr = (fwp_endpoint_attr_t*) endpoint->endpoint_protocol_info.send.body; 
        rv = fwp_send_endpoint_create(node, port, attr, &fwp_epoint);
-       if (rv)
-               return rv;
        endpoint->protocol_info.body = fwp_epoint;
-       return 0;
+       return rv;
 }
 
 int fwp_fna_receive_endpoint_created(fna_endpoint_data_t  *endpoint)
@@ -110,7 +107,8 @@ int fwp_fna_receive_endpoint_created(fna_endpoint_data_t  *endpoint)
        
        endpoint->protocol_info.body = fwp_epoint;
        fwp_endpoint_get_params(fwp_epoint, &node, &port, attr);
-       endpoint->stream_id = fwp_epoint->port;
+       endpoint->stream_id = port;
+       FWP_DEBUG("PORT= %d\n", port);
 
        return 0;
 }