Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[UDP] set send buff (avoid copying before sending) and format code #2174

Merged
merged 1 commit into from
Nov 8, 2017
Merged

[UDP] set send buff (avoid copying before sending) and format code #2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 23 additions & 4 deletions sw/airborne/arch/linux/udp_socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ int udp_socket_send_dontwait(struct UdpSocket *sock, uint8_t *buffer, uint32_t l
}

ssize_t bytes_sent = sendto(sock->sockfd, buffer, len, MSG_DONTWAIT,
(struct sockaddr *)&sock->addr_out, sizeof(sock->addr_out));
(struct sockaddr *)&sock->addr_out, sizeof(sock->addr_out));
return bytes_sent;
}

Expand Down Expand Up @@ -191,7 +191,8 @@ int udp_socket_recv(struct UdpSocket *sock, uint8_t *buffer, uint32_t len)
return (int)bytes_read;
}

int udp_socket_subscribe_multicast(struct UdpSocket *sock, const char* multicast_addr) {
int udp_socket_subscribe_multicast(struct UdpSocket *sock, const char *multicast_addr)
{
// Create the request
struct ip_mreq mreq;
mreq.imr_multiaddr.s_addr = inet_addr(multicast_addr);
Expand All @@ -201,15 +202,33 @@ int udp_socket_subscribe_multicast(struct UdpSocket *sock, const char* multicast
return setsockopt(sock->sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&mreq, sizeof(mreq));
}

int udp_socket_set_recvbuf(struct UdpSocket *sock, int buf_size) {
int udp_socket_set_recvbuf(struct UdpSocket *sock, int buf_size)
{
// Set and check
unsigned int optval_size = 4;
int buf_ret;
setsockopt(sock->sockfd, SOL_SOCKET, SO_RCVBUF, (char *)&buf_size, optval_size);
getsockopt(sock->sockfd, SOL_SOCKET, SO_RCVBUF, (char *)&buf_ret, &optval_size);

if(buf_size != buf_ret)
if (buf_size != buf_ret) {
return -1;
}

return 0;
}

int udp_socket_set_sendbuf(struct UdpSocket *sock, int buf_size)
{
// Set and check
unsigned int optval_size = 4;
int buf_ret;
setsockopt(sock->sockfd, SOL_SOCKET, SO_SNDBUF, (char *)&buf_size, optval_size);
getsockopt(sock->sockfd, SOL_SOCKET, SO_SNDBUF, (char *)&buf_ret, &optval_size);

if (buf_size != buf_ret) {
return -1;
}

return 0;
}

4 changes: 2 additions & 2 deletions sw/airborne/arch/linux/udp_socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ extern int udp_socket_recv_dontwait(struct UdpSocket *sock, uint8_t *buffer, uin
*/
extern int udp_socket_recv(struct UdpSocket *sock, uint8_t *buffer, uint32_t len);

extern int udp_socket_subscribe_multicast(struct UdpSocket *sock, const char* multicast_addr);
extern int udp_socket_subscribe_multicast(struct UdpSocket *sock, const char *multicast_addr);
extern int udp_socket_set_recvbuf(struct UdpSocket *sock, int buf_size);

extern int udp_socket_set_sendbuf(struct UdpSocket *sock, int buf_size);
#endif /* UDP_SOCKET_H */