*/
enum kernel_address_type_t {
/** normal addresses (on regular, up, non-ignored) interfaces */
- ADDR_TYPE_REGULAR = 0,
+ ADDR_TYPE_REGULAR = (1 << 0),
/** addresses on down interfaces */
- ADDR_TYPE_DOWN = (1 << 0),
+ ADDR_TYPE_DOWN = (1 << 1),
/** addresses on ignored interfaces */
- ADDR_TYPE_IGNORED = (1 << 1),
+ ADDR_TYPE_IGNORED = (1 << 2),
/** addresses on loopback interfaces */
- ADDR_TYPE_LOOPBACK = (1 << 2),
+ ADDR_TYPE_LOOPBACK = (1 << 3),
/** virtual IP addresses */
- ADDR_TYPE_VIRTUAL = (1 << 3),
+ ADDR_TYPE_VIRTUAL = (1 << 4),
/** to enumerate all available addresses */
- ADDR_TYPE_ALL = (1 << 4) - 1,
+ ADDR_TYPE_ALL = (1 << 5) - 1,
};
/**
{ /* skip virtual interfaces added by us */
return FALSE;
}
+ if (!(data->which & ADDR_TYPE_REGULAR) && !(*in)->refcount)
+ { /* address is regular, but not requested */
+ return FALSE;
+ }
if ((*in)->scope >= RT_SCOPE_LINK)
{ /* skip addresses with a unusable scope */
return FALSE;
METHOD(kernel_net_t, create_address_enumerator, enumerator_t*,
private_kernel_netlink_net_t *this, kernel_address_type_t which)
{
- address_enumerator_t *data = malloc_thing(address_enumerator_t);
- data->this = this;
- data->which = which;
+ address_enumerator_t *data;
+
+ INIT(data,
+ .this = this,
+ .which = which,
+ );
this->lock->read_lock(this->lock);
return enumerator_create_nested(
{ /* skip virtual interfaces added by us */
return FALSE;
}
+ if (!(data->which & ADDR_TYPE_REGULAR) && !(*in)->virtual)
+ { /* address is regular, but not requested */
+ return FALSE;
+ }
ip = (*in)->ip;
if (ip->get_family(ip) == AF_INET6)
{