[Gnash-commit] gnash/cygnal cygnal.cpp ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/04/02 04:05:10

Modified files:
        cygnal         : cygnal.cpp ChangeLog 

Log message:
                * cygnal.cpp: Ports now have a _PORT appended.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/cygnal.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/ChangeLog?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: cygnal.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/cygnal.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- cygnal.cpp  28 Mar 2008 21:47:45 -0000      1.30
+++ cygnal.cpp  2 Apr 2008 04:05:10 -0000       1.31
@@ -212,7 +212,7 @@
 #if 1
     // Admin handler
     Handler::thread_params_t admin_data;
-    admin_data.port = gnash::ADMIN;
+    admin_data.port = gnash::ADMIN_PORT;
     boost::thread adminhandler(boost::bind(&admin_handler, &admin_data));
 #endif
 
@@ -222,7 +222,7 @@
     // the server. Since this port offset changes the constant to test for 
which protocol,
     // we pass the info to the start thread so it knows which handler to 
invoke.
     Handler::thread_params_t http_data;
-    http_data.port = port_offset + gnash::RTMPT;
+    http_data.port = port_offset + gnash::RTMPT_PORT;
     http_data.netfd = 0;
     http_data.filespec = docroot;
     boost::thread http_thread(boost::bind(&connection_handler, &http_data));
@@ -232,7 +232,7 @@
     // Incomming connection handler for port 1935, RTMP. As RTMP is not a 
priviledged port,
     // we just open it without an offset.
     Handler::thread_params_t rtmp_data;
-    rtmp_data.port = gnash::RTMP;
+    rtmp_data.port = gnash::RTMP_PORT;
     rtmp_data.netfd = 0;
     rtmp_data.filespec = docroot;
     boost::thread rtmp_thread(boost::bind(&connection_handler, &rtmp_data));
@@ -258,10 +258,10 @@
     RTMPproto proto;
     struct thread_params loadfile;
     string filespec;
-    int port = RTMPTS + port_offset;
+    int port = RTMPTS_PORT + port_offset;
 
     Statistics st;
-    st.setFileType(NetStats::RTMPTS);    
+    st.setFileType(NetStats::RTMPTS_PORT);
     
     www.createServer(port);
     

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/cygnal/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ChangeLog   28 Mar 2008 21:55:03 -0000      1.17
+++ ChangeLog   2 Apr 2008 04:05:10 -0000       1.18
@@ -1,3 +1,7 @@
+2008-04-01  Rob Savoye  <address@hidden>
+
+       * cygnal.cpp: Ports now have a _PORT appended.
+
 2008-03-28  Rob Savoye  <address@hidden>
 
        * testsuite/cygnal.all/Makefile.am: Remove testcases moved to
@@ -24,7 +28,7 @@
        threads die in the proper order.
        * handler.h: Add enum for admin commands.
        * http.cpp: Return a bool instead of a string from
-       waitForGetRequest(). CLeanup after ourselves and die when the I/O
+       waitForGetRequest(). Cleanup after ourselves and die when the I/O
        threads go away.
        * netstats.h: Add comment on statistics API. Rename ifdefs of swf
        versions.