RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #4385 from OlegHahm/socket_src_addr_selection

Browse Source 
POSIX socket: source addr selection
This commit is contained in:
Cenk Gündoğan 2015-12-02 23:07:04 +01:00
commit 5febed40bf
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/include/net/conn.h
View File

@ -31,6 +31,7 @@
* @brief Application connection API definitions
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
* @author Oliver Hahm <oliver.hahm@inria.fr>
*/
#ifndef NET_CONN_H_
#define NET_CONN_H_
@ -38,11 +39,24 @@
#include "net/conn/ip.h"
#include "net/conn/tcp.h"
#include "net/conn/udp.h"
#include "net/ipv6/addr.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief Find the best matching source address for a given prefix
*
* @param[in] dst Pointer to the IPv6 address to find a match for
* Must not be NULL
*
* @return NULL if no matching address on any interface could be found
* @return pointer to an IPv6 address configured on an interface with the best
* match to @p dst
*/
ipv6_addr_t *conn_find_best_source(const ipv6_addr_t *dst);
#ifdef __cplusplus
}
#endif

3
sys/include/net/gnrc/ipv6/netif.h
View File

@ -479,6 +479,9 @@ ipv6_addr_t *gnrc_ipv6_netif_find_addr(kernel_pid_t pid, const ipv6_addr_t *addr
* interfaces.
*
* @param[out] out The reference to the found address on the interface.
* Must be a pointer to NULL on calling and may stay
* unchanged if no match can be found.
*
* @param[in] prefix The prefix you want to search for.
*
* @return The PID to the interface the address is registered to.

8
sys/net/gnrc/conn/gnrc_conn.c
View File

@ -11,6 +11,7 @@
*
* @file
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
* @author Oliver Hahm <oliver.hahm@inria.fr>
*/
#include "net/conn.h"
@ -85,6 +86,13 @@ bool gnrc_conn6_set_local_addr(uint8_t *conn_addr, const ipv6_addr_t *addr)
}
return true;
}
ipv6_addr_t *conn_find_best_source(const ipv6_addr_t *dst)
{
ipv6_addr_t *local = NULL;
gnrc_ipv6_netif_find_by_prefix(&local, dst);
return local;
}
#endif
/** @} */

14
sys/posix/sockets/posix_sockets.c
View File

@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Freie Universität Berlin
* Copyright (C) 2015 INRIA
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
@ -11,6 +12,7 @@
* @file
* @brief Providing implementation for POSIX socket wrapper.
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
* @author Oliver Hahm <oliver.hahm@inria.fr>
* @todo
*/
@ -862,11 +864,15 @@ ssize_t sendto(int socket, const void *buffer, size_t length, int flags,
sport, byteorder_ntohs(port));
}
else if (address != NULL) {
ipv6_addr_t local;
ipv6_addr_t unspec;
ipv6_addr_t *best_match;
s->src_port = (uint16_t)genrand_uint32_range(1LU << 10U, 1LU << 16U);
/* implicitly bind the socket here */
ipv6_addr_set_unspecified(&local);
if ((res = conn_udp_create(&s->conn.udp, &local, sizeof(local),
/* find the best matching source address */
if ((best_match = conn_find_best_source(addr)) == NULL) {
ipv6_addr_set_unspecified(&unspec);
best_match = &unspec;
}
if ((res = conn_udp_create(&s->conn.udp, best_match, sizeof(unspec),
s->domain, s->src_port)) < 0) {
errno = -res;
return -1;