Removed "descriptor" types

[frescor/fwp.git] / fwp / lib / fwp / tests / fwp_prototest / fwp_sendrecv_test1.c

diff --git a/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test1.c b/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test1.c
index e09209438fc4cf5f7c3fce95eee57c5042824a68..d32bd338aaa2ffca50843691f884babe34a7222e 100644 (file)
--- a/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test1.c
+++ b/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test1.c
@@ -22,13 +22,13 @@ int main()
 {
 //     struct sockaddr_in local_addr, rem_addr, from;
         ssize_t len;
-       fwp_vres_d_t vres_d1, vres_d2;
+       fwp_vres_t *vres1, *vres2;
        int i;
        struct fwp_vres_params vparam1, vparam2;
        char msg1[] = "Hello1";
        char msg2[] = "Hello2";
        char buffer[30];
-       fwp_endpoint_d_t sepoint_d1, sepoint_d2, repoint_d1, repoint_d2;
+       fwp_endpoint_t *sepoint1, *sepoint2, *repoint1, *repoint2;
        fwp_endpoint_attr_t attr;
        fwp_addr_t from;
        
@@ -48,48 +48,48 @@ int main()
        fwp_init();
        
        printf("Create vres1, vres2\n");
-       if (fwp_vres_create(&vparam1, &vres_d1) < 0) {
+       if (fwp_vres_create(&vparam1, &vres1) < 0) {
                printf("Unable to create vres1\n");
                return -1;
        }
        printf("Vres1 created \n");
        
-       if (fwp_vres_create(&vparam2, &vres_d2) < 0){
+       if (fwp_vres_create(&vparam2, &vres2) < 0){
                fprintf(stderr,"Unable to create vres2\n");
                return -1;
        }
        printf("Vres2 created\n");
        
        /* local_addr should be handled when creating socket */
-       if (fwp_receive_endpoint_create(7777, &attr,&repoint_d1) < 0){
+       if (fwp_receive_endpoint_create(7777, &attr,&repoint1) < 0){
                return -1;
        }
        printf("Receive endpoint created\n");
        
-       if (fwp_receive_endpoint_create(7778, &attr,&repoint_d2) < 0){
+       if (fwp_receive_endpoint_create(7778, &attr,&repoint2) < 0){
                return -1;
        }
        printf("Receive endpoint created\n");
        
        if (fwp_send_endpoint_create(inet_addr("127.0.0.1"), 7777, 0, 
-                                       &sepoint_d1) < 0) {
+                                       &sepoint1) < 0) {
                return -1;
        }
        printf("Send endpoint 1 created\n");
-       fwp_send_endpoint_bind(sepoint_d1, vres_d1);
+       fwp_send_endpoint_bind(sepoint1, vres1);
        
        if (fwp_send_endpoint_create(inet_addr("127.0.0.1"), 7778, 0, 
-                                       &sepoint_d2) < 0){
+                                       &sepoint2) < 0){
                return -1;
        }
        printf("Send endpoint 2 created\n");
-       fwp_send_endpoint_bind(sepoint_d2, vres_d2);
+       fwp_send_endpoint_bind(sepoint2, vres2);
        
-       fwp_send(sepoint_d1, msg1, sizeof(msg1));
-       fwp_send(sepoint_d1, msg2, sizeof(msg2));
+       fwp_send(sepoint1, msg1, sizeof(msg1));
+       fwp_send(sepoint1, msg2, sizeof(msg2));
 
        for (i = 0; i < 2; i++) {
-               if ((len = fwp_recv(repoint_d1, buffer, sizeof(buffer), &from, 
+               if ((len = fwp_recv(repoint1, buffer, sizeof(buffer), &from, 
                        0)) < 0) {
                        perror("Error while receiving data");
                        return -1;
@@ -97,13 +97,13 @@ int main()
                        else printf("Received - %s\n", buffer);
        }
 
-       if (fwp_vres_destroy(vres_d1) < 0) {
+       if (fwp_vres_destroy(vres1) < 0) {
                perror("Unable to destroy vres1\n");
                return -1;
        }
        printf("Vres1 destroyed\n");
        
-       if (fwp_vres_destroy(vres_d2) < 0){
+       if (fwp_vres_destroy(vres2) < 0){
                perror("Unable to destroy vres2\n");
                return -1;
        }