From 68db829db66dbf8faad5bd8df35760b5af3a1491 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 3 May 2006 08:42:32 +0000 Subject: Sweet, all changes from the (once again 1 rev) branch have been merged back in. Now to finalize the changes in my other programs. --- src/test/httpsrv/httpconnectionmonitor.cpp | 3 ++- src/test/httpsrv/httpconnectionmonitor.h | 2 +- src/test/httpsrv/main.cpp | 3 ++- src/test/teltest/main.cpp | 2 +- src/test/teltest/telnetmonitor.cpp | 2 +- src/test/teltest/telnetmonitor.h | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/test') diff --git a/src/test/httpsrv/httpconnectionmonitor.cpp b/src/test/httpsrv/httpconnectionmonitor.cpp index eaadb36..ee1eab3 100644 --- a/src/test/httpsrv/httpconnectionmonitor.cpp +++ b/src/test/httpsrv/httpconnectionmonitor.cpp @@ -10,8 +10,9 @@ HttpConnectionMonitor::~HttpConnectionMonitor() { } -bool HttpConnectionMonitor::onNewConnection( Connection *pCon ) +bool HttpConnectionMonitor::onNewConnection( Connection *pCon, int nPort ) { + printf("Got connection on port %d\n", nPort ); Http hp( pCon ); pCon->readInput( 60, 0 ); diff --git a/src/test/httpsrv/httpconnectionmonitor.h b/src/test/httpsrv/httpconnectionmonitor.h index 63f29e4..30c0afd 100644 --- a/src/test/httpsrv/httpconnectionmonitor.h +++ b/src/test/httpsrv/httpconnectionmonitor.h @@ -9,7 +9,7 @@ public: HttpConnectionMonitor(); ~HttpConnectionMonitor(); - bool onNewConnection( Connection *pCon ); + bool onNewConnection( Connection *pCon, int nPort ); bool onClosedConnection( Connection *pCon ); }; diff --git a/src/test/httpsrv/main.cpp b/src/test/httpsrv/main.cpp index 4ee1ad3..2f1563c 100644 --- a/src/test/httpsrv/main.cpp +++ b/src/test/httpsrv/main.cpp @@ -10,7 +10,8 @@ int main() srv.setConnectionMonitor( &http ); - srv.startServer( 7331, 40 ); + printf("Listening on port 7331\n"); + srv.startServer( 7331 ); for(;;) { diff --git a/src/test/teltest/main.cpp b/src/test/teltest/main.cpp index ce968c4..5d3ec26 100644 --- a/src/test/teltest/main.cpp +++ b/src/test/teltest/main.cpp @@ -10,7 +10,7 @@ int main() srv.setConnectionMonitor( &telnet ); - srv.startServer( 4001, 40 ); + srv.startServer( 4001 ); for(;;) { diff --git a/src/test/teltest/telnetmonitor.cpp b/src/test/teltest/telnetmonitor.cpp index 001932f..32c2924 100644 --- a/src/test/teltest/telnetmonitor.cpp +++ b/src/test/teltest/telnetmonitor.cpp @@ -36,7 +36,7 @@ LinkMessage* TelnetMonitor::processIRM( LinkMessage *pMsg ) { } -bool TelnetMonitor::onNewConnection( Connection *pCon ) +bool TelnetMonitor::onNewConnection( Connection *pCon, int nPort ) { ProtocolTelnet *pt = new ProtocolTelnet(); pCon->setProtocol( pt ); diff --git a/src/test/teltest/telnetmonitor.h b/src/test/teltest/telnetmonitor.h index 95c8493..ba5761e 100644 --- a/src/test/teltest/telnetmonitor.h +++ b/src/test/teltest/telnetmonitor.h @@ -16,7 +16,7 @@ public: bool timeSlice(); LinkMessage* processIRM( LinkMessage *pMsgIn ); - bool onNewConnection( Connection *pCon ); + bool onNewConnection( Connection *pCon, int nPort ); bool onClosedConnection( Connection *pCon ); private: -- cgit v1.2.3