for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34

@@ -299,9 +299,8 @@ END
 GDBDebug=" -g -O0"
 GDBDebug=" -g -O0"
 # the warning level.
 # the warning level.
 WarnLevel=" -Wall"
 WarnLevel=" -Wall"
-# the compile in c++ standard.
-# @remark, donot specifies it for mingw.
-CppStd="-ansi" && echo $MSYSTEM|grep "MINGW">/dev/null && CppStd=""
+# the compile standard.
+CppStd="-ansi"
 # for library compile
 # for library compile
 LibraryCompile=" -fPIC"
 LibraryCompile=" -fPIC"
 # performance of gprof
 # performance of gprof
@@ -356,7 +355,7 @@ if [ $SRS_MIPS_UBUNTU12 = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh
 MODULE_ID="CORE"
 MODULE_ID="CORE"
 MODULE_DEPENDS=()
 MODULE_DEPENDS=()
 ModuleLibIncs=(${SRS_OBJS_DIR})
 ModuleLibIncs=(${SRS_OBJS_DIR})
-MODULE_FILES=("srs_core" "srs_core_autofree" "srs_platform")
+MODULE_FILES=("srs_core" "srs_core_autofree")
 CORE_INCS="src/core"; MODULE_DIR=${CORE_INCS} . auto/modules.sh
 CORE_INCS="src/core"; MODULE_DIR=${CORE_INCS} . auto/modules.sh
 CORE_OBJS="${MODULE_OBJS[@]}"
 CORE_OBJS="${MODULE_OBJS[@]}"
 #
 #

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 // current release version
 #define VERSION_MAJOR       2
 #define VERSION_MAJOR       2
 #define VERSION_MINOR       0
 #define VERSION_MINOR       0
-#define VERSION_REVISION    33
+#define VERSION_REVISION    34
 // server info.
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"
@@ -73,11 +73,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 #endif
 
 
 // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
 // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
-#if defined(_WIN32)
-    #include <windows.h>
-#endif
-
-// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
 #ifndef _WIN32
 #ifndef _WIN32
 #include <inttypes.h>
 #include <inttypes.h>
 #endif
 #endif
@@ -115,9 +110,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
         className(const className&); \
         className(const className&); \
         className& operator= (const className&)
         className& operator= (const className&)
 
 
-// for windows to compile srs-librtmp
-// @see: https://github.com/winlinvip/simple-rtmp-server/issues/213
-#include <srs_platform.hpp>
-
 #endif
 #endif
 
 

-/*
-The MIT License (MIT)
-
-Copyright (c) 2014 allspace
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <srs_platform.hpp>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-int socket_setup()
-{
-    WORD wVersionRequested;
-    WSADATA wsaData;
-    int err;
-
-	/* Use the MAKEWORD(lowbyte, highbyte) macro declared in Windef.h */
-    wVersionRequested = MAKEWORD(2, 2);
-
-    err = WSAStartup(wVersionRequested, &wsaData);
-    if (err != 0) {
-        /* Tell the user that we could not find a usable */
-        /* Winsock DLL.                                  */
-        //printf("WSAStartup failed with error: %d\n", err);
-        return -1;
-    }
-	return 0;
-}
-
-int socket_cleanup()
-{
-	WSACleanup();
-	return 0;
-}
-
-int gettimeofday(struct timeval* tv, struct timezone* tz)
-{  
-    time_t clock;
-    struct tm tm;
-    SYSTEMTIME win_time;
-
-    GetLocalTime(&win_time);
-
-    tm.tm_year = win_time.wYear - 1900;
-    tm.tm_mon = win_time.wMonth - 1;
-    tm.tm_mday = win_time.wDay;
-    tm.tm_hour = win_time.wHour;
-    tm.tm_min = win_time.wMinute;
-    tm.tm_sec = win_time.wSecond;
-    tm.tm_isdst = -1;
-
-    clock = mktime(&tm);
-
-    tv->tv_sec = (long)clock;
-    tv->tv_usec = win_time.wMilliseconds * 1000;
-
-    return 0;
-}
-
-pid_t getpid(void)
-{
-    return (pid_t)GetCurrentProcessId();
-}
-
-int usleep(useconds_t usec)
-{
-    Sleep((DWORD)(usec / 1000));
-    return 0;
-}
-
-ssize_t writev(int fd, const struct iovec *iov, int iovcnt)
-{
-    ssize_t nwrite = 0;
-    for (int i = 0; i < iovcnt; i++) {
-        const struct iovec* current = iov + i;
-
-        int nsent = ::send(fd, (char*)current->iov_base, current->iov_len, 0);
-        if (nsent < 0) {
-            return nsent;
-        }
-
-        nwrite += nsent;
-        if (nsent == 0) {
-            return nwrite;
-        }
-    }
-    return nwrite;
-}
-
-////////////////////////   strlcpy.c (modified) //////////////////////////
-
-/*    $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $    */
-
-/*-
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-//#include <sys/cdefs.h> // ****
-//#include <cstddef> // ****
-// __FBSDID("$FreeBSD: stable/9/sys/libkern/strlcpy.c 243811 2012-12-03 18:08:44Z delphij $"); // ****
-
-// #include <sys/types.h> // ****
-// #include <sys/libkern.h> // ****
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-
-//#define __restrict // ****
-
-size_t strlcpy(char * __restrict dst, const char * __restrict src, size_t siz)
-{
-    char *d = dst;
-    const char *s = src;
-    size_t n = siz;
-
-    /* Copy as many bytes as will fit */
-    if (n != 0) {
-        while (--n != 0) {
-            if ((*d++ = *s++) == '\0')
-                break;
-        }
-    }
-
-    /* Not enough room in dst, add NUL and traverse rest of src */
-    if (n == 0) {
-        if (siz != 0)
-            *d = '\0';        /* NUL-terminate dst */
-        while (*s++)
-            ;
-    }
-
-    return(s - src - 1);    /* count does not include NUL */
-}
-
-// http://www.cplusplus.com/forum/general/141779/////////////////////////   inet_ntop.c (modified) //////////////////////////
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-// #if defined(LIBC_SCCS) && !defined(lint) // ****
-//static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp $";
-// #endif /* LIBC_SCCS and not lint */ // ****
-// #include <sys/cdefs.h> // ****
-// __FBSDID("$FreeBSD: stable/9/sys/libkern/inet_ntop.c 213103 2010-09-24 15:01:45Z attilio $"); // ****
-
-//#define _WIN32_WINNT _WIN32_WINNT_WIN8 // ****
-//#include <Ws2tcpip.h> // ****
-//#pragma comment(lib, "Ws2_32.lib") // ****
-//#include <cstdio> // ****
-
-// #include <sys/param.h> // ****
-// #include <sys/socket.h> // ****
-// #include <sys/systm.h> // ****
-
-// #include <netinet/in.h> // ****
-
-/*%
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
-static char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *    convert a network format address to presentation format.
- * return:
- *    pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *    Paul Vixie, 1996.
- */
-const char* inet_ntop(int af, const void *src, char *dst, socklen_t size)
-{
-    switch (af) {
-    case AF_INET:
-        return (inet_ntop4( (unsigned char*)src, (char*)dst, size)); // ****
-#ifdef AF_INET6
-    //#error "IPv6 not supported"
-    //case AF_INET6:
-    //    return (char*)(inet_ntop6( (unsigned char*)src, (char*)dst, size)); // ****
-#endif
-    default:
-        // return (NULL); // ****
-        return 0 ; // ****
-    }
-    /* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *    format an IPv4 address
- * return:
- *    `dst' (as a const)
- * notes:
- *    (1) uses no statics
- *    (2) takes a u_char* not an in_addr as input
- * author:
- *    Paul Vixie, 1996.
- */
-static char * inet_ntop4(const u_char *src, char *dst, socklen_t size)
-{
-    static const char fmt[128] = "%u.%u.%u.%u";
-    char tmp[sizeof "255.255.255.255"];
-    int l;
-
-    l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]); // ****
-    if (l <= 0 || (socklen_t) l >= size) {
-        return (NULL);
-    }
-    strlcpy(dst, tmp, size);
-    return (dst);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *    convert IPv6 binary address into presentation (printable) format
- * author:
- *    Paul Vixie, 1996.
- */
-static char * inet_ntop6(const u_char *src, char *dst, socklen_t size)
-{
-    /*
-     * Note that int32_t and int16_t need only be "at least" large enough
-     * to contain a value of the specified size.  On some systems, like
-     * Crays, there is no such thing as an integer variable with 16 bits.
-     * Keep this in mind if you think this function should have been coded
-     * to use pointer overlays.  All the world's not a VAX.
-     */
-    char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-    struct { int base, len; } best, cur;
-#define NS_IN6ADDRSZ 16
-#define NS_INT16SZ 2
-    u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-    int i;
-
-    /*
-     * Preprocess:
-     *    Copy the input (bytewise) array into a wordwise array.
-     *    Find the longest run of 0x00's in src[] for :: shorthanding.
-     */
-    memset(words, '\0', sizeof words);
-    for (i = 0; i < NS_IN6ADDRSZ; i++)
-        words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-    best.base = -1;
-    best.len = 0;
-    cur.base = -1;
-    cur.len = 0;
-    for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-        if (words[i] == 0) {
-            if (cur.base == -1)
-                cur.base = i, cur.len = 1;
-            else
-                cur.len++;
-        } else {
-            if (cur.base != -1) {
-                if (best.base == -1 || cur.len > best.len)
-                    best = cur;
-                cur.base = -1;
-            }
-        }
-    }
-    if (cur.base != -1) {
-        if (best.base == -1 || cur.len > best.len)
-            best = cur;
-    }
-    if (best.base != -1 && best.len < 2)
-        best.base = -1;
-
-    /*
-     * Format the result.
-     */
-    tp = tmp;
-    for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-        /* Are we inside the best run of 0x00's? */
-        if (best.base != -1 && i >= best.base &&
-            i < (best.base + best.len)) {
-            if (i == best.base)
-                *tp++ = ':';
-            continue;
-        }
-        /* Are we following an initial run of 0x00s or any real hex? */
-        if (i != 0)
-            *tp++ = ':';
-        /* Is this address an encapsulated IPv4? */
-        if (i == 6 && best.base == 0 && (best.len == 6 ||
-            (best.len == 7 && words[7] != 0x0001) ||
-            (best.len == 5 && words[5] == 0xffff))) {
-            if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
-                return (NULL);
-            tp += strlen(tp);
-            break;
-        }
-        tp += sprintf(tp, "%x", words[i]); // ****
-    }
-    /* Was it a trailing run of 0x00's? */
-    if (best.base != -1 && (best.base + best.len) == 
-        (NS_IN6ADDRSZ / NS_INT16SZ))
-        *tp++ = ':';
-    *tp++ = '\0';
-
-    /*
-     * Check for overflow, copy, and we're done.
-     */
-    if ((socklen_t)(tp - tmp) > size) {
-        return (NULL);
-    }
-    strcpy(dst, tmp);
-    return (dst);
-}
-
-#define Set_errno(num) SetLastError((num))
-
-/* INVALID_SOCKET == INVALID_HANDLE_VALUE == (unsigned int)(~0) */
-/* SOCKET_ERROR == -1 */
-//#define ENOTSOCK WSAENOTSOCK
-//#define EINTR    WSAEINTR
-//#define ENOBUFS  WSAENOBUFS
-//#define EWOULDBLOCK           WSAEWOULDBLOCK
-#define EAFNOSUPPORT  WSAEAFNOSUPPORT
-/* from public\sdk\inc\crt\errno.h */
-#define ENOSPC          28
-
-#endif
-

-/*
-The MIT License (MIT)
-
-Copyright (c) 2014 allspace
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef SRS_WIN_PORTING_H
-#define SRS_WIN_PORTING_H
-
-/** 
-* for linux like,
-* for example, not on windows or it's cygwin. 
-* while the _WIN32 includes both 32-bit and 64-bit
-*/
-#if !defined(_WIN32) || defined(__CYGWIN__)
-    #define SOCKET_ETIME ETIME
-    #define SOCKET_ECONNRESET ECONNRESET
-
-    #define SOCKET int
-    #define SOCKET_ERRNO() errno
-    #define SOCKET_RESET(fd) fd = -1; (void)0
-    #define SOCKET_CLOSE(fd) \
-        if (fd > 0) {\
-            ::close(fd); \
-            fd = -1; \
-        } \
-        (void)0
-    #define SOCKET_VALID(x) (x > 0)
-    #define SOCKET_SETUP() (void)0
-    #define SOCKET_CLEANUP() (void)0
-#else /*on windows, but not on cygwin*/
-    #include <sys/stat.h>
-    #include <time.h>
-    #include <winsock2.h>
-    #include <stdint.h>
-
-    #ifdef _MSC_VER //for VS2010
-    #include <io.h>
-    #include <fcntl.h>
-    #define S_IRUSR _S_IREAD
-    #define S_IWUSR _S_IWRITE
-    #define open _open
-    #define close _close
-    #define lseek _lseek
-    #define write _write
-    #define read _read
-
-    typedef int ssize_t;
-    typedef int pid_t;
-    typedef int mode_t;
-    typedef int64_t useconds_t;
-    #endif
-
-    #define S_IRGRP 0
-    #define S_IWGRP 0
-    #define S_IXGRP 0
-    #define S_IRWXG 0
-    #define S_IROTH 0
-    #define S_IWOTH 0
-    #define S_IXOTH 0
-    #define S_IRWXO 0
-
-    #define PRId64 "lld"
-
-    #define SOCKET_ETIME WSAETIMEDOUT
-    #define SOCKET_ECONNRESET WSAECONNRESET
-    #define SOCKET_ERRNO() WSAGetLastError()
-    #define SOCKET_RESET(x) x=INVALID_SOCKET
-    #define SOCKET_CLOSE(x) if(x!=INVALID_SOCKET){::closesocket(x);x=INVALID_SOCKET;}
-    #define SOCKET_VALID(x) (x!=INVALID_SOCKET)
-    #define SOCKET_BUFF(x) ((char*)x)
-    #define SOCKET_SETUP() socket_setup()
-    #define SOCKET_CLEANUP() socket_cleanup()
-
-    typedef uint32_t u_int32_t;
-    typedef uint8_t  u_int8_t;
-    typedef int socklen_t;
-    struct iovec {
-       void* iov_base; /* Starting address */
-       size_t iov_len; /* Length in bytes */
-    };
-
-    #define snprintf _snprintf
-    ssize_t writev(int fd, const struct iovec *iov, int iovcnt);
-    const char* inet_ntop(int af, const void *src, char *dst, socklen_t size);
-    int gettimeofday(struct timeval* tv, struct timezone* tz);
-    pid_t getpid(void);
-    int usleep(useconds_t usec);
-    int socket_setup();
-    int socket_cleanup();
-#endif
-
-#endif //SRS_WIN_PORTING_H

@@ -45,22 +45,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 SimpleSocketStream::SimpleSocketStream()
 SimpleSocketStream::SimpleSocketStream()
 {
 {
-    SOCKET_RESET(fd);
+    fd = -1;
     send_timeout = recv_timeout = ST_UTIME_NO_TIMEOUT;
     send_timeout = recv_timeout = ST_UTIME_NO_TIMEOUT;
     recv_bytes = send_bytes = 0;
     recv_bytes = send_bytes = 0;
-    SOCKET_SETUP();
 }
 }
 
 
 SimpleSocketStream::~SimpleSocketStream()
 SimpleSocketStream::~SimpleSocketStream()
 {
 {
-    SOCKET_CLOSE(fd);
-    SOCKET_CLEANUP();
+    if (fd != -1) {
+        ::close(fd);
+        fd = -1;
+    }
 }
 }
 
 
 int SimpleSocketStream::create_socket()
 int SimpleSocketStream::create_socket()
 {
 {
-    fd = ::socket(AF_INET, SOCK_STREAM, 0);
-    if (!SOCKET_VALID(fd)) {
+    if((fd = ::socket(AF_INET, SOCK_STREAM, 0)) < 0){
         return ERROR_SOCKET_CREATE;
         return ERROR_SOCKET_CREATE;
     }
     }
 
 
@@ -95,12 +95,12 @@ int SimpleSocketStream::read(void* buf, size_t size, ssize_t* nread)
     // On success a non-negative integer indicating the number of bytes actually read is returned 
     // On success a non-negative integer indicating the number of bytes actually read is returned 
     // (a value of 0 means the network connection is closed or end of file is reached).
     // (a value of 0 means the network connection is closed or end of file is reached).
     if (nb_read <= 0) {
     if (nb_read <= 0) {
-        if (nb_read < 0 && SOCKET_ERRNO() == SOCKET_ETIME) {
+        if (nb_read < 0 && errno == ETIME) {
             return ERROR_SOCKET_TIMEOUT;
             return ERROR_SOCKET_TIMEOUT;
         }
         }
         
         
         if (nb_read == 0) {
         if (nb_read == 0) {
-            errno = SOCKET_ECONNRESET;
+            errno = ECONNRESET;
         }
         }
         
         
         return ERROR_SOCKET_READ;
         return ERROR_SOCKET_READ;
@@ -158,7 +158,7 @@ int SimpleSocketStream::writev(const iovec *iov, int iov_size, ssize_t* nwrite)
     // returned, and errno is set appropriately.
     // returned, and errno is set appropriately.
     if (nb_write <= 0) {
     if (nb_write <= 0) {
         // @see https://github.com/winlinvip/simple-rtmp-server/issues/200
         // @see https://github.com/winlinvip/simple-rtmp-server/issues/200
-        if (nb_write < 0 && SOCKET_ERRNO() == SOCKET_ETIME) {
+        if (nb_write < 0 && errno == ETIME) {
             return ERROR_SOCKET_TIMEOUT;
             return ERROR_SOCKET_TIMEOUT;
         }
         }
         
         
@@ -215,7 +215,7 @@ int SimpleSocketStream::write(void* buf, size_t size, ssize_t* nwrite)
     
     
     if (nb_write <= 0) {
     if (nb_write <= 0) {
         // @see https://github.com/winlinvip/simple-rtmp-server/issues/200
         // @see https://github.com/winlinvip/simple-rtmp-server/issues/200
-        if (nb_write < 0 && SOCKET_ERRNO() == SOCKET_ETIME) {
+        if (nb_write < 0 && errno == ETIME) {
             return ERROR_SOCKET_TIMEOUT;
             return ERROR_SOCKET_TIMEOUT;
         }
         }
         
         

@@ -43,7 +43,7 @@ private:
     int64_t send_timeout;
     int64_t send_timeout;
     int64_t recv_bytes;
     int64_t recv_bytes;
     int64_t send_bytes;
     int64_t send_bytes;
-    SOCKET fd;
+    int fd;
 public:
 public:
     SimpleSocketStream();
     SimpleSocketStream();
     virtual ~SimpleSocketStream();
     virtual ~SimpleSocketStream();

@@ -34,7 +34,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sstream>
 #include <sstream>
 using namespace std;
 using namespace std;
 
 
-#include <srs_platform.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_rtmp.hpp>
 #include <srs_protocol_rtmp.hpp>
 #include <srs_lib_simple_socket.hpp>
 #include <srs_lib_simple_socket.hpp>
@@ -108,6 +107,356 @@ struct Context
     }
     }
 };
 };
 
 
+// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
+#ifdef _WIN32
+    int gettimeofday(struct timeval* tv, struct timezone* tz)
+    {  
+        time_t clock;
+        struct tm tm;
+        SYSTEMTIME win_time;
+    
+        GetLocalTime(&win_time);
+    
+        tm.tm_year = win_time.wYear - 1900;
+        tm.tm_mon = win_time.wMonth - 1;
+        tm.tm_mday = win_time.wDay;
+        tm.tm_hour = win_time.wHour;
+        tm.tm_min = win_time.wMinute;
+        tm.tm_sec = win_time.wSecond;
+        tm.tm_isdst = -1;
+    
+        clock = mktime(&tm);
+    
+        tv->tv_sec = (long)clock;
+        tv->tv_usec = win_time.wMilliseconds * 1000;
+    
+        return 0;
+    }
+    
+    int open(const char *pathname, int flags)
+    {
+        return open(pathname, flags, 0);
+    }
+    
+    int open(const char *pathname, int flags, mode_t mode)
+    {
+        FILE* file = NULL;
+    
+        if ((flags & O_RDONLY) == O_RDONLY) {
+            file = fopen(pathname, "r");
+        } else {
+            file = fopen(pathname, "w+");
+        }
+    
+        if (file == NULL) {
+            return -1;
+        }
+    
+        return (int)file;
+    }
+    
+    int close(int fd)
+    {
+        FILE* file = (FILE*)fd;
+        return fclose(file);
+    }
+    
+    off_t lseek(int fd, off_t offset, int whence)
+    {
+        return (off_t)fseek((FILE*)fd, offset, whence);
+    }
+    
+    ssize_t write(int fd, const void *buf, size_t count)
+    {
+        return (ssize_t)fwrite(buf, count, 1, (FILE*)fd);
+    }
+    
+    ssize_t read(int fd, void *buf, size_t count)
+    {
+        return (ssize_t)fread(buf, count, 1, (FILE*)fd);
+    }
+    
+    pid_t getpid(void)
+    {
+        return (pid_t)GetCurrentProcessId();
+    }
+    
+    int usleep(useconds_t usec)
+    {
+        Sleep((DWORD)(usec / 1000));
+        return 0;
+    }
+    
+    ssize_t writev(int fd, const struct iovec *iov, int iovcnt)
+    {
+        ssize_t nwrite = 0;
+        for (int i = 0; i < iovcnt; i++) {
+            const struct iovec* current = iov + i;
+    
+            int nsent = ::send(fd, (char*)current->iov_base, current->iov_len, 0);
+            if (nsent < 0) {
+                return nsent;
+            }
+    
+            nwrite += nsent;
+            if (nsent == 0) {
+                return nwrite;
+            }
+        }
+        return nwrite;
+    }
+    
+    ////////////////////////   strlcpy.c (modified) //////////////////////////
+    
+    /*    $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $    */
+    
+    /*-
+     * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+     *
+     * Permission to use, copy, modify, and distribute this software for any
+     * purpose with or without fee is hereby granted, provided that the above
+     * copyright notice and this permission notice appear in all copies.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+     * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+     * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+     * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+     * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+     * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+     * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+     */
+    
+    //#include <sys/cdefs.h> // ****
+    //#include <cstddef> // ****
+    // __FBSDID("$FreeBSD: stable/9/sys/libkern/strlcpy.c 243811 2012-12-03 18:08:44Z delphij $"); // ****
+    
+    // #include <sys/types.h> // ****
+    // #include <sys/libkern.h> // ****
+    
+    /*
+     * Copy src to string dst of size siz.  At most siz-1 characters
+     * will be copied.  Always NUL terminates (unless siz == 0).
+     * Returns strlen(src); if retval >= siz, truncation occurred.
+     */
+    
+    //#define __restrict // ****
+    
+    std::size_t strlcpy(char * __restrict dst, const char * __restrict src, size_t siz)
+    {
+        char *d = dst;
+        const char *s = src;
+        size_t n = siz;
+    
+        /* Copy as many bytes as will fit */
+        if (n != 0) {
+            while (--n != 0) {
+                if ((*d++ = *s++) == '\0')
+                    break;
+            }
+        }
+    
+        /* Not enough room in dst, add NUL and traverse rest of src */
+        if (n == 0) {
+            if (siz != 0)
+                *d = '\0';        /* NUL-terminate dst */
+            while (*s++)
+                ;
+        }
+    
+        return(s - src - 1);    /* count does not include NUL */
+    }
+    
+    // http://www.cplusplus.com/forum/general/141779/////////////////////////   inet_ntop.c (modified) //////////////////////////
+    /*
+     * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+     * Copyright (c) 1996-1999 by Internet Software Consortium.
+     *
+     * Permission to use, copy, modify, and distribute this software for any
+     * purpose with or without fee is hereby granted, provided that the above
+     * copyright notice and this permission notice appear in all copies.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+     * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+     * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+     * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+     * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+     * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+     * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+     */
+    
+    // #if defined(LIBC_SCCS) && !defined(lint) // ****
+    //static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp $";
+    // #endif /* LIBC_SCCS and not lint */ // ****
+    // #include <sys/cdefs.h> // ****
+    // __FBSDID("$FreeBSD: stable/9/sys/libkern/inet_ntop.c 213103 2010-09-24 15:01:45Z attilio $"); // ****
+    
+    //#define _WIN32_WINNT _WIN32_WINNT_WIN8 // ****
+    //#include <Ws2tcpip.h> // ****
+    #pragma comment(lib, "Ws2_32.lib") // ****
+    //#include <cstdio> // ****
+    
+    // #include <sys/param.h> // ****
+    // #include <sys/socket.h> // ****
+    // #include <sys/systm.h> // ****
+    
+    // #include <netinet/in.h> // ****
+    
+    /*%
+     * WARNING: Don't even consider trying to compile this on a system where
+     * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
+     */
+    
+    static char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
+    static char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
+    
+    /* char *
+     * inet_ntop(af, src, dst, size)
+     *    convert a network format address to presentation format.
+     * return:
+     *    pointer to presentation format address (`dst'), or NULL (see errno).
+     * author:
+     *    Paul Vixie, 1996.
+     */
+    const char* inet_ntop(int af, const void *src, char *dst, socklen_t size)
+    {
+        switch (af) {
+        case AF_INET:
+            return (inet_ntop4( (unsigned char*)src, (char*)dst, size)); // ****
+    #ifdef AF_INET6
+        #error "IPv6 not supported"
+        //case AF_INET6:
+        //    return (char*)(inet_ntop6( (unsigned char*)src, (char*)dst, size)); // ****
+    #endif
+        default:
+            // return (NULL); // ****
+            return 0 ; // ****
+        }
+        /* NOTREACHED */
+    }
+    
+    /* const char *
+     * inet_ntop4(src, dst, size)
+     *    format an IPv4 address
+     * return:
+     *    `dst' (as a const)
+     * notes:
+     *    (1) uses no statics
+     *    (2) takes a u_char* not an in_addr as input
+     * author:
+     *    Paul Vixie, 1996.
+     */
+    static char * inet_ntop4(const u_char *src, char *dst, socklen_t size)
+    {
+        static const char fmt[128] = "%u.%u.%u.%u";
+        char tmp[sizeof "255.255.255.255"];
+        int l;
+    
+        l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]); // ****
+        if (l <= 0 || (socklen_t) l >= size) {
+            return (NULL);
+        }
+        strlcpy(dst, tmp, size);
+        return (dst);
+    }
+    
+    /* const char *
+     * inet_ntop6(src, dst, size)
+     *    convert IPv6 binary address into presentation (printable) format
+     * author:
+     *    Paul Vixie, 1996.
+     */
+    static char * inet_ntop6(const u_char *src, char *dst, socklen_t size)
+    {
+        /*
+         * Note that int32_t and int16_t need only be "at least" large enough
+         * to contain a value of the specified size.  On some systems, like
+         * Crays, there is no such thing as an integer variable with 16 bits.
+         * Keep this in mind if you think this function should have been coded
+         * to use pointer overlays.  All the world's not a VAX.
+         */
+        char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
+        struct { int base, len; } best, cur;
+    #define NS_IN6ADDRSZ 16
+    #define NS_INT16SZ 2
+        u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
+        int i;
+    
+        /*
+         * Preprocess:
+         *    Copy the input (bytewise) array into a wordwise array.
+         *    Find the longest run of 0x00's in src[] for :: shorthanding.
+         */
+        memset(words, '\0', sizeof words);
+        for (i = 0; i < NS_IN6ADDRSZ; i++)
+            words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
+        best.base = -1;
+        best.len = 0;
+        cur.base = -1;
+        cur.len = 0;
+        for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
+            if (words[i] == 0) {
+                if (cur.base == -1)
+                    cur.base = i, cur.len = 1;
+                else
+                    cur.len++;
+            } else {
+                if (cur.base != -1) {
+                    if (best.base == -1 || cur.len > best.len)
+                        best = cur;
+                    cur.base = -1;
+                }
+            }
+        }
+        if (cur.base != -1) {
+            if (best.base == -1 || cur.len > best.len)
+                best = cur;
+        }
+        if (best.base != -1 && best.len < 2)
+            best.base = -1;
+    
+        /*
+         * Format the result.
+         */
+        tp = tmp;
+        for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
+            /* Are we inside the best run of 0x00's? */
+            if (best.base != -1 && i >= best.base &&
+                i < (best.base + best.len)) {
+                if (i == best.base)
+                    *tp++ = ':';
+                continue;
+            }
+            /* Are we following an initial run of 0x00s or any real hex? */
+            if (i != 0)
+                *tp++ = ':';
+            /* Is this address an encapsulated IPv4? */
+            if (i == 6 && best.base == 0 && (best.len == 6 ||
+                (best.len == 7 && words[7] != 0x0001) ||
+                (best.len == 5 && words[5] == 0xffff))) {
+                if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
+                    return (NULL);
+                tp += strlen(tp);
+                break;
+            }
+            tp += std::sprintf(tp, "%x", words[i]); // ****
+        }
+        /* Was it a trailing run of 0x00's? */
+        if (best.base != -1 && (best.base + best.len) == 
+            (NS_IN6ADDRSZ / NS_INT16SZ))
+            *tp++ = ':';
+        *tp++ = '\0';
+    
+        /*
+         * Check for overflow, copy, and we're done.
+         */
+        if ((socklen_t)(tp - tmp) > size) {
+            return (NULL);
+        }
+        strcpy(dst, tmp);
+        return (dst);
+    }
+#endif
+
 int srs_librtmp_context_parse_uri(Context* context) 
 int srs_librtmp_context_parse_uri(Context* context) 
 {
 {
     int ret = ERROR_SUCCESS;
     int ret = ERROR_SUCCESS;

@@ -30,10 +30,46 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 #include <sys/types.h>
 #include <sys/types.h>
 
 
+// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
 #ifdef _WIN32
 #ifdef _WIN32
-    typedef long int int64_t;
+    #define _CRT_SECURE_NO_WARNINGS
+    typedef unsigned long long u_int64_t;
+    typedef long long int64_t;
     typedef unsigned int u_int32_t;
     typedef unsigned int u_int32_t;
     typedef int int32_t;
     typedef int int32_t;
+    typedef unsigned char u_int8_t;
+    typedef char int8_t;
+    typedef unsigned short u_int16_t;
+    typedef short int16_t;
+    typedef int64_t ssize_t;
+    struct iovec {
+        void  *iov_base;    /* Starting address */
+        size_t iov_len;     /* Number of bytes to transfer */
+    };
+    #include <time.h>
+    #include <windows.h>
+    int gettimeofday(struct timeval* tv, struct timezone* tz);
+    #define PRId64 "lld"
+    typedef int socklen_t;
+    const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
+    typedef int mode_t;
+    #define S_IRUSR 0
+    #define S_IWUSR 0
+    #define S_IRGRP 0
+    #define S_IWGRP 0
+    #define S_IROTH 0
+    int open(const char *pathname, int flags);
+    int open(const char *pathname, int flags, mode_t mode);
+    int close(int fd);
+    off_t lseek(int fd, off_t offset, int whence);
+    ssize_t write(int fd, const void *buf, size_t count);
+    ssize_t read(int fd, void *buf, size_t count);
+    typedef int pid_t;
+    pid_t getpid(void);
+    #define snprintf _snprintf
+    ssize_t writev(int fd, const struct iovec *iov, int iovcnt);
+    typedef int64_t useconds_t;
+    int usleep(useconds_t usec);
 #endif
 #endif
 
 
 /**
 /**

@@ -15,8 +15,6 @@ file
 	..\core\srs_core.cpp,
 	..\core\srs_core.cpp,
 	..\core\srs_core_autofree.hpp,
 	..\core\srs_core_autofree.hpp,
 	..\core\srs_core_autofree.cpp,
 	..\core\srs_core_autofree.cpp,
-	..\core\srs_platform.hpp,
-	..\core\srs_platform.cpp,
 	kernel readonly separator,
 	kernel readonly separator,
 	..\kernel\srs_kernel_buffer.hpp,
 	..\kernel\srs_kernel_buffer.hpp,
 	..\kernel\srs_kernel_buffer.cpp,
 	..\kernel\srs_kernel_buffer.cpp,