Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
5cc99219
Commit
5cc99219
authored
Feb 26, 2017
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tls: remove tls_Recv() and tls_Send()
parent
4a6bd2bd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
include/vlc_tls.h
include/vlc_tls.h
+0
-3
modules/stream_out/chromecast/chromecast_communication.cpp
modules/stream_out/chromecast/chromecast_communication.cpp
+1
-1
src/network/httpd.c
src/network/httpd.c
+2
-2
No files found.
include/vlc_tls.h
View file @
5cc99219
...
...
@@ -241,9 +241,6 @@ static inline int vlc_tls_Shutdown(vlc_tls_t *tls, bool duplex)
return
tls
->
shutdown
(
tls
,
duplex
);
}
# define tls_Recv(a,b,c) vlc_tls_Read(a,b,c,false)
# define tls_Send(a,b,c) vlc_tls_Write(a,b,c)
/**
* Closes a connection and its underlying resources.
*
...
...
modules/stream_out/chromecast/chromecast_communication.cpp
View file @
5cc99219
...
...
@@ -382,7 +382,7 @@ int ChromecastCommunication::sendMessage( const castchannel::CastMessage &msg )
SetDWBE
(
p_data
,
i_size
);
msg
.
SerializeWithCachedSizesToArray
(
p_data
+
PACKET_HEADER_LEN
);
int
i_ret
=
tls_Send
(
m_tls
,
p_data
,
PACKET_HEADER_LEN
+
i_size
);
int
i_ret
=
vlc_tls_Write
(
m_tls
,
p_data
,
PACKET_HEADER_LEN
+
i_size
);
delete
[]
p_data
;
if
(
i_ret
==
PACKET_HEADER_LEN
+
i_size
)
return
VLC_SUCCESS
;
...
...
src/network/httpd.c
View file @
5cc99219
...
...
@@ -1256,7 +1256,7 @@ ssize_t httpd_NetRecv (httpd_client_t *cl, uint8_t *p, size_t i_len)
p_tls
=
cl
->
p_tls
;
do
val
=
p_tls
?
tls_Re
cv
(
p_tls
,
p
,
i_len
)
val
=
p_tls
?
vlc_
tls_Re
ad
(
p_tls
,
p
,
i_len
,
false
)
:
recv
(
cl
->
fd
,
p
,
i_len
,
0
);
while
(
val
==
-
1
&&
errno
==
EINTR
);
return
val
;
...
...
@@ -1270,7 +1270,7 @@ ssize_t httpd_NetSend (httpd_client_t *cl, const uint8_t *p, size_t i_len)
p_tls
=
cl
->
p_tls
;
do
val
=
p_tls
?
tls_Send
(
p_tls
,
p
,
i_len
)
val
=
p_tls
?
vlc_tls_Write
(
p_tls
,
p
,
i_len
)
:
send
(
cl
->
fd
,
p
,
i_len
,
MSG_NOSIGNAL
);
while
(
val
==
-
1
&&
errno
==
EINTR
);
return
val
;
...
...
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