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
cb30cb28
Commit
cb30cb28
authored
Feb 25, 2017
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
http: use vlc_tls_t for HTTP 2 connection test
parent
13a131c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
14 deletions
+11
-14
modules/access/http/h2conn_test.c
modules/access/http/h2conn_test.c
+11
-14
No files found.
modules/access/http/h2conn_test.c
View file @
cb30cb28
...
...
@@ -39,14 +39,14 @@
#include "message.h"
static
struct
vlc_http_conn
*
conn
;
static
int
external_
fd
;
static
struct
vlc_tls
*
external_
tls
;
static
void
conn_send
(
struct
vlc_h2_frame
*
f
)
{
assert
(
f
!=
NULL
);
size_t
len
=
vlc_h2_frame_size
(
f
);
ssize_t
val
=
w
rite
(
external_
fd
,
f
->
data
,
len
);
ssize_t
val
=
vlc_tls_W
rite
(
external_
tls
,
f
->
data
,
len
);
assert
((
size_t
)
val
==
len
);
free
(
f
);
}
...
...
@@ -64,7 +64,7 @@ static void conn_expect(uint_fast8_t wanted)
uint8_t
got
;
do
{
val
=
recv
(
external_
fd
,
hdr
,
9
,
MSG_WAITALL
);
val
=
vlc_tls_Read
(
external_
tls
,
hdr
,
9
,
true
);
assert
(
val
==
9
);
assert
(
hdr
[
0
]
==
0
);
...
...
@@ -77,7 +77,7 @@ static void conn_expect(uint_fast8_t wanted)
{
char
buf
[
len
];
val
=
recv
(
external_
fd
,
buf
,
len
,
MSG_WAITALL
);
val
=
vlc_tls_Read
(
external_
tls
,
buf
,
len
,
true
);
assert
(
val
==
(
ssize_t
)
len
);
}
}
...
...
@@ -87,22 +87,19 @@ static void conn_expect(uint_fast8_t wanted)
static
void
conn_create
(
void
)
{
ssize_t
val
;
int
fds
[
2
];
vlc_tls_t
*
tlsv
[
2
];
char
hello
[
24
];
if
(
vlc_
s
ocket
p
air
(
PF_LOCAL
,
SOCK_STREAM
,
0
,
fds
,
fa
ls
e
))
if
(
vlc_
tls_S
ocket
P
air
(
PF_LOCAL
,
0
,
t
ls
v
))
assert
(
!
"socketpair"
);
struct
vlc_tls
*
tls
=
vlc_tls_SocketOpen
(
fds
[
1
]);
assert
(
tls
!=
NULL
);
external_tls
=
tlsv
[
0
];
external_fd
=
fds
[
0
];
conn
=
vlc_h2_conn_create
(
NULL
,
tls
);
conn
=
vlc_h2_conn_create
(
NULL
,
tlsv
[
1
]);
assert
(
conn
!=
NULL
);
conn_send
(
vlc_h2_frame_settings
());
val
=
recv
(
external_
fd
,
hello
,
24
,
MSG_WAITALL
);
val
=
vlc_tls_Read
(
external_
tls
,
hello
,
24
,
true
);
assert
(
val
==
24
);
assert
(
!
memcmp
(
hello
,
"PRI * HTTP/2.0
\r\n
"
,
16
));
conn_expect
(
SETTINGS
);
...
...
@@ -111,9 +108,9 @@ static void conn_create(void)
static
void
conn_destroy
(
void
)
{
s
hutdown
(
external_
fd
,
SHUT_WR
);
vlc_tls_S
hutdown
(
external_
tls
,
false
);
vlc_http_conn_release
(
conn
);
vlc_
clos
e
(
external_
fd
);
vlc_
tls_SessionDelet
e
(
external_
tls
);
}
static
struct
vlc_http_stream
*
stream_open
(
void
)
...
...
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