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
ba1f7dd0
Commit
ba1f7dd0
authored
Jan 30, 2009
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Porting stun usage ice to use the new StunMessageReturn API
parent
00fb529f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
17 deletions
+26
-17
stun/usages/ice.c
stun/usages/ice.c
+26
-17
No files found.
stun/usages/ice.c
View file @
ba1f7dd0
...
@@ -63,7 +63,7 @@ stun_usage_ice_conncheck_create (StunAgent *agent, StunMessage *msg,
...
@@ -63,7 +63,7 @@ stun_usage_ice_conncheck_create (StunAgent *agent, StunMessage *msg,
bool
cand_use
,
bool
controlling
,
uint32_t
priority
,
bool
cand_use
,
bool
controlling
,
uint32_t
priority
,
uint64_t
tie
,
StunUsageIceCompatibility
compatibility
)
uint64_t
tie
,
StunUsageIceCompatibility
compatibility
)
{
{
int
val
;
StunMessageReturn
val
;
stun_agent_init_request
(
agent
,
msg
,
buffer
,
buffer_len
,
STUN_BINDING
);
stun_agent_init_request
(
agent
,
msg
,
buffer
,
buffer_len
,
STUN_BINDING
);
...
@@ -71,26 +71,26 @@ stun_usage_ice_conncheck_create (StunAgent *agent, StunMessage *msg,
...
@@ -71,26 +71,26 @@ stun_usage_ice_conncheck_create (StunAgent *agent, StunMessage *msg,
if
(
cand_use
)
if
(
cand_use
)
{
{
val
=
stun_message_append_flag
(
msg
,
STUN_ATTRIBUTE_USE_CANDIDATE
);
val
=
stun_message_append_flag
(
msg
,
STUN_ATTRIBUTE_USE_CANDIDATE
);
if
(
val
)
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
return
0
;
return
0
;
}
}
val
=
stun_message_append32
(
msg
,
STUN_ATTRIBUTE_PRIORITY
,
priority
);
val
=
stun_message_append32
(
msg
,
STUN_ATTRIBUTE_PRIORITY
,
priority
);
if
(
val
)
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
return
0
;
return
0
;
if
(
controlling
)
if
(
controlling
)
val
=
stun_message_append64
(
msg
,
STUN_ATTRIBUTE_ICE_CONTROLLING
,
tie
);
val
=
stun_message_append64
(
msg
,
STUN_ATTRIBUTE_ICE_CONTROLLING
,
tie
);
else
else
val
=
stun_message_append64
(
msg
,
STUN_ATTRIBUTE_ICE_CONTROLLED
,
tie
);
val
=
stun_message_append64
(
msg
,
STUN_ATTRIBUTE_ICE_CONTROLLED
,
tie
);
if
(
val
)
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
return
0
;
return
0
;
}
}
if
(
username
&&
username_len
>
0
)
{
if
(
username
&&
username_len
>
0
)
{
val
=
stun_message_append_bytes
(
msg
,
STUN_ATTRIBUTE_USERNAME
,
val
=
stun_message_append_bytes
(
msg
,
STUN_ATTRIBUTE_USERNAME
,
username
,
username_len
);
username
,
username_len
);
if
(
val
)
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
return
0
;
return
0
;
}
}
...
@@ -103,7 +103,8 @@ StunUsageIceReturn stun_usage_ice_conncheck_process (StunMessage *msg,
...
@@ -103,7 +103,8 @@ StunUsageIceReturn stun_usage_ice_conncheck_process (StunMessage *msg,
struct
sockaddr
*
addr
,
socklen_t
*
addrlen
,
struct
sockaddr
*
addr
,
socklen_t
*
addrlen
,
StunUsageIceCompatibility
compatibility
)
StunUsageIceCompatibility
compatibility
)
{
{
int
val
,
code
=
-
1
;
int
code
=
-
1
;
StunMessageReturn
val
;
if
(
stun_message_get_method
(
msg
)
!=
STUN_BINDING
)
if
(
stun_message_get_method
(
msg
)
!=
STUN_BINDING
)
return
STUN_USAGE_ICE_RETURN_RETRY
;
return
STUN_USAGE_ICE_RETURN_RETRY
;
...
@@ -118,7 +119,7 @@ StunUsageIceReturn stun_usage_ice_conncheck_process (StunMessage *msg,
...
@@ -118,7 +119,7 @@ StunUsageIceReturn stun_usage_ice_conncheck_process (StunMessage *msg,
break
;
break
;
case
STUN_ERROR
:
case
STUN_ERROR
:
if
(
stun_message_find_error
(
msg
,
&
code
)
!=
0
)
{
if
(
stun_message_find_error
(
msg
,
&
code
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
/* missing ERROR-CODE: ignore message */
/* missing ERROR-CODE: ignore message */
return
STUN_USAGE_ICE_RETURN_RETRY
;
return
STUN_USAGE_ICE_RETURN_RETRY
;
}
}
...
@@ -147,14 +148,14 @@ StunUsageIceReturn stun_usage_ice_conncheck_process (StunMessage *msg,
...
@@ -147,14 +148,14 @@ StunUsageIceReturn stun_usage_ice_conncheck_process (StunMessage *msg,
val
=
stun_message_find_xor_addr
(
msg
,
val
=
stun_message_find_xor_addr
(
msg
,
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
addr
,
addrlen
);
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
addr
,
addrlen
);
}
}
if
(
val
)
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
{
stun_debug
(
" No XOR-MAPPED-ADDRESS: %
s
\n
"
,
strerror
(
val
)
);
stun_debug
(
" No XOR-MAPPED-ADDRESS: %
d
\n
"
,
val
);
val
=
stun_message_find_addr
(
msg
,
val
=
stun_message_find_addr
(
msg
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
addr
,
addrlen
);
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
addr
,
addrlen
);
if
(
val
)
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
{
stun_debug
(
" No MAPPED-ADDRESS: %
s
\n
"
,
strerror
(
val
)
);
stun_debug
(
" No MAPPED-ADDRESS: %
d
\n
"
,
val
);
return
STUN_USAGE_ICE_RETURN_ERROR
;
return
STUN_USAGE_ICE_RETURN_ERROR
;
}
}
}
}
...
@@ -227,8 +228,8 @@ stun_usage_ice_conncheck_create_reply (StunAgent *agent, StunMessage *req,
...
@@ -227,8 +228,8 @@ stun_usage_ice_conncheck_create_reply (StunAgent *agent, StunMessage *req,
/* Role conflict handling */
/* Role conflict handling */
assert
(
control
!=
NULL
);
assert
(
control
!=
NULL
);
if
(
!
stun_message_find64
(
req
,
*
control
?
STUN_ATTRIBUTE_ICE_CONTROLLING
if
(
stun_message_find64
(
req
,
*
control
?
STUN_ATTRIBUTE_ICE_CONTROLLING
:
STUN_ATTRIBUTE_ICE_CONTROLLED
,
&
q
)
)
:
STUN_ATTRIBUTE_ICE_CONTROLLED
,
&
q
)
==
STUN_MESSAGE_RETURN_SUCCESS
)
{
{
stun_debug
(
"STUN Role Conflict detected:
\n
"
);
stun_debug
(
"STUN Role Conflict detected:
\n
"
);
...
@@ -270,18 +271,25 @@ stun_usage_ice_conncheck_create_reply (StunAgent *agent, StunMessage *req,
...
@@ -270,18 +271,25 @@ stun_usage_ice_conncheck_create_reply (StunAgent *agent, StunMessage *req,
src
,
srclen
);
src
,
srclen
);
}
}
if
(
val
)
{
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
stun_debug
(
" Mapped address problem: %
s
\n
"
,
strerror
(
val
)
);
stun_debug
(
" Mapped address problem: %
d
\n
"
,
val
);
goto
failure
;
goto
failure
;
}
}
username
=
(
const
char
*
)
stun_message_find
(
req
,
username
=
(
const
char
*
)
stun_message_find
(
req
,
STUN_ATTRIBUTE_USERNAME
,
&
username_len
);
STUN_ATTRIBUTE_USERNAME
,
&
username_len
);
if
(
username
)
{
if
(
username
)
{
stun_message_append_bytes
(
msg
,
STUN_ATTRIBUTE_USERNAME
,
val
=
stun_message_append_bytes
(
msg
,
STUN_ATTRIBUTE_USERNAME
,
username
,
username_len
);
username
,
username_len
);
}
}
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
stun_debug
(
"Error appending username: %d
\n
"
,
val
);
goto
failure
;
}
/* the stun agent will automatically use the password of the request */
/* the stun agent will automatically use the password of the request */
len
=
stun_agent_finish_message
(
agent
,
msg
,
NULL
,
0
);
len
=
stun_agent_finish_message
(
agent
,
msg
,
NULL
,
0
);
if
(
len
==
0
)
if
(
len
==
0
)
...
@@ -313,7 +321,8 @@ uint32_t stun_usage_ice_conncheck_priority (const StunMessage *msg)
...
@@ -313,7 +321,8 @@ uint32_t stun_usage_ice_conncheck_priority (const StunMessage *msg)
{
{
uint32_t
value
;
uint32_t
value
;
if
(
stun_message_find32
(
msg
,
STUN_ATTRIBUTE_PRIORITY
,
&
value
))
if
(
stun_message_find32
(
msg
,
STUN_ATTRIBUTE_PRIORITY
,
&
value
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
return
0
;
return
0
;
return
value
;
return
value
;
}
}
...
...
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