API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 18th, 2014
115
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.69 KB | None | 0 0
raw download clone embed print report
  1. diff -ruN libRTMP.org/hashswf.c libRTMP/hashswf.c
  2. --- libRTMP.org/hashswf.c   2014-06-18 15:25:07.631806087 -0500
  3. +++ libRTMP/hashswf.c   2014-06-18 15:25:07.395806080 -0500
  4. @@ -88,6 +88,7 @@
  5.    HTTPResult ret = HTTPRES_OK;
  6.    struct sockaddr_in sa;
  7.    RTMPSockBuf sb = {0};
  8. +  int tv;
  9.  
  10.    http->status = -1;
  11.  
  12. diff -ruN libRTMP.org/rtmp.c libRTMP/rtmp.c
  13. --- libRTMP.org/rtmp.c  2014-06-18 15:25:07.719806089 -0500
  14. +++ libRTMP/rtmp.c  2014-06-18 15:25:07.495806083 -0500
  15. @@ -261,10 +261,13 @@
  16.  {
  17.    void *ctx = NULL;
  18.  #ifdef CRYPTO
  19. +  #ifdef USE_POLARSSL
  20. +    tls_server_ctx *tc;
  21. +  #endif
  22.    if (!RTMP_TLS_ctx)
  23.      RTMP_TLS_Init();
  24.  #ifdef USE_POLARSSL
  25. -  tls_server_ctx *tc = ctx = calloc(1, sizeof(struct tls_server_ctx));
  26. +  tc = ctx = calloc(1, sizeof(struct tls_server_ctx));
  27.    tc->dhm_P = my_dhm_P;
  28.    tc->dhm_G = my_dhm_G;
  29.    tc->hs = &RTMP_TLS_ctx->hs;
  30. @@ -932,6 +935,7 @@
  31.  RTMP_Connect0(RTMP *r, struct sockaddr * service)
  32.  {
  33.    int on = 1;
  34. +  int tv;
  35.    r->m_sb.sb_timedout = FALSE;
  36.    r->m_pausing = 0;
  37.    r->m_fDuration = 0.0;
  38. @@ -3038,6 +3042,18 @@
  39.    char *pageUrl = r->Link.pageUrl.av_len ? r->Link.pageUrl.av_val : "";
  40.    int param_count;
  41.    AVal av_Command, av_Response;
  42. +
  43. +  double code;
  44. +  unsigned int parsedPort;
  45. +  AMFObject obj2;
  46. +  AMFObjectProperty p;
  47. +  AVal redirect;
  48. +  SAVC(ex);
  49. +  SAVC(redirect);
  50. +  char *playpath;
  51. +  int len;
  52. +  char *url;
  53. +
  54.    if (body[0] != 0x02)     /* make sure it is a string method name we start with */
  55.      {
  56.        RTMP_Log(RTMP_LOGWARNING, "%s, Sanity failed. no string method in invoke packet",
  57. @@ -3387,13 +3403,8 @@
  58.          }
  59.        free(methodInvoked.av_val);
  60.  #endif
  61. -      double code = 0.0;
  62. -      unsigned int parsedPort = 0;
  63. -      AMFObject obj2;
  64. -      AMFObjectProperty p;
  65. -      AVal redirect;
  66. -      SAVC(ex);
  67. -      SAVC(redirect);
  68. +      code = 0.0;
  69. +      parsedPort = 0;
  70.  
  71.        AMFProp_GetObject(AMF_GetProp(&obj, NULL, 3), &obj2);
  72.        if (RTMP_FindFirstMatchingProperty(&obj2, &av_ex, &p))
  73. @@ -3406,9 +3417,9 @@
  74.                AMFProp_GetString(&p, &redirect);
  75.                r->Link.redirected = TRUE;
  76.  
  77. -              char *playpath = "//playpath";
  78. -              int len = redirect.av_len + strlen(playpath);
  79. -              char *url = malloc(len + 1);
  80. +              playpath = "//playpath";
  81. +              len = redirect.av_len + strlen(playpath);
  82. +              url = malloc(len + 1);
  83.                memcpy(url, redirect.av_val, redirect.av_len);
  84.                memcpy(url + redirect.av_len, playpath, strlen(playpath));
  85.                url[len] = '\0';
  86. @@ -5691,6 +5702,7 @@
  87.  ConnectSocket(RTMP *r)
  88.  {
  89.    int on = 1;
  90. +  int tv;
  91.    struct sockaddr_in service;
  92.    if (!r->Link.hostname.av_len)
  93.      return FALSE;
  94. @@ -5823,14 +5835,15 @@
  95.  StripParams(AVal *src)
  96.  {
  97.    AVal str;
  98. +  char *start, *end, *ptr, *dynamic, *import;
  99.    if (src->av_val)
  100.      {
  101.        str.av_val = calloc(src->av_len + 1, sizeof (char));
  102.        strncpy(str.av_val, src->av_val, src->av_len);
  103.        str.av_len = src->av_len;
  104. -      char *start = str.av_val;
  105. -      char *end = start + str.av_len;
  106. -      char *ptr = start;
  107. +      start = str.av_val;
  108. +      end = start + str.av_len;
  109. +      ptr = start;
  110.  
  111.        while (ptr < end)
  112.          {
  113. @@ -5843,7 +5856,7 @@
  114.          }
  115.        memset(start + str.av_len, 0, 1);
  116.  
  117. -      char *dynamic = strstr(start, "[[DYNAMIC]]");
  118. +      dynamic = strstr(start, "[[DYNAMIC]]");
  119.        if (dynamic)
  120.          {
  121.            dynamic -= 1;
  122. @@ -5852,7 +5865,7 @@
  123.            end = start + str.av_len;
  124.          }
  125.  
  126. -      char *import = strstr(start, "[[IMPORT]]");
  127. +      import = strstr(start, "[[IMPORT]]");
  128.        if (import)
  129.          {
  130.            str.av_val = import + 11;
  131. @@ -5869,23 +5882,26 @@
  132.  char *
  133.  strreplace(char *srcstr, int srclen, char *orig, char *repl, int didAlloc)
  134.  {
  135. -  char *ptr = NULL, *sptr = srcstr;
  136. -  int origlen = strlen(orig);
  137. -  int repllen = strlen(repl);
  138. +  char *ptr, *sptr, *srcend, *dststr, *dptr;
  139. +  int origlen, repllen, dstbuffer, len;
  140. +
  141. +  ptr = NULL, sptr = srcstr;
  142. +  origlen = strlen(orig);
  143. +  repllen = strlen(repl);
  144.    if (!srclen)
  145.      srclen = strlen(srcstr);
  146. -  char *srcend = srcstr + srclen;
  147. -  int dstbuffer = srclen / origlen * repllen;
  148. +  srcend = srcstr + srclen;
  149. +  dstbuffer = srclen / origlen * repllen;
  150.    if (dstbuffer < srclen)
  151.      dstbuffer = srclen;
  152. -  char *dststr = calloc(dstbuffer + 1, sizeof (char));
  153. -  char *dptr = dststr;
  154. +  dststr = calloc(dstbuffer + 1, sizeof (char));
  155. +  dptr = dststr;
  156.  
  157.    if ((ptr = strstr(srcstr, orig)))
  158.      {
  159.        while (ptr < srcend && (ptr = strstr(sptr, orig)))
  160.          {
  161. -          int len = ptr - sptr;
  162. +          len = ptr - sptr;
  163.            memcpy(dptr, sptr, len);
  164.            sptr += len + origlen;
  165.            dptr += len;
  166. @@ -5907,7 +5923,7 @@
  167.  int
  168.  strsplit(char *src, int srclen, char delim, char ***params)
  169.  {
  170. -  char *sptr, *srcbeg, *srcend, *dstr;
  171. +  char *sptr, *srcbeg, *srcend, *dstr, **param;
  172.    int count = 1, i = 0, len = 0;
  173.  
  174.    if (src == NULL)
  175. @@ -5926,7 +5942,7 @@
  176.      }
  177.    sptr = srcbeg;
  178.    *params = malloc(count * sizeof (size_t));
  179. -  char **param = *params;
  180. +  param = *params;
  181.  
  182.    for (i = 0; i < (count - 1); i++)
  183.      {
  184. diff -ruN libRTMP.org/rtmp_sys.h libRTMP/rtmp_sys.h
  185. --- libRTMP.org/rtmp_sys.h  2014-06-18 15:25:07.779806091 -0500
  186. +++ libRTMP/rtmp_sys.h  2014-06-18 15:25:07.547806084 -0500
  187. @@ -40,7 +40,7 @@
  188.  #define EWOULDBLOCK    WSAETIMEDOUT    /* we don't use nonblocking, but we do use timeouts */
  189.  #define sleep(n)   Sleep(n*1000)
  190.  #define msleep(n)  Sleep(n)
  191. -#define SET_RCVTIMEO(tv,s) int tv = s*1000
  192. +#define SET_RCVTIMEO(tv,s) tv = s*1000
  193.  #else /* !_WIN32 */
  194.  #include <sys/types.h>
  195.  #include <sys/socket.h>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!