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
d66a3155
Commit
d66a3155
authored
May 02, 2014
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stunmessage: Revert another function to use sockaddr
The farstream unit tests were using it.
parent
8da016a7
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
13 deletions
+16
-13
socket/turn.c
socket/turn.c
+2
-2
stun/stunmessage.c
stun/stunmessage.c
+6
-4
stun/stunmessage.h
stun/stunmessage.h
+1
-1
stun/tests/test-format.c
stun/tests/test-format.c
+4
-3
stun/tools/stund.c
stun/tools/stund.c
+1
-1
stun/usages/ice.c
stun/usages/ice.c
+1
-1
tests/test-new-dribble.c
tests/test-new-dribble.c
+1
-1
No files found.
socket/turn.c
View file @
d66a3155
...
@@ -662,7 +662,7 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
...
@@ -662,7 +662,7 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
goto
send
;
goto
send
;
}
}
if
(
stun_message_append_addr
(
&
msg
,
STUN_ATTRIBUTE_DESTINATION_ADDRESS
,
if
(
stun_message_append_addr
(
&
msg
,
STUN_ATTRIBUTE_DESTINATION_ADDRESS
,
&
sa
.
storage
,
sizeof
(
sa
))
!=
&
sa
.
addr
,
sizeof
(
sa
))
!=
STUN_MESSAGE_RETURN_SUCCESS
)
STUN_MESSAGE_RETURN_SUCCESS
)
goto
send
;
goto
send
;
...
@@ -1831,7 +1831,7 @@ priv_add_channel_binding (TurnPriv *priv, const NiceAddress *peer)
...
@@ -1831,7 +1831,7 @@ priv_add_channel_binding (TurnPriv *priv, const NiceAddress *peer)
if
(
stun_message_append_addr
(
&
msg
->
message
,
if
(
stun_message_append_addr
(
&
msg
->
message
,
STUN_ATTRIBUTE_DESTINATION_ADDRESS
,
STUN_ATTRIBUTE_DESTINATION_ADDRESS
,
&
sa
.
storage
,
sizeof
(
sa
))
&
sa
.
addr
,
sizeof
(
sa
))
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
g_free
(
msg
);
g_free
(
msg
);
return
FALSE
;
return
FALSE
;
...
...
stun/stunmessage.c
View file @
d66a3155
...
@@ -420,7 +420,7 @@ stun_message_append_string (StunMessage * msg, StunAttribute type,
...
@@ -420,7 +420,7 @@ stun_message_append_string (StunMessage * msg, StunAttribute type,
StunMessageReturn
StunMessageReturn
stun_message_append_addr
(
StunMessage
*
msg
,
StunAttribute
type
,
stun_message_append_addr
(
StunMessage
*
msg
,
StunAttribute
type
,
const
struct
sockaddr
_storage
*
addr
,
socklen_t
addrlen
)
const
struct
sockaddr
*
addr
,
socklen_t
addrlen
)
{
{
const
void
*
pa
;
const
void
*
pa
;
uint8_t
*
ptr
;
uint8_t
*
ptr
;
...
@@ -430,7 +430,7 @@ stun_message_append_addr (StunMessage *msg, StunAttribute type,
...
@@ -430,7 +430,7 @@ stun_message_append_addr (StunMessage *msg, StunAttribute type,
if
((
size_t
)
addrlen
<
sizeof
(
struct
sockaddr
))
if
((
size_t
)
addrlen
<
sizeof
(
struct
sockaddr
))
return
STUN_MESSAGE_RETURN_INVALID
;
return
STUN_MESSAGE_RETURN_INVALID
;
switch
(
addr
->
s
s
_family
)
switch
(
addr
->
s
a
_family
)
{
{
case
AF_INET
:
case
AF_INET
:
{
{
...
@@ -488,7 +488,8 @@ stun_message_append_xor_addr (StunMessage *msg, StunAttribute type,
...
@@ -488,7 +488,8 @@ stun_message_append_xor_addr (StunMessage *msg, StunAttribute type,
if
(
val
)
if
(
val
)
return
val
;
return
val
;
return
stun_message_append_addr
(
msg
,
type
,
&
tmpaddr
,
addrlen
);
return
stun_message_append_addr
(
msg
,
type
,
(
struct
sockaddr
*
)
&
tmpaddr
,
addrlen
);
}
}
StunMessageReturn
StunMessageReturn
...
@@ -508,7 +509,8 @@ stun_message_append_xor_addr_full (StunMessage *msg, StunAttribute type,
...
@@ -508,7 +509,8 @@ stun_message_append_xor_addr_full (StunMessage *msg, StunAttribute type,
if
(
val
)
if
(
val
)
return
val
;
return
val
;
return
stun_message_append_addr
(
msg
,
type
,
&
tmpaddr
,
addrlen
);
return
stun_message_append_addr
(
msg
,
type
,
(
struct
sockaddr
*
)
&
tmpaddr
,
addrlen
);
}
}
...
...
stun/stunmessage.h
View file @
d66a3155
...
@@ -795,7 +795,7 @@ StunMessageReturn stun_message_append_string (StunMessage *msg,
...
@@ -795,7 +795,7 @@ StunMessageReturn stun_message_append_string (StunMessage *msg,
* %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS if the address family is unknown.
* %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS if the address family is unknown.
*/
*/
StunMessageReturn
stun_message_append_addr
(
StunMessage
*
msg
,
StunMessageReturn
stun_message_append_addr
(
StunMessage
*
msg
,
StunAttribute
type
,
const
struct
sockaddr
_storage
*
addr
,
socklen_t
addrlen
);
StunAttribute
type
,
const
struct
sockaddr
*
addr
,
socklen_t
addrlen
);
/**
/**
* stun_message_append_xor_addr:
* stun_message_append_xor_addr:
...
...
stun/tests/test-format.c
View file @
d66a3155
...
@@ -146,7 +146,7 @@ check_af (const char *name, int family, socklen_t addrlen)
...
@@ -146,7 +146,7 @@ check_af (const char *name, int family, socklen_t addrlen)
stun_agent_init_request
(
&
agent
,
&
msg
,
buf
,
sizeof
(
buf
),
STUN_BINDING
);
stun_agent_init_request
(
&
agent
,
&
msg
,
buf
,
sizeof
(
buf
),
STUN_BINDING
);
if
(
stun_message_append_addr
(
&
msg
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
if
(
stun_message_append_addr
(
&
msg
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
&
addr
,
addrlen
)
!=
(
struct
sockaddr
*
)
&
addr
,
addrlen
)
!=
STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS
)
STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS
)
fatal
(
"Unknown address family test failed"
);
fatal
(
"Unknown address family test failed"
);
if
(
stun_message_append_xor_addr
(
&
msg
,
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
if
(
stun_message_append_xor_addr
(
&
msg
,
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
...
@@ -156,7 +156,8 @@ check_af (const char *name, int family, socklen_t addrlen)
...
@@ -156,7 +156,8 @@ check_af (const char *name, int family, socklen_t addrlen)
addr
.
ss_family
=
family
;
addr
.
ss_family
=
family
;
if
(
stun_message_append_addr
(
&
msg
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
if
(
stun_message_append_addr
(
&
msg
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
&
addr
,
addrlen
-
1
)
!=
STUN_MESSAGE_RETURN_INVALID
)
(
struct
sockaddr
*
)
&
addr
,
addrlen
-
1
)
!=
STUN_MESSAGE_RETURN_INVALID
)
fatal
(
"Too small %s sockaddr test failed"
,
name
);
fatal
(
"Too small %s sockaddr test failed"
,
name
);
if
(
stun_message_append_xor_addr
(
&
msg
,
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
if
(
stun_message_append_xor_addr
(
&
msg
,
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
...
@@ -164,7 +165,7 @@ check_af (const char *name, int family, socklen_t addrlen)
...
@@ -164,7 +165,7 @@ check_af (const char *name, int family, socklen_t addrlen)
fatal
(
"Too small %s sockaddr xor test failed"
,
name
);
fatal
(
"Too small %s sockaddr xor test failed"
,
name
);
if
(
stun_message_append_addr
(
&
msg
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
if
(
stun_message_append_addr
(
&
msg
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
&
addr
,
addrlen
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
(
struct
sockaddr
*
)
&
addr
,
addrlen
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
fatal
(
"%s sockaddr test failed"
,
name
);
fatal
(
"%s sockaddr test failed"
,
name
);
if
(
stun_message_append_xor_addr
(
&
msg
,
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
if
(
stun_message_append_xor_addr
(
&
msg
,
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
...
...
stun/tools/stund.c
View file @
d66a3155
...
@@ -226,7 +226,7 @@ static int dgram_process (int sock, StunAgent *oldagent, StunAgent *newagent)
...
@@ -226,7 +226,7 @@ static int dgram_process (int sock, StunAgent *oldagent, StunAgent *newagent)
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
&
addr
.
storage
,
addr_len
);
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS
,
&
addr
.
storage
,
addr_len
);
else
else
stun_message_append_addr
(
&
response
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
stun_message_append_addr
(
&
response
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
&
addr
.
storage
,
addr_len
);
&
addr
.
addr
,
addr_len
);
break
;
break
;
case
STUN_SHARED_SECRET
:
case
STUN_SHARED_SECRET
:
...
...
stun/usages/ice.c
View file @
d66a3155
...
@@ -305,7 +305,7 @@ stun_usage_ice_conncheck_create_reply (StunAgent *agent, StunMessage *req,
...
@@ -305,7 +305,7 @@ stun_usage_ice_conncheck_create_reply (StunAgent *agent, StunMessage *req,
src
,
srclen
);
src
,
srclen
);
}
else
{
}
else
{
val
=
stun_message_append_addr
(
msg
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
val
=
stun_message_append_addr
(
msg
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
src
,
srclen
);
(
struct
sockaddr
*
)
src
,
srclen
);
}
}
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
if
(
val
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
...
...
tests/test-new-dribble.c
View file @
d66a3155
...
@@ -195,7 +195,7 @@ recv_packet:
...
@@ -195,7 +195,7 @@ recv_packet:
&
addr
.
storage
,
addr_len
);
&
addr
.
storage
,
addr_len
);
else
else
stun_message_append_addr
(
&
response
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
stun_message_append_addr
(
&
response
,
STUN_ATTRIBUTE_MAPPED_ADDRESS
,
&
addr
.
storage
,
addr_len
);
&
addr
.
addr
,
addr_len
);
break
;
break
;
case
STUN_SHARED_SECRET
:
case
STUN_SHARED_SECRET
:
...
...
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