Commit c62438bb authored by Youness Alaoui's avatar Youness Alaoui

Removing turn properties from nice agent

parent 36cad3fd
......@@ -73,10 +73,6 @@ struct _NiceAgent
GTimeVal next_check_tv; /**< property: next conncheck timestamp */
gchar *stun_server_ip; /**< property: STUN server IP */
guint stun_server_port; /**< property: STUN server port */
gchar *turn_server_ip; /**< property: TURN server IP */
guint turn_server_port; /**< property: TURN server port */
gchar *turn_username; /**< property: TURN username */
gchar *turn_password; /**< property: TURN password */
gboolean controlling_mode; /**< property: controlling-mode */
guint timer_ta; /**< property: timer Ta */
guint max_conn_checks; /**< property: max connectivity checks */
......
......@@ -83,10 +83,6 @@ enum
PROP_MAIN_CONTEXT,
PROP_STUN_SERVER,
PROP_STUN_SERVER_PORT,
PROP_TURN_SERVER,
PROP_TURN_SERVER_PORT,
PROP_TURN_USERNAME,
PROP_TURN_PASSWORD,
PROP_CONTROLLING_MODE,
PROP_FULL_MODE,
PROP_STUN_PACING_TIMER,
......@@ -222,39 +218,6 @@ nice_agent_class_init (NiceAgentClass *klass)
1, /* not a construct property, ignored */
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_TURN_SERVER,
g_param_spec_string (
"turn-server",
"TURN server",
"The TURN server used to obtain relay candidates",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_TURN_SERVER_PORT,
g_param_spec_uint (
"turn-server-port",
"TURN server port",
"The TURN server used to obtain relay candidates",
1, 65536,
1, /* not a construct property, ignored */
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_TURN_USERNAME,
g_param_spec_string (
"turn-username",
"TURN server",
"The username to authenticate with the TURN relay server",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_TURN_PASSWORD,
g_param_spec_string (
"turn-password",
"TURN server",
"The password to authenticate with the TURN relay server",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_CONTROLLING_MODE,
g_param_spec_boolean (
"controlling-mode",
......@@ -397,7 +360,6 @@ nice_agent_init (NiceAgent *agent)
/* set defaults; not construct params, so set here */
agent->stun_server_port = DEFAULT_STUN_PORT;
agent->turn_server_port = DEFAULT_STUN_PORT;
agent->controlling_mode = TRUE;
agent->max_conn_checks = NICE_AGENT_MAX_CONNECTIVITY_CHECKS_DEFAULT;
......@@ -471,22 +433,6 @@ nice_agent_get_property (
g_value_set_uint (value, agent->stun_server_port);
break;
case PROP_TURN_SERVER:
g_value_set_string (value, agent->turn_server_ip);
break;
case PROP_TURN_SERVER_PORT:
g_value_set_uint (value, agent->turn_server_port);
break;
case PROP_TURN_USERNAME:
g_value_set_string (value, agent->turn_username);
break;
case PROP_TURN_PASSWORD:
g_value_set_string (value, agent->turn_password);
break;
case PROP_CONTROLLING_MODE:
g_value_set_boolean (value, agent->controlling_mode);
break;
......@@ -558,18 +504,6 @@ nice_agent_set_property (
agent->stun_server_port = g_value_get_uint (value);
break;
case PROP_TURN_SERVER:
agent->turn_server_ip = g_value_dup_string (value);
break;
case PROP_TURN_USERNAME:
agent->turn_username = g_value_dup_string (value);
break;
case PROP_TURN_PASSWORD:
agent->turn_password = g_value_dup_string (value);
break;
case PROP_CONTROLLING_MODE:
agent->controlling_mode = g_value_get_boolean (value);
break;
......@@ -1755,12 +1689,6 @@ nice_agent_dispose (GObject *object)
g_free (agent->stun_server_ip);
agent->stun_server_ip = NULL;
g_free (agent->turn_server_ip);
agent->turn_server_ip = NULL;
g_free (agent->turn_username);
agent->turn_username = NULL;
g_free (agent->turn_password);
agent->turn_password = NULL;
nice_rng_free (agent->rng);
agent->rng = NULL;
......
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