Removed "descriptor" types

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

diff --git a/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test2.c b/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test2.c
index afbc54771f06eaf2eff4898e83273a39849299f7..3e5c5b1d44f82730fe4737c103cf6c0b35683e0a 100644 (file)
--- a/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test2.c
+++ b/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test2.c
@@ -25,20 +25,20 @@ fwp_endpoint_attr_t  attr;
 
 void* receiver(void* arg)
 {
-       fwp_endpoint_d_t repoint_d1;
+       fwp_endpoint_t *repoint1;
        int i,len;
        char buffer[30];
        fwp_addr_t from;
        
        printf("Creating receive endpoint\n");
-       if (fwp_receive_endpoint_create(7777, &attr,&repoint_d1) < 0){
+       if (fwp_receive_endpoint_create(7777, &attr,&repoint1) < 0){
                perror("Error while creating receive endpoint\n");
                return NULL;
        }
                
        printf("Receive endpoint created \n");
        for (i = 0; i < MSGN; 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 NULL;
@@ -56,11 +56,11 @@ void* receiver(void* arg)
 
 int main()
 {
-       fwp_vres_d_t vres_d1;
+       fwp_vres_t *vres1;
        struct fwp_vres_params vparam1, vparam2;
        char msg1[] = "Hello1";
        char msg2[] = "Hello2";
-       fwp_endpoint_d_t sepoint_d1;
+       fwp_endpoint_t *sepoint1;
        pthread_t thread;
        
        vparam1.ac_id = FWP_AC_VO; 
@@ -84,32 +84,32 @@ int main()
        
        pthread_create(&thread, NULL, &receiver, (void*) NULL);
        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_send_endpoint_create(inet_addr("127.0.0.1"), 7777, &attr, 
-                                       &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);
        
-       fwp_send(sepoint_d1, msg1, sizeof(msg1));
+       fwp_send(sepoint1, msg1, sizeof(msg1));
        printf("Sent msg1\n");
-       fwp_send(sepoint_d1, msg2, sizeof(msg2));
+       fwp_send(sepoint1, msg2, sizeof(msg2));
        printf("Sent msg2\n");
        
        pthread_join(thread, (void**) NULL);    
-       /*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;
        }