From d9c4a95345bd758e45196b29368bd2ff0f2790e3 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Apr 2013 13:14:48 +0200 Subject: tagging ychat-0.5.2 --- Makefile | 101 +--- README | 474 +++++---------- base.cpp | 54 +- base.h | 88 +-- chat.cpp | 181 +++--- chat.h | 34 +- cmnd.cpp | 6 +- cmnd.h | 8 +- cmnd/yc_getrusage.cpp | 63 +- cmnd/yc_q.cpp | 17 +- cmnd/yc_test.cpp | 13 +- cmnd/yc_version.cpp | 19 +- conf.cpp | 71 +-- conf.h | 8 +- conf.txt | 8 +- config.cache | 30 + config.log | 71 +++ config.status | 151 +++++ configure | 1596 +++++++++++++++++++++++++++++++++++++++++++++++-- cont.cpp | 8 +- cont.h | 19 +- glob.h | 28 +- hmap.cpp | 159 ++--- hmap.h | 175 +++--- html.cpp | 175 +++--- html.h | 40 +- html/favicon.ico | Bin html/frameset.html | 12 +- html/index.html | 39 +- html/input.html | 50 +- html/notfound.html | 4 +- html/online.html | 21 +- html/stream.html | 33 +- html/style.css | 0 incl.h | 4 +- lang.cpp | 75 +-- lang.h | 8 +- logd.cpp | 65 +- logd.h | 25 +- main.cpp | 71 +-- modl.cpp | 104 ++-- modl.h | 16 +- msgs.h | 9 +- mutx.cpp | 6 +- mutx.h | 12 +- name.cpp | 9 +- name.h | 22 +- pool.cpp | 294 ++++----- pool.h | 89 +-- reqp.cpp | 395 ++++++------ reqp.h | 52 +- room.cpp | 6 +- room.h | 28 +- s_chat.h | 21 +- s_conf.h | 21 +- s_html.h | 21 +- s_lang.h | 22 +- s_modl.h | 21 +- s_mutx.h | 21 +- s_sman.h | 21 +- s_sock.h | 21 +- s_tool.cpp | 159 ++--- s_tool.h | 15 +- scripts/astyle.sh | 5 +- sess.cpp | 30 +- sess.h | 20 +- sman.cpp | 43 +- sman.h | 30 +- sock.cpp | 305 +++++----- sock.h | 46 +- thrd.cpp | 5 +- thrd.h | 19 +- user.cpp | 175 +++--- user.h | 151 +++-- 74 files changed, 3857 insertions(+), 2361 deletions(-) mode change 100644 => 100755 README mode change 100755 => 100644 base.h mode change 100755 => 100644 chat.cpp mode change 100755 => 100644 chat.h mode change 100755 => 100644 cmnd.cpp mode change 100755 => 100644 cmnd.h mode change 100755 => 100644 conf.cpp mode change 100755 => 100644 conf.h create mode 100644 config.cache create mode 100644 config.log create mode 100755 config.status mode change 100755 => 100644 cont.cpp mode change 100755 => 100644 cont.h mode change 100755 => 100644 glob.h mode change 100755 => 100644 html.cpp mode change 100755 => 100644 html.h mode change 100755 => 100644 html/favicon.ico mode change 100755 => 100644 html/style.css mode change 100755 => 100644 incl.h mode change 100755 => 100644 lang.cpp mode change 100755 => 100644 lang.h mode change 100755 => 100644 main.cpp mode change 100755 => 100644 modl.cpp mode change 100755 => 100644 modl.h mode change 100755 => 100644 msgs.h mode change 100755 => 100644 mutx.cpp mode change 100755 => 100644 mutx.h mode change 100755 => 100644 name.cpp mode change 100755 => 100644 name.h mode change 100755 => 100644 pool.cpp mode change 100755 => 100644 pool.h mode change 100755 => 100644 reqp.cpp mode change 100755 => 100644 reqp.h mode change 100755 => 100644 room.cpp mode change 100755 => 100644 room.h mode change 100755 => 100644 sock.cpp mode change 100755 => 100644 sock.h mode change 100755 => 100644 thrd.cpp mode change 100755 => 100644 thrd.h mode change 100755 => 100644 user.cpp mode change 100755 => 100644 user.h diff --git a/Makefile b/Makefile index 8d141ed..1f8a1ff 100644 --- a/Makefile +++ b/Makefile @@ -1,88 +1,13 @@ -PREFIX=`grep "define PREFIX" src/glob.h | cut -d'"' -f2` -all: 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 " - @echo " ~/.ychat/ychat.conf " - @echo " ./etc/ychat.conf " - @echo " /etc/ychat.conf " - @echo " $(PREFIX)/etc/ychat.conf " -install: deinstall - @echo "Instaling ychat to $(PREFIX)" - @cp bin/ychat $(PREFIX)/bin - @if ! test -d $(PREFIX)/lib/ychat; then mkdir -p $(PREFIX)/lib/ychat; fi - @if ! test -d $(PREFIX)/share/ychat/log/rooms; then mkdir -p $(PREFIX)/share/ychat/log/rooms; fi - @if ! test -d $(PREFIX)/etc; then mkdir $(PREFIX)/etc; fi - @if test -d mods; then cp -Rp mods $(PREFIX)/lib/ychat/mods; fi - @cp -Rp html $(PREFIX)/share/ychat/html - @cp -Rp lang $(PREFIX)/share/ychat/lang - @if test -f $(PREFIX)/etc/ychat.conf; then mv $(PREFIX)/etc/ychat.conf $(PREFIX)/etc/ychat.conf.bak; fi - @cp etc/ychat.conf etc/ychat.conf.tmp - @sed "s#mods/#$(PREFIX)/lib/ychat/mods/#" etc/ychat.conf.tmp > etc/ychat.conf.tmp.2 && mv etc/ychat.conf.tmp.2 etc/ychat.conf.tmp - @sed "s#\"log/#\"$(PREFIX)/share/ychat/log/#" etc/ychat.conf.tmp > etc/ychat.conf.tmp.2 && mv etc/ychat.conf.tmp.2 etc/ychat.conf.tmp - @sed "s#LANGUAGE_DIR=\"lang/#LANGUAGE_DIR=\"$(PREFIX)/share/ychat/lang/#" etc/ychat.conf.tmp > etc/ychat.conf.tmp.2 && mv etc/ychat.conf.tmp.2 etc/ychat.conf.tmp - @sed "s#HTML_TEMPLATE_DIR=\"html/#HTML_TEMPLATE_DIR=\"$(PREFIX)/share/ychat/html/#" etc/ychat.conf.tmp > etc/ychat.conf.tmp.2 && mv etc/ychat.conf.tmp.2 etc/ychat.conf.tmp - @mv etc/ychat.conf.tmp $(PREFIX)/etc/ychat.conf - @echo "yChat configuration file can be found under" - @echo " $(PREFIX)/etc/ychat.conf" - @echo "Copy it to ~/.ychat/ychat.conf to use local settings :-)" - @echo "Be sure that $(PREFIX)/share/ychat/logs is writable by your user or modify " - @echo "logging dirs in the ychat.conf to a local directory." - @echo "The most secure would be an additional user 'ychat'!" -uninstall: deinstall -deinstall: - @echo "Deinstalling ychat from $(PREFIX)" - @if test -f $(PREFIX)/bin/ychat; then rm -f $(PREFIX)/bin/ychat; fi - @if test -d $(PREFIX)/lib/ychat; then rm -Rf $(PREFIX)/lib/ychat; fi - @if test -d $(PREFIX)/share/ychat; then rm -Rf $(PREFIX)/share/ychat; fi - @echo "Done. Please remove manually $(PREFIX)/etc/ychat.conf to complete" -modules: - @if test -d ./src/mods; then gmake -C ./src/mods; fi -clean_modules: - @if test -d ./src/mods; then gmake -C ./src/mods clean; fi -base: - @if test -f bin/ychat; then echo "Backing up old binary";if test -f bin/ychat.old; then rm -f bin/ychat.old; fi; mv bin/ychat bin/ychat.old; fi - @perl ./scripts/buildnr.pl - @perl ./scripts/setglobvals.pl - @gmake -C ./src -clean_base: - @gmake -C ./src clean -stats: - @perl scripts/stats.pl -run: - ./bin/ychat -base_start: base - ./bin/ychat -start: base modules - ./bin/ychat -gpl: - @more COPYING -#//<<* -yhttpdbase: - @perl scripts/makeyhttpd.pl || echo "You need to have perl to do this!" - @echo yhttpd code base has been generated in ../yhttpd -#//*>> -clean: clean_base clean_modules -help: - @echo "You may run gmake with the following parameters:" - @grep "^ gmake " README - @echo "For more questions read the README file or contact mail@ychat.org!" -setup: - @./configure - @gmake -config: - @sh -c "scripts/config.sh" - @echo If you run gmake config from the command line then you may need - @echo to rerun ./configure and recompile all now! - -mrproper: clean - @if test -f src/glob.h.org; then mv -f src/glob.h.org src/glob.h;fi - @if test -f g++.version; then rm -f g++.version; fi - @if test -f src/Makefile; then rm -f src/Makefile; 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 -version: - @echo "`grep VERSION src/msgs.h | cut -d'"' -f2`-`grep BRANCH src/msgs.h| cut -d'"' -f2` Build `grep BUILD src/msgs.h| cut -d' ' -f3`" -debug: - @gdb bin/ychat ychat.core +# Generated automatically from Makefile.in by configure. +SRCS=chat.cpp s_chat.cpp cmnd.cpp conf.cpp s_conf.cpp cont.cpp html.cpp s_html.cpp lang.cpp s_lang.cpp logd.cpp main.cpp modl.cpp s_modl.cpp mutx.cpp s_mutx.cpp name.cpp pool.cpp reqp.cpp room.cpp sock.cpp s_sock.cpp thrd.cpp s_tool.cpp user.cpp sess.cpp sman.cpp s_sman.cpp +OBJS=$(SRCS:.cpp=.o) +CC=g++ +LDFLAGS= -lstdc++ -g +LDADD=-pthread -D_THREAD_SAFE +all: ychat +$(SRCS): + $(CC) $(CFLAGS) -c $*.cpp +ychat: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDADD) +clean: + rm *.o diff --git a/README b/README old mode 100644 new mode 100755 index b240e00..8cd5bd1 --- a/README +++ b/README @@ -1,7 +1,6 @@ -yChat; Homepage: www.yChat.org; Version 0.7-RELEASE - +yChat++ Basic; Homepage: www.yChat.org; Version 0.5.2-LEGACYRELEASE Copyright (C) 2003 Paul C. Buetow, Volker Richter -Copyright (C) 2004 Paul C. Buetow +Copyright (C) 2005 Paul C. Buetow ----------------------------------------------------------------- This program is free software; you can redistribute it and/or @@ -17,180 +16,38 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ------------------------------------------------------------------ -YCHAT TABLE OF CONTENTS: +----------------------------------------------------------------- -0.0.0 YCHAT FEATURES //<< +0.0.0 LEGACY YCHAT 0.5 TABLE OF CONTENTS 1.0.0 REQUIREMENTS 1.1.0 TESTED PLATFORMS -1.2.0 IMPORTANT NOTICES -1.3.0 HOW TO OBTAIN YCHAT +1.2.0 IMPORTANT NOTES +1.3.0 HOW TO OBTAIN YCHAT++ 1.3.1 INSTALLATION -1.3.2 INSTALLATION QUICK-START -1.3.3 MYSQL SETUP //<< -1.4.0 HOW TO USE SCREEN WITH YCHAT 1.5.0 CUSTOMIZATION 1.6.0 FILES 1.7.0 WRITING BUG REPORTS 1.8.0 CONTACT -1.9.0 YHTTPD CODE BASE GENERATION //<< - -//<<* -0.0.0 YCHAT FEATURES - -- Its free & portable - -yChat is developed under the GNU general public license and is based on GNU -tools (gcc, gmake), other open source library stuff (such as libncurses etc.) -and should run on any POSIX capable operating system (such as all Linux based -systems, FreeBSD, NetBSD, OpenBSD and other BSD-Systems and on UNICES like -IRIX, HP-UX, Solaris etc.). - -- There is no need for special chat clients - -yChat is web based, that means clients may only connect to the chat server -with an normal web browser such as Microsoft Internet Explorer or any Gecko- -Engine powerd browsers like Mozilla, Firefox, Camino etc. - -- It has features of a real HTTP webserver - -yChat runs completely stand alone and does not need another webserver to build -on like Apache and does not need to be run via any kind of CGI. yChat creates -its own socket on a customized port (standard port: 2000) and seems to be a full -features HTTP web server to the clients (web browsers). All it needs is an -external database server (currently MySQL only). - -The yChat code base can be converted to an yhttpd code base automaticaly. yhttpd -is the webserver subset of yChat which runs completely stand alone and provides -normal websites to the net. It also supports Common Gateway Interface (CGI) -scripting. - -- Its fast and secure - -yChat is written in C++ which is faster than any Java based Chat-Server or any -server written in a scripting language like PHP, Python or Perl. As the -internal data structures hash maps are used to garuantee searching certain -values in O(1) amount of time. If a hash maps gets full, it will be rehashed. -The maximum usage in % can be redefined too (standard is 90%). Currently, yChat -has been measured providing over 5000 hits/requests per second (chat message -postings) on a FreeBSD based server box. Performance seems to be limited by -your bandwith only. Also, each user gets its own session id (random string) -with a standard length of 50 chars to authenticate each logged in user. The -length of the session id can be redefined as well. Soon, OpenSSL sockets will -be included too to enable HTTPS chatting. - -- Its HTML template based and easy to customize via XML based configuration - -All HTML sites are predefined as HTML-Template files and can be easily modified -to use with an customized web design. Also, a lot of yChat preferences can be -set in the main configuration file (ychat.conf). ychat.conf is completely written -in XML 1.0 which makes it easier to use the configuration options in programs of -3rd persons which may want to write some usefull tools for yChat. -yChat caches all HTML and web images to improve overall performance. If needed, the -cache can be cleared to recache new versions of the template files. - -- Its language template based - -The administrator can easily create a new language in which all system messages -appear to the Chat-User. The predefined languages is english but others can be -added easily. The language can be edited in the XML based configuration file. - -- MySQL based database - -Registered users are stored in a MySQL database. C++ Programmers may feel free -to replace the database wrapper class (data.h) with another database routines -to use other databases such as PostgreSQL, SQLite or a text based database etc. -If wished, you can disable database support in the pre-compile options. - -- It has an administration interface - -yChat includes an ncurses based administration interface which tracks some -interesting statistics and system messages and enables you to do certain -administrative tasks. In addition, you can switch to the CLI (command line -interface) mode of the administration interface in order to be provided with -more available functions (like keeping track of the current system usage etc.). -If you dont like ncurses and/or the CLI you can disable both options in the pre- -compile options. - -- It has logging capabilities - -The logging manager keeps track to all yChat system messages (such as users -wich log in and out, modules which are loaded, MySQL queries etc.). Also, an -Apache-Style combined log file format is created by yChat (you can parse this -logfile with any Apache logfile parser like awstats etc.). And last but not -least, all public messages of all available rooms will be logged to disk as -well . To improve performance, you can define the logging puffer (standardly -new logs will be written to disk after each 20 lines). If you want to log -everything immediately, you can reset this option to 1 in ychat.conf. - -- Its modular - -All chat commands are realized through dynamic loadable module files which can -be recompiled and reloaded without restarting the whole yChat server. Also -HTML-Sites with certain tasks can be compiled as a module like -mods/html/yc_register.so, mods/html/yc_options.so and mods/html/yc_colors.so -etc. so you can also program your dynamic yChat websites in C++. - -- Its multi threaded (POSIX threads) - -There is only one main process which spawns several threads, each for its own -unique task. For example one thread is used to handle the socket manager which -waits for incoming TCP/IP requests, another thread schedules the system timer -which proves if clients are still active or frees not needed memory in certain -time intervals (see also "Garbage collector"). Also, each Chat-User gets it own -thread. There is no need of memory wastage by creating for each task a new -process. All User-Threads are managed by a thread pool to avoid CPU wastage -creating every time a new thread by reusing thread objects which have done its -jobs already and have been added to the pool again.. - -- Its using a smart garbage collection engine - -All users and rooms which dont have to be kept in the main memory (because the -user has logged out or the room has been destroyed because it was empty) will -not be deleted immediately but be placed for about 10 minutes in the yChat -garbage collector. Each time a new room is created the systems checks the -garbage to reuse an inactive room object. If a certain user wants to log in, the -system checks if he is already present in the garbage collector. If yes, he will -be reactivated without wasting expensive database queries to fetch the user's -options. This improves overall performance on heavily loaded yChat servers if a -lot of user and room objects are created and destroyed frequently. -//*>> 1.0.0 REQUIREMENTS: -- GNU GCC G++ 3.4 or 3.3 or 3.2 or 3.1 - The GNU C++ compiler. G++ version 3.0 or 2.x does NOT work. - -- GNU make 3.80 (gmake) or higher - If you dont have a gmake executable but make is gnu make then you need - to add a symlink or alias from gmake to make. - yChat Makefiles only have been tested with GNU make and may not work with - other make versions. - -- mysql-client 4.x (3.x may do too but is not supported) - Includes libmysqlclient and the mysql.h header files. - -- ncurses 5.x - Includes libncurses and the ncurses.h header files. - -- Screen - Only needed if yChat should run in background with - ncurses enabled. - -- Perl 5.x - Is needed for some scripts. Is not needed if you use precompiled binaries. +- gcc 3.x + The GNU C++ compiler. 1.1.0 TESTED PLATFORMS: -The following platforms have been tested with success. If you find out that -a listed platform did not work at all please contact me: +The following platforms have been tested with success: - Operating system (arch) GNU G++ GNU make -- FreeBSD 5.2.1-RELEASE (i386) 3.3.3 3.80 -- FreeBSD 4.9-RELEASE (i386) 3.3.4 3.80 -- FreeBSD 4.10-RELEASE (i386) 3.4.1 3.80 -- Gentoo Linux 2004.2 (i386) 3.3.2 3.80 -- OpenBSD 3.6 MP (i386) 3.3.2 3.80 -- Slackware Linux 10.0 (i386) 3.4.0 3.80 -- SUSE Linux 8.0, G (i386) 3.3.1 3.80 +- Linux with GCC 3.2.0, GNU make 3.79.1 +- FreeBSD 5.1-RELEASE-p2, GCC 3.2.2, GNU make 3.80 +- FreeBSD 5.3-RELEASE, GCC 3.4, GNU make 3.80 -Other platforms like Linux based systems, other BSD-Systems or UNICES -are very likely to work too. - -1.2.0 IMPORTANT NOTICES: +1.2.0 IMPORTANT NOTES: Before you compile the source you have to be sure to use at least GCC -version 3.1 with pthreads enabled. ( Type gcc -v to check it ). -GCC 2.95 and 3.0 did not work while testing and WON'T BE SUPPORTED! +version 3.x with pthreads enabled. ( Type gcc -v to check it ). +GCC 2.95 did not work while testing on linux and WON'T BE SUPPORTED! If you like to support yChat++, please write us an email and tell what you can/like/would help ;-]. Please also take a look at the yChat++ homepage which is located at http://www.yChat.org. @@ -200,174 +57,149 @@ 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/CPP-yChat . +Packages or go to http://programming.buetow.org/CPP-yChat . -For CVS download type: +For CVS download type also look at the homepage please. -cvs -d:pserver:anonymous@buetow.org:/usr/home/cvs/cvsroot login -( You will be asked for a password. Use "just enter" ). +1.3.1 INSTALLATION: -vs -z3 -d:pserver:anonymous@buetow.org:/usr/home/cvs/cvsroot co ychat -( The sources will be copied into your local folder ) +Invoke "./configure" and afterwards "make", edit the conf.txt. -cvs -d:pserver:anonymous@buetow.org:/usr/home/cvs/cvsroot logout -( Logs your CVS session out ). +Now we want to compile all the dynamic loadable modules of ychat. +Invoke "cd cmnd && ./compile.sh && cd -". All command modules should get +compiled. -Now you may continue with the installation. +Now its time to run the server with ./ychat. +Then point your webbrowser to http://yourip:port ! -1.3.1 INSTALLATION: +... have fun :-). -Invoke "./configure". Afterwards you will get prompted with the before-compile -options of yChat. After choosing those options you are ready to type "gmake" -afterwards. - -//<<* -If you have choosen MySQL database support, then take a look at section 1.3.2 -how to setup a valid database table. Be also sure to enter the valid MySQL -accessing data in the yChat configuration file which is normally located in -the etc/ychat.conf file if not changed by you with the yChat configurator. -//*>> - -You may also invoke gmake with the following options (the PREFIX can be set -in the yChat configurator which will be launched by the top configure script -or gmake config): - - gmake or gmake all (compiles everything, also modules) - gmake base (only compiles the base) - gmake base_start (only compiles the base and starts the server) - gmake clean (cleans everything) - gmake clean_base (only cleans the base obj and rpo files) - gmake clean_modules (only cleans the modules .so files) - gmake config (runs yChat configurator) - gmake deinstall (deinstalls ychat from PREFIX) - gmake gpl (shows the GNU General Public License) - gmake help (shows all available ychat gmake targets) - gmake install (installs ychat to PREFIX) - gmake modules (only compiles modules) - gmake mrproper (same as gmake clean plus removing all temp files) - gmake setup (runs all configure scripts and afterwards gmake all) - gmake start (compiles everything and starts the server) - gmake stats (generates ychat statistics) - gmake uninstall (same as deinstall) - gmake version (shows the current version of yChat) -//<<* - gmake yhttpdbase (generates an yhttpd code base) -//*>> (See section 1.9 to read about this marks) - -Example: "gmake all install clean" compiles everything, installs it to PREFIX -and cleans the source directories. - -Now its time to run the server with ./bin/ychat. - -Aferwards point your webbrowser to http://yourip:port ! +1.5.0 CUSTOMIZATION: -... have fun :-). +If you like to customize the design/layout/language of yChat, you will have +to edit msgs.h and glob.h before you compile the sources. Afterwards you can +change the html-template files which are placed in the html/ subdirectory. +Dynamic loadable modules can be found in the cmnd/ subdirectory. -1.3.2 INSTALLATION QUICK START: - -If you in hury, then you may just type gmake setup. In the yChat configurator -you may just choose all the default values. If done, yChat will get compiled -and is ready to run with ./bin/ychat! - -//<<* -1.3.3 MYSQL SETUP - -If you chose to use MySQL database support you have to create a valid database -to use with yChat. - -Create a new MySQL database called 'ychat' and type the following command into -a MySQL command line client of your choice: - -USE ychat -CREATE TABLE `user` ( - `uid` int(10) NOT NULL auto_increment, - `nick` varchar(30) NOT NULL default '', - `password` varchar(30) NOT NULL default '', - `color1` varchar(30), - `color2` varchar(30), - `email` varchar(50) default '-', - `registerdate` varchar(30) default '-', - `logincounter` varchar(10) default '0', - `status` char(1) default '3', - PRIMARY KEY (`uid`), - KEY `uid` (`uid`) -) TYPE=MyISAM; -GRANT ALL PRIVILEGES ON ychat.* to ychat@localhost IDENTIFIED BY "yctest"; - -This database uses the default MySQL access informations which are stored in the -ychat.conf file. -//*>> - -1.4.0 HOW TO USE SCREEN WITH YCHAT: - -If you are running yChat in ncurses mode you might want to install -the tool which is called "screen". This will enable you putting the -ncurses interface into the background, closing the terminal session -and reusing the interface later through another terminal. - -Just do: - - screen -S ychat ./bin/ychat ( creates a new session and starts yChat in it ) - ctrl+d+a ( will detach the yChat session ) - ( closing the terminal ) - ( opening a new terminal ) - screen -r ychat ( will return you to the yChat process ) +1.6.0 FILES: ( This list is not complete ) -Screen will terminate automaticaly if all processes in its sessions are -terminated. +conf.txt - The yChat configuration file. ( read by conf.cpp ). -For a closer look read the screen manual page ( man screen ). +base.cpp - Encapsulates vector fields of room's or user ( may be later + hash_maps ) and provides methods for manipulating data + objects. -1.5.0 CUSTOMIZATION: +hmap.cpp - The hash map implementation which is a very fast data + structure. is needed for saving users, rooms and so on. -If you like to customize the design/layout/language of yChat, you will have -to edit src/msgs.h and src/glob.h before you compile the sources. Afterwards -you can change the html-template files which are placed in the html/ -subdirectory and the language-templates which are placed in the XML config -file (etc/ychat.conf). +main.cpp - This includes the required manager headers for starting + the server and finally regulates the correct starting. + +modl.cpp - The module loader. Stores pointers of all dynamic loaded + yChat modules in a hash map object and loads new modules + if desired or returns their pointers. -Notice, that you dont have to edit the src/glob.h file by hand any more, its -already done by the top ./configure script for you. +pool.cpp - The implementation of the thread pool. all threads are stored + in a queue. Each thread will be reused if the assigned job is + finished. -You can edit the etc/ychat.conf to fit your needs. If you dont want to change -the config file, then you also can use ychat start parameters. +reqp.cpp - This class implements the http request parser. If a client + starts a request to the server the reqp class will be + invoked. -Exmpl: ./bin/ychat -o chat.database.password secretpassword +room.cpp - Specifies a chat room. For each chat room an instance of + this class exists. -You can also use multiple words for a specific option. +thrd.cpp - This class is needed by sock.cpp while creating a POSIX thread. + All data which a thread needs to do its tasks are stored in a + thrd object and then a pointer to it will be passed to the + POSIX thread function. -Exmpl: ./bin/ychat -o ychat.version "word1 word2 word3" +user.cpp - Specifies a chat user. For each chat user an instance of + this class exists. -will overwrite the default database password value of the ychat.conf. You can -do this with every configuration element by adding several -o option value -arguments to the start command. +Abstract classes: -Dynamic loadable modules can be found in the mods/ subdirectory. (chat -commands are realized through modules too). Sources of modules can be found -in src/mods instead. If you want to create a new module just create a new -.cpp file and run in src/mods the ./configure script again. Next time -you run gmake your new module gets compiled. +cont.cpp - All classes which need to store "key - value" data sets + inherit from this class. ( cont for content ). -All messages defined in the msgs.h file contain server messages only ( a chat -user never wont read them, only the administrator will get to see them ). +name.cpp - All classes which own a private member string name inherit + from this class. It also provides public get_name and + set_name methods. -1.6.0 FILES: +As described ( main.cpp ), there are so called managers. Managers are +accessible through their assigned wrapper classes and may be +instanciated only once. -etc/ychat.conf - The yChat configuration file -html/* - The html template files -src/* - The yChat base sources -src/mods/* - The dynamic loadable modules sources -scripts/* - Some nice scripts needed for building & co. +chat.cpp - The chat manager. Is responsible for managing the internal + data structure of the system and also covers a lot of + important methods of the system. -The following is created by building yChat: -obj/* - The object files of the compiled yChat base -mods/* - The compiled dynamic loadable modules -bin/ychat - The yChat binary (linked by the object files) +conf.cpp - The config manager. Parses the config file specified in + glob.h and stores all the values of it in a map. -Customizable source files (if changed you need to run gmake clean all) -src/glob.h - Contains some global building options -src/msgs.h - Defines some server side messages +html.cpp - The html-template manager. Reads the requested html-template + files, stores them in an internal cache ( averts reading + template-files from hd twice or more ) and parses the + partivular template in order to substituate dynamic values + of it. +mutx.cpp - The mutex manager. Contains all global mutex handlers for + synchronizing POSIX thread shared data. until now only the + stdout is synchronized by mutx.cpp because most of objects + use their own mutex'. + +sock.cpp - The socket manager. Manages the socket connections. There + are multiplexed sockets. For each requests a new POSIX thread + will be created. + +Files with a leading s_ contain static C++ classes + +s_chat.cpp - Static wrapper for the dynamic chat class. holds one global + reachable instance of chat until the program shuts down. + +s_conf.cpp - Static wrapper for the dynamic conf class. holds one global + reachable instance of conf until the program shuts down. + +s_html.cpp - Static wrapper for the dynamic html class. holds one global + reachable instance of conf until the program shuts down. + +s_mutx.cpp - Static wrapper for the dynamic mutx class. holds one global + reachable instance of conf until the program shuts down. + +s_sock.cpp - Static wrapper for the dynamic sock class. holds one global + reachable instance of conf until the program shuts down. + +s_tool.cpp - Static class which includes some usefull global reachable + methods which are not integraded in independent classes. + +Special header files ( all other header files which are not listed here +belong to their respective .cpp files ): + +glob.h - Defines global variables which are known by compilation + time. + +incl.h - This file is included from every other header file and + includes a set of headers which every class should be able + to use. + +msgs.h - Defines console output messages for verbosity level 0 ( see + glob.h for setting up verbosity levels ). and also defines + all the system messages. you may edit this file for translating + the system user language. + +The basic class structure: + + base base + | | name + | | / \ + | | / \ + chat room user + + cont + / \ + / \ +conf html 1.7 WRITING BUG REPORTS @@ -380,34 +212,26 @@ First you should give the following information: - operating system / distribution and it's version - when did it crash? did you do something? can you reproduce the crash? -Getting backtrace of the crash also helps a lot, especially if yChat crashes -randomly. If after crash you see text: +Getting backtrace of the crash also helps a lot, especially if yChat crashes randomly. If after crash you see text: "segmentation fault (core dumped)" -It writes a file named "core" or "ychat.core" depending on your OS to directory -where you started yChat. If it doesn't print the "(core dumped)" or you can't -find the core file, you'll have to raise the limit for max. core file size -before running yChat. To do this, say: +It writes a file named "core" or "ychat.core" depending on your OS to directory where you started yChat. If it doesn't print the "(core dumped)" or you can't find the core file, you'll have to raise the limit for max. core file size before running yChat. To do this, say: ulimit -c unlimited -So, if you have the core file and GNU debugger (gdb), you can get the -backtrace with: +So, if you have the core file and GNU debugger (gdb), you can get the backtrace with: - gdb ./bin/ychat ychat.core + gdb ychat core bt Paste all the lines starting from line having #0 at the beginning. Here's an example session: - in reqp::parse(thrd*, std::string, std::map, std::allocator > >&) () + in reqp::parse(thrd*, std::string, std::map, std::allocator > >&) () (gdb) bt - #0 0x0805c287 in reqp::parse(thrd*, std::string, std::map, std::allocator > >&) () + #0 0x0805c287 in reqp::parse(thrd*, std::string, std::map, std::allocator > >&) () #1 0x0806060f in sock::read_write(thrd*, int) () #2 0x080612ba in thrd::run() () #3 0x0805a3b8 in pool::run_func(void*) () @@ -415,14 +239,6 @@ Here's an example session: #5 0x281d44ae in _thread_start () from /usr/lib/libc_r.so.5 (gdb) -If you dont get such a gdb output, you need to recompile the yChat using -debuggig symbols. You can do it this way: - -cd ychat -gmake mrproper -./configure -g3 -ggdb -gmake start - 1.8 CONTACT: You may contact us through the following addresses: @@ -431,18 +247,12 @@ You may contact us through the following addresses: The yChat homepage is located at http://www.yChat.org - E-Mail - 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 ) + Paul C. Buetow: Snooper@yChat.org ( core developer ) + Volker Richter: Rover@yChat.org ( core developer ) + Mail@yChat.org ( reaches everybody of yChat ) - ICQ Paul C. Buetow: 11655527 - IRC - #Ychat and #Coding at irc.german-elite.net - -//<<* -1.9 YHTTPD CODE BASE GENERATION - -See docs/yhttpd.txt -//*>> + #ychat at irc.german-elite.net diff --git a/base.cpp b/base.cpp index ce585ea..691d15a 100755 --- a/base.cpp +++ b/base.cpp @@ -1,10 +1,10 @@ /* This file is part of yChat - - $Author: snooper $ - $Date: 2003/04/02 10:50:18 $ + + $Author: buetow $ + $Date: 2005/02/27 00:34:59 $ - $Header: /cvsroot/ychat/ychat/base.cpp,v 1.8 2003/04/02 10:50:18 snooper Exp $ + $Header: /usr/home/cvs/cvsroot/ychat-0.5-legacy/base.cpp,v 1.3 2005/02/27 00:34:59 buetow Exp $ */ // template class data implementation; @@ -16,50 +16,54 @@ template base::base() { - map_elem = new hmap(80); - pthread_mutex_init (&mut_map_elem, NULL ); + map_elem = new hmap(80); + pthread_mutex_init (&mut_map_elem, NULL ); } template base::~base( ) { - pthread_mutex_destroy( &mut_map_elem ); + pthread_mutex_destroy( &mut_map_elem ); } -template void +template +void base::add_elem( type* p_type ) { - pthread_mutex_lock ( &mut_map_elem ); - map_elem->add_elem ( p_type, p_type->get_name()); - pthread_mutex_unlock( &mut_map_elem ); + pthread_mutex_lock ( &mut_map_elem ); + map_elem->add_elem ( p_type, p_type->get_name()); + pthread_mutex_unlock( &mut_map_elem ); } -template void +template +void base::del_elem( string &s_name ) { - pthread_mutex_lock ( &mut_map_elem ); - map_elem->del_elem ( s_name ); - pthread_mutex_unlock( &mut_map_elem ); + pthread_mutex_lock ( &mut_map_elem ); + map_elem->del_elem ( s_name ); + pthread_mutex_unlock( &mut_map_elem ); } -template type* +template +type* base::get_elem( string &s_name, bool &b_found ) { - pthread_mutex_lock ( &mut_map_elem ); - type* p_type = map_elem->get_elem( s_name ); - pthread_mutex_unlock( &mut_map_elem ); + pthread_mutex_lock ( &mut_map_elem ); + type* p_type = map_elem->get_elem( s_name ); + pthread_mutex_unlock( &mut_map_elem ); - b_found = p_type == NULL ? false : true; + b_found = p_type == NULL ? false : true; - return p_type; + return p_type; } -template void +template +void base::run_func( void (*func)(type*, void*), void* v_arg ) { - pthread_mutex_lock ( &mut_map_elem ); - map_elem->run_func( func, v_arg ); - pthread_mutex_unlock( &mut_map_elem ); + pthread_mutex_lock ( &mut_map_elem ); + map_elem->run_func( func, v_arg ); + pthread_mutex_unlock( &mut_map_elem ); } #endif diff --git a/base.h b/base.h old mode 100755 new mode 100644 index 6f06e4b..9ea405d --- a/base.h +++ b/base.h @@ -10,60 +10,60 @@ template class base { private: - hmap* map_elem; - pthread_mutex_t mut_map_elem; + hmap* map_elem; + pthread_mutex_t mut_map_elem; public: base(); - ~base(); + ~base(); - virtual void add_elem( type* p_type ); // add a element. - virtual void del_elem( string &s_name ); // delete a alement. - virtual type* get_elem( string &s_name, bool &b_found ); // get a element. + virtual void add_elem( type* p_type ); // add a element. + virtual void del_elem( string &s_name ); // delete a alement. + virtual type* get_elem( string &s_name, bool &b_found ); // get a element. - // execute func on all elements of map_elem. v_pointer is the argument. - virtual void run_func( void (*func)(type*, void*), void* v_arg ); + // execute func on all elements of map_elem. v_pointer is the argument. + virtual void run_func( void (*func)(type*, void*), void* v_arg ); - // chat::msg_post sends to all users of the system a message. - // room::msg_post sends to all users of the room a message. - // user::msg_post sends to the user a message. - void msg_post( string *s_msg ) - { - run_func( &base::msg_post_ , (void*)s_msg ); - } - static void msg_post_( type* type_obj, void* v_arg ) - { - string *p_msg = (string*) v_arg; - type_obj -> msg_post( p_msg ); - } + // chat::msg_post sends to all users of the system a message. + // room::msg_post sends to all users of the room a message. + // user::msg_post sends to the user a message. + void msg_post( string *s_msg ) + { + run_func( &base::msg_post_ , (void*)s_msg ); + } + static void msg_post_( type* type_obj, void* v_arg ) + { + string *p_msg = (string*) v_arg; + type_obj -> msg_post( p_msg ); + } - void get_data( map_string *p_map_string ) - { - run_func( &base::get_data_ , (void*)p_map_string ); - } - static void get_data_( type* type_obj, void* v_arg ) - { - map_string *map_params = (map_string*) v_arg; - type_obj -> get_data ( map_params ); - } + void get_data( map_string *p_map_string ) + { + run_func( &base::get_data_ , (void*)p_map_string ); + } + static void get_data_( type* type_obj, void* v_arg ) + { + map_string *map_params = (map_string*) v_arg; + type_obj -> get_data ( map_params ); + } - // chat::get_user_list gets a list of all users of the system. - // room::get_user_list gets a list of all users of the room. - // user::get_user_list gets a "list" of a user usernameseperator - void get_user_list( string &s_list, string &s_seperator ) - { + // chat::get_user_list gets a list of all users of the system. + // room::get_user_list gets a list of all users of the room. + // user::get_user_list gets a "list" of a user usernameseperator + void get_user_list( string &s_list, string &s_seperator ) + { - container c; - c.elem[0] = (void*) &s_list; - c.elem[1] = (void*) &s_seperator; + container c; + c.elem[0] = (void*) &s_list; + c.elem[1] = (void*) &s_seperator; - run_func( &base::get_user_list_, (void*)&c ); - } - static void get_user_list_( type* type_obj, void* v_arg ) - { - container *c = (container*) v_arg; - type_obj -> get_user_list( *((string*)c->elem[0]), *((string*)c->elem[1]) ); - } + run_func( &base::get_user_list_, (void*)&c ); + } + static void get_user_list_( type* type_obj, void* v_arg ) + { + container *c = (container*) v_arg; + type_obj -> get_user_list( *((string*)c->elem[0]), *((string*)c->elem[1]) ); + } }; #include "base.cpp" diff --git a/chat.cpp b/chat.cpp old mode 100755 new mode 100644 index b845ec3..da574c7 --- a/chat.cpp +++ b/chat.cpp @@ -12,136 +12,147 @@ using namespace std; chat::chat( ) { - if ( s_conf::get().get_val( "HTML" ) == "OFF" ) - b_strip_html = true; - else - b_strip_html = false; + if ( s_conf::get + ().get_val( "HTML" ) == "OFF" ) + b_strip_html = true; + else + b_strip_html = false; } chat::~chat( ) -{ -} +{} user* chat::get_user( string &s_user ) { - bool b_flag; - return get_user( s_user, b_flag ); + bool b_flag; + return get_user( s_user, b_flag ); } user* chat::get_user( string &s_user, bool &b_found ) { - container param; + container param; - param.elem[0] = (void*) &s_user ; - param.elem[1] = (void*) &b_found; + param.elem[0] = (void*) &s_user ; + param.elem[1] = (void*) &b_found; - b_found = false; + b_found = false; - run_func( get_user_, (void*)¶m ); + run_func( get_user_, (void*)¶m ); - if ( *( (bool*)param.elem[1] ) ) - return (user*)param.elem[2]; + if ( *( (bool*)param.elem[1] ) ) + return (user*)param.elem[2]; } void chat::get_user_( room *room_obj, void *v_arg ) { - container* param = (container*) v_arg; - param->elem[2] = (void*)room_obj->get_elem( *((string*)param->elem[0]), *((bool*)param->elem[1]) ); + container* param = (container*) v_arg; + param->elem[2] = (void*)room_obj->get_elem( *((string*)param->elem[0]), *((bool*)param->elem[1]) ); } void chat::login( map_string &map_params ) { - string s_user = map_params["nick"]; - - // prove if nick is empty: - if ( s_user.empty() ) - { - map_params["INFO"] = E_NONICK; - map_params["request"] = s_conf::get().get_val( "STARTMPL" ); // redirect to the startpage. - return; - } - - // prove if the nick ist alphanumeric: - else if ( ! s_tool::is_alpha_numeric( s_user ) ) - { - map_params["INFO"] = E_ALPNUM; - map_params["request"] = s_conf::get().get_val( "STARTMPL" ); // redirect to the startpage. - return; - } - - bool b_flag; - - // prove if nick is already online / logged in. - get_user( s_user, b_flag ); - if ( b_flag ) - { - map_params["INFO"] = E_ONLINE; - map_params["request"] = s_conf::get().get_val( "STARTMPL" ); - return; - } - - string s_room = map_params["room"]; - room* p_room = get_room( s_room , b_flag ); - - // if room does not exist add room to list! - if ( ! b_flag ) - { - p_room = new room( s_room ); + string s_user = map_params["nick"]; + + // prove if nick is empty: + if ( s_user.empty() ) + { + map_params["INFO"] = E_NONICK; + map_params["request"] = s_conf::get + ().get_val( "STARTMPL" ); // redirect to the startpage. + return; + } + + // prove if the nick ist alphanumeric: + else if ( ! s_tool::is_alpha_numeric( s_user ) ) + { + map_params["INFO"] = E_ALPNUM; + map_params["request"] = s_conf::get + ().get_val( "STARTMPL" ); // redirect to the startpage. + return; + } + + bool b_flag; + + // prove if nick is already online / logged in. + get_user( s_user, b_flag ); + if ( b_flag ) + { + map_params["INFO"] = E_ONLINE; + map_params["request"] = s_conf::get + ().get_val( "STARTMPL" ); + return; + } + + string s_room = map_params["room"]; + room* p_room = get_room( s_room , b_flag ); + + // if room does not exist add room to list! + if ( ! b_flag ) + { + p_room = new room( s_room ); #ifdef VERBOSE - pthread_mutex_lock ( &s_mutx::get().mut_stdout ); - cout << NEWROOM << s_room << endl; - pthread_mutex_unlock( &s_mutx::get().mut_stdout ); + + pthread_mutex_lock ( &s_mutx::get + ().mut_stdout ); + cout << NEWROOM << s_room << endl; + pthread_mutex_unlock( &s_mutx::get + ().mut_stdout ); #endif - - add_elem( p_room ); - } - user *p_user = new user( s_user ); + add_elem( p_room ); + } - // add user to the room. - p_room->add_user( p_user ); - sess *ns =s_sman::get().createSession(); - ns->setValue(string("nick"), (void *)new string(s_user) ); - map_params["tmpid"]=ns->getId(); - // post "username enters the chat" into the room. - p_room->msg_post( new string( s_user.append( s_lang::get().get_val( "USERENTR" ) ) ) ); + user *p_user = new user( s_user ); + + // add user to the room. + p_room->add_user( p_user ); + sess *ns =s_sman::get + ().createSession(); + ns->setValue(string("nick"), (void *)new string(s_user) ); + map_params["tmpid"]=ns->getId(); + // post "username enters the chat" into the room. + p_room->msg_post( new string( s_user.append( s_lang::get + ().get_val( "USERENTR" ) ) ) ); #ifdef VERBOSE - pthread_mutex_lock ( &s_mutx::get().mut_stdout ); - cout << LOGINPR << s_user << endl; - pthread_mutex_unlock( &s_mutx::get().mut_stdout ); + + pthread_mutex_lock ( &s_mutx::get + ().mut_stdout ); + cout << LOGINPR << s_user << endl; + pthread_mutex_unlock( &s_mutx::get + ().mut_stdout ); #endif } -void +void chat::post( user* p_user, map_string &map_params ) { - string s_msg( map_params["message"] ); + string s_msg( map_params["message"] ); - auto unsigned i_pos = s_msg.find( "/" ); - if ( i_pos == 0 ) - return p_user->command( s_msg ); + auto unsigned i_pos = s_msg.find( "/" ); + if ( i_pos == 0 ) + return p_user->command( s_msg ); - if ( b_strip_html ) - s_tool::strip_html( &s_msg ); + if ( b_strip_html ) + s_tool::strip_html( &s_msg ); - string s_post( "get_col1() ) - .append( "\">" ) - .append( p_user->get_name() ) - .append( ": " ) - .append( s_msg ) - .append( "
\n" ); + s_post.append( p_user->get_col1() ) + .append( "\">" ) + .append( p_user->get_name() ) + .append( ": " ) + .append( s_msg ) + .append( "
\n" ); - p_user->get_p_room()->msg_post( &s_post ); + p_user->get_p_room()->msg_post( &s_post ); } #endif diff --git a/chat.h b/chat.h old mode 100755 new mode 100644 index 60bcf9d..f8a6523 --- a/chat.h +++ b/chat.h @@ -17,30 +17,30 @@ using namespace std; class chat : public base { private: - bool b_strip_html; + bool b_strip_html; public: - - room* get_room( string &s_name, bool &b_found ) - { - return static_cast( get_elem( s_name, b_found ) ); - } - // public methods: - explicit chat(); // a standard constructor. - ~chat(); // destructor. + room* get_room( string &s_name, bool &b_found ) + { + return static_cast( get_elem( s_name, b_found ) ); + } - // get the object of a specific user. - virtual user* get_user( string &s_nick ); - virtual user* get_user( string &s_nick, bool &b_found ); - static void get_user_( room* room_obj, void *v_arg ); + // public methods: + explicit chat(); // a standard constructor. + ~chat(); // destructor. - // will be called every time a user tries to login. - virtual void login( map_string &map_params ); + // get the object of a specific user. + virtual user* get_user( string &s_nick ); + virtual user* get_user( string &s_nick, bool &b_found ); + static void get_user_( room* room_obj, void *v_arg ); - // will be called if a user posts a message. - virtual void post ( user* u_user, map_string &map_params ); + // will be called every time a user tries to login. + virtual void login( map_string &map_params ); + + // will be called if a user posts a message. + virtual void post ( user* u_user, map_string &map_params ); }; #endif diff --git a/cmnd.cpp b/cmnd.cpp old mode 100755 new mode 100644 index 28e73a7..f305f35 --- a/cmnd.cpp +++ b/cmnd.cpp @@ -9,11 +9,9 @@ using namespace std; cmnd::cmnd( ) -{ -} +{} cmnd::~cmnd() -{ -} +{} #endif diff --git a/cmnd.h b/cmnd.h old mode 100755 new mode 100644 index 2eb1db2..b5a1d4d --- a/cmnd.h +++ b/cmnd.h @@ -7,12 +7,12 @@ using namespace std; -class cmnd +class cmnd { public: - // public methods: - explicit cmnd( ); // a standard constructor. - ~cmnd( ); + // public methods: + explicit cmnd( ); // a standard constructor. + ~cmnd( ); }; #endif diff --git a/cmnd/yc_getrusage.cpp b/cmnd/yc_getrusage.cpp index 4e10e7c..2f5f456 100644 --- a/cmnd/yc_getrusage.cpp +++ b/cmnd/yc_getrusage.cpp @@ -16,36 +16,37 @@ using namespace std; typedef vector str_vector; -extern "C" { - export int extern_function(void *v_arg); - - int extern_function(void *v_arg) - { - user *p_user = (user*) v_arg; - rusage* p_rusage = new rusage; - getrusage( RUSAGE_SELF, p_rusage ); - char c_msg[1024]; - - /* see man getrusage */ - - sprintf(c_msg, "getrusage:
\nmaxrss: %D (max resident set size)
\nixrss: %D (integral shared text memory size)
\nidrss: %D (integral unshared data size)
\nisrss %D (integral unshared stack size)
\nminflt: %D (page reclaims)
\nmajflt: %D (page faults)
\nnswap: %D (swaps)
\ninblock: %D (block input operations)
\noublock: %D (block output operations)
\nmsgsnd: %D (messages sent)
\nmsgrcv: %D (messages received)
\nnsignals: %D (signals received)
\nnvcsw: %D (voluntary context switches)
\nnivcsw: %D (involuntary context switches)
\n", - p_rusage->ru_maxrss, - p_rusage->ru_ixrss, - p_rusage->ru_idrss, - p_rusage->ru_isrss, - p_rusage->ru_minflt, - p_rusage->ru_majflt, - p_rusage->ru_nswap, - p_rusage->ru_inblock, - p_rusage->ru_oublock, - p_rusage->ru_msgsnd, - p_rusage->ru_msgrcv, - p_rusage->ru_nsignals, - p_rusage->ru_nvcsw, - p_rusage->ru_nivcsw - ); - - p_user->msg_post( new string( c_msg ) ); - } +extern "C" +{ + export int extern_function(void *v_arg); + + int extern_function(void *v_arg) + { + user *p_user = (user*) v_arg; + rusage* p_rusage = new rusage; + getrusage( RUSAGE_SELF, p_rusage ); + char c_msg[1024]; + + /* see man getrusage */ + + sprintf(c_msg, "getrusage:
\nmaxrss: %D (max resident set size)
\nixrss: %D (integral shared text memory size)
\nidrss: %D (integral unshared data size)
\nisrss %D (integral unshared stack size)
\nminflt: %D (page reclaims)
\nmajflt: %D (page faults)
\nnswap: %D (swaps)
\ninblock: %D (block input operations)
\noublock: %D (block output operations)
\nmsgsnd: %D (messages sent)
\nmsgrcv: %D (messages received)
\nnsignals: %D (signals received)
\nnvcsw: %D (voluntary context switches)
\nnivcsw: %D (involuntary context switches)
\n", + p_rusage->ru_maxrss, + p_rusage->ru_ixrss, + p_rusage->ru_idrss, + p_rusage->ru_isrss, + p_rusage->ru_minflt, + p_rusage->ru_majflt, + p_rusage->ru_nswap, + p_rusage->ru_inblock, + p_rusage->ru_oublock, + p_rusage->ru_msgsnd, + p_rusage->ru_msgrcv, + p_rusage->ru_nsignals, + p_rusage->ru_nvcsw, + p_rusage->ru_nivcsw + ); + + p_user->msg_post( new string( c_msg ) ); + } } diff --git a/cmnd/yc_q.cpp b/cmnd/yc_q.cpp index acc8596..8e48748 100644 --- a/cmnd/yc_q.cpp +++ b/cmnd/yc_q.cpp @@ -8,14 +8,15 @@ using namespace std; -extern "C" { - export int extern_function(void *v_arg); +extern "C" +{ + export int extern_function(void *v_arg); - int extern_function(void *v_arg) - { - user *p_user = (user*) v_arg; - p_user->msg_post( new string( "\n " ) ); - p_user->set_online( false ); - } + int extern_function(void *v_arg) + { + user *p_user = (user*) v_arg; + p_user->msg_post( new string( "\n " ) ); + p_user->set_online( false ); + } } diff --git a/cmnd/yc_test.cpp b/cmnd/yc_test.cpp index deb3e54..c96e889 100644 --- a/cmnd/yc_test.cpp +++ b/cmnd/yc_test.cpp @@ -2,11 +2,12 @@ using namespace std; -extern "C" { - export int function(void *v_arg); +extern "C" +{ + export int function(void *v_arg); - int function(void *v_arg) - { - cout << "Hallo " << (char*)v_arg << endl; - } + int function(void *v_arg) + { + cout << "Hallo " << (char*)v_arg << endl; + } } diff --git a/cmnd/yc_version.cpp b/cmnd/yc_version.cpp index 5e686b7..454cf96 100644 --- a/cmnd/yc_version.cpp +++ b/cmnd/yc_version.cpp @@ -7,14 +7,15 @@ using namespace std; -extern "C" { - export int extern_function(void *v_arg); - int valid_color( string ); - - int extern_function(void *v_arg) - { - user *p_user = (user*) v_arg; - p_user->msg_post( new string( *new string(VERSION) + "
\n") ); - } +extern "C" +{ + export int extern_function(void *v_arg); + int valid_color( string ); + + int extern_function(void *v_arg) + { + user *p_user = (user*) v_arg; + p_user->msg_post( new string( *new string(VERSION) + "
\n") ); + } } diff --git a/conf.cpp b/conf.cpp old mode 100755 new mode 100644 index 3ff71b8..14dc199 --- a/conf.cpp +++ b/conf.cpp @@ -10,66 +10,67 @@ using namespace std; conf::conf( string s_conf = CONFILE ) : name( s_conf ) { - parse( ); // parse the config file. + parse( ); // parse the config file. } conf::~conf() -{ -} +{} void conf::parse() { #ifdef VERBOSE - cout << CFILEOK << get_name() << endl; + cout << CFILEOK << get_name() << endl; #endif - ifstream fs_conf( get_name().c_str() ); + ifstream fs_conf( get_name().c_str() ); - if ( ! fs_conf ) - { + if ( ! fs_conf ) + { #ifdef VERBOSE - cout << CFILENO << get_name() << endl; + cout << CFILENO << get_name() << endl; #endif - return; - } - char c_buf[READBUF]; + return; + } + + char c_buf[READBUF]; - while( fs_conf.getline( c_buf, READBUF ) ) - { - string s_token( c_buf ); - unsigned int ui_pos = s_token.find( "#", 0 ); - - // if line is commented out: - if ( ui_pos == 0 ) - continue; + while( fs_conf.getline( c_buf, READBUF ) ) + { + string s_token( c_buf ); + unsigned int ui_pos = s_token.find( "#", 0 ); - ui_pos = s_token.find( ";", 0 ); + // if line is commented out: + if ( ui_pos == 0 ) + continue; - // if token has not been found. - if ( ui_pos == string::npos ) - continue; + ui_pos = s_token.find( ";", 0 ); - s_token = s_token.substr( 0 , --ui_pos ); - ui_pos = s_token.find ( "\"", 0 ); + // if token has not been found. + if ( ui_pos == string::npos ) + continue; - if ( ui_pos == string::npos ) - continue; + s_token = s_token.substr( 0 , --ui_pos ); + ui_pos = s_token.find ( "\"", 0 ); - string s_val = s_token.substr( ui_pos+1, s_token.length() ); - string s_key = s_token.substr( 0 , --ui_pos ); + if ( ui_pos == string::npos ) + continue; + + string s_val = s_token.substr( ui_pos+1, s_token.length() ); + string s_key = s_token.substr( 0 , --ui_pos ); #ifdef VERBOSE2 - cout << s_key << "=" << s_val << endl; + + cout << s_key << "=" << s_val << endl; #endif - // fill the map. - map_vals[s_key] = s_val; - } + // fill the map. + map_vals[s_key] = s_val; + } - fs_conf.close(); - fs_conf.~ifstream(); + fs_conf.close(); + fs_conf.~ifstream(); } #endif diff --git a/conf.h b/conf.h old mode 100755 new mode 100644 index 6e2a890..7d0b807 --- a/conf.h +++ b/conf.h @@ -14,11 +14,11 @@ class conf : public cont, name private: public: - // public methods: - conf ( string s_conf ); // standard constructor. - ~conf(); // standard destructor. + // public methods: + conf ( string s_conf ); // standard constructor. + ~conf(); // standard destructor. - virtual void parse( ); // parses the config file. + virtual void parse( ); // parses the config file. }; #endif diff --git a/conf.txt b/conf.txt index 936af92..1857295 100755 --- a/conf.txt +++ b/conf.txt @@ -11,14 +11,14 @@ # all lines which do not contain a semicolon and at least two quotes # or start with a # will be ignored. # -# greets, paul c. buetow ( snooper@ychat.org ); +# greets, paul c. buetow ( snooper at ychat dot org ); # # server specific configurations ( not allowed to be removed ): HTMLTEMP="html/"; # directory of the html-template files. -THRDPOOL="50"; # thread pool size. -THRDQUEU="50"; # length of the thread pool queue. +THRDPOOL="1"; # Initial pool size. +THRDPMAX="52"; # Max thread pool size SRVRPORT="3000"; # local port on which the server listens. STRDROOM="Lounge"; # the name of the standard room. LANGUAGE="en"; # language of the chat outputs ( CONSOLE OUTPUT IS NOT AFFECTED ) @@ -48,7 +48,7 @@ LOG_LINES="10"; # values which are used by the html-templates and are not sticked within the yC++ core source! GRAPHICS="http://paul.buetow.info/yChat"; # url for graphic files etc. -PGETITLE="yChat++ Basic - Fast Simple Extensible"; +PGETITLE="yChat 0.5.2-LEGACY - Fast Simple Extensible"; # do not edit beyond this line diff --git a/config.cache b/config.cache new file mode 100644 index 0000000..f5f09c0 --- /dev/null +++ b/config.cache @@ -0,0 +1,30 @@ +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +ac_cv_cygwin=${ac_cv_cygwin=no} +ac_cv_header_dirent_dirent_h=${ac_cv_header_dirent_dirent_h=yes} +ac_cv_prog_CXX=${ac_cv_prog_CXX=c++} +ac_cv_search_dlopen=${ac_cv_search_dlopen='none required'} +ac_cv_prog_cxx_cross=${ac_cv_prog_cxx_cross=no} +ac_cv_c_const=${ac_cv_c_const=yes} +ac_cv_header_stdc=${ac_cv_header_stdc=yes} +ac_cv_lib_dir_opendir=${ac_cv_lib_dir_opendir=no} +ac_cv_c_inline=${ac_cv_c_inline=inline} +ac_cv_header_string_h=${ac_cv_header_string_h=yes} +ac_cv_header_unistd_h=${ac_cv_header_unistd_h=yes} +ac_cv_prog_cxx_works=${ac_cv_prog_cxx_works=yes} +ac_cv_prog_cxx_g=${ac_cv_prog_cxx_g=yes} +ac_cv_prog_gxx=${ac_cv_prog_gxx=yes} +ac_cv_prog_CPP=${ac_cv_prog_CPP='cc -E'} +ac_cv_mingw32=${ac_cv_mingw32=no} diff --git a/config.log b/config.log new file mode 100644 index 0000000..0a02618 --- /dev/null +++ b/config.log @@ -0,0 +1,71 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +configure:528: checking for Cygwin environment +configure:544: cc -c conftest.c 1>&5 +configure: In function `main': +configure:540: error: `__CYGWIN32__' undeclared (first use in this function) +configure:540: error: (Each undeclared identifier is reported only once +configure:540: error: for each function it appears in.) +configure: failed program was: +#line 533 "configure" +#include "confdefs.h" + +int main() { + +#ifndef __CYGWIN__ +#define __CYGWIN__ __CYGWIN32__ +#endif +return __CYGWIN__; +; return 0; } +configure:561: checking for mingw32 environment +configure:573: cc -c conftest.c 1>&5 +configure: In function `main': +configure:569: error: `__MINGW32__' undeclared (first use in this function) +configure:569: error: (Each undeclared identifier is reported only once +configure:569: error: for each function it appears in.) +configure: failed program was: +#line 566 "configure" +#include "confdefs.h" + +int main() { +return __MINGW32__; +; return 0; } +configure:590: checking how to run the C preprocessor +configure:611: cc -E conftest.c >/dev/null 2>conftest.out +configure:674: checking for c++ +configure:706: checking whether the C++ compiler (c++ ) works +configure:722: c++ -o conftest conftest.C 1>&5 +configure:748: checking whether the C++ compiler (c++ ) is a cross-compiler +configure:753: checking whether we are using GNU C++ +configure:762: c++ -E conftest.C +configure:781: checking whether c++ accepts -g +configure:815: checking for library containing dlopen +configure:833: cc -o conftest conftest.c 1>&5 +configure:883: checking for dirent.h that defines DIR +configure:896: cc -c conftest.c 1>&5 +configure:921: checking for opendir in -ldir +configure:940: cc -o conftest conftest.c -ldir 1>&5 +/usr/bin/ld: cannot find -ldir +configure: failed program was: +#line 929 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir(); + +int main() { +opendir() +; return 0; } +configure:1004: checking for ANSI C header files +configure:1017: cc -E conftest.c >/dev/null 2>conftest.out +configure:1084: cc -o conftest conftest.c 1>&5 +configure:1111: checking for unistd.h +configure:1121: cc -E conftest.c >/dev/null 2>conftest.out +configure:1151: checking for string.h +configure:1161: cc -E conftest.c >/dev/null 2>conftest.out +configure:1188: checking for working const +configure:1242: cc -c conftest.c 1>&5 +configure:1263: checking for inline +configure:1277: cc -c conftest.c 1>&5 diff --git a/config.status b/config.status new file mode 100755 index 0000000..ee6dd32 --- /dev/null +++ b/config.status @@ -0,0 +1,151 @@ +#! /bin/sh +# Generated automatically by configure. +# Run this file to recreate the current configuration. +# This directory was configured as follows, +# on host fibonacci.exa-ds.com: +# +# ./configure +# +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. + +ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]" +for ac_option +do + case "$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion" + exec ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "./config.status generated by autoconf version 2.13" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "$ac_cs_usage"; exit 0 ;; + *) echo "$ac_cs_usage"; exit 1 ;; + esac +done + +ac_given_srcdir=. + +trap 'rm -fr Makefile conftest*; exit 1' 1 2 15 + +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g; + s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF +/^[ ]*VPATH[ ]*=[^:]*$/d + +s%@SHELL@%/bin/sh%g +s%@CFLAGS@%%g +s%@CPPFLAGS@%%g +s%@CXXFLAGS@%-g -O2%g +s%@FFLAGS@%%g +s%@DEFS@% -DHAVE_DIRENT_H=1 -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 %g +s%@LDFLAGS@%%g +s%@LIBS@%%g +s%@exec_prefix@%${prefix}%g +s%@prefix@%/usr/local%g +s%@program_transform_name@%s,x,x,%g +s%@bindir@%${exec_prefix}/bin%g +s%@sbindir@%${exec_prefix}/sbin%g +s%@libexecdir@%${exec_prefix}/libexec%g +s%@datadir@%${prefix}/share%g +s%@sysconfdir@%${prefix}/etc%g +s%@sharedstatedir@%${prefix}/com%g +s%@localstatedir@%${prefix}/var%g +s%@libdir@%${exec_prefix}/lib%g +s%@includedir@%${prefix}/include%g +s%@oldincludedir@%/usr/include%g +s%@infodir@%${prefix}/info%g +s%@mandir@%${prefix}/man%g +s%@CPP@%cc -E%g +s%@CXX@%c++%g + +CEOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines