mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move test for empty RTMP 'app' into parseURL().

This commit is contained in:
scruzin 2019-01-20 09:59:28 +10:30
parent a362d1d2ab
commit efe40a6778
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtmp/conn.go
View File

@ -121,9 +121,6 @@ func Dial(url string, timeout uint, log Log) (*Conn, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if c.link.app == "" {
return nil, errInvalidURL
}
if c.link.port == 0 { if c.link.port == 0 {
switch { switch {
case (c.link.protocol & featureSSL) != 0: case (c.link.protocol & featureSSL) != 0:

4
rtmp/parseurl.go
View File

@ -41,7 +41,6 @@ import (
) )
// parseURL parses an RTMP URL (ok, technically it is lexing). // parseURL parses an RTMP URL (ok, technically it is lexing).
//
func parseURL(addr string) (protocol int32, host string, port uint16, app, playpath string, err error) { func parseURL(addr string) (protocol int32, host string, port uint16, app, playpath string, err error) {
u, err := url.Parse(addr) u, err := url.Parse(addr)
if err != nil { if err != nil {
@ -81,6 +80,9 @@ func parseURL(addr string) (protocol int32, host string, port uint16, app, playp
} }
elems := strings.SplitN(u.Path[1:], "/", 3) elems := strings.SplitN(u.Path[1:], "/", 3)
app = elems[0] app = elems[0]
if app == "" {
return protocol, host, port, app, playpath, errInvalidURL
}
playpath = elems[1] playpath = elems[1]
if len(elems) == 3 && len(elems[2]) != 0 { if len(elems) == 3 && len(elems[2]) != 0 {
playpath = path.Join(elems[1:]...) playpath = path.Join(elems[1:]...)