Removed "descriptor" types

These types (fwp_endpoint_d_t, fwp_vres_d_t). These types only made things
more complicated than it was necessary. Now all functions use the "real"
types for their parameters.

diff --git a/fwp/lib/fwp/fwp_endpoint.c b/fwp/lib/fwp/fwp_endpoint.c
index 8418b5388bb755570be893660c21e6422db13d70..0531284cbfe763c0e39f39b5a40ac4beb8848195 100644 (file)
--- a/fwp/lib/fwp/fwp_endpoint.c
+++ b/fwp/lib/fwp/fwp_endpoint.c
@@ -71,7 +71,7 @@ struct fwp_endpoint{
        /** Fwp endpoint attributes */
        fwp_endpoint_attr_t     attr;
        /* Vres this fwp endpoint is bound to */
-       fwp_vres_d_t            vresd;
+       fwp_vres_t              *vres;
        /** For send enpoint it contains destination address for
         * receive endpoint it is filled with the msg source address
         */
@@ -124,37 +124,35 @@ static inline void fwp_endpoint_free(fwp_endpoint_t *endpoint)
 /**
  * Destroy endpoint
  *
- * \param[in] epointd Endpoint descriptor
+ * \param[in] epd Endpoint descriptor
  * \return On success 0 is returned. 
  * On error, negative error value is returned and errno is set appropriately. 
  */
-int fwp_endpoint_destroy(fwp_endpoint_d_t epointd)
+int fwp_endpoint_destroy(fwp_endpoint_t *ep)
 {
-       if (epointd->sockd > 0) 
-               close(epointd->sockd);
+       if (ep->sockd > 0) 
+               close(ep->sockd);
        
-       fwp_endpoint_free(epointd);     
+       fwp_endpoint_free(ep);  
        return 0;
 }
 
 /**
  * Get endpoint parameters
  *
- * \param[in] epointd Endpoint descriptor
+ * \param[in] ep Endpoint descriptor
  * \param[out] node Node identifier
  * \param[out] port Port
  * \param[out] attr Endpoint`s attributes
  * \return On success 0 is returned. 
  * On error, negative error value is returned. 
  */
-int fwp_endpoint_get_params(fwp_endpoint_d_t epointd, unsigned int *node, 
+int fwp_endpoint_get_params(fwp_endpoint_t *ep, unsigned int *node, 
                                unsigned int *port, fwp_endpoint_attr_t *attr)
 {
-       fwp_endpoint_t *epoint = epointd;
-
-       if (node) *node = epoint->node;
-       if (port) *port = epoint->port;
-       if (attr) *attr = epoint->attr;
+       if (node) *node = ep->node;
+       if (port) *port = ep->port;
+       if (attr) *attr = ep->attr;
        
        return 0;
 }
@@ -173,7 +171,7 @@ int fwp_endpoint_attr_init(fwp_endpoint_attr_t *attr)
  * \param[in] node IP address of destination node
  * \param[in] port UDP port
  * \param[in] attr Endpoint attributes
- * \param[out] epointdp  Pointer to the descriptor of newly created endpoint
+ * \param[out] epp  Pointer to the descriptor of newly created endpoint
  *
  * \return Zero on success, -1 on error and sets errno appropriately. 
  *
@@ -181,7 +179,7 @@ int fwp_endpoint_attr_init(fwp_endpoint_attr_t *attr)
 int fwp_send_endpoint_create(unsigned int node,
                                unsigned int port, 
                                fwp_endpoint_attr_t *attr,
-                               fwp_endpoint_d_t *epointd)
+                               fwp_endpoint_t **epoint)
 {      
        struct sockaddr_in *addr;
        fwp_endpoint_t *fwp_epoint;
@@ -256,7 +254,7 @@ int fwp_send_endpoint_create(unsigned int node,
        fwp_send_endpoint_bind(fwp_epoint, fwp_epoint->vresd);
 #endif
        
-       *epointd = fwp_epoint;
+       *epoint = fwp_epoint;
        return fwp_epoint->sockd;               
 err:
        fwp_endpoint_destroy(fwp_epoint);
@@ -274,7 +272,7 @@ err:
  */
 int fwp_receive_endpoint_create(unsigned int port,
                                fwp_endpoint_attr_t *attr,
-                               fwp_endpoint_d_t *epointd)
+                               fwp_endpoint_t **epp)
 {
        struct sockaddr_in *addr;
        fwp_endpoint_t *fwp_epoint;
@@ -370,7 +368,7 @@ int fwp_receive_endpoint_create(unsigned int port,
        addr = (struct sockaddr_in*) fwp_epoint->peer.addr;
        fwp_epoint->port = ntohs(addr->sin_port);
        FWP_DEBUG("Recv port= %d\n",ntohs(addr->sin_port));     
-       *epointd = fwp_epoint;  
+       *epp = fwp_epoint;
        return 0;
 err:
        fwp_endpoint_destroy(fwp_epoint);
@@ -380,19 +378,18 @@ err:
 /**
  * Binds send endpoint to vres
  *
- * \param[in] vres_id identifier of vres
- * \param[in] epoint_id send endpoint identifier
+ * \param[in] vres identifier of vres
+ * \param[in] ep send endpoint identifier
  *
  * \return On success returns 0. On error, -1 and errno is set appropriately.
  */
-int fwp_send_endpoint_bind(fwp_endpoint_d_t epointd, fwp_vres_d_t vresd)
+int fwp_send_endpoint_bind(fwp_endpoint_t *ep, fwp_vres_t *vres)
 {
        int rv = 0;
 #ifndef FWP_WITHOUT_CONTNEGT
-       fwp_endpoint_t *fwp_epoint = epointd;
        
-       fwp_epoint->vresd = vresd;      
-       rv = fwp_vres_bind(vresd, fwp_epoint->sockd);
+       ep->vres = vres;
+       rv = fwp_vres_bind(vres, ep->sockd);
 #endif
        /* if send endpoint is already bound 
        if (epoint->type == FWP_EPOINT_BOUND) {  
@@ -408,13 +405,12 @@ int fwp_send_endpoint_bind(fwp_endpoint_d_t epointd, fwp_vres_d_t vresd)
  * \return On success returns 0. On error, -1 is returned and errno is set appropriately.
  *
  */
-int fwp_send_endpoint_unbind(fwp_endpoint_d_t epointd)
+int fwp_send_endpoint_unbind(fwp_endpoint_t *ep)
 {
        int rv = 0;
-       fwp_endpoint_t *fwp_epoint = epointd;
 
        /* unlink epoint-vres mutually */
-       if ((rv = fwp_vres_unbind(fwp_epoint->vresd)) < 0) 
+       if ((rv = fwp_vres_unbind(ep->vres)) < 0) 
                return rv;
 
        return 0;
@@ -471,24 +467,23 @@ static int fwp_receive_endpoint_accept(fwp_endpoint_t *fwp_epoint)
  * On error, -1 is returned and errno is set appropriately.
  *
  */
-int fwp_recv_conn(fwp_endpoint_d_t epointd, void *buffer, 
+int fwp_recv_conn(fwp_endpoint_t *ep, void *buffer, 
                        size_t buffer_size)
 {
-       fwp_endpoint_t *fwp_epoint = epointd;
-       fwp_sockaddr_t *peer = &fwp_epoint->peer;
-       fd_set fdset = fwp_epoint->fdset;
+       fwp_sockaddr_t *peer = &ep->peer;
+       fd_set fdset = ep->fdset;
        ssize_t len;
        int i;
 
        FWP_DEBUG("Checking for tcp data\n");
-       for (i = 0; i < fwp_epoint->nr_connections; i++) {
-               if (!FD_ISSET(fwp_epoint->c_sockd[i], &fdset)) {
+       for (i = 0; i < ep->nr_connections; i++) {
+               if (!FD_ISSET(ep->c_sockd[i], &fdset)) {
                        continue;       
                }       
                        
                FWP_DEBUG("Prepare to receive tcp data\n");
                peer->addrlen = sizeof(struct sockaddr_in);
-               len = _fwp_recvfrom(fwp_epoint->c_sockd[i], buffer, 
+               len = _fwp_recvfrom(ep->c_sockd[i], buffer, 
                                        buffer_size,0, peer);
 
                if (len < 0) /* Error */
@@ -500,10 +495,10 @@ int fwp_recv_conn(fwp_endpoint_d_t epointd, void *buffer,
        
                /* tcp connection closed */
                FWP_DEBUG("Connection closed\n");
-               FD_CLR(fwp_epoint->c_sockd[i], &fwp_epoint->fdset);
-               memcpy(fwp_epoint->c_sockd+i, fwp_epoint->c_sockd+i+1, 
-                       sizeof(int)*(fwp_epoint->nr_connections -i-1));
-               fwp_epoint->nr_connections--;
+               FD_CLR(ep->c_sockd[i], &ep->fdset);
+               memcpy(ep->c_sockd+i, ep->c_sockd+i+1, 
+                       sizeof(int)*(ep->nr_connections -i-1));
+               ep->nr_connections--;
                return 0;
        }
        return 0;
@@ -521,13 +516,12 @@ int fwp_recv_conn(fwp_endpoint_d_t epointd, void *buffer,
  * On error, -1 is returned and errno is set appropriately.
  *
  */
-ssize_t fwp_recv(fwp_endpoint_d_t epointd,
+ssize_t fwp_recv(fwp_endpoint_t *ep,
                        void *buffer, const size_t buffer_size,
                        unsigned int *from, int flags)
 {
-       fwp_endpoint_t *fwp_epoint = epointd;
-       fwp_sockaddr_t *peer = &fwp_epoint->peer;
-       struct sockaddr_in *addr = (struct sockaddr_in*) fwp_epoint->peer.addr;
+       fwp_sockaddr_t *peer = &ep->peer;
+       struct sockaddr_in *addr = (struct sockaddr_in*) ep->peer.addr;
        ssize_t len;
        fd_set fdset;
        
@@ -536,8 +530,8 @@ ssize_t fwp_recv(fwp_endpoint_d_t epointd,
                return -1;
        }*/
        
-       if (fwp_epoint->attr.reliability == FWP_EPOINT_BESTEFFORT) {    
-               len = _fwp_recvfrom(fwp_epoint->sockd, buffer, 
+       if (ep->attr.reliability == FWP_EPOINT_BESTEFFORT) {    
+               len = _fwp_recvfrom(ep->sockd, buffer, 
                                        buffer_size, 0, peer);
                
                *from = addr->sin_addr.s_addr;
@@ -546,7 +540,7 @@ ssize_t fwp_recv(fwp_endpoint_d_t epointd,
        
        while (1){
                /* FWP_EPOINT_RELIABLE */
-               fdset = fwp_epoint->fdset;
+               fdset = ep->fdset;
                if (select(FD_SETSIZE, &fdset, (fd_set *)0, 
                           (fd_set *)0, NULL) < 0) {
                
@@ -554,13 +548,13 @@ ssize_t fwp_recv(fwp_endpoint_d_t epointd,
                        return -1;
                }
        
-               if (FD_ISSET(fwp_epoint->sockd, &fdset)) { /* is it listen socket? */
-                       fwp_receive_endpoint_accept(fwp_epoint);
+               if (FD_ISSET(ep->sockd, &fdset)) { /* is it listen socket? */
+                       fwp_receive_endpoint_accept(ep);
                        continue;
                }
 
                /* Check client TCP sockets */
-               len = fwp_recv_conn(fwp_epoint, buffer, buffer_size);
+               len = fwp_recv_conn(ep, buffer, buffer_size);
                if (len) {
                        *from = addr->sin_addr.s_addr;
                        return len;
@@ -580,9 +574,8 @@ ssize_t fwp_recv(fwp_endpoint_d_t epointd,
  * On error, -1 is returned and errno is set appropriately.
  *
  */
-int fwp_send(fwp_endpoint_d_t epointd,const void *msg, const size_t size)
+int fwp_send(fwp_endpoint_t *ep,const void *msg, const size_t size)
 {
-       fwp_endpoint_t *fwp_epoint = epointd;
        struct fwp_msgb *msgb;
        
 /*     if (!fwp_endpoint_is_valid(epointd)){
@@ -602,7 +595,7 @@ int fwp_send(fwp_endpoint_d_t epointd,const void *msg, const size_t size)
                        return -1;
                }
 
-               /*msgb->peer = &fwp_epoint->peer;*/
+               /*msgb->peer = &ep->peer;*/
                /*msgb->data = msg;*/
                /*msgb->flags = epoint->flags;*/
                
@@ -617,6 +610,6 @@ int fwp_send(fwp_endpoint_d_t epointd,const void *msg, const size_t size)
        /*}*/
 
        /* TODO: test whether _fwp_vres_send is successful */
-       return fwp_vres_send(fwp_epoint->vresd, msgb);
+       return fwp_vres_send(ep->vres, msgb);
 }
 

diff --git a/fwp/lib/fwp/fwp_endpoint.h b/fwp/lib/fwp/fwp_endpoint.h
index c5a61c69cc14198c1b79ef2c0b52bd289d5b06ab..18358952bc79b8a65719f54cf238dae826826ecd 100644 (file)
--- a/fwp/lib/fwp/fwp_endpoint.h
+++ b/fwp/lib/fwp/fwp_endpoint.h
@@ -55,8 +55,6 @@ typedef enum {
 
 struct fwp_endpoint;
 typedef struct fwp_endpoint fwp_endpoint_t;
-/** fwp endpoint descriptor type */
-typedef struct fwp_endpoint* fwp_endpoint_d_t;
 
 typedef unsigned int fwp_addr_t;
 
@@ -73,23 +71,23 @@ struct fwp_endpoint_attr {
 
 #include "fwp_vres.h"
 
-int fwp_endpoint_get_params(fwp_endpoint_d_t epointd, unsigned int *node, 
+int fwp_endpoint_get_params(fwp_endpoint_t *ep, unsigned int *node, 
                                unsigned int *port, fwp_endpoint_attr_t *attr);
 int fwp_send_endpoint_create(unsigned int node, unsigned int port,
                                fwp_endpoint_attr_t *attr, 
-                               fwp_endpoint_d_t *epointd);
+                               fwp_endpoint_t **epoint);
 int fwp_receive_endpoint_create(/*unsigned int node,*/ unsigned int port,
                                fwp_endpoint_attr_t *attr, 
-                               fwp_endpoint_d_t *epointd);
-int fwp_endpoint_destroy(fwp_endpoint_d_t epointd);
+                               fwp_endpoint_t **epoint);
+int fwp_endpoint_destroy(fwp_endpoint_t *ep);
 
-int fwp_send_endpoint_bind(fwp_endpoint_d_t epointd, fwp_vres_d_t vresd);
-int fwp_send_endpoint_unbind(fwp_endpoint_d_t epointd);
+int fwp_send_endpoint_bind(fwp_endpoint_t *ep, fwp_vres_t *vres);
+int fwp_send_endpoint_unbind(fwp_endpoint_t *ep);
 
-ssize_t fwp_recv(fwp_endpoint_d_t epointd,
+ssize_t fwp_recv(fwp_endpoint_t *ep,
                        void *buffer, const size_t buffer_size,
                        unsigned int *from, int flags);
-int fwp_send(fwp_endpoint_d_t epointd, const void *msg, const size_t size);
+int fwp_send(fwp_endpoint_t *ep, const void *msg, const size_t size);
 int fwp_endpoint_attr_init(fwp_endpoint_attr_t *attr);
 
 static inline int fwp_endpoint_attr_setreliability(fwp_endpoint_attr_t *attr, 

diff --git a/fwp/lib/fwp/fwp_vres.c b/fwp/lib/fwp/fwp_vres.c
index d81c16a5e80514b3738158bbd9354e6213bbbca5..32a9eff4f0f75ef0e4d91e5b9184d62c69cd1614 100644 (file)
--- a/fwp/lib/fwp/fwp_vres.c
+++ b/fwp/lib/fwp/fwp_vres.c
@@ -254,10 +254,8 @@ int fwp_vres_table_init(unsigned int max_vres)
        return 0;
 }
 
-fwp_vres_id_t fwp_vres_get_id(fwp_vres_d_t vresd)
+fwp_vres_id_t fwp_vres_get_id(fwp_vres_t *vres)
 {
-       fwp_vres_t *vres = vresd;
-       
        return (vres - fwp_vres_table.entry);
 }
 
@@ -266,7 +264,7 @@ fwp_vres_id_t fwp_vres_get_id(fwp_vres_d_t vresd)
  *
  * \return On success returns vres descriptor. 
  */
-fwp_vres_d_t fwp_vres_alloc()
+fwp_vres_t *fwp_vres_alloc()
 {
        int i;
        unsigned int max_vres;
@@ -309,17 +307,15 @@ inline int _fwp_vres_set_params(fwp_vres_t *vres, fwp_vres_params_t *params)
 /**
  * Set vres params
  *
- * \param[in] vresdp Vres descriptor
+ * \param[in] vresp Vres descriptor
  * \param[in] params Vres parameters
  *
  * \return On success returns zero. 
  * On error, negative error code is returned. 
  *
  */
-int fwp_vres_set_params(fwp_vres_d_t vresd, fwp_vres_params_t *params)
+int fwp_vres_set_params(fwp_vres_t *vres, fwp_vres_params_t *params)
 {
-       fwp_vres_t *vres = vresd;
-       
        if (!fwp_vres_is_valid(vres)) {
                errno = EINVAL;
                return -1;
@@ -332,13 +328,13 @@ int fwp_vres_set_params(fwp_vres_d_t vresd, fwp_vres_params_t *params)
  * Creates new vres
  *
  * \param[in] params Vres parameters
- * \param[out] vresdp Pointer to the descriptor of newly created vres
+ * \param[out] vresp Pointer to the descriptor of newly created vres
  *
  * \return On success returns descriptor of vres. 
  * On error, negative error code is returned. 
  *
  */
-int fwp_vres_create(fwp_vres_params_t *params, fwp_vres_d_t *vresdp)
+int fwp_vres_create(fwp_vres_params_t *params, fwp_vres_t **vresp)
 {
        int rv;
        fwp_vres_t *vres;
@@ -359,7 +355,7 @@ int fwp_vres_create(fwp_vres_params_t *params, fwp_vres_d_t *vresdp)
                goto err;
        }
 
-       *vresdp = vres;
+       *vresp = vres;
        return 0;
 err:   
        fwp_vres_free(vres);
@@ -369,16 +365,14 @@ err:
 /**
  * Destroys vres
  *
- * \param[in] vresd Vres descriptor
+ * \param[in] vres Vres descriptor
  *
  * \return On success returns 0. 
  * On error, negative error code is returned. 
  *
  */
-int fwp_vres_destroy(fwp_vres_d_t vresd)
+int fwp_vres_destroy(fwp_vres_t *vres)
 {      
-       fwp_vres_t *vres = vresd;
-
        if (!fwp_vres_is_valid(vres)) {
                errno = EINVAL;
                return -1;
@@ -492,10 +486,8 @@ static void* fwp_vres_tx_thread(void *_vres)
        return NULL;
 }
 
-int fwp_vres_send(fwp_vres_d_t vresd, struct fwp_msgb* msgb)
+int fwp_vres_send(fwp_vres_t *vres, struct fwp_msgb* msgb)
 {
-       fwp_vres_t *vres = vresd;
-
        if (fwp_vres_is_valid(vres)) {
                return fwp_msgq_enqueue(&vres->tx_queue, msgb);
        } else {
@@ -504,10 +496,9 @@ int fwp_vres_send(fwp_vres_d_t vresd, struct fwp_msgb* msgb)
        }
 }
 
-/*int fwp_vres_bind(fwp_vres_d_t vresd, fwp_endpoint_t *epoint)*/
-int fwp_vres_bind(fwp_vres_d_t vresd, int sockd)
+/*int fwp_vres_bind(fwp_vres_t *vres, fwp_endpoint_t *epoint)*/
+int fwp_vres_bind(fwp_vres_t *vres, int sockd)
 {
-       fwp_vres_t *vres = vresd;
        int rv = 0;
 
        pthread_mutex_lock(&fwp_vres_table.lock);
@@ -533,11 +524,9 @@ err:
        return rv;
 }
 
-int fwp_vres_unbind(fwp_vres_d_t vresd)
+int fwp_vres_unbind(fwp_vres_t *vres)
 {
-       fwp_vres_t *vres = vresd;
-       
-       if (!fwp_vres_is_valid(vresd)) {
+       if (!fwp_vres_is_valid(vres)) {
                errno = EINVAL;
                return -1;
        }

diff --git a/fwp/lib/fwp/fwp_vres.h b/fwp/lib/fwp/fwp_vres.h
index b3c244e8151f24877475f45aada48291f5c06ff8..65bfd9177feae7802707ca0a5b7cfa6b8d76259a 100644 (file)
--- a/fwp/lib/fwp/fwp_vres.h
+++ b/fwp/lib/fwp/fwp_vres.h
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 
 struct fwp_vres;
-typedef struct fwp_vres* fwp_vres_d_t;
+typedef struct fwp_vres fwp_vres_t;
 
 /** WMM defines 4 queues */
 typedef enum  {
@@ -59,15 +59,13 @@ typedef enum  {
        FWP_AC_BK = 3
 } fwp_ac_t;
 
-fwp_ac_t fwp_vres_get_ac(fwp_vres_d_t vresd);
+fwp_ac_t fwp_vres_get_ac(fwp_vres_t *vres);
 
 
 #ifdef _FWP_INTERNALS_
 
 #include "fwp_msgb.h"
 
-typedef struct fwp_vres  fwp_vres_t;
-
 typedef unsigned int fwp_vres_id_t;
 typedef unsigned int fwp_vparam_id_t;
 typedef unsigned long int fwp_budget_t;
@@ -90,16 +88,15 @@ struct fwp_vres_params {
 
 int fwp_vres_table_init(unsigned int max_vres);
 
-fwp_vres_d_t fwp_vres_alloc();
-fwp_vres_id_t fwp_vres_get_id(fwp_vres_d_t vresd);
-int fwp_vres_set_params(fwp_vres_d_t vresd, fwp_vres_params_t *params);
-int fwp_vres_create(fwp_vres_params_t *params, fwp_vres_d_t *vresdp);
-int fwp_vres_destroy(fwp_vres_d_t vresd);
+fwp_vres_t *fwp_vres_alloc();
+fwp_vres_id_t fwp_vres_get_id(fwp_vres_t *vres);
+int fwp_vres_set_params(fwp_vres_t *vres, fwp_vres_params_t *params);
+int fwp_vres_create(fwp_vres_params_t *params, fwp_vres_t **vresp);
+int fwp_vres_destroy(fwp_vres_t *vres);
 
-int fwp_vres_send(fwp_vres_d_t vresd, struct fwp_msgb* msgb);
-/*int _fwp_vres_bind(fwp_vres_d_t vresd, fwp_endpoint_d_t epointd);*/
-int fwp_vres_bind(fwp_vres_d_t vresd, int sockd);
-int fwp_vres_unbind(fwp_vres_d_t vresd);
+int fwp_vres_send(fwp_vres_t *vres, struct fwp_msgb* msgb);
+int fwp_vres_bind(fwp_vres_t *vres, int sockd);
+int fwp_vres_unbind(fwp_vres_t *vres);
 
 extern fwp_vres_params_t fwp_vres_params_default;
 

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;
        }       

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;
        }       

diff --git a/fwp/lib/fwp/tests/fwp_vrestest/fwp_vrestest1.c b/fwp/lib/fwp/tests/fwp_vrestest/fwp_vrestest1.c
index b013d9590aa0e75d50b4b2d984bfcb91109e91f5..27a2395025660824c054e1d41391d39e32fa0bc7 100644 (file)
--- a/fwp/lib/fwp/tests/fwp_vrestest/fwp_vrestest1.c
+++ b/fwp/lib/fwp/tests/fwp_vrestest/fwp_vrestest1.c
@@ -25,11 +25,11 @@ int main()
 {
 //     struct sockaddr_in local_addr, rem_addr, from;
         ssize_t len;
-       fwp_vres_d_t vresd1, vresd2;
+       fwp_vres_t *vres1, *vres2;
        struct fwp_vres_params vparam1;
        char msg1[15];
        char buffer[30];
-       fwp_endpoint_d_t sepoint_d1, repoint_d;
+       fwp_endpoint_t *sepoint, *repoint;
        int count;
        struct timespec  sendtime;
        fwp_endpoint_attr_t attr;
@@ -49,47 +49,47 @@ int main()
        }       
        
        printf("Create vres1\n");
-       if ((fwp_vres_create(&vparam1, &vresd1) < 0)) {
+       if ((fwp_vres_create(&vparam1, &vres1) < 0)) {
                printf("Unable to create vres1\n");
                return -1;
        }
        printf("Vres1 created\n");
        
        printf("Create vres2\n");
-       if ((fwp_vres_create(&vparam1, &vresd2) < 0)) {
+       if ((fwp_vres_create(&vparam1, &vres2) < 0)) {
                printf("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_d) < 0) {
+       if (fwp_receive_endpoint_create(7777, &attr, &repoint) < 0) {
                return -1;
        }
        printf("Receive endpoint created\n");
        
        if (fwp_send_endpoint_create(inet_addr("127.0.0.1"), 7777, &attr, 
-                                       &sepoint_d1) < 0){
+                                    &sepoint) < 0){
                return -1;
        }
        printf("Send endpoint 1 created\n");
-       fwp_send_endpoint_bind(sepoint_d1, vresd1);
+       fwp_send_endpoint_bind(sepoint, vres1);
        
        for (count = 0; count < NUM; count++) { 
                sprintf(msg1,"msg%d",count);
-               fwp_send(sepoint_d1, msg1, sizeof(msg1));
+               fwp_send(sepoint, msg1, sizeof(msg1));
                
                clock_gettime(CLOCK_MONOTONIC, &sendtime);
                printf("Sent: sec = %ld nsec = %ld \n", sendtime.tv_sec,
                       sendtime.tv_nsec);
                
-               if ((len = fwp_recv(repoint_d, buffer, sizeof(buffer), &from, 0)) < 0) {
+               if ((len = fwp_recv(repoint, buffer, sizeof(buffer), &from, 0)) < 0) {
                        perror("Error while receiving data");
                        return -1;
                } 
                        else printf("Received - %s\n", buffer);
        }
 
-       if (fwp_vres_destroy(vresd1) < 0) {
+       if (fwp_vres_destroy(vres1) < 0) {
                perror("Unable to destroy vres1\n");
                return -1;
        }

diff --git a/fwp/lib/fwp/tests/fwp_vrestest/fwp_vrestest2.c b/fwp/lib/fwp/tests/fwp_vrestest/fwp_vrestest2.c
index c1c4d22c8c8c612415033c54307754bcda093d42..d4dbe5c5ef4a45986fdd70666f08218034b5cbf4 100644 (file)
--- a/fwp/lib/fwp/tests/fwp_vrestest/fwp_vrestest2.c
+++ b/fwp/lib/fwp/tests/fwp_vrestest/fwp_vrestest2.c
@@ -31,8 +31,8 @@ fwp_endpoint_attr_t attr;
        
 void* sender()
 {
-       fwp_endpoint_d_t sepoint_d1;
-       fwp_vres_d_t vres_d1;
+       fwp_endpoint_t *sepoint;
+       fwp_vres_t *vres;
        struct fwp_vres_params vparam1;
        char msg1[10];
        int count;
@@ -44,18 +44,18 @@ void* sender()
        vparam1.period.tv_nsec = 0; 
        
        printf("Create vres1\n");
-       if (fwp_vres_create(&vparam1, &vres_d1) < 0) {
+       if (fwp_vres_create(&vparam1, &vres) < 0) {
                printf("Unable to open vres1\n");
                return NULL;
        }
        printf("Vres1 created\n");
        
        if (fwp_send_endpoint_create(inet_addr("127.0.0.1"), PORT, &attr, 
-               &sepoint_d1) < 0){
+               &sepoint) < 0){
                return NULL;
        }
        printf("Send endpoint 1 created\n");
-       fwp_send_endpoint_bind(sepoint_d1, vres_d1);
+       fwp_send_endpoint_bind(sepoint, vres);
        
        sleep(2);
        //for (count = 0; count < NUM; count++) {       
@@ -65,7 +65,7 @@ void* sender()
        while (count < NUM){
                count++;
                sprintf(msg1,"msg%d sent\n",count);
-               fwp_send(sepoint_d1, msg1, sizeof(msg1));
+               fwp_send(sepoint, msg1, sizeof(msg1));
        
                printf(msg1);   
                /*clock_gettime(CLOCK_MONOTONIC, &sendtime);
@@ -78,7 +78,7 @@ void* sender()
                sleep(1);
        }
        
-       if (fwp_vres_destroy(vres_d1) < 0) {
+       if (fwp_vres_destroy(vres) < 0) {
                perror("Unable to destroy vres1\n");
                return NULL;
        }
@@ -91,13 +91,13 @@ void* receiver()
 {
         ssize_t len;
        char buffer[30];
-       fwp_endpoint_d_t repoint_d;
+       fwp_endpoint_t *repoint;
        int count;
        struct timespec recvtime;
        fwp_addr_t      from;
        
        /* local_addr should be handled when creating socket */
-       if (fwp_receive_endpoint_create(PORT, &attr, &repoint_d) < 0){
+       if (fwp_receive_endpoint_create(PORT, &attr, &repoint) < 0){
                perror("Not initialized\n");
                return NULL;
        }
@@ -105,7 +105,7 @@ void* receiver()
        
        for (count = 1; count <= NUM; count++) {        
                
-               if ((len = fwp_recv(repoint_d, buffer, sizeof(buffer), &from, 0)) < 0){
+               if ((len = fwp_recv(repoint, buffer, sizeof(buffer), &from, 0)) < 0){
                        perror("Error while receiving data");
                        return NULL;
                }