From 0f1dc61921eef1db8e404a5a82372e2d1cd55daa Mon Sep 17 00:00:00 2001 From: pk910 Date: Sun, 2 Oct 2011 00:33:13 +0200 Subject: [PATCH] tried to reorder the program structure and build process --- .gitignore | 4 +- Makefile.am | 101 ++++++++++++++++++ autogen.sh | 9 ++ configure.ac | 37 +++++++ config.h.example => mysqlConfig.h.example | 0 BanNode.c => src/BanNode.c | 0 BanNode.h => src/BanNode.h | 0 ChanNode.c => src/ChanNode.c | 0 ChanNode.h => src/ChanNode.h | 0 ChanUser.c => src/ChanUser.c | 0 ChanUser.h => src/ChanUser.h | 0 ClientSocket.c => src/ClientSocket.c | 0 ClientSocket.h => src/ClientSocket.h | 0 src/DATABASE.txt | 65 +++++++++++ DBHelper.c => src/DBHelper.c | 0 DBHelper.h => src/DBHelper.h | 0 EventLogger.c => src/EventLogger.c | 0 EventLogger.h => src/EventLogger.h | 0 .../HandleInfoHandler.c | 0 .../HandleInfoHandler.h | 0 IRCEvents.c => src/IRCEvents.c | 0 IRCEvents.h => src/IRCEvents.h | 0 IRCParser.c => src/IRCParser.c | 0 IRCParser.h => src/IRCParser.h | 0 Makefile => src/Makefile | 0 ModeNode.c => src/ModeNode.c | 0 ModeNode.h => src/ModeNode.h | 0 UserNode.c => src/UserNode.c | 0 UserNode.h => src/UserNode.h | 0 WHOHandler.c => src/WHOHandler.c | 0 WHOHandler.h => src/WHOHandler.h | 0 bot_NeonServ.c => src/bot_NeonServ.c | 0 bot_NeonServ.h => src/bot_NeonServ.h | 0 bots.c => src/bots.c | 0 bots.h => src/bots.h | 0 cmd_neonserv.h => src/cmd_neonserv.h | 0 .../cmd_neonserv_access.c | 0 .../cmd_neonserv_addban.c | 0 .../cmd_neonserv_addtimeban.c | 0 .../cmd_neonserv_adduser.c | 0 cmd_neonserv_ban.c => src/cmd_neonserv_ban.c | 0 .../cmd_neonserv_bans.c | 0 .../cmd_neonserv_bind.c | 0 .../cmd_neonserv_chanservsync.c | 0 .../cmd_neonserv_clvl.c | 0 .../cmd_neonserv_command.c | 0 .../cmd_neonserv_csuspend.c | 0 .../cmd_neonserv_cunsuspend.c | 0 .../cmd_neonserv_delban.c | 0 .../cmd_neonserv_delme.c | 0 .../cmd_neonserv_deluser.c | 0 .../cmd_neonserv_deop.c | 0 .../cmd_neonserv_deopall.c | 0 .../cmd_neonserv_devoice.c | 0 .../cmd_neonserv_devoiceall.c | 0 .../cmd_neonserv_down.c | 0 .../cmd_neonserv_downall.c | 0 .../cmd_neonserv_emote.c | 0 .../cmd_neonserv_events.c | 0 .../cmd_neonserv_giveowner.c | 0 cmd_neonserv_god.c => src/cmd_neonserv_god.c | 0 .../cmd_neonserv_help.c | 0 .../cmd_neonserv_invite.c | 0 .../cmd_neonserv_inviteme.c | 0 .../cmd_neonserv_kick.c | 0 .../cmd_neonserv_kickban.c | 0 .../cmd_neonserv_mdeluser.c | 0 .../cmd_neonserv_mode.c | 0 .../cmd_neonserv_move.c | 0 .../cmd_neonserv_myaccess.c | 0 .../cmd_neonserv_netinfo.c | 0 .../cmd_neonserv_notice.c | 0 cmd_neonserv_op.c => src/cmd_neonserv_op.c | 0 .../cmd_neonserv_opall.c | 0 .../cmd_neonserv_oplog.c | 0 .../cmd_neonserv_peek.c | 0 cmd_neonserv_raw.c => src/cmd_neonserv_raw.c | 0 .../cmd_neonserv_recover.c | 0 .../cmd_neonserv_register.c | 0 .../cmd_neonserv_reloadlang.c | 0 .../cmd_neonserv_resync.c | 0 cmd_neonserv_say.c => src/cmd_neonserv_say.c | 0 .../cmd_neonserv_search.c | 0 cmd_neonserv_set.c => src/cmd_neonserv_set.c | 0 .../cmd_neonserv_setaccess.c | 0 .../cmd_neonserv_suspend.c | 0 .../cmd_neonserv_topic.c | 0 .../cmd_neonserv_trace.c | 0 .../cmd_neonserv_trim.c | 0 .../cmd_neonserv_unban.c | 0 .../cmd_neonserv_unbanall.c | 0 .../cmd_neonserv_unbanme.c | 0 .../cmd_neonserv_unbind.c | 0 .../cmd_neonserv_unregister.c | 0 .../cmd_neonserv_unsuspend.c | 0 cmd_neonserv_up.c => src/cmd_neonserv_up.c | 0 .../cmd_neonserv_upall.c | 0 .../cmd_neonserv_users.c | 0 .../cmd_neonserv_uset.c | 0 .../cmd_neonserv_version.c | 0 .../cmd_neonserv_voice.c | 0 .../cmd_neonserv_voiceall.c | 0 .../cmd_neonserv_wipeinfo.c | 0 src/config.h.example | 6 ++ .../event_neonserv_ctcp.c | 0 .../event_neonserv_invite.c | 0 .../event_neonserv_join.c | 0 .../event_neonserv_notice.c | 0 .../event_neonserv_part.c | 0 .../event_neonserv_quit.c | 0 .../event_neonserv_topic.c | 0 lang.c => src/lang.c | 0 lang.h => src/lang.h | 0 main.c => src/main.c | 0 main.h => src/main.h | 2 +- modcmd.c => src/modcmd.c | 0 modcmd.h => src/modcmd.h | 0 mysqlConn.c => src/mysqlConn.c | 0 mysqlConn.h => src/mysqlConn.h | 0 timeq.c => src/timeq.c | 0 timeq.h => src/timeq.h | 0 tools.c => src/tools.c | 0 tools.h => src/tools.h | 0 version.h => src/version.h | 0 version.sh => src/version.sh | 2 +- 125 files changed, 222 insertions(+), 4 deletions(-) create mode 100644 Makefile.am create mode 100644 autogen.sh create mode 100644 configure.ac rename config.h.example => mysqlConfig.h.example (100%) rename BanNode.c => src/BanNode.c (100%) rename BanNode.h => src/BanNode.h (100%) rename ChanNode.c => src/ChanNode.c (100%) rename ChanNode.h => src/ChanNode.h (100%) rename ChanUser.c => src/ChanUser.c (100%) rename ChanUser.h => src/ChanUser.h (100%) rename ClientSocket.c => src/ClientSocket.c (100%) rename ClientSocket.h => src/ClientSocket.h (100%) create mode 100644 src/DATABASE.txt rename DBHelper.c => src/DBHelper.c (100%) rename DBHelper.h => src/DBHelper.h (100%) rename EventLogger.c => src/EventLogger.c (100%) rename EventLogger.h => src/EventLogger.h (100%) rename HandleInfoHandler.c => src/HandleInfoHandler.c (100%) rename HandleInfoHandler.h => src/HandleInfoHandler.h (100%) rename IRCEvents.c => src/IRCEvents.c (100%) rename IRCEvents.h => src/IRCEvents.h (100%) rename IRCParser.c => src/IRCParser.c (100%) rename IRCParser.h => src/IRCParser.h (100%) rename Makefile => src/Makefile (100%) rename ModeNode.c => src/ModeNode.c (100%) rename ModeNode.h => src/ModeNode.h (100%) rename UserNode.c => src/UserNode.c (100%) rename UserNode.h => src/UserNode.h (100%) rename WHOHandler.c => src/WHOHandler.c (100%) rename WHOHandler.h => src/WHOHandler.h (100%) rename bot_NeonServ.c => src/bot_NeonServ.c (100%) rename bot_NeonServ.h => src/bot_NeonServ.h (100%) rename bots.c => src/bots.c (100%) rename bots.h => src/bots.h (100%) rename cmd_neonserv.h => src/cmd_neonserv.h (100%) rename cmd_neonserv_access.c => src/cmd_neonserv_access.c (100%) rename cmd_neonserv_addban.c => src/cmd_neonserv_addban.c (100%) rename cmd_neonserv_addtimeban.c => src/cmd_neonserv_addtimeban.c (100%) rename cmd_neonserv_adduser.c => src/cmd_neonserv_adduser.c (100%) rename cmd_neonserv_ban.c => src/cmd_neonserv_ban.c (100%) rename cmd_neonserv_bans.c => src/cmd_neonserv_bans.c (100%) rename cmd_neonserv_bind.c => src/cmd_neonserv_bind.c (100%) rename cmd_neonserv_chanservsync.c => src/cmd_neonserv_chanservsync.c (100%) rename cmd_neonserv_clvl.c => src/cmd_neonserv_clvl.c (100%) rename cmd_neonserv_command.c => src/cmd_neonserv_command.c (100%) rename cmd_neonserv_csuspend.c => src/cmd_neonserv_csuspend.c (100%) rename cmd_neonserv_cunsuspend.c => src/cmd_neonserv_cunsuspend.c (100%) rename cmd_neonserv_delban.c => src/cmd_neonserv_delban.c (100%) rename cmd_neonserv_delme.c => src/cmd_neonserv_delme.c (100%) rename cmd_neonserv_deluser.c => src/cmd_neonserv_deluser.c (100%) rename cmd_neonserv_deop.c => src/cmd_neonserv_deop.c (100%) rename cmd_neonserv_deopall.c => src/cmd_neonserv_deopall.c (100%) rename cmd_neonserv_devoice.c => src/cmd_neonserv_devoice.c (100%) rename cmd_neonserv_devoiceall.c => src/cmd_neonserv_devoiceall.c (100%) rename cmd_neonserv_down.c => src/cmd_neonserv_down.c (100%) rename cmd_neonserv_downall.c => src/cmd_neonserv_downall.c (100%) rename cmd_neonserv_emote.c => src/cmd_neonserv_emote.c (100%) rename cmd_neonserv_events.c => src/cmd_neonserv_events.c (100%) rename cmd_neonserv_giveowner.c => src/cmd_neonserv_giveowner.c (100%) rename cmd_neonserv_god.c => src/cmd_neonserv_god.c (100%) rename cmd_neonserv_help.c => src/cmd_neonserv_help.c (100%) rename cmd_neonserv_invite.c => src/cmd_neonserv_invite.c (100%) rename cmd_neonserv_inviteme.c => src/cmd_neonserv_inviteme.c (100%) rename cmd_neonserv_kick.c => src/cmd_neonserv_kick.c (100%) rename cmd_neonserv_kickban.c => src/cmd_neonserv_kickban.c (100%) rename cmd_neonserv_mdeluser.c => src/cmd_neonserv_mdeluser.c (100%) rename cmd_neonserv_mode.c => src/cmd_neonserv_mode.c (100%) rename cmd_neonserv_move.c => src/cmd_neonserv_move.c (100%) rename cmd_neonserv_myaccess.c => src/cmd_neonserv_myaccess.c (100%) rename cmd_neonserv_netinfo.c => src/cmd_neonserv_netinfo.c (100%) rename cmd_neonserv_notice.c => src/cmd_neonserv_notice.c (100%) rename cmd_neonserv_op.c => src/cmd_neonserv_op.c (100%) rename cmd_neonserv_opall.c => src/cmd_neonserv_opall.c (100%) rename cmd_neonserv_oplog.c => src/cmd_neonserv_oplog.c (100%) rename cmd_neonserv_peek.c => src/cmd_neonserv_peek.c (100%) rename cmd_neonserv_raw.c => src/cmd_neonserv_raw.c (100%) rename cmd_neonserv_recover.c => src/cmd_neonserv_recover.c (100%) rename cmd_neonserv_register.c => src/cmd_neonserv_register.c (100%) rename cmd_neonserv_reloadlang.c => src/cmd_neonserv_reloadlang.c (100%) rename cmd_neonserv_resync.c => src/cmd_neonserv_resync.c (100%) rename cmd_neonserv_say.c => src/cmd_neonserv_say.c (100%) rename cmd_neonserv_search.c => src/cmd_neonserv_search.c (100%) rename cmd_neonserv_set.c => src/cmd_neonserv_set.c (100%) rename cmd_neonserv_setaccess.c => src/cmd_neonserv_setaccess.c (100%) rename cmd_neonserv_suspend.c => src/cmd_neonserv_suspend.c (100%) rename cmd_neonserv_topic.c => src/cmd_neonserv_topic.c (100%) rename cmd_neonserv_trace.c => src/cmd_neonserv_trace.c (100%) rename cmd_neonserv_trim.c => src/cmd_neonserv_trim.c (100%) rename cmd_neonserv_unban.c => src/cmd_neonserv_unban.c (100%) rename cmd_neonserv_unbanall.c => src/cmd_neonserv_unbanall.c (100%) rename cmd_neonserv_unbanme.c => src/cmd_neonserv_unbanme.c (100%) rename cmd_neonserv_unbind.c => src/cmd_neonserv_unbind.c (100%) rename cmd_neonserv_unregister.c => src/cmd_neonserv_unregister.c (100%) rename cmd_neonserv_unsuspend.c => src/cmd_neonserv_unsuspend.c (100%) rename cmd_neonserv_up.c => src/cmd_neonserv_up.c (100%) rename cmd_neonserv_upall.c => src/cmd_neonserv_upall.c (100%) rename cmd_neonserv_users.c => src/cmd_neonserv_users.c (100%) rename cmd_neonserv_uset.c => src/cmd_neonserv_uset.c (100%) rename cmd_neonserv_version.c => src/cmd_neonserv_version.c (100%) rename cmd_neonserv_voice.c => src/cmd_neonserv_voice.c (100%) rename cmd_neonserv_voiceall.c => src/cmd_neonserv_voiceall.c (100%) rename cmd_neonserv_wipeinfo.c => src/cmd_neonserv_wipeinfo.c (100%) create mode 100644 src/config.h.example rename event_neonserv_ctcp.c => src/event_neonserv_ctcp.c (100%) rename event_neonserv_invite.c => src/event_neonserv_invite.c (100%) rename event_neonserv_join.c => src/event_neonserv_join.c (100%) rename event_neonserv_notice.c => src/event_neonserv_notice.c (100%) rename event_neonserv_part.c => src/event_neonserv_part.c (100%) rename event_neonserv_quit.c => src/event_neonserv_quit.c (100%) rename event_neonserv_topic.c => src/event_neonserv_topic.c (100%) rename lang.c => src/lang.c (100%) rename lang.h => src/lang.h (100%) rename main.c => src/main.c (100%) rename main.h => src/main.h (98%) rename modcmd.c => src/modcmd.c (100%) rename modcmd.h => src/modcmd.h (100%) rename mysqlConn.c => src/mysqlConn.c (100%) rename mysqlConn.h => src/mysqlConn.h (100%) rename timeq.c => src/timeq.c (100%) rename timeq.h => src/timeq.h (100%) rename tools.c => src/tools.c (100%) rename tools.h => src/tools.h (100%) rename version.h => src/version.h (100%) rename version.sh => src/version.sh (97%) diff --git a/.gitignore b/.gitignore index 57678a9..4e8b61d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -config.h -version.c \ No newline at end of file +mysqlConfig.h +src/version.c \ No newline at end of file diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..409b9be --- /dev/null +++ b/Makefile.am @@ -0,0 +1,101 @@ +AUTOMAKE_OPTIONS = foreign +AM_CFLAGS = $(MYSQL_CFLAGS) + +CFLAGS = -g -O2 -Wall -Wshadow -Werror + +BUILT_SOURCES = version.c +version.c: checkversion +checkversion: + cd src && chmod +x version.sh && ./version.sh && cd .. + +bin_PROGRAMS = neonserv +neonserv_SOURCES = src/version.c \ + src/EventLogger.c \ + src/IRCEvents.c \ + src/main.c \ + src/ChanNode.c \ + src/IRCParser.c \ + src/ClientSocket.c \ + src/UserNode.c \ + src/ChanUser.c \ + src/ModeNode.c \ + src/BanNode.c \ + src/WHOHandler.c \ + src/modcmd.c \ + src/mysqlConn.c \ + src/lang.c \ + src/HandleInfoHandler.c \ + src/tools.c \ + src/timeq.c \ + src/DBHelper.c \ + src/bots.c \ + src/bot_NeonServ.c \ + src/cmd_neonserv_access.c \ + src/cmd_neonserv_addban.c \ + src/cmd_neonserv_addtimeban.c \ + src/cmd_neonserv_adduser.c \ + src/cmd_neonserv_ban.c \ + src/cmd_neonserv_bans.c \ + src/cmd_neonserv_bind.c \ + src/cmd_neonserv_chanservsync.c \ + src/cmd_neonserv_clvl.c \ + src/cmd_neonserv_command.c \ + src/cmd_neonserv_csuspend.c \ + src/cmd_neonserv_cunsuspend.c \ + src/cmd_neonserv_delban.c \ + src/cmd_neonserv_delme.c \ + src/cmd_neonserv_deluser.c \ + src/cmd_neonserv_deop.c \ + src/cmd_neonserv_deopall.c \ + src/cmd_neonserv_devoice.c \ + src/cmd_neonserv_devoiceall.c \ + src/cmd_neonserv_down.c \ + src/cmd_neonserv_downall.c \ + src/cmd_neonserv_emote.c \ + src/cmd_neonserv_events.c \ + src/cmd_neonserv_giveowner.c \ + src/cmd_neonserv_god.c \ + src/cmd_neonserv_help.c \ + src/cmd_neonserv_invite.c \ + src/cmd_neonserv_inviteme.c \ + src/cmd_neonserv_kick.c \ + src/cmd_neonserv_kickban.c \ + src/cmd_neonserv_mdeluser.c \ + src/cmd_neonserv_mode.c \ + src/cmd_neonserv_move.c \ + src/cmd_neonserv_myaccess.c \ + src/cmd_neonserv_netinfo.c \ + src/cmd_neonserv_notice.c \ + src/cmd_neonserv_op.c \ + src/cmd_neonserv_opall.c \ + src/cmd_neonserv_oplog.c \ + src/cmd_neonserv_peek.c \ + src/cmd_neonserv_raw.c \ + src/cmd_neonserv_recover.c \ + src/cmd_neonserv_register.c \ + src/cmd_neonserv_reloadlang.c \ + src/cmd_neonserv_resync.c \ + src/cmd_neonserv_say.c \ + src/cmd_neonserv_search.c \ + src/cmd_neonserv_set.c \ + src/cmd_neonserv_setaccess.c \ + src/cmd_neonserv_suspend.c \ + src/cmd_neonserv_topic.c \ + src/cmd_neonserv_trace.c \ + src/cmd_neonserv_trim.c \ + src/cmd_neonserv_unban.c \ + src/cmd_neonserv_unbanall.c \ + src/cmd_neonserv_unbanme.c \ + src/cmd_neonserv_unbind.c \ + src/cmd_neonserv_unregister.c \ + src/cmd_neonserv_unsuspend.c \ + src/cmd_neonserv_up.c \ + src/cmd_neonserv_upall.c \ + src/cmd_neonserv_users.c \ + src/cmd_neonserv_uset.c \ + src/cmd_neonserv_version.c \ + src/cmd_neonserv_voice.c \ + src/cmd_neonserv_voiceall.c \ + src/cmd_neonserv_wipeinfo.c + +neonserv_LDADD = $(MYSQL_LIBS) \ No newline at end of file diff --git a/autogen.sh b/autogen.sh new file mode 100644 index 0000000..01c075c --- /dev/null +++ b/autogen.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +echo "Generating configure files... may take a while." + +autoreconf --install --force && \ + echo "Preparing was successful if there was no error messages above." && \ + echo "Now type:" && \ + echo " ./configure && make" && \ + echo "Run './configure --help' for more information" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..308d5f4 --- /dev/null +++ b/configure.ac @@ -0,0 +1,37 @@ +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.67]) +AC_INIT([NeonServ], [5.0], [bugs@pk910.de], [neonserv], [http://neonserv.krypton-bouncer.de]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) +AC_CONFIG_HEADERS([config.h]) + +# Checks for programs. +AC_PROG_CC +AC_PROG_AWK + +# Checks for libraries. +# Get MySQL library and include locations +AC_ARG_WITH([mysql-include-path], + [AS_HELP_STRING([--with-mysql-include-path], + [location of the MySQL headers, defaults to /usr/include/mysql])], + [MYSQL_CFLAGS="-I$withval"], + [MYSQL_CFLAGS='-I/usr/include/mysql']) +AC_SUBST([MYSQL_CFLAGS]) + +AC_ARG_WITH([mysql-lib-path], + [AS_HELP_STRING([--with-mysql-lib-path], [location of the MySQL libraries])], + [MYSQL_LIBS="-L$withval -lmysqlclient"], + [MYSQL_LIBS='-lmysqlclient']) +AC_SUBST([MYSQL_LIBS]) + +# Checks for header files. +AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h]) + +# Checks for typedefs, structures, and compiler characteristics. + +# Checks for library functions. +AC_FUNC_MALLOC +AC_CHECK_FUNCS([gethostbyname memset select socket strchr strdup strstr]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT \ No newline at end of file diff --git a/config.h.example b/mysqlConfig.h.example similarity index 100% rename from config.h.example rename to mysqlConfig.h.example diff --git a/BanNode.c b/src/BanNode.c similarity index 100% rename from BanNode.c rename to src/BanNode.c diff --git a/BanNode.h b/src/BanNode.h similarity index 100% rename from BanNode.h rename to src/BanNode.h diff --git a/ChanNode.c b/src/ChanNode.c similarity index 100% rename from ChanNode.c rename to src/ChanNode.c diff --git a/ChanNode.h b/src/ChanNode.h similarity index 100% rename from ChanNode.h rename to src/ChanNode.h diff --git a/ChanUser.c b/src/ChanUser.c similarity index 100% rename from ChanUser.c rename to src/ChanUser.c diff --git a/ChanUser.h b/src/ChanUser.h similarity index 100% rename from ChanUser.h rename to src/ChanUser.h diff --git a/ClientSocket.c b/src/ClientSocket.c similarity index 100% rename from ClientSocket.c rename to src/ClientSocket.c diff --git a/ClientSocket.h b/src/ClientSocket.h similarity index 100% rename from ClientSocket.h rename to src/ClientSocket.h diff --git a/src/DATABASE.txt b/src/DATABASE.txt new file mode 100644 index 0000000..62e38fa --- /dev/null +++ b/src/DATABASE.txt @@ -0,0 +1,65 @@ +//Database of NeonServ V4 modifications for NeonServ V5 + +ALTER TABLE `bots` CHANGE `botclass` `botclass` INT( 10 ) NOT NULL; + +ALTER TABLE `users` CHANGE `user_lang` `user_lang` VARCHAR( 6 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL; +ALTER TABLE `users` ADD `user_reply_privmsg` TINYINT( 1 ) NOT NULL ; + +CREATE TABLE IF NOT EXISTS `godlog` ( + `godlog_id` int(11) NOT NULL AUTO_INCREMENT, + `godlog_uid` int(11) NOT NULL, + `godlog_cid` int(15) NOT NULL, + `godlog_time` int(15) NOT NULL, + `godlog_cmd` varchar(512) NOT NULL, + PRIMARY KEY (`godlog_id`) +) ENGINE=MyISAM; + +ALTER TABLE `channels` ADD `channel_lastgiveowner` INT( 11 ) NOT NULL AFTER `channel_lastvisit`; + +CREATE TABLE IF NOT EXISTS `owner_history` ( +`owner_history_id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY , +`owner_history_cid` INT( 11 ) NOT NULL , +`owner_history_uid` INT( 11 ) NOT NULL , +`owner_history_time` INT( 11 ) NOT NULL , +INDEX ( `owner_history_cid` ) +) ENGINE = MYISAM ; + +ALTER TABLE `chanusers` ADD INDEX ( `chanuser_cid` ) ; +ALTER TABLE `chanusers` ADD INDEX ( `chanuser_uid` ) ; + +ALTER TABLE `bot_binds` ADD `chan_access` VARCHAR( 256 ) NULL DEFAULT NULL AFTER `parameters`; + +ALTER TABLE `bot_binds` CHANGE `global_access` `global_access` INT( 3 ) NULL; + +ALTER TABLE `bans` CHANGE `ban_owner` `ban_owner` INT( 11 ) NOT NULL; + +ALTER TABLE `channels` ADD `channel_exttopic` TINYINT( 1 ) NOT NULL AFTER `channel_topicmask` , +ADD `channel_exttopic_topic` VARCHAR( 512 ) NOT NULL AFTER `channel_exttopic`; + +ALTER TABLE `bots` ADD `max_channels` INT( 5 ) NOT NULL ; + +ALTER TABLE `bot_binds` CHANGE `botid` `botclass` INT( 11 ) NOT NULL; +ALTER TABLE `bots` DROP `whoisbot` ; +ALTER TABLE `bots` DROP `bindFrom` ; + +CREATE TABLE IF NOT EXISTS `help` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `lang` varchar(6) NOT NULL, + `ident` varchar(64) NOT NULL, + `text` text NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +CREATE TABLE IF NOT EXISTS `language` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `lang` varchar(5) NOT NULL, + `ident` varchar(64) NOT NULL, + `text` varchar(256) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +ALTER TABLE `bot_channels` ADD `suspended` TINYINT( 1 ) NOT NULL; + +ALTER TABLE `users` ADD UNIQUE (`user_user`); + +ALTER TABLE `noinvite` ADD INDEX ( `cid`, `uid` ); \ No newline at end of file diff --git a/DBHelper.c b/src/DBHelper.c similarity index 100% rename from DBHelper.c rename to src/DBHelper.c diff --git a/DBHelper.h b/src/DBHelper.h similarity index 100% rename from DBHelper.h rename to src/DBHelper.h diff --git a/EventLogger.c b/src/EventLogger.c similarity index 100% rename from EventLogger.c rename to src/EventLogger.c diff --git a/EventLogger.h b/src/EventLogger.h similarity index 100% rename from EventLogger.h rename to src/EventLogger.h diff --git a/HandleInfoHandler.c b/src/HandleInfoHandler.c similarity index 100% rename from HandleInfoHandler.c rename to src/HandleInfoHandler.c diff --git a/HandleInfoHandler.h b/src/HandleInfoHandler.h similarity index 100% rename from HandleInfoHandler.h rename to src/HandleInfoHandler.h diff --git a/IRCEvents.c b/src/IRCEvents.c similarity index 100% rename from IRCEvents.c rename to src/IRCEvents.c diff --git a/IRCEvents.h b/src/IRCEvents.h similarity index 100% rename from IRCEvents.h rename to src/IRCEvents.h diff --git a/IRCParser.c b/src/IRCParser.c similarity index 100% rename from IRCParser.c rename to src/IRCParser.c diff --git a/IRCParser.h b/src/IRCParser.h similarity index 100% rename from IRCParser.h rename to src/IRCParser.h diff --git a/Makefile b/src/Makefile similarity index 100% rename from Makefile rename to src/Makefile diff --git a/ModeNode.c b/src/ModeNode.c similarity index 100% rename from ModeNode.c rename to src/ModeNode.c diff --git a/ModeNode.h b/src/ModeNode.h similarity index 100% rename from ModeNode.h rename to src/ModeNode.h diff --git a/UserNode.c b/src/UserNode.c similarity index 100% rename from UserNode.c rename to src/UserNode.c diff --git a/UserNode.h b/src/UserNode.h similarity index 100% rename from UserNode.h rename to src/UserNode.h diff --git a/WHOHandler.c b/src/WHOHandler.c similarity index 100% rename from WHOHandler.c rename to src/WHOHandler.c diff --git a/WHOHandler.h b/src/WHOHandler.h similarity index 100% rename from WHOHandler.h rename to src/WHOHandler.h diff --git a/bot_NeonServ.c b/src/bot_NeonServ.c similarity index 100% rename from bot_NeonServ.c rename to src/bot_NeonServ.c diff --git a/bot_NeonServ.h b/src/bot_NeonServ.h similarity index 100% rename from bot_NeonServ.h rename to src/bot_NeonServ.h diff --git a/bots.c b/src/bots.c similarity index 100% rename from bots.c rename to src/bots.c diff --git a/bots.h b/src/bots.h similarity index 100% rename from bots.h rename to src/bots.h diff --git a/cmd_neonserv.h b/src/cmd_neonserv.h similarity index 100% rename from cmd_neonserv.h rename to src/cmd_neonserv.h diff --git a/cmd_neonserv_access.c b/src/cmd_neonserv_access.c similarity index 100% rename from cmd_neonserv_access.c rename to src/cmd_neonserv_access.c diff --git a/cmd_neonserv_addban.c b/src/cmd_neonserv_addban.c similarity index 100% rename from cmd_neonserv_addban.c rename to src/cmd_neonserv_addban.c diff --git a/cmd_neonserv_addtimeban.c b/src/cmd_neonserv_addtimeban.c similarity index 100% rename from cmd_neonserv_addtimeban.c rename to src/cmd_neonserv_addtimeban.c diff --git a/cmd_neonserv_adduser.c b/src/cmd_neonserv_adduser.c similarity index 100% rename from cmd_neonserv_adduser.c rename to src/cmd_neonserv_adduser.c diff --git a/cmd_neonserv_ban.c b/src/cmd_neonserv_ban.c similarity index 100% rename from cmd_neonserv_ban.c rename to src/cmd_neonserv_ban.c diff --git a/cmd_neonserv_bans.c b/src/cmd_neonserv_bans.c similarity index 100% rename from cmd_neonserv_bans.c rename to src/cmd_neonserv_bans.c diff --git a/cmd_neonserv_bind.c b/src/cmd_neonserv_bind.c similarity index 100% rename from cmd_neonserv_bind.c rename to src/cmd_neonserv_bind.c diff --git a/cmd_neonserv_chanservsync.c b/src/cmd_neonserv_chanservsync.c similarity index 100% rename from cmd_neonserv_chanservsync.c rename to src/cmd_neonserv_chanservsync.c diff --git a/cmd_neonserv_clvl.c b/src/cmd_neonserv_clvl.c similarity index 100% rename from cmd_neonserv_clvl.c rename to src/cmd_neonserv_clvl.c diff --git a/cmd_neonserv_command.c b/src/cmd_neonserv_command.c similarity index 100% rename from cmd_neonserv_command.c rename to src/cmd_neonserv_command.c diff --git a/cmd_neonserv_csuspend.c b/src/cmd_neonserv_csuspend.c similarity index 100% rename from cmd_neonserv_csuspend.c rename to src/cmd_neonserv_csuspend.c diff --git a/cmd_neonserv_cunsuspend.c b/src/cmd_neonserv_cunsuspend.c similarity index 100% rename from cmd_neonserv_cunsuspend.c rename to src/cmd_neonserv_cunsuspend.c diff --git a/cmd_neonserv_delban.c b/src/cmd_neonserv_delban.c similarity index 100% rename from cmd_neonserv_delban.c rename to src/cmd_neonserv_delban.c diff --git a/cmd_neonserv_delme.c b/src/cmd_neonserv_delme.c similarity index 100% rename from cmd_neonserv_delme.c rename to src/cmd_neonserv_delme.c diff --git a/cmd_neonserv_deluser.c b/src/cmd_neonserv_deluser.c similarity index 100% rename from cmd_neonserv_deluser.c rename to src/cmd_neonserv_deluser.c diff --git a/cmd_neonserv_deop.c b/src/cmd_neonserv_deop.c similarity index 100% rename from cmd_neonserv_deop.c rename to src/cmd_neonserv_deop.c diff --git a/cmd_neonserv_deopall.c b/src/cmd_neonserv_deopall.c similarity index 100% rename from cmd_neonserv_deopall.c rename to src/cmd_neonserv_deopall.c diff --git a/cmd_neonserv_devoice.c b/src/cmd_neonserv_devoice.c similarity index 100% rename from cmd_neonserv_devoice.c rename to src/cmd_neonserv_devoice.c diff --git a/cmd_neonserv_devoiceall.c b/src/cmd_neonserv_devoiceall.c similarity index 100% rename from cmd_neonserv_devoiceall.c rename to src/cmd_neonserv_devoiceall.c diff --git a/cmd_neonserv_down.c b/src/cmd_neonserv_down.c similarity index 100% rename from cmd_neonserv_down.c rename to src/cmd_neonserv_down.c diff --git a/cmd_neonserv_downall.c b/src/cmd_neonserv_downall.c similarity index 100% rename from cmd_neonserv_downall.c rename to src/cmd_neonserv_downall.c diff --git a/cmd_neonserv_emote.c b/src/cmd_neonserv_emote.c similarity index 100% rename from cmd_neonserv_emote.c rename to src/cmd_neonserv_emote.c diff --git a/cmd_neonserv_events.c b/src/cmd_neonserv_events.c similarity index 100% rename from cmd_neonserv_events.c rename to src/cmd_neonserv_events.c diff --git a/cmd_neonserv_giveowner.c b/src/cmd_neonserv_giveowner.c similarity index 100% rename from cmd_neonserv_giveowner.c rename to src/cmd_neonserv_giveowner.c diff --git a/cmd_neonserv_god.c b/src/cmd_neonserv_god.c similarity index 100% rename from cmd_neonserv_god.c rename to src/cmd_neonserv_god.c diff --git a/cmd_neonserv_help.c b/src/cmd_neonserv_help.c similarity index 100% rename from cmd_neonserv_help.c rename to src/cmd_neonserv_help.c diff --git a/cmd_neonserv_invite.c b/src/cmd_neonserv_invite.c similarity index 100% rename from cmd_neonserv_invite.c rename to src/cmd_neonserv_invite.c diff --git a/cmd_neonserv_inviteme.c b/src/cmd_neonserv_inviteme.c similarity index 100% rename from cmd_neonserv_inviteme.c rename to src/cmd_neonserv_inviteme.c diff --git a/cmd_neonserv_kick.c b/src/cmd_neonserv_kick.c similarity index 100% rename from cmd_neonserv_kick.c rename to src/cmd_neonserv_kick.c diff --git a/cmd_neonserv_kickban.c b/src/cmd_neonserv_kickban.c similarity index 100% rename from cmd_neonserv_kickban.c rename to src/cmd_neonserv_kickban.c diff --git a/cmd_neonserv_mdeluser.c b/src/cmd_neonserv_mdeluser.c similarity index 100% rename from cmd_neonserv_mdeluser.c rename to src/cmd_neonserv_mdeluser.c diff --git a/cmd_neonserv_mode.c b/src/cmd_neonserv_mode.c similarity index 100% rename from cmd_neonserv_mode.c rename to src/cmd_neonserv_mode.c diff --git a/cmd_neonserv_move.c b/src/cmd_neonserv_move.c similarity index 100% rename from cmd_neonserv_move.c rename to src/cmd_neonserv_move.c diff --git a/cmd_neonserv_myaccess.c b/src/cmd_neonserv_myaccess.c similarity index 100% rename from cmd_neonserv_myaccess.c rename to src/cmd_neonserv_myaccess.c diff --git a/cmd_neonserv_netinfo.c b/src/cmd_neonserv_netinfo.c similarity index 100% rename from cmd_neonserv_netinfo.c rename to src/cmd_neonserv_netinfo.c diff --git a/cmd_neonserv_notice.c b/src/cmd_neonserv_notice.c similarity index 100% rename from cmd_neonserv_notice.c rename to src/cmd_neonserv_notice.c diff --git a/cmd_neonserv_op.c b/src/cmd_neonserv_op.c similarity index 100% rename from cmd_neonserv_op.c rename to src/cmd_neonserv_op.c diff --git a/cmd_neonserv_opall.c b/src/cmd_neonserv_opall.c similarity index 100% rename from cmd_neonserv_opall.c rename to src/cmd_neonserv_opall.c diff --git a/cmd_neonserv_oplog.c b/src/cmd_neonserv_oplog.c similarity index 100% rename from cmd_neonserv_oplog.c rename to src/cmd_neonserv_oplog.c diff --git a/cmd_neonserv_peek.c b/src/cmd_neonserv_peek.c similarity index 100% rename from cmd_neonserv_peek.c rename to src/cmd_neonserv_peek.c diff --git a/cmd_neonserv_raw.c b/src/cmd_neonserv_raw.c similarity index 100% rename from cmd_neonserv_raw.c rename to src/cmd_neonserv_raw.c diff --git a/cmd_neonserv_recover.c b/src/cmd_neonserv_recover.c similarity index 100% rename from cmd_neonserv_recover.c rename to src/cmd_neonserv_recover.c diff --git a/cmd_neonserv_register.c b/src/cmd_neonserv_register.c similarity index 100% rename from cmd_neonserv_register.c rename to src/cmd_neonserv_register.c diff --git a/cmd_neonserv_reloadlang.c b/src/cmd_neonserv_reloadlang.c similarity index 100% rename from cmd_neonserv_reloadlang.c rename to src/cmd_neonserv_reloadlang.c diff --git a/cmd_neonserv_resync.c b/src/cmd_neonserv_resync.c similarity index 100% rename from cmd_neonserv_resync.c rename to src/cmd_neonserv_resync.c diff --git a/cmd_neonserv_say.c b/src/cmd_neonserv_say.c similarity index 100% rename from cmd_neonserv_say.c rename to src/cmd_neonserv_say.c diff --git a/cmd_neonserv_search.c b/src/cmd_neonserv_search.c similarity index 100% rename from cmd_neonserv_search.c rename to src/cmd_neonserv_search.c diff --git a/cmd_neonserv_set.c b/src/cmd_neonserv_set.c similarity index 100% rename from cmd_neonserv_set.c rename to src/cmd_neonserv_set.c diff --git a/cmd_neonserv_setaccess.c b/src/cmd_neonserv_setaccess.c similarity index 100% rename from cmd_neonserv_setaccess.c rename to src/cmd_neonserv_setaccess.c diff --git a/cmd_neonserv_suspend.c b/src/cmd_neonserv_suspend.c similarity index 100% rename from cmd_neonserv_suspend.c rename to src/cmd_neonserv_suspend.c diff --git a/cmd_neonserv_topic.c b/src/cmd_neonserv_topic.c similarity index 100% rename from cmd_neonserv_topic.c rename to src/cmd_neonserv_topic.c diff --git a/cmd_neonserv_trace.c b/src/cmd_neonserv_trace.c similarity index 100% rename from cmd_neonserv_trace.c rename to src/cmd_neonserv_trace.c diff --git a/cmd_neonserv_trim.c b/src/cmd_neonserv_trim.c similarity index 100% rename from cmd_neonserv_trim.c rename to src/cmd_neonserv_trim.c diff --git a/cmd_neonserv_unban.c b/src/cmd_neonserv_unban.c similarity index 100% rename from cmd_neonserv_unban.c rename to src/cmd_neonserv_unban.c diff --git a/cmd_neonserv_unbanall.c b/src/cmd_neonserv_unbanall.c similarity index 100% rename from cmd_neonserv_unbanall.c rename to src/cmd_neonserv_unbanall.c diff --git a/cmd_neonserv_unbanme.c b/src/cmd_neonserv_unbanme.c similarity index 100% rename from cmd_neonserv_unbanme.c rename to src/cmd_neonserv_unbanme.c diff --git a/cmd_neonserv_unbind.c b/src/cmd_neonserv_unbind.c similarity index 100% rename from cmd_neonserv_unbind.c rename to src/cmd_neonserv_unbind.c diff --git a/cmd_neonserv_unregister.c b/src/cmd_neonserv_unregister.c similarity index 100% rename from cmd_neonserv_unregister.c rename to src/cmd_neonserv_unregister.c diff --git a/cmd_neonserv_unsuspend.c b/src/cmd_neonserv_unsuspend.c similarity index 100% rename from cmd_neonserv_unsuspend.c rename to src/cmd_neonserv_unsuspend.c diff --git a/cmd_neonserv_up.c b/src/cmd_neonserv_up.c similarity index 100% rename from cmd_neonserv_up.c rename to src/cmd_neonserv_up.c diff --git a/cmd_neonserv_upall.c b/src/cmd_neonserv_upall.c similarity index 100% rename from cmd_neonserv_upall.c rename to src/cmd_neonserv_upall.c diff --git a/cmd_neonserv_users.c b/src/cmd_neonserv_users.c similarity index 100% rename from cmd_neonserv_users.c rename to src/cmd_neonserv_users.c diff --git a/cmd_neonserv_uset.c b/src/cmd_neonserv_uset.c similarity index 100% rename from cmd_neonserv_uset.c rename to src/cmd_neonserv_uset.c diff --git a/cmd_neonserv_version.c b/src/cmd_neonserv_version.c similarity index 100% rename from cmd_neonserv_version.c rename to src/cmd_neonserv_version.c diff --git a/cmd_neonserv_voice.c b/src/cmd_neonserv_voice.c similarity index 100% rename from cmd_neonserv_voice.c rename to src/cmd_neonserv_voice.c diff --git a/cmd_neonserv_voiceall.c b/src/cmd_neonserv_voiceall.c similarity index 100% rename from cmd_neonserv_voiceall.c rename to src/cmd_neonserv_voiceall.c diff --git a/cmd_neonserv_wipeinfo.c b/src/cmd_neonserv_wipeinfo.c similarity index 100% rename from cmd_neonserv_wipeinfo.c rename to src/cmd_neonserv_wipeinfo.c diff --git a/src/config.h.example b/src/config.h.example new file mode 100644 index 0000000..6d573d4 --- /dev/null +++ b/src/config.h.example @@ -0,0 +1,6 @@ + +#define MYSQL_HOST "127.0.0.1" +#define MYSQL_PORT 3306 +#define MYSQL_USER "neonserv" +#define MYSQL_PASS "" +#define MYSQL_BASE "neonserv" diff --git a/event_neonserv_ctcp.c b/src/event_neonserv_ctcp.c similarity index 100% rename from event_neonserv_ctcp.c rename to src/event_neonserv_ctcp.c diff --git a/event_neonserv_invite.c b/src/event_neonserv_invite.c similarity index 100% rename from event_neonserv_invite.c rename to src/event_neonserv_invite.c diff --git a/event_neonserv_join.c b/src/event_neonserv_join.c similarity index 100% rename from event_neonserv_join.c rename to src/event_neonserv_join.c diff --git a/event_neonserv_notice.c b/src/event_neonserv_notice.c similarity index 100% rename from event_neonserv_notice.c rename to src/event_neonserv_notice.c diff --git a/event_neonserv_part.c b/src/event_neonserv_part.c similarity index 100% rename from event_neonserv_part.c rename to src/event_neonserv_part.c diff --git a/event_neonserv_quit.c b/src/event_neonserv_quit.c similarity index 100% rename from event_neonserv_quit.c rename to src/event_neonserv_quit.c diff --git a/event_neonserv_topic.c b/src/event_neonserv_topic.c similarity index 100% rename from event_neonserv_topic.c rename to src/event_neonserv_topic.c diff --git a/lang.c b/src/lang.c similarity index 100% rename from lang.c rename to src/lang.c diff --git a/lang.h b/src/lang.h similarity index 100% rename from lang.h rename to src/lang.h diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/main.h b/src/main.h similarity index 98% rename from main.h rename to src/main.h index 0731781..b1452e7 100644 --- a/main.h +++ b/src/main.h @@ -3,7 +3,7 @@ #define NEONSERV_VERSION "5.0.1-dev" -#include "config.h" +#include "../mysqlConfig.h" #ifndef BOTWAR_ALERT_CHAN #define BOTWAR_ALERT_CHAN NULL #endif diff --git a/modcmd.c b/src/modcmd.c similarity index 100% rename from modcmd.c rename to src/modcmd.c diff --git a/modcmd.h b/src/modcmd.h similarity index 100% rename from modcmd.h rename to src/modcmd.h diff --git a/mysqlConn.c b/src/mysqlConn.c similarity index 100% rename from mysqlConn.c rename to src/mysqlConn.c diff --git a/mysqlConn.h b/src/mysqlConn.h similarity index 100% rename from mysqlConn.h rename to src/mysqlConn.h diff --git a/timeq.c b/src/timeq.c similarity index 100% rename from timeq.c rename to src/timeq.c diff --git a/timeq.h b/src/timeq.h similarity index 100% rename from timeq.h rename to src/timeq.h diff --git a/tools.c b/src/tools.c similarity index 100% rename from tools.c rename to src/tools.c diff --git a/tools.h b/src/tools.h similarity index 100% rename from tools.h rename to src/tools.h diff --git a/version.h b/src/version.h similarity index 100% rename from version.h rename to src/version.h diff --git a/version.sh b/src/version.sh similarity index 97% rename from version.sh rename to src/version.sh index caaff7e..b5bdc12 100644 --- a/version.sh +++ b/src/version.sh @@ -33,7 +33,7 @@ else fi -/bin/cat >version.c < version.c <