Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
videolan
vlc-2-2
Commits
ceb9edfa
Commit
ceb9edfa
authored
Mar 13, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TLS: attach before inheriting variables
parent
f79d566e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
src/network/tls.c
src/network/tls.c
+2
-2
No files found.
src/network/tls.c
View file @
ceb9edfa
...
@@ -69,6 +69,7 @@ tls_ServerCreate (vlc_object_t *obj, const char *cert_path,
...
@@ -69,6 +69,7 @@ tls_ServerCreate (vlc_object_t *obj, const char *cert_path,
var_SetString
(
srv
,
"tls-x509-key"
,
key_path
);
var_SetString
(
srv
,
"tls-x509-key"
,
key_path
);
}
}
vlc_object_attach
(
srv
,
obj
);
srv
->
p_module
=
module_need
(
srv
,
"tls server"
,
NULL
,
false
);
srv
->
p_module
=
module_need
(
srv
,
"tls server"
,
NULL
,
false
);
if
(
srv
->
p_module
==
NULL
)
if
(
srv
->
p_module
==
NULL
)
{
{
...
@@ -77,7 +78,6 @@ tls_ServerCreate (vlc_object_t *obj, const char *cert_path,
...
@@ -77,7 +78,6 @@ tls_ServerCreate (vlc_object_t *obj, const char *cert_path,
return
NULL
;
return
NULL
;
}
}
vlc_object_attach
(
srv
,
obj
);
msg_Dbg
(
srv
,
"TLS server plugin initialized"
);
msg_Dbg
(
srv
,
"TLS server plugin initialized"
);
return
srv
;
return
srv
;
}
}
...
@@ -184,6 +184,7 @@ tls_ClientCreate (vlc_object_t *obj, int fd, const char *psz_hostname)
...
@@ -184,6 +184,7 @@ tls_ClientCreate (vlc_object_t *obj, int fd, const char *psz_hostname)
else
else
msg_Dbg
(
cl
,
"requested anonymous server"
);
msg_Dbg
(
cl
,
"requested anonymous server"
);
vlc_object_attach
(
cl
,
obj
);
cl
->
p_module
=
module_need
(
cl
,
"tls client"
,
NULL
,
false
);
cl
->
p_module
=
module_need
(
cl
,
"tls client"
,
NULL
,
false
);
if
(
cl
->
p_module
==
NULL
)
if
(
cl
->
p_module
==
NULL
)
{
{
...
@@ -201,7 +202,6 @@ tls_ClientCreate (vlc_object_t *obj, int fd, const char *psz_hostname)
...
@@ -201,7 +202,6 @@ tls_ClientCreate (vlc_object_t *obj, int fd, const char *psz_hostname)
if
(
val
==
0
)
if
(
val
==
0
)
{
{
msg_Dbg
(
cl
,
"TLS client session initialized"
);
msg_Dbg
(
cl
,
"TLS client session initialized"
);
vlc_object_attach
(
cl
,
obj
);
return
cl
;
return
cl
;
}
}
msg_Err
(
cl
,
"TLS client session handshake error"
);
msg_Err
(
cl
,
"TLS client session handshake error"
);
...
...
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