mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-04 05:39:53 +00:00
Sockets: add sendmsg
Adds sendmsg implementation for TCP and UDP sockets. Control messages are not supported at this point, but could be added in the future https://savannah.nongnu.org/bugs/?44805 Change-Id: Iddb287fd4b693f7563f8c923f76785cdde782d2f
This commit is contained in:
Joel Cunningham
parent
68a1ec2eb1
commit
c1c1754171
@ -969,6 +969,148 @@ lwip_send(int s, const void *data, size_t size, int flags)
|
||||
return (err == ERR_OK ? (int)written : -1);
|
||||
}
|
||||
|
||||
int
|
||||
lwip_sendmsg(int s, const struct msghdr *msg, int flags)
|
||||
{
|
||||
struct lwip_sock *sock;
|
||||
struct netbuf *chain_buf;
|
||||
u16_t remote_port;
|
||||
int i;
|
||||
int size;
|
||||
err_t err;
|
||||
u8_t write_flags;
|
||||
size_t written;
|
||||
|
||||
size = 0;
|
||||
err = ERR_OK;
|
||||
|
||||
sock = get_socket(s);
|
||||
if (!sock) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
LWIP_ERROR("lwip_sendmsg: invalid msghdr", msg != NULL,
|
||||
sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
|
||||
|
||||
LWIP_UNUSED_ARG(msg->msg_control);
|
||||
LWIP_UNUSED_ARG(msg->msg_controllen);
|
||||
LWIP_UNUSED_ARG(msg->msg_flags);
|
||||
LWIP_ERROR("lwip_sendmsg: invalid msghdr iov", (msg->msg_iov != NULL && msg->msg_iovlen != 0),
|
||||
sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
|
||||
|
||||
if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) {
|
||||
#if LWIP_TCP
|
||||
write_flags = NETCONN_COPY |
|
||||
((flags & MSG_MORE) ? NETCONN_MORE : 0) |
|
||||
((flags & MSG_DONTWAIT) ? NETCONN_DONTBLOCK : 0);
|
||||
|
||||
for(i = 0; i < msg->msg_iovlen; i++) {
|
||||
written = 0;
|
||||
err = netconn_write_partly(sock->conn, msg->msg_iov[i].iov_base, msg->msg_iov[i].iov_len, write_flags, &written);
|
||||
if (err == ERR_OK) {
|
||||
size += written;
|
||||
/* check that the entire IO vector was accepected, if not return a partial write */
|
||||
if (written != msg->msg_iov[i].iov_len)
|
||||
break;
|
||||
}
|
||||
/* none of this IO vector was accepted, but previous was, return partial write and conceal ERR_WOULDBLOCK */
|
||||
else if (err == ERR_WOULDBLOCK && size > 0) {
|
||||
err = ERR_OK;
|
||||
/* let ERR_WOULDBLOCK persist on the netconn since we are returning ERR_OK */
|
||||
break;
|
||||
} else {
|
||||
size = -1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
sock_set_errno(sock, err_to_errno(err));
|
||||
return size;
|
||||
#else /* LWIP_TCP */
|
||||
sock_set_errno(sock, err_to_errno(ERR_ARG));
|
||||
return -1;
|
||||
#endif /* LWIP_TCP */
|
||||
}
|
||||
/* else, UDP and RAW NETCONNs */
|
||||
#if LWIP_UDP || LWIP_RAW
|
||||
|
||||
LWIP_UNUSED_ARG(flags);
|
||||
LWIP_ERROR("lwip_sendmsg: invalid msghdr name", (((msg->msg_name == NULL) && (msg->msg_namelen == 0)) ||
|
||||
IS_SOCK_ADDR_LEN_VALID(msg->msg_namelen)) ,
|
||||
sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
|
||||
|
||||
/* initialize chain buffer with destination */
|
||||
chain_buf = netbuf_new();
|
||||
if (!chain_buf) {
|
||||
sock_set_errno(sock, err_to_errno(ERR_MEM));
|
||||
return -1;
|
||||
}
|
||||
if (msg->msg_name) {
|
||||
SOCKADDR_TO_IPADDR_PORT((const struct sockaddr *)msg->msg_name, &chain_buf->addr, remote_port);
|
||||
netbuf_fromport(chain_buf) = remote_port;
|
||||
}
|
||||
#if LWIP_NETIF_TX_SINGLE_PBUF
|
||||
for(i = 0; i < msg->msg_iovlen; i++) {
|
||||
size += msg->msg_iov[i].iov_len;
|
||||
}
|
||||
/* Allocate a new netbuf and copy the data into it. */
|
||||
if (netbuf_alloc(chain_buf, (u16_t)size) == NULL) {
|
||||
err = ERR_MEM;
|
||||
}
|
||||
else {
|
||||
/* flatten the IO vectors */
|
||||
size_t offset = 0;
|
||||
for(i = 0; i < msg->msg_iovlen; i++ ) {
|
||||
MEMCPY(&((u8_t*)chain_buf->p->payload)[offset], msg->msg_iov[i].iov_base, msg->msg_iov[i].iov_len);
|
||||
offset += msg->msg_iov[i].iov_len;
|
||||
}
|
||||
#if LWIP_CHECKSUM_ON_COPY
|
||||
/* This can be improved by using LWIP_CHKSUM_COPY() and aggregating the checksum for each IO vector */
|
||||
u16_t chksum = ~inet_chksum_pbuf(chain_buf->p);
|
||||
netbuf_set_chksum(chain_buf, chksum);
|
||||
#endif /* LWIP_CHECKSUM_ON_COPY */
|
||||
err = ERR_OK;
|
||||
}
|
||||
#else /* LWIP_NETIF_TX_SINGLE_PBUF */
|
||||
/* create a chained netbuf from the IO vectors */
|
||||
err = netbuf_ref(chain_buf, msg->msg_iov[0].iov_base, (u16_t)msg->msg_iov[0].iov_len);
|
||||
if (err == ERR_OK) {
|
||||
struct netbuf *tail_buf;
|
||||
size = msg->msg_iov[0].iov_len;
|
||||
for(i = 1; i < msg->msg_iovlen; i++) {
|
||||
tail_buf = netbuf_new();
|
||||
if (!tail_buf) {
|
||||
err = ERR_MEM;
|
||||
break;
|
||||
} else {
|
||||
err = netbuf_ref(tail_buf, msg->msg_iov[i].iov_base, (u16_t)msg->msg_iov[i].iov_len);
|
||||
if (err == ERR_OK) {
|
||||
netbuf_chain(chain_buf, tail_buf);
|
||||
size += msg->msg_iov[i].iov_len;
|
||||
} else {
|
||||
netbuf_delete(tail_buf);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
|
||||
|
||||
if (err == ERR_OK) {
|
||||
/* send the data */
|
||||
err = netconn_send(sock->conn, chain_buf);
|
||||
}
|
||||
|
||||
/* deallocated the buffer */
|
||||
netbuf_delete(chain_buf);
|
||||
|
||||
sock_set_errno(sock, err_to_errno(err));
|
||||
return (err == ERR_OK ? size : -1);
|
||||
#else /* LWIP_UDP || LWIP_RAW */
|
||||
sock_set_errno(sock, err_to_errno(ERR_ARG));
|
||||
return -1;
|
||||
#endif /* LWIP_UDP || LWIP_RAW */
|
||||
}
|
||||
|
||||
int
|
||||
lwip_sendto(int s, const void *data, size_t size, int flags,
|
||||
const struct sockaddr *to, socklen_t tolen)
|
||||
|
||||
@ -136,6 +136,23 @@ struct lwip_setgetsockopt_data {
|
||||
};
|
||||
#endif /* !LWIP_TCPIP_CORE_LOCKING */
|
||||
|
||||
#if !defined(iovec)
|
||||
struct iovec {
|
||||
void *iov_base;
|
||||
size_t iov_len;
|
||||
};
|
||||
#endif
|
||||
|
||||
struct msghdr {
|
||||
void *msg_name;
|
||||
socklen_t msg_namelen;
|
||||
struct iovec *msg_iov;
|
||||
int msg_iovlen;
|
||||
void *msg_control;
|
||||
socklen_t msg_controllen;
|
||||
int msg_flags;
|
||||
};
|
||||
|
||||
/* Socket protocol types (TCP/UDP/RAW) */
|
||||
#define SOCK_STREAM 1
|
||||
#define SOCK_DGRAM 2
|
||||
@ -442,6 +459,7 @@ void lwip_socket_thread_cleanup(void); /* LWIP_NETCONN_SEM_PER_THREAD==1: destro
|
||||
#define lwip_recv recv
|
||||
#define lwip_recvfrom recvfrom
|
||||
#define lwip_send send
|
||||
#define lwip_sendmsg sendmsg
|
||||
#define lwip_sendto sendto
|
||||
#define lwip_socket socket
|
||||
#define lwip_select select
|
||||
@ -473,6 +491,7 @@ int lwip_read(int s, void *mem, size_t len);
|
||||
int lwip_recvfrom(int s, void *mem, size_t len, int flags,
|
||||
struct sockaddr *from, socklen_t *fromlen);
|
||||
int lwip_send(int s, const void *dataptr, size_t size, int flags);
|
||||
int lwip_sendmsg(int s, const struct msghdr *message, int flags);
|
||||
int lwip_sendto(int s, const void *dataptr, size_t size, int flags,
|
||||
const struct sockaddr *to, socklen_t tolen);
|
||||
int lwip_socket(int domain, int type, int protocol);
|
||||
@ -497,6 +516,7 @@ int lwip_fcntl(int s, int cmd, int val);
|
||||
#define recv(s,mem,len,flags) lwip_recv(s,mem,len,flags)
|
||||
#define recvfrom(s,mem,len,flags,from,fromlen) lwip_recvfrom(s,mem,len,flags,from,fromlen)
|
||||
#define send(s,dataptr,size,flags) lwip_send(s,dataptr,size,flags)
|
||||
#define sendmsg(s,message,flags) lwip_sendmsg(s,message,flags)
|
||||
#define sendto(s,dataptr,size,flags,to,tolen) lwip_sendto(s,dataptr,size,flags,to,tolen)
|
||||
#define socket(domain,type,protocol) lwip_socket(domain,type,protocol)
|
||||
#define select(maxfdp1,readset,writeset,exceptset,timeout) lwip_select(maxfdp1,readset,writeset,exceptset,timeout)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user