[rtmpdump] r283 - in trunk: Makefile README rtmpgw.c

[hyc]

Author: hyc
Date: Thu Mar  4 08:25:29 2010
New Revision: 283

Log:
Renamed streams program to rtmpgw

Added:
   trunk/rtmpgw.c
      - copied, changed from r263, trunk/streams.c
Modified:
   trunk/Makefile
   trunk/README

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Thu Mar  4 08:17:29 2010	(r282)
+++ trunk/Makefile	Thu Mar  4 08:25:29 2010	(r283)
@@ -16,7 +16,7 @@ all:
 	@echo '    "make mingw" for a MinGW32 build'
 	@echo 'use commandline overrides if you want anything else'
 
-progs:	rtmpdump streams rtmpsrv rtmpsuck
+progs:	rtmpdump rtmpgw rtmpsrv rtmpsuck
 
 posix linux unix osx:
 	@$(MAKE) $(MAKEFLAGS) progs
@@ -31,7 +31,7 @@ cross:
 	@$(MAKE) CROSS_COMPILE=armv7a-angstrom-linux-gnueabi- INC=-I/OE/tmp/staging/armv7a-angstrom-linux-gnueabi/usr/include $(MAKEFLAGS) progs
 
 clean:
-	rm -f *.o *.a rtmpdump$(EXT) streams$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
+	rm -f *.o *.a rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
 
 librtmp.a: rtmp.o log.o amf.o hashswf.o
 	$(AR) rs $@ $?
@@ -45,12 +45,12 @@ rtmpsrv: rtmpsrv.o thread.o librtmp.a
 rtmpsuck: rtmpsuck.o thread.o librtmp.a
 	$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
 
-streams: streams.o parseurl.o thread.o librtmp.a
+rtmpgw: rtmpgw.o parseurl.o thread.o librtmp.a
 	$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
 
 log.o: log.c log.h Makefile
 parseurl.o: parseurl.c parseurl.h log.h Makefile
-streams.o: streams.c rtmp.h log.h hashswf.o Makefile
+rtmpgw.o: rtmpgw.c rtmp.h log.h hashswf.o Makefile
 rtmp.o: rtmp.c rtmp.h handshake.h dh.h log.h amf.h Makefile
 amf.o: amf.c amf.h bytes.h log.h Makefile
 rtmpdump.o: rtmpdump.c rtmp.h log.h amf.h Makefile

Modified: trunk/README
==============================================================================
--- trunk/README	Thu Mar  4 08:17:29 2010	(r282)
+++ trunk/README	Thu Mar  4 08:25:29 2010	(r283)
@@ -1,4 +1,4 @@
-RTMP Dump v2.1d
+RTMP Dump v2.2
 (C) 2009 Andrej Stepanchuk
 (C) 2009-2010 Howard Chu
 (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090
@@ -101,7 +101,7 @@ Example Servers
 Three different types of servers are also present in this distribution:
  rtmpsrv - a stub server
  rtmpsuck - a transparent proxy
- streams - an RTMP to HTTP gateway
+ rtmpgw - an RTMP to HTTP gateway
 
 rtmpsrv - Note that this is very incomplete code, and I haven't yet decided
 whether or not to finish it. It is useful for obtaining all the parameters
@@ -174,7 +174,7 @@ has performed real handshakes with both 
 negotiate whatever encryption keys are needed and so record the unencrypted
 data.
 
-streams - HTTP gateway: this is an HTTP server that accepts requests that
+rtmpgw - HTTP gateway: this is an HTTP server that accepts requests that
 consist of rtmpdump parameters. It then connects to the specified RTMP
 server and returns the retrieved data in the HTTP response. The only valid
 HTTP request is "GET /" but additional options can be provided in normal

Copied and modified: trunk/rtmpgw.c (from r263, trunk/streams.c)
==============================================================================
--- trunk/streams.c	Sun Feb 21 04:49:56 2010	(r263, copy source)
+++ trunk/rtmpgw.c	Thu Mar  4 08:25:29 2010	(r283)
@@ -1,6 +1,6 @@
-/*  HTTP-RTMP Stream Server
+/*  HTTP-RTMP Stream Gateway
  *  Copyright (C) 2009 Andrej Stepanchuk
- *  Copyright (C) 2009 Howard Chu
+ *  Copyright (C) 2009-2010 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
@@ -1173,7 +1173,7 @@ main(int argc, char **argv)
   char *httpStreamingDevice = DEFAULT_HTTP_STREAMING_DEVICE;	// streaming device, default 0.0.0.0
   int nHttpStreamingPort = 80;	// port
 
-  LogPrintf("HTTP-RTMP Stream Server %s\n", RTMPDUMP_VERSION);
+  LogPrintf("HTTP-RTMP Stream Gateway %s\n", RTMPDUMP_VERSION);
   LogPrintf("(c) 2010 Andrej Stepanchuk, Howard Chu; license: GPL\n\n");
 
   // init request
@@ -1243,7 +1243,7 @@ main(int argc, char **argv)
 	{
 	case 'h':
 	  LogPrintf
-	    ("\nThis program dumps the media content streamed over rtmp.\n\n");
+	    ("\nThis program serves media content streamed from RTMP onto HTTP.\n\n");
 	  LogPrintf("--help|-h               Prints this help screen.\n");
 	  LogPrintf
 	    ("--rtmp|-r url           URL (e.g. rtmp//hotname[:port]/path)\n");