colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/netlink: add const modifier to netlink header pointers

Browse Source 
They are not supposed to be modified.
This commit is contained in:
Thomas Haller
2022-06-21 22:01:24 +02:00
parent 80afc691d5
commit 59f577df56
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libnm-platform/nm-linux-platform.c
View File

@@ -2924,10 +2924,10 @@ _nmp_link_address_set(NMPLinkAddress *dst, const struct nlattr *nla)
/* Copied and heavily modified from libnl3's link_msg_parser(). */ /* Copied and heavily modified from libnl3's link_msg_parser(). */
static NMPObject * static NMPObject *
_new_from_nl_link(NMPlatform *platform, _new_from_nl_link(NMPlatform *platform,
const NMPCache *cache, const NMPCache *cache,
struct nlmsghdr *nlh, const struct nlmsghdr *nlh,
gboolean id_only) gboolean id_only)
{ {
static const struct nla_policy policy[] = { static const struct nla_policy policy[] = {
[IFLA_IFNAME] = {.type = NLA_STRING, .maxlen = IFNAMSIZ}, [IFLA_IFNAME] = {.type = NLA_STRING, .maxlen = IFNAMSIZ},
@@ -3275,7 +3275,7 @@ _new_from_nl_link(NMPlatform *platform,
/* Copied and heavily modified from libnl3's addr_msg_parser(). */ /* Copied and heavily modified from libnl3's addr_msg_parser(). */
static NMPObject * static NMPObject *
_new_from_nl_addr(struct nlmsghdr *nlh, gboolean id_only) _new_from_nl_addr(const struct nlmsghdr *nlh, gboolean id_only)
{ {
static const struct nla_policy policy[] = { static const struct nla_policy policy[] = {
[IFA_LABEL] = {.type = NLA_STRING, .maxlen = IFNAMSIZ}, [IFA_LABEL] = {.type = NLA_STRING, .maxlen = IFNAMSIZ},
@@ -3390,7 +3390,7 @@ _new_from_nl_addr(struct nlmsghdr *nlh, gboolean id_only)
/* Copied and heavily modified from libnl3's rtnl_route_parse() and parse_multipath(). */ /* Copied and heavily modified from libnl3's rtnl_route_parse() and parse_multipath(). */
static NMPObject * static NMPObject *
_new_from_nl_route(struct nlmsghdr *nlh, gboolean id_only, ParseNlmsgIter *parse_nlmsg_iter) _new_from_nl_route(const struct nlmsghdr *nlh, gboolean id_only, ParseNlmsgIter *parse_nlmsg_iter)
{ {
static const struct nla_policy policy[] = { static const struct nla_policy policy[] = {
[RTA_TABLE] = {.type = NLA_U32}, [RTA_TABLE] = {.type = NLA_U32},
@@ -3698,7 +3698,7 @@ rta_multipath_done:
} }
static NMPObject * static NMPObject *
_new_from_nl_routing_rule(struct nlmsghdr *nlh, gboolean id_only) _new_from_nl_routing_rule(const struct nlmsghdr *nlh, gboolean id_only)
{ {
static const struct nla_policy policy[] = { static const struct nla_policy policy[] = {
[FRA_UNSPEC] = {}, [FRA_UNSPEC] = {},
@@ -3974,7 +3974,7 @@ psched_tick_to_time(NMPlatform *platform, guint32 tick)
} }
static NMPObject * static NMPObject *
_new_from_nl_qdisc(NMPlatform *platform, struct nlmsghdr *nlh, gboolean id_only) _new_from_nl_qdisc(NMPlatform *platform, const struct nlmsghdr *nlh, gboolean id_only)
{ {
static const struct nla_policy policy[] = { static const struct nla_policy policy[] = {
[TCA_KIND] = {.type = NLA_STRING}, [TCA_KIND] = {.type = NLA_STRING},
@@ -4087,7 +4087,7 @@ _new_from_nl_qdisc(NMPlatform *platform, struct nlmsghdr *nlh, gboolean id_only)
} }
static NMPObject * static NMPObject *
_new_from_nl_tfilter(NMPlatform *platform, struct nlmsghdr *nlh, gboolean id_only) _new_from_nl_tfilter(NMPlatform *platform, const struct nlmsghdr *nlh, gboolean id_only)
{ {
static const struct nla_policy policy[] = { static const struct nla_policy policy[] = {
[TCA_KIND] = {.type = NLA_STRING}, [TCA_KIND] = {.type = NLA_STRING},
@@ -4138,7 +4138,7 @@ nmp_object_new_from_nl(NMPlatform *platform,
gboolean id_only, gboolean id_only,
ParseNlmsgIter *parse_nlmsg_iter) ParseNlmsgIter *parse_nlmsg_iter)
{ {
struct nlmsghdr *msghdr; const struct nlmsghdr *msghdr;
if (nlmsg_get_proto(msg) != NETLINK_ROUTE) if (nlmsg_get_proto(msg) != NETLINK_ROUTE)
return NULL; return NULL;

2
src/libnm-platform/nm-netlink.c
View File

@@ -402,7 +402,7 @@ nlmsg_append(struct nl_msg *n, const void *data, size_t len, int pad)
/*****************************************************************************/ /*****************************************************************************/
int int
nlmsg_parse(struct nlmsghdr *nlh, nlmsg_parse(const struct nlmsghdr *nlh,
int hdrlen, int hdrlen,
struct nlattr *tb[], struct nlattr *tb[],
int maxtype, int maxtype,

2
src/libnm-platform/nm-netlink.h
View File

@@ -465,7 +465,7 @@ nlmsg_find_attr(struct nlmsghdr *nlh, int hdrlen, int attrtype)
return nla_find(nlmsg_attrdata(nlh, hdrlen), nlmsg_attrlen(nlh, hdrlen), attrtype); return nla_find(nlmsg_attrdata(nlh, hdrlen), nlmsg_attrlen(nlh, hdrlen), attrtype);
} }
int nlmsg_parse(struct nlmsghdr *nlh, int nlmsg_parse(const struct nlmsghdr *nlh,
int hdrlen, int hdrlen,
struct nlattr *tb[], struct nlattr *tb[],
int maxtype, int maxtype,