Merge pull request #65 from jbreich/master

Added rtmps protocol on client connection

Author: yutopp

client.go

@@ -8,6 +8,7 @@
 package rtmp
 
 import (
+	"crypto/tls"
 	"net"
 
 	"github.com/pkg/errors"
@@ -17,6 +18,13 @@ func Dial(protocol, addr string, config *ConnConfig) (*ClientConn, error) {
 	return DialWithDialer(&net.Dialer{}, protocol, addr, config)
 }
 
+func TLSDial(protocol, addr string, config *ConnConfig, tlsConfig *tls.Config) (*ClientConn, error) {
+	return DialWithTLSDialer(&tls.Dialer{
+		NetDialer: &net.Dialer{},
+		Config:    tlsConfig,
+	}, protocol, addr, config)
+}
+
 func DialWithDialer(dialer *net.Dialer, protocol, addr string, config *ConnConfig) (*ClientConn, error) {
 	if protocol != "rtmp" {
 		return nil, errors.Errorf("Unknown protocol: %s", protocol)
@@ -30,13 +38,15 @@ func DialWithDialer(dialer *net.Dialer, protocol, addr string, config *ConnConfi
 	return newClientConnWithSetup(rwc, config)
 }
 
-func makeValidAddr(addr string) (string, error) {
-	host, port, err := net.SplitHostPort(addr)
+func DialWithTLSDialer(dialer *tls.Dialer, protocol, addr string, config *ConnConfig) (*ClientConn, error) {
+	if protocol != "rtmps" {
+		return nil, errors.Errorf("Unknown protocol: %s", protocol)
+	}
+
+	rwc, err := dialer.Dial("tcp", addr)
 	if err != nil {
-		if err, ok := err.(*net.AddrError); ok && err.Err == "missing port in address" {
-			return makeValidAddr(addr + ":1935") // Default RTMP port
-		}
-		return "", err
+		return nil, err
 	}
-	return net.JoinHostPort(host, port), nil
+
+	return newClientConnWithSetup(rwc, config)
 }