Skip to content

gnrc_sock: set remote network interface implicitly #8470

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

Merged
bergzand merged 2 commits into from
Mar 6, 2018
Merged

gnrc_sock: set remote network interface implicitly #8470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98e45c3
gnrc_sock: set remote network interface implicitly
miri64 Jan 29, 2018
15d405f
gnrc_sock: add more cppcheck suppressions
miri64 Mar 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions sys/net/gnrc/sock/include/gnrc_sock_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include <stdbool.h>
#include <stdint.h>
#include <string.h>
#include "mbox.h"
#include "net/af.h"
#include "net/gnrc.h"
Expand Down Expand Up @@ -96,6 +97,25 @@ static inline bool gnrc_ep_addr_any(const sock_ip_ep_t *ep)
return true;
}

/**
* @brief Initializes a sock end-point from a given and sets the network
* interface implicitly if there is only one potential interface.
* @internal
*/
static inline void gnrc_ep_set(sock_ip_ep_t *out, const sock_ip_ep_t *in,
size_t in_size)
{
memcpy(out, in, in_size);
Copy link
Copy Markdown
Member

@bergzand bergzand Jan 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason as not to fix the size to sizeof(sock_ip_ep_t) here (and remove the extra argument with it)?

Copy link
Copy Markdown
Member Author

@miri64 miri64 Jan 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, in https://github.com/RIOT-OS/RIOT/pull/8470/files#diff-71ddba2942574ad9a8d73c8de31b2230R126 this is called with sizeof(sock_udp_ep_t) ;-).

Copy link
Copy Markdown
Member

@bergzand bergzand Jan 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind then, It all looked like the same sock_something_ep_t from here :)

#if GNRC_NETIF_NUMOF == 1
/* set interface implicitly */
gnrc_netif_t *netif = gnrc_netif_iter(NULL);

if (netif != NULL) {
out->netif = netif->pid;
}
#endif
}

/**
* @brief Create a sock internally
* @internal
Expand Down
7 changes: 4 additions & 3 deletions sys/net/gnrc/sock/ip/gnrc_sock_ip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int sock_ip_create(sock_ip_t *sock, const sock_ip_ep_t *local,
if (gnrc_ep_addr_any(remote)) {
return -EINVAL;
}
memcpy(&sock->remote, remote, sizeof(sock_ip_ep_t));
gnrc_ep_set(&sock->remote, remote, sizeof(sock_ip_ep_t));
}
gnrc_sock_create(&sock->reg, GNRC_NETTYPE_IPV6,
proto);
Expand Down Expand Up @@ -140,7 +140,8 @@ ssize_t sock_ip_send(sock_ip_t *sock, const void *data, size_t len,
return -EINVAL;
}
if ((remote == NULL) &&
/* sock can't be NULL as per assertion above */
/* cppcheck-suppress nullPointerRedundantCheck
* (reason: sock can't be NULL as per the check above) */
(sock->remote.family == AF_UNSPEC)) {
return -ENOTCONN;
}
Expand All @@ -165,7 +166,7 @@ ssize_t sock_ip_send(sock_ip_t *sock, const void *data, size_t len,
memcpy(&rem, &sock->remote, sizeof(rem));
}
else {
memcpy(&rem, remote, sizeof(rem));
gnrc_ep_set(&rem, remote, sizeof(rem));
}
if ((remote != NULL) && (remote->family == AF_UNSPEC) &&
(sock->remote.family != AF_UNSPEC)) {
Expand Down
10 changes: 8 additions & 2 deletions sys/net/gnrc/sock/udp/gnrc_sock_udp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ int sock_udp_create(sock_udp_t *sock, const sock_udp_ep_t *local,
if (gnrc_ep_addr_any((const sock_ip_ep_t *)remote)) {
return -EINVAL;
}
memcpy(&sock->remote, remote, sizeof(sock_udp_ep_t));
gnrc_ep_set((sock_ip_ep_t *)&sock->remote,
(sock_ip_ep_t *)remote, sizeof(sock_udp_ep_t));
}
if (local != NULL) {
/* listen only with local given */
Expand Down Expand Up @@ -216,6 +217,7 @@ ssize_t sock_udp_send(sock_udp_t *sock, const void *data, size_t len,
gnrc_pktsnip_t *payload, *pkt;
uint16_t src_port = 0, dst_port;
sock_ip_ep_t local;
sock_udp_ep_t remote_cpy;
sock_ip_ep_t *rem;

assert((sock != NULL) || (remote != NULL));
Expand Down Expand Up @@ -250,6 +252,9 @@ ssize_t sock_udp_send(sock_udp_t *sock, const void *data, size_t len,
if ((src_port = _get_dyn_port(sock)) == GNRC_SOCK_DYN_PORTRANGE_ERR) {
return -EINVAL;
}
/* cppcheck-suppress nullPointer
* (reason: sock *can* be NULL at this place, cppcheck is weird here as
* well, see above) */
if (sock != NULL) {
/* bind sock object implicitly */
sock->local.port = src_port;
Expand Down Expand Up @@ -277,7 +282,8 @@ ssize_t sock_udp_send(sock_udp_t *sock, const void *data, size_t len,
dst_port = sock->remote.port;
}
else {
rem = (sock_ip_ep_t *)remote;
rem = (sock_ip_ep_t *)&remote_cpy;
gnrc_ep_set(rem, (sock_ip_ep_t *)remote, sizeof(sock_udp_ep_t));
dst_port = remote->port;
}
/* check for matching address families in local and remote */
Expand Down