Changeset 28236 for lang/c/librtmp

Timestamp:

01/10/09 10:51:14 (4 years ago)

Author:

itkz

Message:

fixed memory allocation bug

Location:

lang/c/librtmp

Files:

• Makefile (modified) (1 diff)
• amf_packet.c (modified) (2 diffs)
• main.c (modified) (1 diff)
• rtmp.c (modified) (6 diffs)
• rtmp.h (modified) (1 diff)
• rtmp_packet.c (modified) (1 diff)

lang/c/librtmp/Makefile

@@ -1 +1 @@
 
-CC = gcc
+CC = gcc-4.1
 
-CFLAGS = -g -Wall -Ipthread/include
-LDFLAGS = -Lpthread/lib -lwsock32 -lpthreadGC2
+CFLAGS = -g -Wall -fmudflap
+LDFLAGS = -lpthread -lmudflap
 
-TARGET = test.exe
+TARGET = test
 OBJS = main.o rtmp.o rtmp_packet.o amf_packet.o
 

lang/c/librtmp/amf_packet.c

@@ -23 +23 @@
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "amf_packet.h"
@@ -224 +226 @@
         property->next = NULL;
 
-        property->key = malloc(sizeof(string_length) + 1);
+        property->key = malloc(string_length + 1);
         memmove(property->key, raw_data + raw_data_position, string_length);
         property->key[string_length] = '\0';

lang/c/librtmp/main.c

@@ -60 +60 @@
     while (count--) {
         rtmp_client_process_message(rc);
-        Sleep(1);
+//        Sleep(1);
     }
 

lang/c/librtmp/rtmp.c

@@ -50 +50 @@
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
@@ -208 +210 @@
     rtmp_client_t *client;
     int ret;
-    WSADATA data;
+//    WSADATA data;
     struct sockaddr_in conn_sockaddr;
 
-    WSAStartup(MAKEWORD(2, 0), &data);
+//    WSAStartup(MAKEWORD(2, 0), &data);
 
     client = (rtmp_client_t*)malloc(sizeof(rtmp_client_t));
@@ -220 +222 @@
     memset(&conn_sockaddr, 0, sizeof(conn_sockaddr));
     conn_sockaddr.sin_family = AF_INET;
+    conn_sockaddr.sin_addr.s_addr = inet_addr(host);
     conn_sockaddr.sin_port = htons(port_number);
     
 /* UNIX!!!
-    ret = inet_aton(host, &(client->conn_sockaddr.sin_addr));
-    if (ret == 0) {
-    }
-*/
     conn_sockaddr.sin_addr.s_addr = inet_addr(host);
     if (conn_sockaddr.sin_addr.s_addr == INADDR_NONE) {
@@ -232 +231 @@
         return NULL;
     }
+*/
 
     client->conn_sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
-/* UNIX!!!
     ret = connect(
         client->conn_sock, &(client->conn_sockaddr),
         sizeof(client->conn_sockaddr));
     if (ret == -1) {
-    }
-*/
+        return NULL;
+    }
+/* UNIX!!!
     ret = connect(
         client->conn_sock,
@@ -249 +249 @@
         return NULL;
     }
+*/
 
     client->received_size = 0;
@@ -260 +261 @@
 void rtmp_client_free(rtmp_client_t *client)
 {
+    close(client->conn_sock);
 /* UNIX!!!
-    close(client->conn_sock);
-*/
     closesocket(client->conn_sock);
     WSACleanup();
+*/
 }
 

lang/c/librtmp/rtmp.h

@@ -109 +109 @@
 {
     int conn_sock;
+    struct sockaddr conn_sockaddr;
     unsigned char received_buffer[RTMP_BUFFER_SIZE];
     int received_size;

lang/c/librtmp/rtmp_packet.c

@@ -23 +23 @@
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "rtmp_packet.h"