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
39622889
Commit
39622889
authored
Apr 04, 2014
by
Youness Alaoui
Committed by
Olivier Crête
May 15, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for MS-TURN in tcp-turn
parent
82f3aa49
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
75 additions
and
4 deletions
+75
-4
socket/tcp-turn.c
socket/tcp-turn.c
+75
-4
No files found.
socket/tcp-turn.c
View file @
39622889
...
@@ -64,8 +64,16 @@ typedef struct {
...
@@ -64,8 +64,16 @@ typedef struct {
NiceSocket
*
base_socket
;
NiceSocket
*
base_socket
;
}
TurnTcpPriv
;
}
TurnTcpPriv
;
typedef
enum
{
MS_TURN_CONTROL_MESSAGE
=
2
,
MS_TURN_END_TO_END_DATA
=
3
}
MsTurnPayloadType
;
#define MAX_UDP_MESSAGE_SIZE 65535
#define MAX_UDP_MESSAGE_SIZE 65535
#define MAGIC_COOKIE_OFFSET \
STUN_MESSAGE_HEADER_LENGTH + STUN_MESSAGE_TYPE_LEN + STUN_MESSAGE_LENGTH_LEN
static
void
socket_close
(
NiceSocket
*
sock
);
static
void
socket_close
(
NiceSocket
*
sock
);
static
gint
socket_recv_messages
(
NiceSocket
*
sock
,
static
gint
socket_recv_messages
(
NiceSocket
*
sock
,
NiceInputMessage
*
recv_messages
,
guint
n_recv_messages
);
NiceInputMessage
*
recv_messages
,
guint
n_recv_messages
);
...
@@ -123,7 +131,8 @@ socket_recv_message (NiceSocket *sock, NiceInputMessage *recv_message)
...
@@ -123,7 +131,8 @@ socket_recv_message (NiceSocket *sock, NiceInputMessage *recv_message)
guint
headerlen
=
0
;
guint
headerlen
=
0
;
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9
||
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9
||
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_RFC5766
)
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_RFC5766
||
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_OC2007
)
headerlen
=
4
;
headerlen
=
4
;
else
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE
)
else
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE
)
headerlen
=
2
;
headerlen
=
2
;
...
@@ -164,6 +173,18 @@ socket_recv_message (NiceSocket *sock, NiceInputMessage *recv_message)
...
@@ -164,6 +173,18 @@ socket_recv_message (NiceSocket *sock, NiceInputMessage *recv_message)
priv
->
expecting_len
=
compat_len
;
priv
->
expecting_len
=
compat_len
;
priv
->
recv_buf_len
=
0
;
priv
->
recv_buf_len
=
0
;
}
}
else
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_OC2007
)
{
guint8
pt
=
*
priv
->
recv_buf
.
u8
;
guint16
packetlen
=
ntohs
(
priv
->
recv_buf
.
u16
[
1
]);
if
(
pt
!=
MS_TURN_CONTROL_MESSAGE
&&
pt
!=
MS_TURN_END_TO_END_DATA
)
{
/* Unexpected data, error in stream */
return
-
1
;
}
priv
->
expecting_len
=
packetlen
;
priv
->
recv_buf_len
=
0
;
}
}
}
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9
||
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9
||
...
@@ -237,7 +258,14 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
...
@@ -237,7 +258,14 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
guint
j
;
guint
j
;
gint
ret
;
gint
ret
;
guint
n_bufs
;
guint
n_bufs
;
guint16
header_buf
;
union
{
guint16
google_len
;
struct
{
guint8
pt
;
guint8
zero
;
guint16
packet_len
;
}
msoc
;
}
header_buf
;
guint
offset
=
0
;
guint
offset
=
0
;
/* Count the number of buffers. */
/* Count the number of buffers. */
...
@@ -257,9 +285,9 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
...
@@ -257,9 +285,9 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
local_message
.
n_buffers
=
n_bufs
+
1
;
local_message
.
n_buffers
=
n_bufs
+
1
;
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE
)
{
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE
)
{
header_buf
=
htons
(
output_message_get_size
(
message
));
header_buf
.
google_len
=
htons
(
output_message_get_size
(
message
));
local_bufs
[
0
].
buffer
=
&
header_buf
;
local_bufs
[
0
].
buffer
=
&
header_buf
;
local_bufs
[
0
].
size
=
sizeof
(
header_buf
);
local_bufs
[
0
].
size
=
sizeof
(
guint16
);
offset
=
1
;
offset
=
1
;
}
else
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9
||
}
else
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9
||
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_RFC5766
)
{
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_RFC5766
)
{
...
@@ -268,6 +296,49 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
...
@@ -268,6 +296,49 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
local_bufs
[
n_bufs
].
buffer
=
&
padbuf
;
local_bufs
[
n_bufs
].
buffer
=
&
padbuf
;
local_bufs
[
n_bufs
].
size
=
padlen
;
local_bufs
[
n_bufs
].
size
=
padlen
;
}
else
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_OC2007
)
{
union
{
guint32
u32
;
guint8
u8
[
4
];
}
cookie
;
guint16
len
=
output_message_get_size
(
message
);
guint16
header_len
;
/* Copy the cookie from possibly split messages */
cookie
.
u32
=
0
;
if
(
len
>
sizeof
(
TURN_MAGIC_COOKIE
)
+
MAGIC_COOKIE_OFFSET
)
{
guint16
buf_offset
=
0
;
guint
i
;
for
(
i
=
0
;
i
<
n_bufs
;
i
++
)
{
if
(
message
->
buffers
[
i
].
size
>
(
gsize
)
(
MAGIC_COOKIE_OFFSET
-
buf_offset
))
{
/* If the cookie is split, we assume it's data */
if
(
message
->
buffers
[
i
].
size
>
sizeof
(
TURN_MAGIC_COOKIE
)
+
MAGIC_COOKIE_OFFSET
-
buf_offset
)
{
const
guint8
*
buf
=
message
->
buffers
[
i
].
buffer
;
memcpy
(
&
cookie
.
u8
,
buf
+
MAGIC_COOKIE_OFFSET
-
buf_offset
,
sizeof
(
TURN_MAGIC_COOKIE
));
}
break
;
}
else
{
buf_offset
+=
message
->
buffers
[
i
].
size
;
}
}
}
cookie
.
u32
=
ntohl
(
cookie
.
u32
);
header_buf
.
msoc
.
packet_len
=
htons
(
len
);
header_buf
.
msoc
.
zero
=
0
;
header_len
=
sizeof
(
header_buf
.
msoc
);
if
(
cookie
.
u32
==
TURN_MAGIC_COOKIE
)
header_buf
.
msoc
.
pt
=
MS_TURN_CONTROL_MESSAGE
;
else
header_buf
.
msoc
.
pt
=
MS_TURN_END_TO_END_DATA
;
local_bufs
[
0
].
buffer
=
&
header_buf
;
local_bufs
[
0
].
size
=
header_len
;
offset
=
1
;
}
else
{
}
else
{
local_message
.
n_buffers
=
n_bufs
;
local_message
.
n_buffers
=
n_bufs
;
}
}
...
...
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