stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace RTNL_LINK_NOT_FOUND with just 0

Browse source 
The interface index 0 is reserved and can be safely used to
signal that the device does not exist.
This commit is contained in:
Thomas Graf 2008-05-14 18:34:39 +02:00
parent eed2afaab7
commit b4fbe1d34d
5 changed files with 9 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/netlink/route/link.h
View file

@ -51,12 +51,6 @@ enum rtnl_link_st {
#define RTNL_LINK_STATS_MAX (__RTNL_LINK_STATS_MAX - 1)
/**
* Special interface index stating the link was not found.
* @ingroup link
*/
#define RTNL_LINK_NOT_FOUND -1
/* link object allocation/freeage */
extern struct rtnl_link *rtnl_link_alloc(void);
extern void rtnl_link_put(struct rtnl_link *);

10
lib/route/addr.c
View file

@ -872,10 +872,7 @@ void rtnl_addr_set_ifindex(struct rtnl_addr *addr, int ifindex)
int rtnl_addr_get_ifindex(struct rtnl_addr *addr)
{
if (addr->ce_mask & ADDR_ATTR_IFINDEX)
return addr->a_ifindex;
else
return RTNL_LINK_NOT_FOUND;
return addr->a_ifindex;
}
void rtnl_addr_set_family(struct rtnl_addr *addr, int family)
@ -886,10 +883,7 @@ void rtnl_addr_set_family(struct rtnl_addr *addr, int family)
int rtnl_addr_get_family(struct rtnl_addr *addr)
{
if (addr->ce_mask & ADDR_ATTR_FAMILY)
return addr->a_family;
else
return AF_UNSPEC;
return addr->a_family;
}
void rtnl_addr_set_prefixlen(struct rtnl_addr *addr, int prefix)

19
lib/route/link.c
View file

@ -1092,11 +1092,11 @@ char * rtnl_link_i2name(struct nl_cache *cache, int ifindex, char *dst,
* @arg cache link cache
* @arg name link name
*
* @return interface index or RTNL_LINK_NOT_FOUND if no match was found.
* @return interface index or 0 if no match was found.
*/
int rtnl_link_name2i(struct nl_cache *cache, const char *name)
{
int ifindex = RTNL_LINK_NOT_FOUND;
int ifindex = 0;
struct rtnl_link *link;
link = rtnl_link_get_by_name(cache, name);
@ -1366,10 +1366,7 @@ void rtnl_link_set_ifindex(struct rtnl_link *link, int ifindex)
int rtnl_link_get_ifindex(struct rtnl_link *link)
{
if (link->ce_mask & LINK_ATTR_IFINDEX)
return link->l_index;
else
return RTNL_LINK_NOT_FOUND;
return link->l_index;
}
void rtnl_link_set_mtu(struct rtnl_link *link, unsigned int mtu)
@ -1422,10 +1419,7 @@ void rtnl_link_set_link(struct rtnl_link *link, int ifindex)
int rtnl_link_get_link(struct rtnl_link *link)
{
if (link->ce_mask & LINK_ATTR_LINK)
return link->l_link;
else
return RTNL_LINK_NOT_FOUND;
return link->l_link;
}
void rtnl_link_set_master(struct rtnl_link *link, int ifindex)
@ -1436,10 +1430,7 @@ void rtnl_link_set_master(struct rtnl_link *link, int ifindex)
int rtnl_link_get_master(struct rtnl_link *link)
{
if (link->ce_mask & LINK_ATTR_MASTER)
return link->l_master;
else
return RTNL_LINK_NOT_FOUND;
return link->l_master;
}
void rtnl_link_set_operstate(struct rtnl_link *link, uint8_t operstate)

5
lib/route/neigh.c
View file

@ -883,10 +883,7 @@ void rtnl_neigh_set_ifindex(struct rtnl_neigh *neigh, int ifindex)
int rtnl_neigh_get_ifindex(struct rtnl_neigh *neigh)
{
if (neigh->ce_mask & NEIGH_ATTR_IFINDEX)
return neigh->n_ifindex;
else
return RTNL_LINK_NOT_FOUND;
return neigh->n_ifindex;
}
static inline int __assign_addr(struct rtnl_neigh *neigh, struct nl_addr **pos,

5
lib/route/tc.c
View file

@ -274,10 +274,7 @@ void tca_set_ifindex(struct rtnl_tca *t, int ifindex)
int tca_get_ifindex(struct rtnl_tca *t)
{
if (t->ce_mask & TCA_ATTR_IFINDEX)
return t->tc_ifindex;
else
return RTNL_LINK_NOT_FOUND;
return t->tc_ifindex;
}
void tca_set_handle(struct rtnl_tca *t, uint32_t handle)