proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: constify a few parameters of helper functions

Browse Source 
Parameters should be const whenever possible to improve code
readability and remove the need to cast away the constness of
const arguments.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2019-08-07 20:00:58 -03:00 committed by Olivier Dugeon
parent 31b5355d6f
commit 0b7005375f
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/if.c
View File

@ -410,7 +410,7 @@ struct interface *if_lookup_by_index_all_vrf(ifindex_t ifindex)
} }
/* Lookup interface by IP address. */ /* Lookup interface by IP address. */
struct interface *if_lookup_exact_address(void *src, int family, struct interface *if_lookup_exact_address(const void *src, int family,
vrf_id_t vrf_id) vrf_id_t vrf_id)
{ {
struct vrf *vrf = vrf_lookup_by_id(vrf_id); struct vrf *vrf = vrf_lookup_by_id(vrf_id);
@ -442,7 +442,7 @@ struct interface *if_lookup_exact_address(void *src, int family,
} }
/* Lookup interface by IP address. */ /* Lookup interface by IP address. */
struct connected *if_lookup_address(void *matchaddr, int family, struct connected *if_lookup_address(const void *matchaddr, int family,
vrf_id_t vrf_id) vrf_id_t vrf_id)
{ {
struct vrf *vrf = vrf_lookup_by_id(vrf_id); struct vrf *vrf = vrf_lookup_by_id(vrf_id);
@ -479,7 +479,7 @@ struct connected *if_lookup_address(void *matchaddr, int family,
} }
/* Lookup interface by prefix */ /* Lookup interface by prefix */
struct interface *if_lookup_prefix(struct prefix *prefix, vrf_id_t vrf_id) struct interface *if_lookup_prefix(const struct prefix *prefix, vrf_id_t vrf_id)
{ {
struct vrf *vrf = vrf_lookup_by_id(vrf_id); struct vrf *vrf = vrf_lookup_by_id(vrf_id);
struct listnode *cnode; struct listnode *cnode;
@ -982,7 +982,8 @@ nbr_connected_log(struct nbr_connected *connected, char *str)
} }
/* If two connected address has same prefix return 1. */ /* If two connected address has same prefix return 1. */
static int connected_same_prefix(struct prefix *p1, struct prefix *p2) static int connected_same_prefix(const struct prefix *p1,
const struct prefix *p2)
{ {
if (p1->family == p2->family) { if (p1->family == p2->family) {
if (p1->family == AF_INET if (p1->family == AF_INET
@ -1010,7 +1011,7 @@ unsigned int connected_count_by_family(struct interface *ifp, int family)
} }
struct connected *connected_lookup_prefix_exact(struct interface *ifp, struct connected *connected_lookup_prefix_exact(struct interface *ifp,
struct prefix *p) const struct prefix *p)
{ {
struct listnode *node; struct listnode *node;
struct listnode *next; struct listnode *next;
@ -1049,7 +1050,7 @@ struct connected *connected_delete_by_prefix(struct interface *ifp,
/* Find the address on our side that will be used when packets /* Find the address on our side that will be used when packets
are sent to dst. */ are sent to dst. */
struct connected *connected_lookup_prefix(struct interface *ifp, struct connected *connected_lookup_prefix(struct interface *ifp,
struct prefix *addr) const struct prefix *addr)
{ {
struct listnode *cnode; struct listnode *cnode;
struct connected *c; struct connected *c;

12
lib/if.h
View File

@ -512,11 +512,11 @@ extern struct interface *if_create_name(const char *name, vrf_id_t vrf_id);
extern struct interface *if_create_ifindex(ifindex_t ifindex, vrf_id_t vrf_id); extern struct interface *if_create_ifindex(ifindex_t ifindex, vrf_id_t vrf_id);
extern struct interface *if_lookup_by_index(ifindex_t, vrf_id_t vrf_id); extern struct interface *if_lookup_by_index(ifindex_t, vrf_id_t vrf_id);
extern struct interface *if_lookup_by_index_all_vrf(ifindex_t); extern struct interface *if_lookup_by_index_all_vrf(ifindex_t);
extern struct interface *if_lookup_exact_address(void *matchaddr, int family, extern struct interface *if_lookup_exact_address(const void *matchaddr,
vrf_id_t vrf_id); int family, vrf_id_t vrf_id);
extern struct connected *if_lookup_address(void *matchaddr, int family, extern struct connected *if_lookup_address(const void *matchaddr, int family,
vrf_id_t vrf_id); vrf_id_t vrf_id);
extern struct interface *if_lookup_prefix(struct prefix *prefix, extern struct interface *if_lookup_prefix(const struct prefix *prefix,
vrf_id_t vrf_id); vrf_id_t vrf_id);
size_t if_lookup_by_hwaddr(const uint8_t *hw_addr, size_t addrsz, size_t if_lookup_by_hwaddr(const uint8_t *hw_addr, size_t addrsz,
struct interface ***result, vrf_id_t vrf_id); struct interface ***result, vrf_id_t vrf_id);
@ -575,9 +575,9 @@ connected_add_by_prefix(struct interface *, struct prefix *, struct prefix *);
extern struct connected *connected_delete_by_prefix(struct interface *, extern struct connected *connected_delete_by_prefix(struct interface *,
struct prefix *); struct prefix *);
extern struct connected *connected_lookup_prefix(struct interface *, extern struct connected *connected_lookup_prefix(struct interface *,
struct prefix *); const struct prefix *);
extern struct connected *connected_lookup_prefix_exact(struct interface *, extern struct connected *connected_lookup_prefix_exact(struct interface *,
struct prefix *); const struct prefix *);
extern unsigned int connected_count_by_family(struct interface *, int family); extern unsigned int connected_count_by_family(struct interface *, int family);
extern struct nbr_connected *nbr_connected_new(void); extern struct nbr_connected *nbr_connected_new(void);
extern void nbr_connected_free(struct nbr_connected *); extern void nbr_connected_free(struct nbr_connected *);

2
lib/prefix.h
View File

@ -522,7 +522,7 @@ static inline int is_default_prefix(const struct prefix *p)
return 0; return 0;
} }
static inline int is_host_route(struct prefix *p) static inline int is_host_route(const struct prefix *p)
{ {
if (p->family == AF_INET) if (p->family == AF_INET)
return (p->prefixlen == IPV4_MAX_BITLEN); return (p->prefixlen == IPV4_MAX_BITLEN);