Merge branch 'librtmp-fixes'

plugins/obs-outputs/librtmp/amf.c

@@ -483,6 +483,7 @@ AMF3ReadString(const char *data, AVal *str)
 
         return len + nSize;
     }
+    return len;
 }
 
 int
@@ -504,7 +505,7 @@ AMF3Prop_Decode(AMFObjectProperty *prop, const char *pBuffer, int nSize,
     /* decode name */
     if (bDecodeName)
     {
-        AVal name;
+        AVal name = AV_empty;
         int nRes = AMF3ReadString(pBuffer, &name);
 
         if (name.av_len <= 0)
@@ -863,7 +864,7 @@ AMFProp_Dump(AMFObjectProperty *prop)
 void
 AMFProp_Reset(AMFObjectProperty *prop)
 {
-    if (prop->p_type == AMF_OBJECT)
+    if (prop->p_type == AMF_OBJECT || prop->p_type == AMF_ECMA_ARRAY || prop->p_type == AMF_STRICT_ARRAY)
         AMF_Reset(&prop->p_vu.p_object);
     else
     {
@@ -1078,7 +1079,7 @@ AMF3_Decode(AMFObject *obj, const char *pBuffer, int nSize, int bAMFData)
 
             for (i = 0; i < cd.cd_num; i++)
             {
-                AVal memberName;
+                AVal memberName = AV_empty;
                 len = AMF3ReadString(pBuffer, &memberName);
                 RTMP_Log(RTMP_LOGDEBUG, "Member: %s", memberName.av_val);
                 AMF3CD_AddProp(&cd, &memberName);

plugins/obs-outputs/librtmp/parseurl.c

@@ -27,7 +27,7 @@
 int RTMP_ParseURL(const char *url, int *protocol, AVal *host, unsigned int *port,
                   AVal *app)
 {
-    char *p, *end, *col, /* *ques, */ *slash;
+    char *p, *end, *col, /* *ques, */ *slash, *v6;
 
     RTMP_Log(RTMP_LOGDEBUG, "Parsing...");
 
@@ -83,9 +83,10 @@ parsehost:
     }
 
     end   = p + strlen(p);
-    col   = strchr(p, ':');
+    v6    = strchr(p, ']');
     // ques  = strchr(p, '?');
     slash = strchr(p, '/');
+    col   = strchr((v6 && v6 < slash) ? v6 : p, ':');
 
     {
         int hostlen;

plugins/obs-outputs/librtmp/rtmp.c

@@ -642,35 +642,71 @@ int RTMP_AddStream(RTMP *r, const char *playpath)
 }
 
 static int
-add_addr_info(struct sockaddr_in *service, AVal *host, int port)
+add_addr_info(struct sockaddr_storage *service, socklen_t *addrlen, AVal *host, int port)
 {
     char *hostname;
     int ret = TRUE;
-    if (host->av_val[host->av_len])
+    if (host->av_val[host->av_len] || host->av_val[0] == '[')
     {
-        hostname = malloc(host->av_len+1);
-        memcpy(hostname, host->av_val, host->av_len);
-        hostname[host->av_len] = '\0';
+        int v6 = host->av_val[0] == '[';
+        hostname = malloc(host->av_len+1 - v6 * 2);
+        memcpy(hostname, host->av_val + v6, host->av_len - v6 * 2);
+        hostname[host->av_len - v6 * 2] = '\0';
     }
     else
     {
         hostname = host->av_val;
     }
 
-    service->sin_addr.s_addr = inet_addr(hostname);
-    if (service->sin_addr.s_addr == INADDR_NONE)
+    struct addrinfo hints;
+    struct addrinfo *result = NULL;
+    struct addrinfo *ptr = NULL;
+
+    memset(&hints, 0, sizeof(hints));
+
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = IPPROTO_TCP;
+
+    service->ss_family = AF_UNSPEC;
+    *addrlen = 0;
+
+    char portStr[8];
+
+    sprintf(portStr, "%d", port);
+
+    int err = getaddrinfo(hostname, portStr, &hints, &result);
+
+    if (err)
+    {
+#ifndef _WIN32
+#define gai_strerrorA gai_strerror
+#endif
+        RTMP_Log(RTMP_LOGERROR, "Could not resolve %s: %s (%d)", hostname, gai_strerrorA(GetSockError()), GetSockError());
+        ret = FALSE;
+        goto finish;
+    }
+
+    // they should come back in OS preferred order
+    for (ptr = result; ptr != NULL; ptr = ptr->ai_next)
     {
-        struct hostent *host = gethostbyname(hostname);
-        if (host == NULL || host->h_addr == NULL)
+        if (ptr->ai_family == AF_INET || ptr->ai_family == AF_INET6)
         {
-            RTMP_Log(RTMP_LOGERROR, "Problem accessing the DNS. (addr: %s, error: %d)", hostname, GetSockError());
-            ret = FALSE;
-            goto finish;
+            memcpy(service, ptr->ai_addr, ptr->ai_addrlen);
+            *addrlen = (socklen_t)ptr->ai_addrlen;
+            break;
         }
-        service->sin_addr = *(struct in_addr *)host->h_addr;
     }
 
-    service->sin_port = htons(port);
+    freeaddrinfo(result);
+
+    if (service->ss_family == AF_UNSPEC || *addrlen == 0)
+    {
+        RTMP_Log(RTMP_LOGERROR, "Could not resolve server '%s': no valid address found", hostname);
+        ret = FALSE;
+        goto finish;
+    }
+
 finish:
     if (hostname != host->av_val)
         free(hostname);
@@ -688,7 +724,7 @@ finish:
 #endif
 
 int
-RTMP_Connect0(RTMP *r, struct sockaddr * service)
+RTMP_Connect0(RTMP *r, struct sockaddr * service, socklen_t addrlen)
 {
     int on = 1;
     r->m_sb.sb_timedout = FALSE;
@@ -697,9 +733,9 @@ RTMP_Connect0(RTMP *r, struct sockaddr * service)
 
     //best to be explicit, we need overlapped socket
 #ifdef _WIN32
-    r->m_sb.sb_socket = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED);
+    r->m_sb.sb_socket = WSASocket(service->sa_family, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED);
 #else
-    r->m_sb.sb_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    r->m_sb.sb_socket = socket(service->sa_family, SOCK_STREAM, IPPROTO_TCP);
 #endif
 
     if (r->m_sb.sb_socket != INVALID_SOCKET)
@@ -716,7 +752,7 @@ RTMP_Connect0(RTMP *r, struct sockaddr * service)
             }
         }
 
-        if (connect(r->m_sb.sb_socket, service, sizeof(struct sockaddr)) < 0)
+        if (connect(r->m_sb.sb_socket, service, addrlen) < 0)
         {
             int err = GetSockError();
             if (err == E_CONNREFUSED)
@@ -843,27 +879,40 @@ RTMP_Connect1(RTMP *r, RTMPPacket *cp)
 int
 RTMP_Connect(RTMP *r, RTMPPacket *cp)
 {
-    struct sockaddr_in service;
+#ifdef _WIN32
+    HOSTENT *h;
+#endif
+    struct sockaddr_storage service;
+    socklen_t addrlen = 0;
     if (!r->Link.hostname.av_len)
         return FALSE;
 
-    memset(&service, 0, sizeof(struct sockaddr_in));
-    service.sin_family = AF_INET;
+#ifdef _WIN32
+    //COMODO security software sandbox blocks all DNS by returning "host not found"
+    h = gethostbyname("localhost");
+    if (!h && GetLastError() == WSAHOST_NOT_FOUND)
+    {
+        RTMP_Log(RTMP_LOGERROR, "RTMP_Connect: Connection test failed. This error is likely caused by Comodo Internet Security running OBS in sandbox mode. Please add OBS to the Comodo automatic sandbox exclusion list, restart OBS and try again (11001).");
+        return FALSE;
+    }
+#endif
+
+    memset(&service, 0, sizeof(service));
 
     if (r->Link.socksport)
     {
         /* Connect via SOCKS */
-        if (!add_addr_info(&service, &r->Link.sockshost, r->Link.socksport))
+        if (!add_addr_info(&service, &addrlen, &r->Link.sockshost, r->Link.socksport))
             return FALSE;
     }
     else
     {
         /* Connect directly */
-        if (!add_addr_info(&service, &r->Link.hostname, r->Link.port))
+        if (!add_addr_info(&service, &addrlen, &r->Link.hostname, r->Link.port))
             return FALSE;
     }
 
-    if (!RTMP_Connect0(r, (struct sockaddr *)&service))
+    if (!RTMP_Connect0(r, (struct sockaddr *)&service, addrlen))
         return FALSE;
 
     r->m_bSendCounter = TRUE;
@@ -875,11 +924,17 @@ static int
 SocksNegotiate(RTMP *r)
 {
     unsigned long addr;
-    struct sockaddr_in service;
-    memset(&service, 0, sizeof(struct sockaddr_in));
+    struct sockaddr_storage service;
+    socklen_t addrlen = 0;
+    memset(&service, 0, sizeof(service));
+
+    add_addr_info(&service, &addrlen, &r->Link.hostname, r->Link.port);
+
+    // not doing IPv6 socks
+    if (service.ss_family == AF_INET6)
+        return FALSE;
 
-    add_addr_info(&service, &r->Link.hostname, r->Link.port);
-    addr = htonl(service.sin_addr.s_addr);
+    addr = htonl((*(struct sockaddr_in *)&service).sin_addr.s_addr);
 
     {
         char packet[] =
@@ -1192,7 +1247,7 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet)
         RTMP_Log(RTMP_LOGDEBUG, "%s, unknown packet type received: 0x%02x", __FUNCTION__,
                  packet->m_packetType);
 #ifdef _DEBUG
-        RTMP_LogHex(RTMP_LOGDEBUG, (uint8_t*)packet->m_body, packet->m_nBodySize);
+        RTMP_LogHex(RTMP_LOGDEBUG, (const uint8_t*)packet->m_body, packet->m_nBodySize);
 #endif
     }
 
@@ -1742,9 +1797,6 @@ SendFCUnpublish(RTMP *r, int streamIdx)
 
 SAVC(publish);
 SAVC(live);
-#if 0
-SAVC(record);
-#endif
 
 static int
 SendPublish(RTMP *r, int streamIdx)
@@ -2367,6 +2419,17 @@ static void hexenc(unsigned char *inbuf, int len, char *dst)
     *ptr = '\0';
 }
 
+static char *AValChr(AVal *av, char c)
+{
+    int i;
+    for (i = 0; i < av->av_len; i++)
+    {
+        if (av->av_val[i] == c)
+            return &av->av_val[i];
+    }
+    return NULL;
+}
+
 static int
 PublisherAuth(RTMP *r, AVal *description)
 {
@@ -2416,8 +2479,9 @@ PublisherAuth(RTMP *r, AVal *description)
         {
             char *par, *val = NULL, *orig_ptr;
             AVal user, salt, opaque, challenge, *aptr = NULL;
-            opaque.av_len = 0;
-            challenge.av_len = 0;
+
+            opaque.av_len = challenge.av_len = salt.av_len = user.av_len = 0;
+            opaque.av_val = challenge.av_val = salt.av_val = user.av_val = NULL;
 
             ptr = orig_ptr = strdup(token_in);
             while (ptr)
@@ -2605,6 +2669,9 @@ PublisherAuth(RTMP *r, AVal *description)
             /* cnonce = hexenc(4 random bytes) (initialized on first connection) */
             char cnonce[9];
 
+            nonce.av_len = user.av_len = 0;
+            nonce.av_val = user.av_val = NULL;
+
             ptr = orig_ptr = strdup(token_in);
             /* Extract parameters (we need user and nonce) */
             while (ptr)
@@ -2660,7 +2727,7 @@ PublisherAuth(RTMP *r, AVal *description)
             /* hash2 = hexenc(md5(method + ":/" + app + "/" + appInstance)) */
             /* Extract appname + appinstance without query parameters */
             apptmp = r->Link.app;
-            ptr = strchr(apptmp.av_val, '?');
+            ptr = AValChr(&apptmp, '?');
             if (ptr)
                 apptmp.av_len = ptr - apptmp.av_val;
 
@@ -2668,6 +2735,8 @@ PublisherAuth(RTMP *r, AVal *description)
             MD5_Update(&md5ctx, (void *)method, sizeof(method)-1);
             MD5_Update(&md5ctx, ":/", 2);
             MD5_Update(&md5ctx, apptmp.av_val, apptmp.av_len);
+            if (!AValChr(&apptmp, '/'))
+                MD5_Update(&md5ctx, "/_definst_", sizeof("/_definst_") - 1);
             MD5_Final(md5sum_val, &md5ctx);
             RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s:/%.*s) =>", __FUNCTION__,
                      method, apptmp.av_len, apptmp.av_val);
@@ -2789,10 +2858,6 @@ static const AVal av_NetStream_Play_UnpublishNotify =
 static const AVal av_NetStream_Publish_Start = AVC("NetStream.Publish.Start");
 static const AVal av_NetStream_Publish_Rejected = AVC("NetStream.Publish.Rejected");
 static const AVal av_NetStream_Publish_Denied = AVC("NetStream.Publish.Denied");
-#if 0
-static const AVal av_NetConnection_Connect_Rejected =
-    AVC("NetConnection.Connect.Rejected");
-#endif
 
 /* Returns 0 for OK/Failed/error, 1 for 'Stop or Complete' */
 static int
@@ -3474,6 +3539,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet)
     char *header = (char *)hbuf;
     int nSize, hSize, nToRead, nChunk;
     // int didAlloc = FALSE;
+    int extendedTimestamp = 0;
 
     RTMP_Log(RTMP_LOGDEBUG2, "%s: fd=%d", __FUNCTION__, (int)r->m_sb.sb_socket);
 
@@ -3578,7 +3644,10 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet)
                     packet->m_nInfoField2 = DecodeInt32LE(header + 7);
             }
         }
-        if (packet->m_nTimeStamp == 0xffffff)
+
+        extendedTimestamp = (packet->m_nTimeStamp == 0xffffff);
+
+        if (extendedTimestamp)
         {
             if (ReadN(r, header + nSize, 4) != 4)
             {
@@ -3633,6 +3702,8 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet)
     if (!r->m_vecChannelsIn[packet->m_nChannel])
         r->m_vecChannelsIn[packet->m_nChannel] = malloc(sizeof(RTMPPacket));
     memcpy(r->m_vecChannelsIn[packet->m_nChannel], packet, sizeof(RTMPPacket));
+    if (extendedTimestamp)
+        r->m_vecChannelsIn[packet->m_nChannel]->m_nTimeStamp = 0xffffff;
 
     if (RTMPPacket_IsReady(packet))
     {
@@ -4901,8 +4972,8 @@ stopKeyframeSearch:
 
     if (recopy)
     {
-        len = (unsigned int)(ret) > buflen ? buflen : (unsigned int)ret;
-	memcpy(buf, r->m_read.buf, len);
+        len = ret > (int)(buflen) ? buflen : (unsigned int)(ret);
+        memcpy(buf, r->m_read.buf, len);
         r->m_read.bufpos = r->m_read.buf + len;
         r->m_read.buflen = ret - len;
     }
@@ -4948,6 +5019,7 @@ fail:
             memcpy(mybuf, flvHeader, sizeof(flvHeader));
             r->m_read.buf += sizeof(flvHeader);
             r->m_read.buflen -= sizeof(flvHeader);
+            cnt += sizeof(flvHeader);
 
             while (r->m_read.timestamp == 0)
             {
@@ -4965,6 +5037,7 @@ fail:
                 {
                     mybuf = realloc(mybuf, cnt + nRead);
                     memcpy(mybuf+cnt, r->m_read.buf, nRead);
+                    free(r->m_read.buf);
                     r->m_read.buf = mybuf+cnt+nRead;
                     break;
                 }

plugins/obs-outputs/librtmp/rtmp.h

@@ -265,7 +265,7 @@ extern "C"
 
     typedef struct RTMP_BINDINFO
     {
-        struct sockaddr_in addr;
+        struct sockaddr_storage addr;
         int addrLen;
     } RTMP_BINDINFO;
 
@@ -358,7 +358,7 @@ extern "C"
 
     int RTMP_Connect(RTMP *r, RTMPPacket *cp);
     struct sockaddr;
-    int RTMP_Connect0(RTMP *r, struct sockaddr *svc);
+    int RTMP_Connect0(RTMP *r, struct sockaddr *svc, socklen_t addrlen);
     int RTMP_Connect1(RTMP *r, RTMPPacket *cp);
     int RTMP_Serve(RTMP *r);
     int RTMP_TLS_Accept(RTMP *r, void *ctx);

plugins/obs-outputs/librtmp/rtmp_sys.h

@@ -38,6 +38,7 @@
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include <Mstcpip.h>
 
 
 #ifdef _MSC_VER	/* MSVC */