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

Misc net updates #87453

Merged
merged 3 commits into from
Mar 25, 2025
Merged

Misc net updates #87453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8181c0a
net: virtual: Add capability flag for VPN type interface
jukkar Jul 25, 2024
f0f6fe1
net: Add helper to get sockaddr from sockaddr_storage struct
jukkar Feb 19, 2025
7d357d7
net: ipv4: Add DiffServ DSCP code point definitions
jukkar Feb 28, 2025
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
13 changes: 13 additions & 0 deletions include/zephyr/net/net_ip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,6 +1550,19 @@ static inline bool net_ipv6_addr_based_on_ll(const struct in6_addr *addr,
return false;
}

/**
* @brief Get sockaddr from sockaddr_storage. This is a helper so that
* the code calling this function can be made shorter.
*
* @param addr Socket storage address
*
* @return Pointer to socket address (struct sockaddr)
*/
static inline struct sockaddr *net_sad(const struct sockaddr_storage *addr)
{
return (struct sockaddr *)addr;
}

/**
* @brief Get sockaddr_in6 from sockaddr. This is a helper so that
* the code calling this function can be made shorter.
Expand Down
3 changes: 3 additions & 0 deletions include/zephyr/net/virtual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ enum virtual_interface_caps {
/** Virtual Ethernet bridge interface. */
VIRTUAL_INTERFACE_BRIDGE = BIT(3),

/** VPN interface */
VIRTUAL_INTERFACE_VPN = BIT(4),

/** @cond INTERNAL_HIDDEN */
/* Marker for capabilities - must be at the end of the enum.
* It is here because the capability list cannot be empty.
Expand Down
20 changes: 20 additions & 0 deletions subsys/net/ip/ipv4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,26 @@
#define NET_IPV4_DSCP_OFFSET 2
#define NET_IPV4_ECN_MASK 0x03

/* IPv4 DiffServ code points (DSCP) for Assured Forwarding (AF) group.
* See https://tools.ietf.org/html/rfc2597
* https://en.wikipedia.org/wiki/Differentiated_services
*/
/* Drop probability low */
#define NET_IPV4_DSCP_AF11 10 /* 001010 */ /* Class 1 */
#define NET_IPV4_DSCP_AF21 18 /* 010010 */ /* Class 2 */
#define NET_IPV4_DSCP_AF31 26 /* 011010 */ /* Class 3 */
#define NET_IPV4_DSCP_AF41 34 /* 100010 */ /* Class 4 */
/* Drop probability medium */
#define NET_IPV4_DSCP_AF12 12 /* 001100 */ /* Class 1 */
#define NET_IPV4_DSCP_AF22 20 /* 010100 */ /* Class 2 */
#define NET_IPV4_DSCP_AF32 28 /* 011100 */ /* Class 3 */
#define NET_IPV4_DSCP_AF42 36 /* 100100 */ /* Class 4 */
/* Drop probability high */
#define NET_IPV4_DSCP_AF13 14 /* 001110 */ /* Class 1 */
#define NET_IPV4_DSCP_AF23 22 /* 010110 */ /* Class 2 */
#define NET_IPV4_DSCP_AF33 30 /* 011110 */ /* Class 3 */
#define NET_IPV4_DSCP_AF43 38 /* 100110 */ /* Class 4 */

/* IPv4 Options */
#define NET_IPV4_OPTS_EO 0 /* End of Options */
#define NET_IPV4_OPTS_NOP 1 /* No operation */
Expand Down
Loading