Removed unneeded functions from fwp_utils.h

[frescor/fwp.git] / fwp / lib / fwp / fwp_endpoint.c

diff --git a/fwp/lib/fwp/fwp_endpoint.c b/fwp/lib/fwp/fwp_endpoint.c
index 56964aadb8745ac0edb7247d858de500324c6acc..05d4dd755554ea631c5684154d8fd51c46155281 100644 (file)
--- a/fwp/lib/fwp/fwp_endpoint.c
+++ b/fwp/lib/fwp/fwp_endpoint.c
@@ -397,7 +397,7 @@ int fwp_send_endpoint_bind(struct fwp_endpoint *ep, fwp_vres_t *vres)
                return FRSH_ERR_ALREADY_BOUND;
        
        ep->vres = vres;
-       rv = fwp_vres_bind(vres, ep, ep->sockd);
+       rv = fwp_vres_bind(vres, ep, ep->sockd, &ep->src);
 
        return rv;
 }
@@ -487,9 +487,9 @@ int fwp_recv_conn(struct fwp_endpoint *ep, void *buffer,
                        
                FWP_DEBUG("Prepare to receive tcp data\n");
                peer->addrlen = sizeof(struct sockaddr_in);
-               len = _fwp_recvfrom(ep->c_sockd[i], buffer, 
-                                       buffer_size,0, peer);
 
+               len = recvfrom(ep->c_sockd[i], buffer, buffer_size, 0,
+                              (struct sockaddr*)&peer->addr, &peer->addrlen);
                if (len < 0) /* Error */
                        return len;
                
@@ -535,9 +535,8 @@ ssize_t fwp_recv(struct fwp_endpoint *ep,
        }*/
        
        if (ep->attr.reliability == FWP_EPOINT_BESTEFFORT) {    
-               len = _fwp_recvfrom(ep->sockd, buffer, 
-                                       buffer_size, 0, peer);
-               
+               len = recvfrom(ep->sockd, buffer, buffer_size, 0,
+                              (struct sockaddr*)&peer->addr, &peer->addrlen);
                *from = addr->sin_addr.s_addr;
                return len;
        }
@@ -578,14 +577,14 @@ ssize_t fwp_recv(struct fwp_endpoint *ep,
  * @return 
  */
 ssize_t fwp_endpoint_do_send(struct fwp_endpoint *ep,
-                            void *data, const size_t size)
+                            const void *data, const size_t size)
 {
        struct iovec  iov;
        struct msghdr msg = {0};
        ssize_t ret;
        char cmsg_buf[CMSG_SPACE(sizeof(struct in_pktinfo))];
 
-       iov.iov_base = data;
+       iov.iov_base = (void*)data;
        iov.iov_len = size;
 
        msg.msg_iov = &iov;
@@ -625,7 +624,7 @@ ssize_t fwp_endpoint_do_send(struct fwp_endpoint *ep,
  * On error, -1 is returned and errno is set appropriately.
  *
  */
-int fwp_send_async(struct fwp_endpoint *ep, void *msg, size_t size)
+int fwp_send_async(struct fwp_endpoint *ep, const void *msg, size_t size)
 {
        int ret;
 
@@ -639,7 +638,7 @@ int fwp_send_async(struct fwp_endpoint *ep, void *msg, size_t size)
        return ret;
 }
 
-int fwp_send_sync(struct fwp_endpoint *ep, void *msg, size_t size)
+int fwp_send_sync(struct fwp_endpoint *ep, const void *msg, size_t size)
 {
        int ret;