From 4ecbf33fae730bc79c4a47e6efda615b104754ad Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Apr 2013 13:14:48 +0200 Subject: tagging ychat-0.7.8 --- CHANGES | 29 ---- CVS/Entries | 13 +- Makefile | 6 +- NEWS | 17 +++ README | 31 ++-- RELEASES | 64 ++++----- SNAPSHOT | 2 +- TODO | 7 +- VERSION | 2 +- etc/CVS/Entries | 2 +- etc/ychat.conf | 18 ++- html/CVS/Entries | 6 +- scripts/CVS/Entries | 7 +- scripts/makeyhttpd.pl | 3 +- scripts/stats.pl | 4 +- src/CVS/Entries | 40 +++--- src/CVS/Entries.Log | 1 + src/chat/CVS/Entries | 32 ++--- src/chat/base.h | 4 - src/chat/base.tmpl | 30 ---- src/chat/chat.cpp | 8 +- src/chat/chat.h | 1 - src/chat/gcol.cpp | 2 - src/chat/room.cpp | 10 -- src/chat/room.h | 2 - src/chat/sman.cpp | 20 +-- src/chat/sman.h | 3 +- src/chat/user.cpp | 43 ++---- src/chat/user.h | 8 +- src/cli/CVS/Entries | 4 +- src/cli/cli.cpp | 29 ---- src/cli/cli.h | 8 +- src/conf/CVS/Entries | 4 +- src/conf/conf.cpp | 9 +- src/configure | 16 +-- src/contrib/crypt/CVS/Entries | 6 +- src/contrib/xml/CVS/Entries | 8 +- src/data/CVS/Entries | 14 +- src/data/data_base.cpp | 2 +- src/data/data_base.h | 2 +- src/glob.h | 72 ++++------ src/html.cpp | 3 +- src/main.cpp | 89 +++++++++++- src/maps/CVS/Entries | 16 +-- src/maps/shashmap.h | 9 +- src/maps/shashmap.tmpl | 14 -- src/memb/memb.h | 50 +------ src/memb/memb.tmpl | 67 +-------- src/memb/tupel.h | 2 - src/memb/tupel.tmpl | 14 +- src/modl.cpp | 8 -- src/modl.h | 3 +- src/mods/commands/CVS/Entries | 60 ++++---- src/mods/commands/Makefile.in | 2 +- src/mods/html/CVS/Entries | 14 +- src/mods/html/Makefile.in | 4 +- src/msgs.h | 14 +- src/ncur/CVS/Entries | 8 +- src/ncur/ncur.cpp | 5 +- src/ncur/ncur.h | 4 +- src/reqp.cpp | 52 ++++--- src/reqp.h | 7 +- src/sign.cpp | 9 +- src/sock/CVS/Entries | 4 +- src/sock/sock.cpp | 323 +++++++++--------------------------------- src/sock/sock.h | 38 ++--- src/stats.cpp | 167 +++++++++++----------- src/stats.h | 23 +-- src/thrd/CVS/Entries | 8 +- src/thrd/pool.cpp | 9 +- src/thrd/pool.h | 9 +- src/thrd/thro.cpp | 1 - src/thrd/thro.h | 2 +- src/time/CVS/Entries | 8 +- src/time/timr.cpp | 4 +- src/tool/CVS/Entries | 8 +- src/wrap.cpp | 132 +++-------------- src/wrap.h | 21 +-- 78 files changed, 624 insertions(+), 1176 deletions(-) diff --git a/CHANGES b/CHANGES index a1f06a9..abec250 100644 --- a/CHANGES +++ b/CHANGES @@ -1,32 +1,3 @@ --Changes from 0.7.9.2-RELEASE to 0.7.9.3-STABLERELEASE - -$ The 0.7 branch is now STABLE. -$ Modified the Makefiles, so that they produce valid output while using -$ the -j flag of gmake. -$ Fixed a mini bug in the src/configure script. -$ Backported some security related HTTP patches from the 0.8-CURRENT branch. - --Changes from 0.7.9.1-RELEASE to 0.7.9.2-RELEASE - -$ Added monitor/dump, and the dump command to the CLI. -$ Fixed a bug in the session manager. -$ Added gmake dist do the README. -$ Added the charset to the HTTP-header. - --Changes from 0.7.9-RELEASE to 0.7.9.1-RELEASE - -$ Fixed etc/ychat.conf (Its now valid XML) -$ Fixed some typos. -$ Added the scripts/makedist.sh script, which can be invoked by gmake dist. -$ yhttpd.org has been renamed to yChat.org. The yhttpd.org SLD will be -$ canceled! The yhttpd.org Homepage will remain on yChat.org! - --Changes from 0.7.8-RELEASE to 0.7.9-RELEASE - -$ In the system messages will be the user printed which has requested the - specified module. -$ Removed the cursor from the ncurses interface. -$ Added wrap::init_wrappers -> The main.cpp is now shorter. -$ Added some Makefile modifications -$ Bugfix: cleanipcache shouldn run every minute but every 10! -$ Bugfix: scripts/stats.pl now counts all text-files properly. - -Changes from 0.7.7.1-RELEASE to 0.7.8-RELEASE - $ Updated the yhttpd generation script due new sources in src/memb. $ Changd some hashmaps back into simple std::map objects, this might diff --git a/CVS/Entries b/CVS/Entries index b7262f8..6e0ccd2 100644 --- a/CVS/Entries +++ b/CVS/Entries @@ -1,9 +1,10 @@ -/CHANGES/1.17/Mon Feb 14 20:09:50 2005// +/CHANGES/1.32/Sat Mar 5 11:35:09 2005// /COPYING/1.6/Sun Jun 27 06:32:26 2004// /INSTALL/1.7/Fri Jul 9 22:33:20 2004// -/Makefile/1.31/Sun Feb 13 07:56:58 2005// -/NEWS/1.33/Mon Feb 14 20:09:50 2005// -/README/1.98/Mon Feb 14 20:09:50 2005// -/TODO/1.68/Mon Feb 14 17:33:09 2005// -/configure/1.31/Wed Feb 9 22:42:58 2005// +/Makefile/1.34/Sun Feb 27 06:28:53 2005// +/NEWS/1.42/Sat Mar 5 11:36:48 2005// +/README/1.115/Sat Mar 5 11:35:09 2005// +/RELEASES/1.13/Sat Mar 5 11:35:09 2005// +/TODO/1.75/Sat Mar 5 00:15:23 2005// +/configure/1.34/Fri Mar 4 21:00:44 2005// D diff --git a/Makefile b/Makefile index b3c5ca8..070817f 100755 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ MAKE=`tail -n 1 make.version` PREFIX=`grep "define PREFIX" src/glob.h | cut -d'"' -f2` -all: version base modules +all: version base modules version @echo "Now edit the ychat.conf and run ychat!" @echo "The config file is searched in the following order:" @echo " ./ychat.conf " @@ -74,7 +74,7 @@ mrproper: clean @if test -f g++.version; then rm -f g++.version; fi @if test -f make.version; then rm -f make.version; fi @if test -f src/Makefile; then rm -f src/Makefile; fi - @if test -f bin/ychat; then find bin/ -name "*ychat*" | xargs rm -f; fi + @if test -f bin/ychat; then find bin/ -name "*ychat" | xargs rm -f; fi @if test -d src/mods; then find src/mods/*/ -name Makefile | xargs rm -f; fi @find . -name "*.add" | xargs rm -f @ls | grep core | xargs rm -f @@ -84,5 +84,3 @@ debug: @gdb bin/ychat ychat.core confdebug: ./configure -g3 -ggdb -dist: - @./scripts/makedist.sh diff --git a/NEWS b/NEWS index 310dde8..76d6ab6 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +::(05.03.05)::Released yChat 0.7.8. This release includes an IP cache for more speed. An UNIX signal catcher class has been added. SIGUSR1 and SIGUSR2 now clean the template cache or reload all dynamic modules. Added "Allow" to the HTTPD header. Also, lots of Bugfixes and minor improvements were made. Changed the 0.5 branch into STABLE. The 0.5.4-STABLERELEASE will follow next week. The ychat-stable CVS branch has been opened, which now points to ychat-0.5. +::(02.03.05)::Released yChat 0.5.3. This is a LEGACYRELEASE. It includes a stats generation script located in the scripts/ directory which can be called by gmake stats. Also all the sources have been moved to ./src. Some minor bugfixes are included also. +::(27.02.05)::Released yChat 0.5.2. This is a LEGACYRELEASE. That means, that this version is not official supported. The 0.5.2 version might be interesting by developers who want to have a clean base structure of an existing C++ based chat system. The 0.5.2 version does not have any features besides logging in and single room chatting. Multi rooms can be added easily. +::(24.02.05)::Released yChat 0.7.7.1. This release only includes a yChat startup bugfix. +::(17.02.05)::Released yChat 0.7.6. This release now uses the hash_map class from the SGI STL extension which is more stable then the old Hash Map used by yChat. +::(14.02.05)::Released yChat 0.7.5. The garbage collector will now run once a hour. The dynamic thread pool has been improved. Removed thre equiv-http-refresh meta tag from the online list. Added a minor bugfix in the /topic command. Implemented an HTML based list of all logged in users and the /users command which does the same. +::(13.02.05)::Released yChat 0.7.4.1 This new version includes a major bugfix made in the new dynamic thread pool which has been introdouced in 0.7.4. The bug resulted in a thread pool dead lock.. Tagged yChat 0.7.5-CURRENT into CVS. +::(12.02.05)::Released yChat 0.7.4. This release includes a code cleanup and a dynamic increasing thread pool. Also, some other thread pool and session engine improvements were made. The Makefiles got more organized and the HTTPD header has got a Content-length line. The Content-type text/plain is now also supported. The command line interface has got the ! (bang) operator. So you can run programs of your shell through yChat. The HTML interface has got a scrolling checkbox to de/activate the scrolling of the chat stream. Last but not least some bugfixes were made. +::(09.02.05)::Tagged yChat 0.7.4-PRERELEASE into CVS. The RELEASE will follow this week. +::(08.01.05)::We passed the build number 3000! 3000 times yChat has been compiled during the developing process since there are build numbers! Also the first steps have been made porting yChat/yhttpd to the Windows platform using Cygwin (yChat 0.7.4-CURRENT Build 3040 CYGWIN_NT-5.1 1.5.12 (0.116/4/2) i686). It runs without having installed Cygwin and having an 1MB cygwin1.dll file instead. There are still some issues (like dynamic modules [which means, that there are no chat commands and no color choser etc], command line interface, ncurses interface, database support) which do not yet run on Cygwin. But those issues will be resolved the next weeks. An alpha (experimental) binary yChat/Win32 release might be done also. +::(04.01.05)::First we wish all of you a happy new year. Second we have to announce that yhttpd 0.7-CURRENT now also has tested on an OpenBSD/i386 MP 3.6 box with success. Also yChat 0.7.4-CURRENT is now available from CVS. +::(29.12.04)::Released yChat 0.7.3-RELEASE. New features: Added the /all command (Global system message), added FreeBSD 5.3-RELEASE support, added chat.enableguest option. Renamed the /getstatus command into /about. Fixed some bugs. +::(09.11.04)::Released yChat 0.7.2-RELEASE. New features: /morph. Added the new standard html template design. Bugfixes: /away prints a . instead of a : if no away reason is given. /ko message was wrong. Displayed not room name of the user to be kicked out. /invisible command displayed wrong private messages. /getstatus had no help text. /msg and /s should now print the system time if printalwaystime == true. Added a blank to the /uptime message. /topic now prints the topic in the user's color. +- Fixed some typos. +::(06.11.04)::Released yChat and yhttpd 0.7.1-RELEASE. Added ${MAKE} to the Make file because some Linux distros dont use the "gmake" command for GNU make but just "make"! Modified the configure script to generate a make.version file. Removed some typos from the ychat.conf. Fixed the auto away message. This one will be posted in the room as public rather than only private to the auto-away-user. Fixed some documentation stuff for yhttpd because yhttpd does not need MySQL at all. Added the chat.maxlength.word option. +::(02.11.04)::We now provided a yhttpd-0.7.tar.bz2 file for download which is a source code package of the HTTP kernel of yChat. This one can be used as a stand alone web server. Also a yhttpd branch will be created for yhttpd as well. :) We also started to work on the 0.7.x-CURRENT versions which will become some day 0.8-RELEASE. +::(01.11.04)::We now provided a ychat-0.7.tar.bz2 file for download which is a source code package of the release we made yesterday. It also contains some fixes since then. You can download it on this site under Sourcecode -> Source packages -> CPP-yChat. :) ::(31.10.04)::After a long yChat 0.7-CURRENT developing phase we are proud to anounce yChat 0.7-RELEASE. By now, there may not any 0.7 release source packages for download available but you can fetch the release from the current cvs instead until source packages are available. This release has the biggest change log ever in yChat history. Here are some highlights: Included color switcher user interface, smart garbage collection engine, real MySQL support, nick registration + password protection, completly rewritten configure and Makefile scripts, perl script for source code stats, system_log and room_log, logout button, string replace for smileys e.g., additional CLI mode in parallel to the ncurses mode for the admin interface, memory watching, HTTP POST request handling in addition to POST request handling, CGI support, md5-summing of session ids to make reverse engineering of sessions harder, yhttpd generation script out of the yChat source tree, XML based configuration file, and lots of new configuration options which we can't list all here. yChat 0.7-RELEASE is known to compile and work correctly with GNU G++ 3.1, 3.2, 3.3 and 3.4. This announcement will be as well on Freshmeat.net on monday. ::(30.10.04)::yChat now has been tested on an OpenBSD 3.6 MP box with success. It has been compiled with GNU make 3.80 and GNU G++ 3.3.2. OpenBSD is now the 3rd operating system which is know to work with yChat. The other two tested OSes are still FreeBSD and Linux. All other UNIX and UNIX like operating systems should also work. But if you have tested it please write us an email to tell us about. ;) ::(26.09.04)::Renamed yChat Advanced 0.5 into yChat 0.6-RELEASE and yChat 0.6-CURRENT into yChat 0.7-CURRENT. diff --git a/README b/README index cf2f810..185df99 100755 --- a/README +++ b/README @@ -1,4 +1,4 @@ -yChat; Homepage: www.yChat.org; Version 0.7.9.3-RELEASES +yChat; Homepage: www.yChat.org; Version 0.7.8-RELEASE Copyright (C) 2003 Paul C. Buetow, Volker Richter Copyright (C) 2004, 2005 Paul C. Buetow @@ -36,7 +36,6 @@ YCHAT TABLE OF CONTENTS: 1.7.0 WRITING BUG REPORTS 1.8.0 CONTACT 1.9.0 YHTTPD CODE BASE GENERATION //<< -2.0.0 CREDITS 0.0.0 ABOUT RELEASES @@ -52,9 +51,6 @@ yhttpd does not have as much features but is easy to use and faster than apache. yhttpd is a subset of the chat. It can be generated using the srcipts/yhttpdbase.pl script in the chat's source tree. -- The ycurses - -ycurses is a easy to use and small C++ wrapper of the C ncurses API. - There are different branches: - CURRENT - @@ -202,8 +198,8 @@ lot of user and room objects are created and destroyed frequently. 1.0.0 REQUIREMENTS: -- GNU GCC G++ - The GNU C++ compiler version 3.1 or up. +- GNU GCC G++ 3.4 + The GNU C++ compiler. - GNU make 3.80 (gmake) or higher If you dont have a gmake executable but make is gnu make then you need @@ -267,7 +263,7 @@ homepage which is located at http://www.yChat.org. yChat can be downloaded as a source package or through CVS. The packages are located at http://www.yChat.org -> Sourcecode -> -Packages or go to http://pub.buetow.org/yChat/yChat . +Packages or go to http://pub.buetow.org/yChat/CPP-yChat . For CVS download type: @@ -318,7 +314,6 @@ or gmake config): gmake confdebug (runs ./configure with enabling debugging) gmake config (runs yChat configurator) gmake debug (runs gdb on ./ychat.core) - gmake dist (creates a .tar.bz2 ball) gmake gpl (shows the GNU General Public License) gmake help (shows all available ychat gmake targets) gmake mail (sends a mail to the yChat developers containing build opts.) @@ -464,7 +459,7 @@ src/msgs.h - Defines some server side messages How to submit a good bug report? -Send them to mail at yChat dot org. +Send them to Bug@yChat.org. First you should give the following information: - yChat version, if CVS (or devel. tarball) then which day? @@ -520,7 +515,8 @@ You may contact us through the following addresses: The yChat homepage is located at http://www.yChat.org - E-Mail - Paul C. Buetow: Buetow at yChat point org ( core developer ) + Paul C. Buetow: Snooper at yChat point org ( core developer ) + Volker Richter: Rover at yChat dot org ( core developer ) Mail at yChat dot org ( reaches everybody of yChat ) - ICQ @@ -530,18 +526,7 @@ You may contact us through the following addresses: #Ychat and #Coding at irc.german-elite.net //<<* -1.9.0 YHTTPD CODE BASE GENERATION +1.9 YHTTPD CODE BASE GENERATION See docs/yhttpd.txt //*>> - -2.0.0 CREDITS - -Thanks to the following persons. Without them yChat would not be like today: - -- Volker Richter of EXA Digital Solutions GbR - (http://www.exa-ds.com) for adding initial MySQL support and lots of more - code. - -- Joshia Teitelbaum of CryptpMail.org for adding - lots of security patches in the HTTP header handling. diff --git a/RELEASES b/RELEASES index 1d62ebc..24e4afa 100644 --- a/RELEASES +++ b/RELEASES @@ -1,40 +1,32 @@ Release table -Release date Release name and version Release focus +Release date Branch Release focus -Planing: yChat 0.7.9.4-STABLERELEASE Maintenance -Planing: ycurses 0.1-RELEASE________ Initial release -Planing: yhttpd 0.8-RELEASE_________ Features -Planing: yChat 0.8.2-RELEASE________ Features +Planing: yXML 0.1-RELEASE_________ Initial release +Planung: yChat 0.5.4-STABLERELEASE N/A +Planung: yhttpd 0.7.2-RELEASE_____ Features -Jun 21st 05: yChat 0.8.1-RELEASE Major features -May 25th 05: yChat 0.8.0-RELEASE Major features -May 08th 05: yChat 0.7.9.3-STABLERELEASE Security bugfixes -Apr 11th 05: yChat 0.5.5-STABLERELEASE__ Minor security fixes -Apr 10th 05: yChat 0.7.9.2-RELEASE______ Major security fixes -Apr 07th 05: yChat 0.7.9.1-RELEASE______ Minor bugfixes -Mar 11th 05: yChat 0.7.9-RELEASE________ -Mar 08th 05: yChat 0.5.4-STABLERELEASE__ -Mar 05th 05 yChat 0.7.8-RELEASE________ -Mar 02th 05 yChat 0.5.3-LEGACYRELEASE__ -Feb 27th 05 yChat 0.5.2-LEGACYRELEASE__ -Feb 24th 05 yChat 0.7.7.1-RELEASE______ Major bugfixes -Feb 21th 05 yChat 0.7.7-RELEASE________ -Feb 18th 05 yChat 0.7.6-RELEASE________ -Feb 15th 05 yChat 0.7.5-RELEASE________ -Feb 14th 05 yChat 0.7.4.1-RELEASE______ Major bugfixes -Feb 12th 05 yChat 0.7.4-RELEASE________ -Feb 10th 05 yChat 0.7.4-PRERELEASE_____ -Dec 29th 04 yChat 0.7.3-RELEASE________ -Nov 09th 04 yChat 0.7.2-RELEASE________ -Nov 06th 04 yhttpd 0.7.1-RELEASE_______ -Nov 06th 04 yChat 0.7.1-RELEASE________ -Nov 01st 04 yhttpd 0.7-RELEASE_________ Initial release -Oct 31st 04 yChat 0.7-RELEASE__________ -Jan 03rd 04 yChat 0.5.1-RELEASE________ -Sep 15th 03 yChat 0.6-RELEASE__________ -Sep 15th 03 yChat 0.5.0-RELEASE________ -Apr 26th 03 yChat 0.4-RELEASE__________ -Mar 30th 03 yChat 0.3-RELEASE__________ -Mar 24th 03 yChat 0.2-RELEASE__________ -Mar 20th 03 yChat 0.1-RELEASE__________ Initial release +Mar 05th 05 yChat 0.7.8-RELEASE______ Features +Mar 02th 05 yChat 0.5.3-LEGACYRELEASE Minor improvements +Feb 27th 05 yChat 0.5.2-LEGACYRELEASE Bugfixes, code cleanup +Feb 24th 05 yChat 0.7.7.1-RELEASE____ Bugfix +Feb 21th 05 yChat 0.7.7-RELEASE______ Code cleanup +Feb 18th 05 yChat 0.7.6-RELEASE______ Improvements +Feb 15th 05 yChat 0.7.5-RELEASE______ Features, bugfixes +Feb 14th 05 yChat 0.7.4.1-RELEASE____ Bugfix +Feb 12th 05 yChat 0.7.4-RELEASE______ Bugfixes, improvements, feat. +Feb 10th 05 yChat 0.7.4-PRERELEASE___ Bugfixes, improvements, feat. +Dec 29th 04 yChat 0.7.3-RELEASE______ Bugfixes, features +Nov 09th 04 yChat 0.7.2-RELEASE______ Bugfixes, features +Nov 06th 04 yhttpd 0.7.1-RELEASE_____ Bugfixes +Nov 06th 04 yChat 0.7.1-RELEASE______ Bugfixes +Nov 01st 04 yhttpd 0.7-RELEASE_______ Initial release +Oct 31st 04 yChat 0.7-RELEASE________ Cleanup, features +Jan 03rd 04 yChat 0.5.1-RELEASE______ Cleanup, bugfixes +Sep 15th 03 yChat 0.6-RELEASE________ Cleanup, features +Sep 15th 03 yChat 0.5.0-RELEASE______ Features +Apr 26th 03 yChat 0.4-RELEASE________ Features +Mar 30th 03 yChat 0.3-RELEASE________ Features +Mar 24th 03 yChat 0.2-RELEASE________ Bugfixes +Mar 20th 03 yChat 0.1-RELEASE________ Initial release + diff --git a/SNAPSHOT b/SNAPSHOT index 6f8684e..4872beb 100644 --- a/SNAPSHOT +++ b/SNAPSHOT @@ -1 +1 @@ -Thu Feb 17 23:59:05 CET 2005 +Sat Mar 5 12:36:58 CET 2005 diff --git a/TODO b/TODO index 404cee2..009aa00 100644 --- a/TODO +++ b/TODO @@ -1,8 +1,7 @@ - Must do's for next RELEASE - -$ None specific +$ Add thread pool decreasing - Might do's for next RELEASE - -$ Add thread pool decreasing $ dir : public vector $ Disable /help command for commands wich are not accessible for the $ specific user. @@ -10,10 +9,6 @@ $ Flood protection $ Add /nick, /beam, /su $ Add / to whisper to the last person to whom the user has been whispered the last time. -- Known bugs - -$ Using yChat via proxy sometimes causes a white chat stream. -$ yhttpd cant serve very large html files. - - To do in general for some later RELEASE - $ Use libevent $ Not found sites should get a 404 error site! diff --git a/VERSION b/VERSION index ab96f12..c240510 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -yChat 0.7.5-RELEASE Build 3213 +yChat 0.7.8-RELEASE Build 3592 diff --git a/etc/CVS/Entries b/etc/CVS/Entries index 5d7edfa..7822364 100644 --- a/etc/CVS/Entries +++ b/etc/CVS/Entries @@ -1,2 +1,2 @@ -/ychat.conf/1.41/Mon Feb 14 20:09:50 2005// +/ychat.conf/1.46/Sun Feb 27 06:28:53 2005// D diff --git a/etc/ychat.conf b/etc/ychat.conf index 0bdb3c1..e875420 100644 --- a/etc/ychat.conf +++ b/etc/ychat.conf @@ -1,5 +1,4 @@ - - + @@ -649,11 +648,11 @@ Specifies the relative or absolute path to the system messsage log file @@ -687,4 +686,3 @@ - diff --git a/html/CVS/Entries b/html/CVS/Entries index b9ef70c..19aa725 100644 --- a/html/CVS/Entries +++ b/html/CVS/Entries @@ -9,12 +9,12 @@ /input.html/1.12/Mon Feb 14 18:01:22 2005// /loggedin.html/1.1/Mon Feb 14 18:01:22 2005// /notfound.html/1.2/Sat Mar 20 21:58:14 2004// -/online.html/1.6/Mon Feb 14 18:01:22 2005// +/online.html/1.7/Wed Feb 23 05:08:04 2005// /options.html/1.6/Sun Nov 7 02:24:57 2004// /register.html/1.10/Sun Nov 7 02:37:57 2004// /robots.txt/1.1.1.1/Fri Jan 2 03:15:10 2004// -/stream.html/1.5/Sat Feb 12 16:15:30 2005// -/style.css/1.3/Sun Nov 7 02:24:57 2004// +/stream.html/1.6/Sat Feb 19 11:08:50 2005// +/style.css/1.4/Sat Feb 19 11:08:50 2005// /test.cgi/1.2/Sat Sep 25 04:12:43 2004// /urlredirect.html/1.1/Sun Nov 7 00:33:14 2004// D diff --git a/scripts/CVS/Entries b/scripts/CVS/Entries index d18751c..4fb49c8 100644 --- a/scripts/CVS/Entries +++ b/scripts/CVS/Entries @@ -1,8 +1,9 @@ /README/1.1/Tue Jun 29 23:38:15 2004// -/astyle.sh/1.1/Sat Nov 13 19:16:39 2004// +/astyle.sh/1.2/Mon Feb 21 01:55:49 2005// /buildnr.pl/1.4/Sun Feb 6 16:38:36 2005// -/config.sh/1.3/Sun Oct 31 18:04:18 2004// -/makeyhttpd.pl/1.11/Wed Feb 9 22:42:58 2005// +/checkperl.sh/1.1/Sat Feb 26 23:09:19 2005// +/config.pl/1.1/Sat Feb 26 21:14:55 2005// +/makeyhttpd.pl/1.15/Tue Mar 1 14:10:39 2005// /screen.sh/1.1/Fri Mar 5 05:53:12 2004// /setglobvals.pl/1.1.1.1/Fri Jan 2 03:15:10 2004// /stats.pl/1.7/Fri Jan 14 17:33:02 2005// diff --git a/scripts/makeyhttpd.pl b/scripts/makeyhttpd.pl index 7dd0345..6adcc96 100644 --- a/scripts/makeyhttpd.pl +++ b/scripts/makeyhttpd.pl @@ -40,7 +40,6 @@ my %substituate = ( 'yChat' => 'yhttpd', 'YCHAT' => 'YHTTPD', 'CHAT' => 'HTTPD', - 'yhttpd.org' => 'yChat.org', '//>>' => '' ); @@ -157,7 +156,7 @@ sub remove_marked_lines { sub edit_yhttpd_conf { my @old = fopen("etc/yhttpd.conf"); - my @new = @old[0..1]; + my @new = shift @old; my $flag = 0; for (@old) diff --git a/scripts/stats.pl b/scripts/stats.pl index 96fbdf1..e5cc2b3 100755 --- a/scripts/stats.pl +++ b/scripts/stats.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# The yhttpd Project (2003 - 2004) +# The yChat Project (2003 - 2004) # # This script generates source code and project statistics @@ -76,7 +76,7 @@ sub filestats $stats{"Number of script files"}++; $stats{"Lines of scripts"} += countlines($shift); } - elsif ( $shift =~ /(\.txt|[A-Z]+)$/ ) + elsif ( $shift =~ /(\.txt|README|INSTALL|COPYING|NEWS|SNAPSHOT|ChangeLog)$/ ) { $stats{"Number of text files"}++; $stats{"Lines of text"} += countlines($shift); diff --git a/src/CVS/Entries b/src/CVS/Entries index 7009aff..4472904 100644 --- a/src/CVS/Entries +++ b/src/CVS/Entries @@ -1,21 +1,23 @@ /Makefile.in/1.22/Tue Sep 7 17:14:39 2004// -/configure/1.28/Fri Jan 7 21:00:19 2005// -/glob.h/1.51/Sun Feb 13 03:53:35 2005// -/html.cpp/1.18/Thu Feb 10 16:07:18 2005// -/html.h/1.8/Fri Jan 7 21:00:19 2005// -/incl.h/1.4/Fri Jan 7 21:00:19 2005// -/logd.cpp/1.9/Sun Feb 6 16:38:36 2005// -/logd.h/1.7/Sun Feb 6 16:38:36 2005// -/main.cpp/1.30/Thu Feb 10 19:55:24 2005// -/modl.cpp/1.16/Fri Jan 7 21:00:19 2005// -/modl.h/1.8/Thu Nov 18 13:41:47 2004// -/msgs.h/1.161/Mon Feb 14 20:09:50 2005// -/name.cpp/1.7/Fri Jan 7 21:00:19 2005// -/name.h/1.5/Fri Jan 7 21:00:19 2005// -/reqp.cpp/1.34/Thu Feb 10 16:07:18 2005// -/reqp.h/1.12/Sun Feb 6 16:38:36 2005// -/stats.cpp/1.9/Fri Jan 7 21:00:19 2005// -/stats.h/1.6/Fri Jan 7 21:00:19 2005// -/wrap.cpp/1.15/Wed Feb 9 22:42:58 2005// -/wrap.h/1.22/Wed Feb 9 22:42:58 2005// +/configure/1.38/Sun Feb 27 06:28:53 2005// +/glob.h/1.70/Fri Mar 4 21:09:34 2005// +/html.cpp/1.23/Wed Feb 23 20:23:31 2005// +/html.h/1.11/Wed Feb 23 03:12:05 2005// +/incl.h/1.7/Wed Feb 23 03:12:05 2005// +/logd.cpp/1.15/Sun Feb 27 06:28:53 2005// +/logd.h/1.11/Wed Feb 23 03:12:05 2005// +/main.cpp/1.37/Fri Mar 4 02:41:30 2005// +/modl.cpp/1.18/Mon Feb 21 01:55:49 2005// +/modl.h/1.10/Mon Feb 21 01:55:49 2005// +/msgs.h/1.200/Sat Mar 5 11:35:09 2005// +/name.cpp/1.8/Mon Feb 21 01:55:49 2005// +/name.h/1.6/Mon Feb 21 01:55:49 2005// +/reqp.cpp/1.41/Tue Mar 1 16:11:03 2005// +/reqp.h/1.15/Wed Feb 23 03:12:05 2005// +/sign.cpp/1.2/Fri Mar 4 21:09:34 2005// +/sign.h/1.1/Fri Mar 4 02:41:30 2005// +/stats.cpp/1.10/Mon Feb 21 01:55:49 2005// +/stats.h/1.7/Mon Feb 21 01:55:49 2005// +/wrap.cpp/1.17/Fri Feb 25 00:15:38 2005// +/wrap.h/1.24/Fri Feb 25 00:15:38 2005// D diff --git a/src/CVS/Entries.Log b/src/CVS/Entries.Log index fd574a4..7d9d881 100644 --- a/src/CVS/Entries.Log +++ b/src/CVS/Entries.Log @@ -5,6 +5,7 @@ A D/contrib//// A D/data//// A D/irc//// A D/maps//// +A D/memb//// A D/mods//// A D/ncur//// A D/sock//// diff --git a/src/chat/CVS/Entries b/src/chat/CVS/Entries index 8d2fcbd..26360be 100644 --- a/src/chat/CVS/Entries +++ b/src/chat/CVS/Entries @@ -1,17 +1,17 @@ -/base.h/1.5/Fri Jan 7 21:00:19 2005// -/base.tmpl/1.4/Thu Nov 18 13:41:47 2004// -/chat.cpp/1.14/Fri Jan 7 21:00:19 2005// -/chat.h/1.8/Fri Jan 7 21:00:19 2005// -/gcol.cpp/1.4/Thu Nov 18 13:41:47 2004// -/gcol.h/1.3/Thu Nov 18 13:41:47 2004// -/perm.cpp/1.7/Thu Nov 18 13:41:47 2004// -/perm.h/1.5/Thu Nov 18 13:41:47 2004// -/room.cpp/1.9/Sun Feb 6 16:38:36 2005// -/room.h/1.5/Sun Feb 6 16:38:36 2005// -/sess.cpp/1.5/Tue Jan 4 18:31:35 2005// -/sess.h/1.5/Tue Jan 4 18:31:35 2005// -/sman.cpp/1.9/Tue Jan 4 18:31:35 2005// -/sman.h/1.4/Tue Jan 4 18:31:35 2005// -/user.cpp/1.13/Mon Feb 14 20:09:50 2005// -/user.h/1.6/Fri Jan 7 21:00:19 2005// +/base.h/1.8/Mon Feb 21 01:55:49 2005// +/base.tmpl/1.6/Mon Feb 21 01:55:49 2005// +/chat.cpp/1.20/Fri Feb 25 00:15:38 2005// +/chat.h/1.12/Wed Feb 23 03:12:05 2005// +/gcol.cpp/1.7/Mon Feb 21 01:55:49 2005// +/gcol.h/1.5/Mon Feb 21 01:55:49 2005// +/perm.cpp/1.10/Mon Feb 21 01:55:49 2005// +/perm.h/1.8/Mon Feb 21 01:55:49 2005// +/room.cpp/1.11/Fri Mar 4 00:34:29 2005// +/room.h/1.8/Fri Mar 4 00:34:29 2005// +/sess.cpp/1.6/Mon Feb 21 01:55:49 2005// +/sess.h/1.6/Mon Feb 21 01:55:49 2005// +/sman.cpp/1.11/Mon Feb 21 01:55:49 2005// +/sman.h/1.6/Mon Feb 21 01:55:49 2005// +/user.cpp/1.17/Wed Feb 23 20:23:31 2005// +/user.h/1.11/Mon Feb 21 01:55:49 2005// D diff --git a/src/chat/base.h b/src/chat/base.h index b995c5c..9da4304 100755 --- a/src/chat/base.h +++ b/src/chat/base.h @@ -9,9 +9,6 @@ template class base : public nhashmap { -protected: - void dumpit(); - public: base(); ~base(); @@ -25,7 +22,6 @@ public: } virtual type* get_elem( string s_name, bool &b_found ); // get a element. - virtual type* get_elem( string s_name ); virtual void add_elem( type* p_type ); // add a element. // chat::msg_post sends to all users of the system a message. diff --git a/src/chat/base.tmpl b/src/chat/base.tmpl index 5b0fceb..0be21aa 100755 --- a/src/chat/base.tmpl +++ b/src/chat/base.tmpl @@ -21,14 +21,6 @@ base::get_elem( string s_name, bool &b_found ) return p_type; } -template -type* -base::get_elem( string s_name) -{ - bool b; - return get_elem(s_name, b); -} - template void base::add_elem( type* p_type ) @@ -36,26 +28,4 @@ base::add_elem( type* p_type ) nhashmap::add_elem(p_type, p_type->get_lowercase_name()); } -template -void -base::dumpit() -{ - dumpable::add("[base]"); - vector* p_vec = nhashmap::get_key_vector(); - - vector::iterator iter; - for (iter = p_vec->begin(); iter != p_vec->end(); ++iter) - { - dumpable::add(*iter); - type* p_elem = get_elem(*iter); - if (p_elem) - { - dumpable::next_no_newline(); - dumpable::add(p_elem->dump(dumpable::get_level())); - } - } - - delete p_vec; -} - #endif diff --git a/src/chat/chat.cpp b/src/chat/chat.cpp index e4cbaac..0839261 100755 --- a/src/chat/chat.cpp +++ b/src/chat/chat.cpp @@ -165,6 +165,7 @@ chat::login( map &map_params ) else { sess* p_sess = wrap::SMAN->create_session(); + //p_sess->set_value( string("nick"), (void *) new string(s_user) ); p_sess->set_user(p_user); map_params["tmpid"] = p_sess->get_tmpid(); p_user->set_tmpid( map_params["tmpid"] ); @@ -360,11 +361,4 @@ chat::string_replacer(string *p_msg) } } -void -chat::dumpit() -{ - dumpable::add("[chat]"); - base::dumpit(); -} - #endif diff --git a/src/chat/chat.h b/src/chat/chat.h index bb087d5..47645c3 100755 --- a/src/chat/chat.h +++ b/src/chat/chat.h @@ -23,7 +23,6 @@ class chat : public base, public perm private: map map_replace_strings; vector vec_replace_keys; - void dumpit(); public: virtual room* get_room( string s_name ) diff --git a/src/chat/gcol.cpp b/src/chat/gcol.cpp index d4c9416..7df111d 100755 --- a/src/chat/gcol.cpp +++ b/src/chat/gcol.cpp @@ -44,8 +44,6 @@ gcol::add_user_to_garbage( user* p_user ) p_user->s_mess_delete(); p_map_users->add_elem( p_user, tool::to_lower(p_user->get_name()) ); wrap::system_message( GARUSER + p_user->get_name() ); - p_user->destroy_session(); - #ifdef NCURSES print_garbage(); diff --git a/src/chat/room.cpp b/src/chat/room.cpp index 0e28c84..b927d40 100755 --- a/src/chat/room.cpp +++ b/src/chat/room.cpp @@ -101,14 +101,4 @@ room::set_name( string s_name ) #endif } -void -room::dumpit() -{ - dumpable::add("[room]"); - dumpable::add("Name: "+get_name()); - dumpable::add("Topic: "+get_topic()); - base::dumpit(); -} - - #endif diff --git a/src/chat/room.h b/src/chat/room.h index 4c5fac6..06b0a9a 100755 --- a/src/chat/room.h +++ b/src/chat/room.h @@ -23,8 +23,6 @@ private: logd* p_logd; #endif - - void dumpit(); public: room( string s_name ); diff --git a/src/chat/sman.cpp b/src/chat/sman.cpp index 530aa17..d80d421 100755 --- a/src/chat/sman.cpp +++ b/src/chat/sman.cpp @@ -21,33 +21,23 @@ sman::~sman() string sman::generate_id( int i_len ) { - string s_valid = wrap::CONF->get_elem("chat.session.validchars"); + string valid_chars = wrap::CONF->get_elem("chat.session.validchars"); string s_ret = ""; srand(time(0)+tool::string2int(wrap::CONF->get_elem("chat.session.kloakkey"))); int i_char; - for (int i = 0; i < i_len; i++) { - i_char = rand() % s_valid.length(); - s_ret += s_valid[i_char]; + i_char = rand() % 64; + s_ret += valid_chars[i_char]; } if ( wrap::CONF->get_elem("chat.session.md5hash") == "true" ) { string s_salt = wrap::CONF->get_elem("chat.session.md5salt"); - string s_hash(md5::MD5Crypt(s_ret.c_str(), s_salt.c_str())); - s_ret.append(s_hash.substr(s_ret.find(s_salt) + s_salt.length() + 3)); - } - - // Prove, if the TempID already exists - sess* p_sess = get_elem(s_ret); - - if (p_sess) - { - wrap::system_message(SESSEXI); - return generate_id(i_len); + s_ret = string(md5::MD5Crypt(s_ret.c_str(), s_salt.c_str())); + return s_ret.substr(s_ret.find(s_salt) + s_salt.length() + 3); } return s_ret; diff --git a/src/chat/sman.h b/src/chat/sman.h index 13fc45a..992fc64 100755 --- a/src/chat/sman.h +++ b/src/chat/sman.h @@ -7,11 +7,10 @@ #include "sess.h" #include "../maps/shashmap.h" -#include "../monitor/dump.h" using namespace std; -class sman : public shashmap +class sman : private shashmap { private: string generate_id( int i_len ); diff --git a/src/chat/user.cpp b/src/chat/user.cpp index bac8b7e..4f1646b 100755 --- a/src/chat/user.cpp +++ b/src/chat/user.cpp @@ -73,27 +73,23 @@ user::initialize() void user::clean() { - destroy_session(); - set_fake( false ); - set_invisible( false ); - set_away( false, "" ); -} - -void -user::destroy_session() -{ - if ( !get_has_sess() ) - return; + // If this user has a session + if ( get_has_sess() ) + { #ifdef DATABASE - // Store all changed data into the mysql table if this user is registered: - if ( b_is_reg ) - wrap::DATA->update_user_data( get_name(), "savechangednick", map_changed_data ); + // Store all changed data into the mysql table if this user is registered: + if ( b_is_reg ) + wrap::DATA->update_user_data( get_name(), "savechangednick", map_changed_data ); #endif - set_has_sess(false); - wrap::SMAN->destroy_session(get_tmpid()); - set_tmpid(""); + wrap::SMAN->destroy_session( get_tmpid() ); + // wrap::system_message( SESSION + tool::int2string( wrap::SMAN->get_session_count() ) ); + } + + set_fake( false ); + set_invisible( false ); + set_away( false, "" ); } string @@ -415,7 +411,7 @@ user::command( string &s_command ) string s_command2 = s_command.substr(0, pos2-1); s_mod.append( s_command2 ).append( ".so" ); - dynmod *mod = wrap::MODL->get_module( s_mod, get_name() ); + dynmod *mod = wrap::MODL->get_module( s_mod ); if ( mod == NULL || wrap::CHAT->get_command_disabled( s_command2 ) || @@ -581,15 +577,4 @@ void user::reconf() {} -void -user::dumpit() -{ - dumpable::add("[user]"); - dumpable::add("Name: " + get_name() + - "; Room: " + get_room()->get_name() + - "; Status: " + tool::int2string(get_status())); - dumpable::add("TempID: " + get_tmpid()); -} - - #endif diff --git a/src/chat/user.h b/src/chat/user.h index 4632e07..443eef6 100755 --- a/src/chat/user.h +++ b/src/chat/user.h @@ -5,13 +5,13 @@ #include "../name.h" #include "../time/timo.h" -#include "../monitor/dump.h" +//#include "../memb/memb.h" class room; using namespace std; -class user : public name, public timo, public dumpable +class user : public name, public timo//, public memb { private: @@ -56,8 +56,7 @@ private: pthread_mutex_t mut_map_changed_data; void initialize(); - void set_changed_data( string s_varname, string s_value ); - void dumpit(); + void set_changed_data( string s_varname, string s_value ); public: pthread_cond_t cond_message; @@ -68,7 +67,6 @@ public: ~user(); void clean(); - void destroy_session(); // gets specific data of this user und stores it in // (*p_map)["nick"]. this method will be used diff --git a/src/cli/CVS/Entries b/src/cli/CVS/Entries index 7d01982..10c9656 100644 --- a/src/cli/CVS/Entries +++ b/src/cli/CVS/Entries @@ -1,3 +1,3 @@ -/cli.cpp/1.25/Wed Feb 9 22:42:58 2005// -/cli.h/1.11/Fri Jan 7 21:00:19 2005// +/cli.cpp/1.28/Mon Feb 28 18:03:02 2005// +/cli.h/1.13/Mon Feb 21 02:14:23 2005// D diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index cc0f5e5..96a0010 100755 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -37,8 +37,6 @@ cli::parse_input( string s_input ) cout << CLIPRMO << " (d)ebug - Starts debug routine (cli.cpp)" << endl; #endif - cout << CLIPRMO << " (du)mp [part] - Prints out a dump of the data structure" << endl; - cout << CLIPRMO << " (Run without part to list all possibilities)" << endl; cout << CLIPRMO << " (e)cho VAR - Prints out configuration value of VAR" << endl; cout << CLIPRMO << " Wildcards can be used too, example: echo http*" << endl; #ifdef NCURSES @@ -80,11 +78,6 @@ cli::parse_input( string s_input ) cout << CLIPRMI; } #endif - else if ( s_input.compare("du") == 0 || s_input.compare("dump") == 0 ) - { - dump d(vectorize(s_param)); - cout << CLIPRMI; - } else if( s_input.compare("echo") == 0 || s_input.compare("e") == 0 ) { string s_val; @@ -141,7 +134,6 @@ cli::parse_input( string s_input ) { cout << CLIPRMO; wrap::MODL->reload_modules(); - cout << MODRELO << endl; cout << CLIPRMI; } //*>> @@ -215,7 +207,6 @@ cli::parse_input( string s_input ) { cout << CLIPRMO; wrap::MODL->unload_modules(); - cout << MODUNLO << endl; cout << CLIPRMI; } //*>> @@ -294,26 +285,6 @@ cli::print_rusage() delete p_rusage; } -vector -cli::vectorize(string s_param) -{ - vector vec_ret; - unsigned i_pos; - - for (i_pos = s_param.find(" "); - i_pos != string::npos; - i_pos = s_param.find(" ")) - { - vec_ret.push_back(s_param.substr(0, i_pos)); - s_param = s_param.substr(i_pos+1); - } - - if (!s_param.empty()) - vec_ret.push_back(s_param); - - return vec_ret; -} - #ifdef DEBUG void cli::debug_routine() diff --git a/src/cli/cli.h b/src/cli/cli.h index 7d51e3f..23e1d1c 100755 --- a/src/cli/cli.h +++ b/src/cli/cli.h @@ -22,8 +22,6 @@ #include "../thrd/thro.h" #endif -#include "../monitor/dump.h" - using namespace std; #ifndef NCURSES @@ -34,9 +32,8 @@ class cli { #endif private: - int parse_input(string s_input); - vector vectorize(string s_param); - + int parse_input(string s_input); + public: cli( ); ~cli( ); @@ -55,6 +52,7 @@ void start(void* p_void); void start(); #endif + }; #endif diff --git a/src/conf/CVS/Entries b/src/conf/CVS/Entries index 68ec4ab..cfb51ed 100644 --- a/src/conf/CVS/Entries +++ b/src/conf/CVS/Entries @@ -1,3 +1,3 @@ -/conf.cpp/1.11/Fri Jan 7 21:00:19 2005// -/conf.h/1.7/Fri Jan 7 21:00:19 2005// +/conf.cpp/1.14/Sun Feb 27 06:28:53 2005// +/conf.h/1.11/Sun Feb 27 06:28:53 2005// D diff --git a/src/conf/conf.cpp b/src/conf/conf.cpp index 38c29c4..2e5893b 100755 --- a/src/conf/conf.cpp +++ b/src/conf/conf.cpp @@ -36,7 +36,6 @@ conf::conf( string s_conf, map* p_start_params ) : name::name( s_ cout << CFILEFA << endl; exit(1); } - else { cout << CFILEOK << "..." << endl; @@ -77,18 +76,12 @@ conf::parse_xml(TiXmlNode* p_node, vector* p_vec) { //cout << p_vec->size() << ": (Value:" << p_child->Value() << ") (Type:" << p_child->Type() << ")" << endl; - if ( strcmp(p_child->Value(),"config") == 0 ) - { - parse_xml(p_child, p_vec); - } - - else if ( strcmp(p_child->Value(),"category") == 0 ) + if ( strcmp(p_child->Value(),"category") == 0 ) { p_vec->push_back(p_child->ToElement()->Attribute("name")); parse_xml(p_child, p_vec); p_vec->pop_back(); } - else if ( strcmp(p_child->Value(),"option") == 0 ) { string s_option_name = ""; diff --git a/src/configure b/src/configure index 125890c..eb54cce 100755 --- a/src/configure +++ b/src/configure @@ -70,7 +70,7 @@ perl -e ' remove_from_array("libmysqlclient.so",\@libs); } - if ( /\/\/#define NCURSES/ ) + elsif ( /\/\/#define NCURSES/ ) { remove_from_array("ncurses.h",\@headers); remove_from_array("libncurses.so",\@libs); @@ -156,23 +156,19 @@ perl -e ' $ofile =~ s/\.cpp/\.o/; print Fout "../obj/$ofile: $cppfile\n"; print Fout "\t\@if ! test -d `dirname ../obj/$ofile`; then mkdir -p `dirname ../obj/$ofile`; fi\n"; - my $class = $ofile; - $class =~ s/\.o//; - - my $text; - if ( $class =~ /contrib\/.+/ ) + if ( $ofile =~ /contrib\/.+/ ) { - my $dirname = `dirname $class`; - $text = "\t\@echo -n \"Contributed class $class \"\n"; + my $dirname = `dirname $ofile`; + print Fout "\t\@echo -n \"Compiling contributed class $ofile \"\n"; } else { - $text = "\t\@echo -n \"Base class $class \"\n"; + print Fout "\t\@echo -n \"Compiling base class $ofile \"\n"; } print Fout "\t\@\$(CC) \$(CFLAGS) \$(INCLUDES) $args -c -o ../obj/$ofile $cppfile\n"; - print Fout $text."\t\@du -hc ../obj/$ofile | tail -n 1 | sed s/total// | sed \"s/ //g\"\n"; + print Fout "\t\@du -hc ../obj/$ofile | tail -n 1 | sed s/total// | sed \"s/ //g\"\n"; } close Fout; diff --git a/src/contrib/crypt/CVS/Entries b/src/contrib/crypt/CVS/Entries index 0548c58..78ab490 100644 --- a/src/contrib/crypt/CVS/Entries +++ b/src/contrib/crypt/CVS/Entries @@ -1,5 +1,5 @@ /how/1.1/Tue Aug 31 17:50:55 2004// -/md5.cpp/1.3/Thu Nov 18 13:41:47 2004// -/md5.h/1.3/Thu Nov 18 13:41:47 2004// -/md5crypt.cpp/1.3/Thu Nov 18 13:41:47 2004// +/md5.cpp/1.4/Mon Feb 21 01:55:49 2005// +/md5.h/1.4/Mon Feb 21 01:55:49 2005// +/md5crypt.cpp/1.4/Mon Feb 21 01:55:49 2005// D diff --git a/src/contrib/xml/CVS/Entries b/src/contrib/xml/CVS/Entries index fa52de9..baf8483 100644 --- a/src/contrib/xml/CVS/Entries +++ b/src/contrib/xml/CVS/Entries @@ -1,6 +1,6 @@ /README/1.1/Tue Sep 7 17:28:34 2004// -/tinyxml.cpp/1.3/Thu Nov 18 13:41:47 2004// -/tinyxml.h/1.4/Thu Nov 18 13:41:47 2004// -/tinyxmlerror.cpp/1.3/Thu Nov 18 13:41:47 2004// -/tinyxmlparser.cpp/1.3/Thu Nov 18 13:41:47 2004// +/tinyxml.cpp/1.4/Mon Feb 21 01:55:49 2005// +/tinyxml.h/1.5/Mon Feb 21 01:55:49 2005// +/tinyxmlerror.cpp/1.4/Mon Feb 21 01:55:49 2005// +/tinyxmlparser.cpp/1.4/Mon Feb 21 01:55:49 2005// D diff --git a/src/data/CVS/Entries b/src/data/CVS/Entries index 848bb28..eb4056f 100644 --- a/src/data/CVS/Entries +++ b/src/data/CVS/Entries @@ -1,10 +1,10 @@ /README/1.1/Sun Apr 11 05:17:03 2004// -/con.cpp/1.8/Fri Jan 7 21:17:53 2005// -/con.h/1.6/Fri Jan 7 21:17:53 2005// +/con.cpp/1.9/Mon Feb 21 01:55:49 2005// +/con.h/1.7/Mon Feb 21 01:55:49 2005// /con_base.cpp/1.7/Fri Jan 7 21:17:53 2005// -/con_base.h/1.7/Fri Jan 7 21:17:53 2005// -/data.cpp/1.10/Fri Jan 7 21:17:53 2005// -/data.h/1.7/Fri Jan 7 21:17:53 2005// -/data_base.cpp/1.12/Fri Jan 7 21:17:53 2005// -/data_base.h/1.9/Fri Jan 7 21:17:53 2005// +/con_base.h/1.8/Mon Feb 21 01:55:49 2005// +/data.cpp/1.13/Fri Feb 25 00:52:24 2005// +/data.h/1.10/Fri Feb 25 00:52:24 2005// +/data_base.cpp/1.14/Mon Feb 21 01:55:49 2005// +/data_base.h/1.11/Mon Feb 21 01:55:49 2005// D diff --git a/src/data/data_base.cpp b/src/data/data_base.cpp index 8150608..05f4e0a 100644 --- a/src/data/data_base.cpp +++ b/src/data/data_base.cpp @@ -47,7 +47,7 @@ data_base::data_base( ) } } -void data_base::init_connections() +void data_base::initialize_connections() { int i_min_con = tool::string2int( wrap::CONF->get_elem("chat.database.mincon") ), i_max_con = tool::string2int( wrap::CONF->get_elem("chat.database.maxcon") ); diff --git a/src/data/data_base.h b/src/data/data_base.h index 79f5630..1da5ce7 100644 --- a/src/data/data_base.h +++ b/src/data/data_base.h @@ -36,7 +36,7 @@ public: data_base(); ~data_base(); - void init_connections(); + void initialize_connections(); virtual hashmap select_user_data( string s_user, string s_query ); virtual void insert_user_data( string s_user, string s_query, hashmap insert_map ); virtual void update_user_data( string s_user, string s_query, hashmap update_map ); diff --git a/src/glob.h b/src/glob.h index a0d980a..3fe9b7f 100755 --- a/src/glob.h +++ b/src/glob.h @@ -1,11 +1,11 @@ /* Notice: - + All #defines which start with an CONFIG can be edited through gmake config in the main directory! */ -#include "maps/hashmap.h" +#include "maps/hashmap.h" // global variables. #ifndef GLOB_H @@ -18,15 +18,15 @@ //<<* /* FIRST THE YCHAT ONLY OPTIONS */ -/* - CONFIG - +/* - CONFIG - Should yChat get compiled with database support? Currently MyS- QL only is a supported database. */ //#define DATABASE #ifdef DATABASE -#define USE_MYSQL -/* - CONFIG - +#define USE_MYSQL +/* - CONFIG - Should all database queries printed out at the admin interface? (This option wont take action if database support has not been chosen) @@ -54,12 +54,12 @@ */ #define CONFILE "ychat.conf" -/* - DISABLED - +/* - DISABLED - Enable debugging options. */ //#define DEBUG -/* - DISABLED - +/* - DISABLED - If you want to enable EXPERIMENTAL features, then set this val- ue to true. Else use false which is recommended! All experimen- al features are marked inside of the running yChat! @@ -68,7 +68,7 @@ /* - CONFIG - Should yChat get compiled with logging support? -*/ +*/ #define LOGGING /* - CONFIG - @@ -80,33 +80,23 @@ */ #define MAXPORT 65535 -/* Specifies the max amount of lines to read from a HTTP request - header -*/ -#define MAXLINES 30 - -/* Specifies the max length of a lines to read from a HTTP request - header -*/ -#define MAXLENGTH 1024 - /* - CONFIG - Should yChat get compiled with ncurses support? -*/ -#define NCURSES +*/ +//#define NCURSES -/* - CONFIG - +/* - CONFIG - Please specify the maximum length of a HTTP post request. */ #define POSTBUF 512 -/* - CONFIG - +/* - CONFIG - Please specify the size of a temporary buffer. (Will be used f- or different tasks) */ #define READBUF 2048 -/* - CONFIG - +/* - CONFIG - Please specify the maximum length of a line read from a socket or a file. ( config-file, html-template ) */ @@ -131,9 +121,9 @@ will print a warning message into the system messages and will not core dump if an error occurs. */ -//#define CTCSEGV +#define CTCSEGV -/* - CONFIG - +/* - CONFIG - Please chose if you want to use verbose server outputs or not. The verbose messages will appear in the ncurses menu if ncurses is enabled or in the server-window if yChat has been compiled @@ -149,42 +139,42 @@ // The following values define the positions of the data stats in the NCURSES interface. #ifdef NCURSES #define NCUR_SERVER_HEADER_X 21 -#define NCUR_SERVER_HEADER_Y 2 +#define NCUR_SERVER_HEADER_Y 2 #define NCUR_PORT_X 22 #define NCUR_PORT_Y 2 #define NCUR_HITS_X 23 #define NCUR_HITS_Y 2 #define NCUR_POOL_HEADER_X 21 -#define NCUR_POOL_HEADER_Y 16 +#define NCUR_POOL_HEADER_Y 16 #define NCUR_POOL_WAIT_X 22 -#define NCUR_POOL_WAIT_Y 16 +#define NCUR_POOL_WAIT_Y 16 #define NCUR_POOL_RUNNING_X 23 -#define NCUR_POOL_RUNNING_Y 16 +#define NCUR_POOL_RUNNING_Y 16 #define NCUR_DATA_HEADER_X 21 -#define NCUR_DATA_HEADER_Y 35 +#define NCUR_DATA_HEADER_Y 35 #define NCUR_GARBAGE_X 22 #define NCUR_GARBAGE_Y 35 -#define NCUR_CON_QUEUE_X 23 +#define NCUR_CON_QUEUE_X 23 #define NCUR_CON_QUEUE_Y 35 #define NCUR_CHAT_HEADER_X 21 #define NCUR_CHAT_HEADER_Y 52 #define NCUR_NUM_ROOMS_X 22 -#define NCUR_NUM_ROOMS_Y 52 +#define NCUR_NUM_ROOMS_Y 52 #define NCUR_SESSION_X 23 -#define NCUR_SESSION_Y 52 +#define NCUR_SESSION_Y 52 #define NCUR_CACHED_HEADER_X 21 -#define NCUR_CACHED_HEADER_Y 68 +#define NCUR_CACHED_HEADER_Y 68 #define NCUR_CACHED_DOCS_X 22 -#define NCUR_CACHED_DOCS_Y 68 -#define NCUR_CACHED_MODS_X 23 -#define NCUR_CACHED_MODS_Y 68 +#define NCUR_CACHED_DOCS_Y 68 +#define NCUR_CACHED_MODS_X 23 +#define NCUR_CACHED_MODS_Y 68 #define NCUR_MENU_CHAR_X 0 -#define NCUR_MENU_CHAR_Y 33 +#define NCUR_MENU_CHAR_Y 33 #define NCUR_UPTIME_X 0 #define NCUR_UPTIME_Y 44 #define NCUR_TIME_X 0 @@ -202,13 +192,13 @@ typedef int function( void *v_arg ); struct container { - void* elem[4]; + void* elem[4]; }; struct dynmod { - function *the_func ; - void *the_module; + function *the_func ; + void *the_module; }; typedef enum method_ { diff --git a/src/html.cpp b/src/html.cpp index 3f47867..4160f60 100755 --- a/src/html.cpp +++ b/src/html.cpp @@ -43,11 +43,12 @@ html::parse( map &map_params ) if ( ! if_templ ) { wrap::system_message( OFFFOUND + s_path ); - if(map_params["request"] == wrap::CONF->get_elem( "httpd.html.notfound" )) + if(map_params["request"]== wrap::CONF->get_elem( "httpd.html.notfound" )) return ""; map_params["request"] = wrap::CONF->get_elem( "httpd.html.notfound" ); return parse( map_params ); + } char c_buf; diff --git a/src/main.cpp b/src/main.cpp index c0adb5e..ffe5484 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,6 +23,11 @@ #include "incl.h" #include "sign.h" +#ifndef NCURSES +#ifdef CLI +#include "cli/cli.h" +#endif +#endif #include "maps/hashmap.h" @@ -80,18 +85,98 @@ parse_argc( int argc, char* argv[] ) int main(int argc, char* argv[]) { + map* p_start_params = parse_argc( argc, argv ); + cout << tool::ychat_version() << endl << DESCRIP << endl << DESCRI2 << endl << CONTACT << endl << SEPERAT << endl; - wrap::init_wrapper(parse_argc(argc, argv)); + + // All the static data classes have to be initialized once. otherwise they will + // contain only empty pointers and the chat server won't work correctly. + // the order of the initializations is very importand. for example the s_html::init() + // invokations assumes an initialized conf class. + + // Init the dynamic wrapper (is needed to pass all wrapped objects through a single pointer). + wrap::WRAP = new dynamic_wrap; + + // Init the config manager. + wrap::WRAP->CONF = wrap::CONF = new conf( CONFILE, p_start_params ); + delete p_start_params, + + // Init the statistic manager. + wrap::WRAP->STAT = wrap::STAT = new stats; + + // Init the html-template manager. + wrap::WRAP->HTML = wrap::HTML = new html; + +#ifdef LOGGING + // Init the system message logd + wrap::WRAP->LOGD = wrap::LOGD = new logd( wrap::CONF->get_elem("httpd.logging.systemfile"), + wrap::CONF->get_elem("httpd.logging.systemlines") ); +#endif + //<<* + // Init the session manager. + wrap::WRAP->SMAN = wrap::SMAN = new sman; + //*>> + + +#ifdef NCURSES + + wrap::WRAP->NCUR = wrap::NCUR = new ncur; // init the ncurses admin interface. + wrap::NCUR->run(); // run the thread + + // Wait until ncurses interface has been initialized. + do { + usleep(1000); + } while ( ! wrap::NCUR->is_ready() ); + + wrap::HTML->print_cached(0); +#endif + + // Init the thread pool + wrap::WRAP->POOL = wrap::POOL = new pool; + // Init the socket manager. + wrap::WRAP->SOCK = wrap::SOCK = new sock; + + //<<* + // Init the chat manager. + wrap::WRAP->CHAT = wrap::CHAT = new chat; + //*>> + + // Init the system timer. + wrap::WRAP->TIMR = wrap::TIMR = new timr; + wrap::TIMR->run(); // run the thread + + //<<* + // Init the module-loader manager. + wrap::WRAP->MODL = wrap::MODL = new modl; + + // Init the garbage collector + wrap::WRAP->GCOL = wrap::GCOL = new gcol; + + // Init the data manager. +#ifdef DATABASE + + wrap::WRAP->DATA = wrap::DATA = new data; +#endif + //*>> + +#ifndef NCURSES +#ifdef CLI + + cli* p_cli = new cli; + p_cli->run(); +#endif +#endif //<<* // Initialize database connection queue #ifdef DATABASE - wrap::DATA->init_connections(); + + wrap::DATA->initialize_connections(); #endif //*>> diff --git a/src/maps/CVS/Entries b/src/maps/CVS/Entries index b0587e6..991bf8b 100644 --- a/src/maps/CVS/Entries +++ b/src/maps/CVS/Entries @@ -1,9 +1,9 @@ -/hmap.h/1.7/Thu Nov 18 13:41:47 2004// -/hmap.tmpl/1.7/Fri Jan 7 21:00:19 2005// -/mtools.h/1.4/Fri Jan 7 21:00:19 2005// -/mtools.tmpl/1.3/Thu Nov 18 13:41:47 2004// -/nmap.h/1.4/Fri Jan 7 21:00:19 2005// -/nmap.tmpl/1.3/Thu Nov 18 13:41:47 2004// -/smap.h/1.9/Fri Jan 7 21:00:19 2005// -/smap.tmpl/1.8/Fri Jan 7 21:00:19 2005// +/hashmap.h/1.12/Fri Mar 4 21:00:44 2005// +/hashmap.tmpl/1.6/Fri Mar 4 21:00:44 2005// +/mtools.h/1.7/Mon Feb 21 01:55:49 2005// +/mtools.tmpl/1.6/Mon Feb 21 01:55:49 2005// +/nhashmap.h/1.5/Fri Mar 4 21:00:44 2005// +/nhashmap.tmpl/1.4/Fri Mar 4 21:00:44 2005// +/shashmap.h/1.8/Fri Mar 4 21:00:44 2005// +/shashmap.tmpl/1.6/Fri Mar 4 21:00:45 2005// D diff --git a/src/maps/shashmap.h b/src/maps/shashmap.h index 99dd7c8..6152ba2 100644 --- a/src/maps/shashmap.h +++ b/src/maps/shashmap.h @@ -4,8 +4,6 @@ #include #include "hashmap.h" -#include "../monitor/dump.h" - using namespace std; template @@ -15,15 +13,11 @@ template class hash_type = size_hash, class alloc_type = compare_allocator > -class shashmap : protected hashmap, - public dumpable +class shashmap : protected hashmap { private: pthread_mutex_t mut_shashmap; -protected: - virtual void dumpit(); - public: explicit shashmap(); ~shashmap(); @@ -42,7 +36,6 @@ public: virtual inline vector* get_key_vector(); virtual inline void run_func( void (*func)(obj_type) ); virtual inline void run_func( void (*func)(obj_type, void*), void* v_arg ); - }; #include "shashmap.tmpl" diff --git a/src/maps/shashmap.tmpl b/src/maps/shashmap.tmpl index c864d28..4559284 100644 --- a/src/maps/shashmap.tmpl +++ b/src/maps/shashmap.tmpl @@ -139,17 +139,3 @@ shashmap::run_func( void (*func)(obj hashmap::run_func(func, v_arg); pthread_mutex_unlock( &mut_shashmap ); } - -template -void -shashmap::dumpit() -{ - dumpable::add("[shashmap]"); - vector* p_vec = get_key_vector(); - - typename vector::iterator iter; - for (iter = p_vec->begin(); iter != p_vec->end(); ++iter) - dumpable::add(*iter); - - delete p_vec; -} diff --git a/src/memb/memb.h b/src/memb/memb.h index f0df6ed..9c398ec 100644 --- a/src/memb/memb.h +++ b/src/memb/memb.h @@ -2,8 +2,7 @@ #define MEMB_H #include "../incl.h" -#include "../wrap.h" -#include "../maps/hashmap.h" +#include "../maps/nhashmap.h" #include "tupel.h" using namespace std; @@ -12,58 +11,13 @@ template class memb { private: - hashmap< mutexed_tupel* > map_elems; + nhashmap< mutexed_tupel* > map_elems; public: - memb() - {} - memb(vector &vec_fields); - void initialize(vector &vec_fields); inline obj_type get_elem(string s_key); inline void set_elem(obj_type t_obj, string s_key); -}; -struct memb_string : protected memb -{ - memb_string() - {} - memb_string(vector &vec_fields) : memb(vec_fields) - {} - void init_strings(vector vec_fields) - { - initialize(vec_fields); - } - inline string get_string(string s_key); - inline void set_string(string s_obj, string s_key); -}; - -struct memb_int : protected memb -{ - memb_int() - {} - void init_ints(vector vec_fields) - { - initialize(vec_fields); - } - inline int get_int(string s_key); - inline void set_int(int i_obj, string s_key); }; -struct memb_bool : protected memb -{ - memb_bool() - {} - void init_bools(vector vec_fields) - { - initialize(vec_fields); - } - inline bool get_bool(string s_key); - inline void set_bool(bool b_obj, string s_key); -}; - -class memb_base : public memb_string, public memb_int, public memb_bool - {} -; - #include "memb.tmpl" #endif diff --git a/src/memb/memb.tmpl b/src/memb/memb.tmpl index 5c745cc..0b4da0e 100644 --- a/src/memb/memb.tmpl +++ b/src/memb/memb.tmpl @@ -1,20 +1,3 @@ - -template -memb::memb(vector &vec_fields) -{ - initialize(vec_fields); -} - -template -void -memb::initialize(vector &vec_fields) -{ - obj_type t_default; - vector::iterator iter; - for (iter = vec_fields.begin(); iter != vec_fields.end(); ++iter) - map_elems[*iter] = new mutexed_tupel(t_default); -} - template obj_type memb::get_elem(string s_key) @@ -23,58 +6,12 @@ memb::get_elem(string s_key) if ( p_tupel ) return p_tupel->get_elem(); - obj_type t_ret; - return t_ret; + return obj_type(); } template void memb::set_elem(obj_type t_obj, string s_key) { - mutexed_tupel *p_tupel = map_elems.get_elem(s_key); - if ( p_tupel ) - { - p_tupel->set_elem(t_obj); - return; - } - - //wrap::system_message(MEMBERE+string("("+s_key+")")); -} - -string -memb_string::get_string(string s_key) -{ - return get_elem(s_key); -} - -void -memb_string::set_string(string s_obj, string s_key) -{ - set_elem(s_obj, s_key); -} - -int -memb_int::get_int(string s_key) -{ - return get_elem(s_key); -} - -void -memb_int::set_int(int i_obj, string s_key) -{ - set_elem(i_obj, s_key); + // mutexed_tupel *p_tupel = map_elems } - -bool -memb_bool::get_bool(string s_key) -{ - return get_elem(s_key); -} - -void -memb_bool::set_bool(bool b_obj, string s_key) -{ - set_elem(b_obj, s_key); -} - - diff --git a/src/memb/tupel.h b/src/memb/tupel.h index 864a092..bb1939e 100644 --- a/src/memb/tupel.h +++ b/src/memb/tupel.h @@ -13,9 +13,7 @@ class tupel private: pthread_mutex_t mut_tupel; obj_type t_obj; - public: - tupel(); tupel(obj_type t_obj); ~tupel(); diff --git a/src/memb/tupel.tmpl b/src/memb/tupel.tmpl index ab42748..bdde516 100644 --- a/src/memb/tupel.tmpl +++ b/src/memb/tupel.tmpl @@ -1,29 +1,29 @@ template tupel::tupel() { - pthread_mutex_init(&mut_tupel, NULL); + pthread_mutex_init( &mut_tupel, NULL ); } template tupel::tupel(obj_type t_obj) { this->t_obj = t_obj; - pthread_mutex_init(&mut_tupel, NULL); + pthread_mutex_init( &mut_tupel, NULL ); } template tupel::~tupel() { - pthread_mutex_destroy(&mut_tupel); + pthread_mutex_destroy( &mut_tupel ); } template obj_type tupel::get_elem() { - pthread_mutex_lock(&mut_tupel); + pthread_mutex_lock( &mut_tupel ); obj_type t_ret = t_obj; - pthread_mutex_unlock(&mut_tupel); + pthread_mutex_unlock( &mut_tupel ); return t_ret; } @@ -31,7 +31,7 @@ template void tupel::set_elem(obj_type t_obj) { - pthread_mutex_lock(&mut_tupel); + pthread_mutex_lock( &mut_tupel ); this->t_obj = t_obj; - pthread_mutex_unlock(&mut_tupel); + pthread_mutex_unlock( &mut_tupel ); } diff --git a/src/modl.cpp b/src/modl.cpp index 32fe33a..6668109 100755 --- a/src/modl.cpp +++ b/src/modl.cpp @@ -112,14 +112,6 @@ modl::cache_module( string s_name, bool b_print_sys_msg ) return mod; } -dynmod* -modl::get_module( string s_name, string s_user ) -{ - wrap::system_message( MODULER + s_name.substr( s_name.find_last_of("/")+1 ) + " (" + s_user + ")"); - dynmod* mod = get_elem( s_name ); - return ! mod ? cache_module( s_name, true ) : mod; -} - dynmod* modl::get_module( string s_name ) { diff --git a/src/modl.h b/src/modl.h index 73abd58..983bdda 100755 --- a/src/modl.h +++ b/src/modl.h @@ -7,7 +7,7 @@ using namespace std; -class modl : public shashmap +class modl : private shashmap { private: static void dlclose_( dynmod* mod ); @@ -24,7 +24,6 @@ public: ~modl(); dynmod* get_module( string s_name ); - dynmod* get_module( string s_name, string s_user ); vector* get_mod_vector() { diff --git a/src/mods/commands/CVS/Entries b/src/mods/commands/CVS/Entries index f719ced..0d8d93b 100644 --- a/src/mods/commands/CVS/Entries +++ b/src/mods/commands/CVS/Entries @@ -1,32 +1,32 @@ -/Makefile/1.26/Mon Feb 14 20:09:50 2005// +/Makefile/1.30/Wed Feb 23 05:08:04 2005// /Makefile.in/1.7/Thu Jul 8 14:39:03 2004// -/yc_about.cpp/1.1/Thu Dec 30 18:36:03 2004// -/yc_all.cpp/1.1/Thu Dec 30 19:14:52 2004// -/yc_away.cpp/1.8/Thu Nov 18 13:41:47 2004// -/yc_col.cpp/1.8/Thu Nov 18 13:41:47 2004// -/yc_compopt.cpp/1.3/Thu Nov 18 13:41:47 2004// -/yc_exec.cpp/1.9/Thu Nov 18 13:41:47 2004// -/yc_fake.cpp/1.11/Thu Nov 18 13:41:47 2004// -/yc_getroom.cpp/1.6/Thu Nov 18 13:41:47 2004// -/yc_getrusage.cpp/1.8/Thu Nov 18 13:41:47 2004// -/yc_help.cpp/1.4/Thu Nov 18 13:41:47 2004// -/yc_invisible.cpp/1.9/Thu Nov 18 13:41:47 2004// -/yc_j.cpp/1.9/Thu Nov 18 13:41:47 2004// -/yc_ko.cpp/1.7/Thu Nov 18 13:41:47 2004// -/yc_m.cpp/1.7/Thu Nov 18 13:41:47 2004// -/yc_md5.cpp/1.7/Thu Nov 18 13:41:47 2004// -/yc_me.cpp/1.7/Thu Nov 18 13:41:47 2004// -/yc_morph.cpp/1.3/Thu Nov 18 13:41:47 2004// -/yc_msg.cpp/1.9/Thu Dec 30 17:44:05 2004// -/yc_q.cpp/1.8/Thu Nov 18 13:41:47 2004// -/yc_reload.cpp/1.7/Thu Nov 18 13:41:47 2004// -/yc_ren.cpp/1.7/Thu Nov 18 13:41:47 2004// -/yc_s.cpp/1.8/Thu Nov 18 13:41:47 2004// -/yc_set.cpp/1.7/Thu Nov 18 13:41:47 2004// -/yc_template.cpp/1.7/Thu Nov 18 13:41:47 2004// -/yc_time.cpp/1.6/Thu Nov 18 13:41:47 2004// -/yc_topic.cpp/1.10/Mon Feb 14 17:33:09 2005// -/yc_uptime.cpp/1.6/Thu Nov 18 13:41:47 2004// -/yc_users.cpp/1.1/Mon Feb 14 20:09:50 2005// -/yc_version.cpp/1.9/Thu Nov 18 13:41:47 2004// +/yc_about.cpp/1.2/Mon Feb 21 01:55:49 2005// +/yc_all.cpp/1.2/Mon Feb 21 01:55:49 2005// +/yc_away.cpp/1.9/Mon Feb 21 01:55:49 2005/