pool_free (config->groups);
hash_free (config->igmp_group_by_key);
- hash_unset_mem (im->igmp_config_by_sw_if_index, &config->sw_if_index);
+ hash_unset (im->igmp_config_by_sw_if_index, config->sw_if_index);
pool_put (im->configs, config);
}
igmp_clear_group (config, group);
if (pool_elts (config->groups) == 0)
{
- hash_unset_mem (im->igmp_config_by_sw_if_index, &config->sw_if_index);
+ hash_unset (im->igmp_config_by_sw_if_index, config->sw_if_index);
pool_put (im->configs, config);
}
}
config->adj_index =
adj_mcast_add_or_lock (FIB_PROTOCOL_IP4, VNET_LINK_IP4,
config->sw_if_index);
- hash_set_mem (im->igmp_config_by_sw_if_index,
- &config->sw_if_index, config - im->configs);
+ hash_set (im->igmp_config_by_sw_if_index,
+ config->sw_if_index, config - im->configs);
}
else if (config->cli_api_configured != cli_api_configured)
{
int i;
if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
return error;
- im->igmp_config_by_sw_if_index =
- hash_create_mem (0, sizeof (u32), sizeof (uword));
- im->igmp_api_client_by_client_index =
- hash_create_mem (0, sizeof (u32), sizeof (uword));
+ im->igmp_config_by_sw_if_index = hash_create (0, sizeof (u32));
+ im->igmp_api_client_by_client_index = hash_create (0, sizeof (u32));
vec_validate_aligned (im->buffers, tm->n_vlib_mains - 1,
CLIB_CACHE_LINE_BYTES);
ip4_register_protocol (IP_PROTOCOL_IGMP, igmp_input_node.index);
uword *p;
vpe_client_registration_t *api_client = NULL;
- p = hash_get_mem (im->igmp_api_client_by_client_index, &client_index);
+ p = hash_get (im->igmp_api_client_by_client_index, client_index);
if (p)
api_client = vec_elt_at_index (im->api_clients, p[0]);
rv = VNET_API_ERROR_INVALID_REGISTRATION;
goto done;
}
- hash_unset_mem (im->igmp_api_client_by_client_index,
- &api_client->client_index);
+ hash_unset (im->igmp_api_client_by_client_index,
+ api_client->client_index);
pool_put (im->api_clients, api_client);
goto done;
}
memset (api_client, 0, sizeof (vpe_client_registration_t));
api_client->client_index = mp->client_index;
api_client->client_pid = mp->pid;
- hash_set_mem (im->igmp_api_client_by_client_index,
- &mp->client_index, api_client - im->api_clients);
+ hash_set (im->igmp_api_client_by_client_index,
+ mp->client_index, api_client - im->api_clients);
goto done;
}
rv = VNET_API_ERROR_INVALID_REGISTRATION;
vpe_client_registration_t *api_client;
uword *p;
- p = hash_get_mem (im->igmp_api_client_by_client_index, &client_index);
+ p = hash_get (im->igmp_api_client_by_client_index, client_index);
if (p)
{
api_client = pool_elt_at_index (im->api_clients, p[0]);
pool_put (im->api_clients, api_client);
- hash_unset_mem (im->igmp_api_client_by_client_index, &client_index);
+ hash_unset (im->igmp_api_client_by_client_index, client_index);
}
return (NULL);
}
igmp_clear_group (config, group);
if (pool_elts (config->groups) == 0)
{
- hash_unset_mem (im->igmp_config_by_sw_if_index,
- &config->sw_if_index);
+ hash_unset (im->igmp_config_by_sw_if_index, config->sw_if_index);
pool_put (im->configs, config);
}
}