mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-05-04 13:49:17 +00:00
zebra: Remove unused functionality
The nl_rta_putXXX functions are never used. Let's just remove them. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
parent
cc66dff0a3
commit
ada7353089
@ -741,58 +741,6 @@ void nl_attr_rtnh_end(struct nlmsghdr *n, struct rtnexthop *rtnh)
|
|||||||
rtnh->rtnh_len = (uint8_t *)NLMSG_TAIL(n) - (uint8_t *)rtnh;
|
rtnh->rtnh_len = (uint8_t *)NLMSG_TAIL(n) - (uint8_t *)rtnh;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool nl_rta_put(struct rtattr *rta, unsigned int maxlen, int type,
|
|
||||||
const void *data, int alen)
|
|
||||||
{
|
|
||||||
struct rtattr *subrta;
|
|
||||||
int len = RTA_LENGTH(alen);
|
|
||||||
|
|
||||||
if (RTA_ALIGN(rta->rta_len) + RTA_ALIGN(len) > maxlen) {
|
|
||||||
zlog_err("ERROR max allowed bound %d exceeded for rtattr",
|
|
||||||
maxlen);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
subrta = (struct rtattr *)(((char *)rta) + RTA_ALIGN(rta->rta_len));
|
|
||||||
subrta->rta_type = type;
|
|
||||||
subrta->rta_len = len;
|
|
||||||
if (alen)
|
|
||||||
memcpy(RTA_DATA(subrta), data, alen);
|
|
||||||
rta->rta_len = NLMSG_ALIGN(rta->rta_len) + RTA_ALIGN(len);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool nl_rta_put16(struct rtattr *rta, unsigned int maxlen, int type,
|
|
||||||
uint16_t data)
|
|
||||||
{
|
|
||||||
return nl_rta_put(rta, maxlen, type, &data, sizeof(uint16_t));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool nl_rta_put64(struct rtattr *rta, unsigned int maxlen, int type,
|
|
||||||
uint64_t data)
|
|
||||||
{
|
|
||||||
return nl_rta_put(rta, maxlen, type, &data, sizeof(uint64_t));
|
|
||||||
}
|
|
||||||
|
|
||||||
struct rtattr *nl_rta_nest(struct rtattr *rta, unsigned int maxlen, int type)
|
|
||||||
{
|
|
||||||
struct rtattr *nest = RTA_TAIL(rta);
|
|
||||||
|
|
||||||
if (nl_rta_put(rta, maxlen, type, NULL, 0))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
nest->rta_type |= NLA_F_NESTED;
|
|
||||||
|
|
||||||
return nest;
|
|
||||||
}
|
|
||||||
|
|
||||||
int nl_rta_nest_end(struct rtattr *rta, struct rtattr *nest)
|
|
||||||
{
|
|
||||||
nest->rta_len = (uint8_t *)RTA_TAIL(rta) - (uint8_t *)nest;
|
|
||||||
|
|
||||||
return rta->rta_len;
|
|
||||||
}
|
|
||||||
|
|
||||||
const char *nl_msg_type_to_str(uint16_t msg_type)
|
const char *nl_msg_type_to_str(uint16_t msg_type)
|
||||||
{
|
{
|
||||||
return lookup_msg(nlmsg_str, msg_type, "");
|
return lookup_msg(nlmsg_str, msg_type, "");
|
||||||
|
@ -85,35 +85,6 @@ extern void netlink_parse_rtattr_nested(struct rtattr **tb, int max,
|
|||||||
*/
|
*/
|
||||||
extern bool nl_addraw_l(struct nlmsghdr *n, unsigned int maxlen,
|
extern bool nl_addraw_l(struct nlmsghdr *n, unsigned int maxlen,
|
||||||
const void *data, unsigned int len);
|
const void *data, unsigned int len);
|
||||||
/*
|
|
||||||
* nl_rta_put - add an additional optional attribute(rtattr) to the
|
|
||||||
* Netlink message buffer.
|
|
||||||
*
|
|
||||||
* Returns true if the attribute could be added to the message (fits into the
|
|
||||||
* buffer), otherwise false is returned.
|
|
||||||
*/
|
|
||||||
extern bool nl_rta_put(struct rtattr *rta, unsigned int maxlen, int type,
|
|
||||||
const void *data, int alen);
|
|
||||||
extern bool nl_rta_put16(struct rtattr *rta, unsigned int maxlen, int type,
|
|
||||||
uint16_t data);
|
|
||||||
extern bool nl_rta_put64(struct rtattr *rta, unsigned int maxlen, int type,
|
|
||||||
uint64_t data);
|
|
||||||
/*
|
|
||||||
* nl_rta_nest - start an additional optional attribute (rtattr) nest.
|
|
||||||
*
|
|
||||||
* Returns a valid pointer to the beginning of the nest if the attribute
|
|
||||||
* describing the nest could be added to the message (fits into the buffer),
|
|
||||||
* otherwise NULL is returned.
|
|
||||||
*/
|
|
||||||
extern struct rtattr *nl_rta_nest(struct rtattr *rta, unsigned int maxlen,
|
|
||||||
int type);
|
|
||||||
/*
|
|
||||||
* nl_rta_nest_end - finalize nesting of an aditionl optionl attributes.
|
|
||||||
*
|
|
||||||
* Updates the length field of the attribute header to include the appeneded
|
|
||||||
* attributes. Returns a total length of the Netlink message.
|
|
||||||
*/
|
|
||||||
extern int nl_rta_nest_end(struct rtattr *rta, struct rtattr *nest);
|
|
||||||
extern const char *nl_msg_type_to_str(uint16_t msg_type);
|
extern const char *nl_msg_type_to_str(uint16_t msg_type);
|
||||||
extern const char *nl_rtproto_to_str(uint8_t rtproto);
|
extern const char *nl_rtproto_to_str(uint8_t rtproto);
|
||||||
extern const char *nl_family_to_str(uint8_t family);
|
extern const char *nl_family_to_str(uint8_t family);
|
||||||
|
Loading…
Reference in New Issue
Block a user