clean:
rm -f *.o rtmpdump$(EXT) streams$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
-streams: log.o rtmp.o amf.o streams.o parseurl.o hashswf.o
- $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
-
rtmpdump: log.o rtmp.o amf.o rtmpdump.o parseurl.o hashswf.o
$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(LIBS)
-rtmpsrv: log.o rtmp.o amf.o rtmpsrv.o
+rtmpsrv: log.o rtmp.o amf.o rtmpsrv.o thread.o
+ $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
+
+rtmpsuck: log.o rtmp.o amf.o rtmpsuck.o hashswf.o thread.o
$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
-rtmpsuck: log.o rtmp.o amf.o rtmpsuck.o hashswf.o
+streams: log.o rtmp.o amf.o streams.o parseurl.o hashswf.o thread.o
$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
log.o: log.c log.h Makefile
rtmpdump.o: rtmpdump.c rtmp.h log.h amf.h Makefile
rtmpsrv.o: rtmpsrv.c rtmp.h log.h amf.h Makefile
hashswf.o: hashswf.c
+thread.o: thread.c thread.h
#include "rtmp.h"
#include "parseurl.h"
-#ifdef WIN32
-#include <process.h>
-#else
+#include "thread.h"
+
#ifdef linux
#include <linux/netfilter_ipv4.h>
#endif
-#include <pthread.h>
-#endif
#define RTMPDUMP_SERVER_VERSION "v2.1"
return ret;
}
-#ifdef WIN32
-HANDLE
-ThreadCreate(void *(*routine) (void *), void *args)
-{
- HANDLE thd;
-
- thd = (HANDLE) _beginthread(routine, 0, args);
- if (thd == -1L)
- LogPrintf("%s, _beginthread failed with %d\n", __FUNCTION__, errno);
-
- return thd;
-}
-#else
-pthread_t
-ThreadCreate(void *(*routine) (void *), void *args)
-{
- pthread_t id = 0;
- pthread_attr_t attributes;
- int ret;
-
- pthread_attr_init(&attributes);
- pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
-
- ret =
- pthread_create(&id, &attributes, (void *(*)(void *)) routine,
- (void *) args);
- if (ret != 0)
- LogPrintf("%s, pthread_create failed with %d\n", __FUNCTION__, ret);
-
- return id;
-}
-#endif
-
-void *
+TFTYPE
controlServerThread(void *unused)
{
char ich;
LogPrintf("Unknown command \'%c\', ignoring\n", ich);
}
}
- return 0;
+ TFRET();
}
return;
}
-void *
+TFTYPE
serverThread(STREAMING_SERVER * server)
{
server->state = STREAMING_ACCEPTING;
}
}
server->state = STREAMING_STOPPED;
- return 0;
+ TFRET();
}
STREAMING_SERVER *
server = (STREAMING_SERVER *) calloc(1, sizeof(STREAMING_SERVER));
server->socket = sockfd;
- ThreadCreate((void *(*)(void *)) serverThread, server);
+ ThreadCreate((thrfunc *)serverThread, server);
return server;
}
#include "rtmp.h"
#include "parseurl.h"
-#ifdef WIN32
-#include <process.h>
-#else
+#include "thread.h"
+
#ifdef linux
#include <linux/netfilter_ipv4.h>
#endif
-#include <pthread.h>
-#endif
#define RTMPDUMP_PROXY_VERSION "v2.1"
return ret; // no more media packets
}
-#ifdef WIN32
-HANDLE
-ThreadCreate(void *(*routine) (void *), void *args)
-{
- HANDLE thd;
-
- thd = (HANDLE) _beginthread(routine, 0, args);
- if (thd == -1L)
- LogPrintf("%s, _beginthread failed with %d\n", __FUNCTION__, errno);
-
- return thd;
-}
-#else
-pthread_t
-ThreadCreate(void *(*routine) (void *), void *args)
-{
- pthread_t id = 0;
- pthread_attr_t attributes;
- int ret;
-
- pthread_attr_init(&attributes);
- pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
-
- ret =
- pthread_create(&id, &attributes, (void *(*)(void *)) routine,
- (void *) args);
- if (ret != 0)
- LogPrintf("%s, pthread_create failed with %d\n", __FUNCTION__, ret);
-
- return id;
-}
-#endif
-
-void *
+TFTYPE
controlServerThread(void *unused)
{
char ich;
LogPrintf("Unknown command \'%c\', ignoring\n", ich);
}
}
- return 0;
+ TFRET();
}
void doServe(STREAMING_SERVER * server, // server socket and state (our listening socket)
return;
}
-void *
+TFTYPE
serverThread(STREAMING_SERVER * server)
{
server->state = STREAMING_ACCEPTING;
}
}
server->state = STREAMING_STOPPED;
- return 0;
+ TFRET();
}
STREAMING_SERVER *
server = (STREAMING_SERVER *) calloc(1, sizeof(STREAMING_SERVER));
server->socket = sockfd;
- ThreadCreate((void *(*)(void *)) serverThread, server);
+ ThreadCreate((thrfunc *)serverThread, server);
return server;
}
#include "rtmp.h"
#include "parseurl.h"
-#ifdef WIN32
-#include <process.h>
-#else
-#include <pthread.h>
-#endif
+#include "thread.h"
#define RTMPDUMP_STREAMS_VERSION "v2.1"
return ret; // no more media packets
}
-#ifdef WIN32
-HANDLE
-ThreadCreate(void *(*routine) (void *), void *args)
-{
- HANDLE thd;
-
- thd = (HANDLE) _beginthread(routine, 0, args);
- if (thd == -1L)
- LogPrintf("%s, _beginthread failed with %d\n", __FUNCTION__, errno);
-
- return thd;
-}
-#else
-pthread_t
-ThreadCreate(void *(*routine) (void *), void *args)
-{
- pthread_t id = 0;
- pthread_attr_t attributes;
- int ret;
-
- pthread_attr_init(&attributes);
- pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
-
- ret =
- pthread_create(&id, &attributes, (void *(*)(void *)) routine,
- (void *) args);
- if (ret != 0)
- LogPrintf("%s, pthread_create failed with %d\n", __FUNCTION__, ret);
-
- return id;
-}
-#endif
-
-void *
+TFTYPE
controlServerThread(void *unused)
{
char ich;
LogPrintf("Unknown command \'%c\', ignoring\n", ich);
}
}
- return 0;
+ TFRET();
}
/*
goto quit;
}
-void *
+TFTYPE
serverThread(STREAMING_SERVER * server)
{
server->state = STREAMING_ACCEPTING;
}
}
server->state = STREAMING_STOPPED;
- return 0;
+ TFRET();
}
STREAMING_SERVER *
--- /dev/null
+/* Thread compatibility glue
+ * Copyright (C) 2009 Howard Chu
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RTMPDump; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "thread.h"
+#include "log.h"
+
+#ifdef WIN32
+HANDLE
+ThreadCreate(thrfunc *routine, void *args)
+{
+ HANDLE thd;
+
+ thd = (HANDLE) _beginthread(routine, 0, args);
+ if (thd == -1L)
+ LogPrintf("%s, _beginthread failed with %d\n", __FUNCTION__, errno);
+
+ return thd;
+}
+#else
+pthread_t
+ThreadCreate(thrfunc *routine, void *args)
+{
+ pthread_t id = 0;
+ pthread_attr_t attributes;
+ int ret;
+
+ pthread_attr_init(&attributes);
+ pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
+
+ ret =
+ pthread_create(&id, &attributes, routine, args);
+ if (ret != 0)
+ LogPrintf("%s, pthread_create failed with %d\n", __FUNCTION__, ret);
+
+ return id;
+}
+#endif
--- /dev/null
+/* Thread compatibility glue
+ * Copyright (C) 2009 Howard Chu
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with RTMPDump; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef __THREAD_H__
+#define __THREAD_H__ 1
+
+#ifdef WIN32
+#include <process.h>
+#define TFTYPE void
+#define TFRET()
+#define THANDLE HANDLE
+#else
+#include <pthread.h>
+#define TFTYPE void *
+#define TFRET() return 0
+#define THANDLE pthread_t
+#endif
+typedef TFTYPE (thrfunc)(void *arg);
+
+THANDLE ThreadCreate(thrfunc *routine, void *args);
+#endif /* __THREAD_H__ */
projects / rtmpdump / commitdiff