Commit 7abf0f98 authored by Youness Alaoui's avatar Youness Alaoui
Browse files

Remove interface and socket from CandidateDiscovery as they are not used

parent 5238086a
......@@ -659,10 +659,8 @@ priv_add_new_candidate_discovery_stun (NiceAgent *agent,
if (modified_list) {
cdisco->type = NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE;
cdisco->socket = host_candidate->sockptr->fileno;
cdisco->nicesock = host_candidate->sockptr;
cdisco->server = server;
cdisco->interface = addr;
cdisco->stream = stream;
cdisco->component = stream_find_component_by_id (stream, component_id);
cdisco->agent = agent;
......@@ -695,10 +693,8 @@ priv_add_new_candidate_discovery_turn (NiceAgent *agent,
if (modified_list) {
cdisco->type = NICE_CANDIDATE_TYPE_RELAYED;
cdisco->socket = host_candidate->sockptr->fileno;
cdisco->nicesock = host_candidate->sockptr;
cdisco->server = server;
cdisco->interface = addr;
cdisco->stream = stream;
cdisco->component = stream_find_component_by_id (stream, component_id);
cdisco->agent = agent;
......
......@@ -705,8 +705,8 @@ static gboolean priv_discovery_tick_unlocked (gpointer pointer)
{
gchar tmpbuf[INET6_ADDRSTRLEN];
nice_address_to_string (&cand->server, tmpbuf);
nice_debug ("Agent %p : discovery - scheduling cand type %u addr %s and socket %d.\n", agent,
cand->type, tmpbuf, cand->socket);
nice_debug ("Agent %p : discovery - scheduling cand type %u addr %s.\n",
agent, cand->type, tmpbuf);
}
if (nice_address_is_valid (&cand->server) &&
(cand->type == NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE ||
......
......@@ -47,10 +47,8 @@ struct _CandidateDiscovery
{
NiceAgent *agent; /**< back pointer to owner */
NiceCandidateType type; /**< candidate type STUN or TURN */
guint socket; /**< XXX: should be taken from local cand: existing socket to use */
NiceSocket *nicesock; /**< XXX: should be taken from local cand: existing socket to use */
NiceAddress server; /**< STUN/TURN server address */
NiceAddress *interface; /**< Address of local interface */
GTimeVal next_tick; /**< next tick timestamp */
gboolean pending; /**< is discovery in progress? */
gboolean done; /**< is discovery complete? */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment