Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
ff4ca893
Commit
ff4ca893
authored
Aug 04, 2008
by
Youness Alaoui
Committed by
Youness Alaoui
Aug 04, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MSN username for peer reflexive candidates
parent
7d187257
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
59 additions
and
12 deletions
+59
-12
agent/conncheck.c
agent/conncheck.c
+6
-5
agent/discovery.c
agent/discovery.c
+51
-6
agent/discovery.h
agent/discovery.h
+2
-1
No files found.
agent/conncheck.c
View file @
ff4ca893
...
@@ -1488,7 +1488,7 @@ static void priv_check_for_role_conflict (NiceAgent *agent, gboolean control)
...
@@ -1488,7 +1488,7 @@ static void priv_check_for_role_conflict (NiceAgent *agent, gboolean control)
*
*
* @return pointer to a new pair if one was created, otherwise NULL
* @return pointer to a new pair if one was created, otherwise NULL
*/
*/
static
CandidateCheckPair
*
priv_process_response_check_for_peer_reflexive
(
NiceAgent
*
agent
,
Stream
*
stream
,
Component
*
component
,
CandidateCheckPair
*
p
,
NiceUDPSocket
*
sockptr
,
struct
sockaddr
*
mapped_sockaddr
,
NiceCandidate
*
bas
e_candidate
)
static
CandidateCheckPair
*
priv_process_response_check_for_peer_reflexive
(
NiceAgent
*
agent
,
Stream
*
stream
,
Component
*
component
,
CandidateCheckPair
*
p
,
NiceUDPSocket
*
sockptr
,
struct
sockaddr
*
mapped_sockaddr
,
NiceCandidate
*
local_candidate
,
NiceCandidate
*
remot
e_candidate
)
{
{
CandidateCheckPair
*
new_pair
=
NULL
;
CandidateCheckPair
*
new_pair
=
NULL
;
NiceAddress
mapped
;
NiceAddress
mapped
;
...
@@ -1519,7 +1519,8 @@ static CandidateCheckPair *priv_process_response_check_for_peer_reflexive(NiceAg
...
@@ -1519,7 +1519,8 @@ static CandidateCheckPair *priv_process_response_check_for_peer_reflexive(NiceAg
component
->
id
,
component
->
id
,
&
mapped
,
&
mapped
,
sockptr
,
sockptr
,
base_candidate
);
local_candidate
,
remote_candidate
);
p
->
state
=
NICE_CHECK_FAILED
;
p
->
state
=
NICE_CHECK_FAILED
;
/* step: add a new discovered pair (see ICE 7.1.2.2.2
/* step: add a new discovered pair (see ICE 7.1.2.2.2
...
@@ -1538,7 +1539,7 @@ static CandidateCheckPair *priv_process_response_check_for_peer_reflexive(NiceAg
...
@@ -1538,7 +1539,7 @@ static CandidateCheckPair *priv_process_response_check_for_peer_reflexive(NiceAg
*
*
* @return TRUE if a matching transaction is found
* @return TRUE if a matching transaction is found
*/
*/
static
gboolean
priv_map_reply_to_conn_check_request
(
NiceAgent
*
agent
,
Stream
*
stream
,
Component
*
component
,
NiceUDPSocket
*
sockptr
,
const
NiceAddress
*
from
,
NiceCandidate
*
bas
e_candidate
,
StunMessage
*
resp
)
static
gboolean
priv_map_reply_to_conn_check_request
(
NiceAgent
*
agent
,
Stream
*
stream
,
Component
*
component
,
NiceUDPSocket
*
sockptr
,
const
NiceAddress
*
from
,
NiceCandidate
*
local_candidate
,
NiceCandidate
*
remot
e_candidate
,
StunMessage
*
resp
)
{
{
struct
sockaddr
sockaddr
;
struct
sockaddr
sockaddr
;
socklen_t
socklen
=
sizeof
(
sockaddr
);
socklen_t
socklen
=
sizeof
(
sockaddr
);
...
@@ -1595,7 +1596,7 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, Stream *
...
@@ -1595,7 +1596,7 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, Stream *
* "Discovering Peer Reflexive Candidates" ICE ID-19) */
* "Discovering Peer Reflexive Candidates" ICE ID-19) */
ok_pair
=
priv_process_response_check_for_peer_reflexive
(
agent
,
stream
,
component
,
ok_pair
=
priv_process_response_check_for_peer_reflexive
(
agent
,
stream
,
component
,
p
,
sockptr
,
&
sockaddr
,
bas
e_candidate
);
p
,
sockptr
,
&
sockaddr
,
local_candidate
,
remot
e_candidate
);
if
(
!
ok_pair
)
if
(
!
ok_pair
)
ok_pair
=
p
;
ok_pair
=
p
;
...
@@ -1950,7 +1951,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, Stream *stream,
...
@@ -1950,7 +1951,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, Stream *stream,
/* step: let's try to match the response to an existing check context */
/* step: let's try to match the response to an existing check context */
if
(
trans_found
!=
TRUE
)
if
(
trans_found
!=
TRUE
)
trans_found
=
priv_map_reply_to_conn_check_request
(
agent
,
stream
,
trans_found
=
priv_map_reply_to_conn_check_request
(
agent
,
stream
,
component
,
udp_socket
,
from
,
local
_candidate
,
&
req
);
component
,
udp_socket
,
from
,
local_candidate
,
remote
_candidate
,
&
req
);
/* step: let's try to match the response to an existing discovery */
/* step: let's try to match the response to an existing discovery */
if
(
trans_found
!=
TRUE
)
if
(
trans_found
!=
TRUE
)
...
...
agent/discovery.c
View file @
ff4ca893
...
@@ -387,7 +387,8 @@ discovery_add_peer_reflexive_candidate (
...
@@ -387,7 +387,8 @@ discovery_add_peer_reflexive_candidate (
guint
component_id
,
guint
component_id
,
NiceAddress
*
address
,
NiceAddress
*
address
,
NiceUDPSocket
*
base_socket
,
NiceUDPSocket
*
base_socket
,
NiceCandidate
*
base_candidate
)
NiceCandidate
*
local_candidate
,
NiceCandidate
*
remote_candidate
)
{
{
NiceCandidate
*
candidate
;
NiceCandidate
*
candidate
;
Component
*
component
;
Component
*
component
;
...
@@ -414,13 +415,34 @@ discovery_add_peer_reflexive_candidate (
...
@@ -414,13 +415,34 @@ discovery_add_peer_reflexive_candidate (
candidate
->
addr
=
*
address
;
candidate
->
addr
=
*
address
;
candidate
->
base_addr
=
base_socket
->
addr
;
candidate
->
base_addr
=
base_socket
->
addr
;
if
(
base_candidate
->
username
)
candidate
->
username
=
g_strdup
(
base_candidate
->
username
);
if
(
base_candidate
->
password
)
candidate
->
password
=
g_strdup
(
base_candidate
->
password
);
priv_assign_foundation
(
agent
,
candidate
);
priv_assign_foundation
(
agent
,
candidate
);
if
(
agent
->
compatibility
==
NICE_COMPATIBILITY_MSN
&&
remote_candidate
&&
local_candidate
)
{
guchar
*
new_username
=
NULL
;
guchar
*
decoded_local
=
NULL
;
guchar
*
decoded_remote
=
NULL
;
gsize
local_size
;
gsize
remote_size
;
g_free
(
candidate
->
username
);
g_free
(
candidate
->
password
);
decoded_local
=
g_base64_decode
(
local_candidate
->
username
,
&
local_size
);
decoded_remote
=
g_base64_decode
(
remote_candidate
->
username
,
&
remote_size
);
new_username
=
g_new0
(
guchar
,
local_size
+
remote_size
);
memcpy
(
new_username
,
decoded_local
,
local_size
);
memcpy
(
new_username
+
local_size
,
decoded_remote
,
remote_size
);
candidate
->
username
=
g_base64_encode
(
new_username
,
local_size
+
remote_size
);
g_free
(
new_username
);
g_free
(
decoded_local
);
g_free
(
decoded_remote
);
candidate
->
password
=
g_strdup
(
local_candidate
->
password
);
}
/* step: link to the base candidate+socket */
/* step: link to the base candidate+socket */
candidate
->
sockptr
=
base_socket
;
candidate
->
sockptr
=
base_socket
;
candidate
->
base_addr
=
base_socket
->
addr
;
candidate
->
base_addr
=
base_socket
->
addr
;
...
@@ -485,8 +507,31 @@ NiceCandidate *discovery_learn_remote_peer_reflexive_candidate (
...
@@ -485,8 +507,31 @@ NiceCandidate *discovery_learn_remote_peer_reflexive_candidate (
candidate
->
stream_id
=
stream
->
id
;
candidate
->
stream_id
=
stream
->
id
;
candidate
->
component_id
=
component
->
id
;
candidate
->
component_id
=
component
->
id
;
priv_generate_msn_credentials
(
agent
,
candidate
);
g_snprintf
(
candidate
->
foundation
,
NICE_CANDIDATE_MAX_FOUNDATION
,
"%u"
,
next_remote_id
);
g_snprintf
(
candidate
->
foundation
,
NICE_CANDIDATE_MAX_FOUNDATION
,
"%u"
,
next_remote_id
);
#if 0
if (agent->compatibility == NICE_COMPATIBILITY_MSN &&
remote && local) {
gchar *new_username = NULL;
gchar *decoded_local = NULL;
gchar *decoded_remote = NULL;
gsize local_size;
gsize remote_size;
g_free(candidate->username);
decoded_local = g_base64_decode (local->username, &local_size);
decoded_remote = g_base64_decode (remote->username, &remote_size);
new_username = g_new0(gchar, local_size + remote_size);
memcpy(new_username, decoded_remote, remote_size);
memcpy(new_username + remote_size, decoded_local, local_size);
candidate->username = g_base64_encode (new_username, local_size + remote_size);
g_free(new_username);
g_free(decoded_local);
g_free(decoded_remote);
}
#endif
candidate
->
sockptr
=
NULL
;
/* not stored for remote candidates */
candidate
->
sockptr
=
NULL
;
/* not stored for remote candidates */
/* note: candidate username and password are left NULL as stream
/* note: candidate username and password are left NULL as stream
level ufrag/password are used */
level ufrag/password are used */
...
...
agent/discovery.h
View file @
ff4ca893
...
@@ -90,7 +90,8 @@ discovery_add_peer_reflexive_candidate (
...
@@ -90,7 +90,8 @@ discovery_add_peer_reflexive_candidate (
guint
component_id
,
guint
component_id
,
NiceAddress
*
address
,
NiceAddress
*
address
,
NiceUDPSocket
*
base_socket
,
NiceUDPSocket
*
base_socket
,
NiceCandidate
*
base_candidate
);
NiceCandidate
*
local_candidate
,
NiceCandidate
*
remote_candidate
);
NiceCandidate
*
NiceCandidate
*
discovery_learn_remote_peer_reflexive_candidate
(
discovery_learn_remote_peer_reflexive_candidate
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment