d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netlink: add rtsock-compatible header to use with netlink snl(3).

Browse Source 
Some routing socket defines (`RTM_` and `RTA_` ones) clash with the ones
 used by the the Netlink.
As some rtsock definitions like interface flags or route flags are used in
 both netlink and rtsock, provide a convenient way to include those without
 running into the define collision.

Differential Revision: https://reviews.freebsd.org/D38982
MFC after:	2 weeks
This commit is contained in:
Alexander V. Chernikov 2023-03-09 14:36:52 +00:00
parent 76f6d39150
commit 90d6251228
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/net/route.h
View File

@ -265,6 +265,7 @@ struct rt_msghdr {
#define RTM_VERSION 5 /* Up the ante and ignore older versions */
#ifndef NETLINK_COMPAT
/*
* Message types.
*
@ -297,6 +298,8 @@ struct rt_msghdr {
#define RTM_IFANNOUNCE 0x11 /* (5) iface arrival/departure */
#define RTM_IEEE80211 0x12 /* (5) IEEE80211 wireless event */
#endif /* NETLINK_COMPAT*/
/*
* Bitmask values for rtm_inits and rmx_locks.
*/
@ -310,6 +313,8 @@ struct rt_msghdr {
#define RTV_RTTVAR 0x80 /* init or lock _rttvar */
#define RTV_WEIGHT 0x100 /* init or lock _weight */
#ifndef NETLINK_COMPAT
/*
* Bitmask values for rtm_addrs.
*/
@ -322,6 +327,8 @@ struct rt_msghdr {
#define RTA_AUTHOR 0x40 /* sockaddr for author of redirect */
#define RTA_BRD 0x80 /* for NEWADDR, broadcast or p-p dest addr */
#endif /* NETLINK_COMPAT*/
/*
* Index offsets for sockaddr array for alternate internal encoding.
*/

50
sys/netlink/netlink_snl_route_compat.h Normal file
View File

@ -0,0 +1,50 @@
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2023 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _NETLINK_NETLINK_SNL_ROUTE_COMPAT_H_
#define _NETLINK_NETLINK_SNL_ROUTE_COMPAT_H_
/*
* This file contains netlink-compatible definitions from the
* net/route.h header.
*/
#define NETLINK_COMPAT
#include <net/route.h>
#define RTSOCK_RTM_ADD 0x1
#define RTSOCK_RTM_DELETE 0x2
#define RTSOCK_RTM_CHANGE 0x3
#define RTSOCK_RTM_GET 0x4
#define RTSOCK_RTM_NEWADDR 0xc
#define RTSOCK_RTM_DELADDR 0xd
#define RTSOCK_RTM_IFINFO 0xe
#define RTSOCK_RTM_NEWMADDR 0xf
#define RTSOCK_RTM_DELMADDR 0x10
#define RTSOCK_RTM_IFANNOUNCE 0x11
#define RTSOCK_RTM_IEEE80211 0x12
#endif