Commit Graph
100 Commits
Author SHA1 Message Date
Jan Vidar Krey 19559f4974 Make sure we count OpenSSL traffic for the byte IO statistics. 2012-10-18 11:40:18 +02:00
Jan Vidar Krey b999068555 Use OpenSSL by default. 2012-10-17 19:02:32 +00:00
Jan Vidar Krey 4385266bb7 Free all memory in case the hub does not start because of port already in use. 2012-10-17 20:54:46 +02:00
Jan Vidar Krey c50eb90bee Removed the last bits of OpenSSL code called directly 2012-10-17 20:53:05 +02:00
Jan Vidar Krey 1e0927f510 Update copyright year. 2012-10-17 20:00:52 +02:00
Jan Vidar Krey b9d43c784c Merge branch 'master' of github.com:janvidar/uhub
Conflicts:
	CMakeLists.txt
2012-10-17 19:59:02 +02:00
Jan Vidar Krey 46d365cafe Merge branch 'gnutls_work' 2012-10-17 15:47:16 +02:00
Jan Vidar Krey 2f830d3132 Cleaned up error handling. 2012-10-17 15:39:48 +02:00
Jan Vidar Krey 5884983a2f Return -1 as error for recv/send only to signal socket has closed, use a number < -1 for socket errors. 2012-10-17 15:02:32 +02:00
Jan Vidar Krey c43acd97bd Fixed accept/connect state event propagation.
Also removed some unused states and flags.
2012-10-17 09:25:15 +02:00
Jan Vidar Krey b1f2c93738 Reworked the error handling of non-blocking reads and writes.
This should prevent busy loops where the socket is makred readable
but we are really only looking for it to become writable.
2012-10-17 09:16:02 +02:00
Jan Vidar Krey 50912bdf75 More work on splitting out OpenSSL specific bits. 2012-10-15 20:39:03 +02:00
Jan Vidar Krey 3a8c91004e fixup! Add possibility to specify UHUB_REVISION manually. 2012-10-15 20:27:43 +02:00
Jan Vidar Krey c28a5d3a9b Merge branch 'master' of github.com:janvidar/uhub 2012-10-15 20:20:17 +02:00
Jan Vidar Krey 8b06a75d8e Revert "Add possibility to specify UHUB_REVISION manually."
This reverts commit dcfcf3110d.
2012-10-15 00:24:59 +02:00
Jan Vidar Krey e6cb7a7e10 Revert "Add possibility to specify UHUB_REVISION manually."
This reverts commit dcfcf3110d.
2012-10-14 22:24:33 +00:00
Jan Vidar Krey 82caa6b81f Merge pull request #14 from tehnick/fix-build-on-kfreebsd-any
Fix build in Debian GNU/kFreeBSD.
2012-10-14 15:19:21 -07:00
Jan Vidar Krey 7fae42aa4d Merge pull request #12 from tehnick/fix-version
Add possibility to specify UHUB_REVISION manually.
2012-10-13 10:34:39 -07:00
Jan Vidar Krey ba59e1a00e Merge pull request #13 from tehnick/cmake-up
Simplify CMakeLists.txt
2012-10-13 10:34:23 -07:00
Jan Vidar Krey 4fcfee8e82 Merge pull request #11 from tehnick/fix-plugins-location
Use directory /usr/lib/uhub/ instead of /var/lib/uhub/
2012-10-13 10:33:09 -07:00
Jan Vidar Krey f3922bb3e0 Work on splitting out OpenSSL cleanly. 2012-10-12 14:24:03 +02:00
Jan Vidar Krey af083efb0c fixup! Don't compile the utils files multiple times. 2012-10-09 22:14:38 +02:00
Jan Vidar Krey e7aa63f3bd Don't compile the utils files multiple times. 2012-10-09 22:09:25 +02:00
Jan Vidar Krey 279c932b67 fixup! Add install make rule. 2012-10-09 19:31:54 +02:00
Jan Vidar Krey 69603ff70f Add install make rule. 2012-10-09 14:36:14 +02:00
Jan Vidar Krey f20c42d05f Wrapped everything OpenSSL related in a SSL_USE_OPENSSL check macro. 2012-10-02 23:59:11 +02:00
Jan Vidar Krey 3ea38c59af Better reporting using the !stats command. 2012-10-02 23:59:11 +02:00
Jan Vidar Krey 50292cb8c9 Update the network statistics every 10 seconds instead of 60 seconds. 2012-10-02 23:59:11 +02:00
Jan Vidar Krey e4fc91dde1 Made the network statistics work again. 2012-10-02 23:59:11 +02:00
Jan Vidar Krey 8086d89e23 Better formatting of byte sizes. 2012-10-02 23:59:11 +02:00
Jan Vidar Krey cc2ead8136 Use util's format_size. 2012-10-09 10:20:58 +02:00
Jan Vidar Krey 10d8157477 Added a utility function to convert an arbitrary byte size into a human readable string.
E.g. 849484 becomes "829.57 KB".
2012-10-09 10:20:12 +02:00
Jan Vidar Krey 0a7cb86014 Fixed a crash in plugin mod_chat_only. 2012-10-09 10:02:08 +02:00
Jan Vidar Krey 2e8c99b7ec Refurbished the ADC hub stress-tester tool; adcrush 2012-10-02 23:59:11 +02:00
Jan Vidar Krey cb6236691b Added more functionality to the ADC client test code. 2012-10-02 23:59:11 +02:00
Jan Vidar Krey 5136525abc Added API to construct ADC messages with source and destination. 2012-10-02 23:59:11 +02:00
Jan Vidar Krey 07da142e65 Only enable the C compiler (no C++ compiler required). 2012-10-05 09:09:54 +02:00
Jan Vidar Krey aa21556600 Use correct source directory for building outside of source. 2012-10-04 22:00:30 +00:00
Jan Vidar Krey f0b11dadf1 Refurbished adcrush (hub stress tester). 2012-10-03 13:51:07 +02:00
Jan Vidar Krey 61073bd304 Fix rare protocol parse error due to incorrect recv queue handling. 2012-10-03 13:49:50 +02:00
Jan Vidar Krey 20a847e1b4 Moved the ipcalc code to the network directory. 2012-10-03 12:59:05 +02:00
Jan Vidar Krey a90807fccb Fix version auto generation. 2012-10-03 12:02:35 +02:00
Jan Vidar Krey 25c82076da Cmake fixes, build adc client and link uhub with pthread if sqlite3 is used. 2012-10-03 11:45:21 +02:00
Jan Vidar Krey 089966d918 Fix ADC client send queue. 2012-10-03 11:44:07 +02:00
Jan Vidar Krey e95a892fb7 MSVC compile warnings fixed. 2012-10-02 22:47:43 +02:00
Jan Vidar Krey 564f09ad65 Update the CMake minimum version to 2.8.3 2012-10-02 20:16:30 +00:00
Jan Vidar Krey a33851b13d fixup! Updated .gitignore 2012-10-02 21:54:56 +02:00
Jan Vidar Krey 20e445bf94 Updated .gitignore 2012-10-02 21:49:25 +02:00
Jan Vidar Krey 133707ef57 Removed the VS2010 project files. Use CMake instead. 2012-10-02 21:43:58 +02:00
Jan Vidar Krey 62d14a9c52 Plugin compile fixes for windows systems. 2012-10-02 21:42:58 +02:00
Jan Vidar Krey ab9dda1c61 Some fixes for CMake on Windows.
Tested successfully with NMake.
2012-10-02 21:38:45 +02:00
Jan Vidar Krey 37e78eada1 Replaced the GNU makefiles with CMake. 2012-10-02 15:49:27 +02:00
Jan Vidar Krey 5b4467acd5 Minor stuff on the uhub-admin tool based on the changes in the ADC client code. 2012-09-28 15:52:39 +02:00
Jan Vidar Krey ff2e2a3d4c Misc ADC client fixes. 2012-09-28 15:51:39 +02:00
Jan Vidar Krey a599b29b9d Added more complete API for dealing with ADC messages.
- Added a construct method which would take a fourcc and a source.
- Added an unescape function that would write into pre-allocated memory.
2012-09-28 15:49:46 +02:00
Jan Vidar Krey fc52f0e030 Renamed the hub_sendq and hub_recvq to ioq_send and ioq_recv. 2012-09-28 09:24:04 +02:00
Jan Vidar Krey 35bfefa717 Fix debug output typo. 2012-09-27 15:29:19 +02:00
Jan Vidar Krey 845aefc941 Decouple hub and user manager more cleanly. 2012-09-27 15:29:00 +02:00
Jan Vidar Krey 4fcf3ffc83 Add support for configuration options that depend on certain #ifdefs. 2012-09-27 15:28:46 +02:00
Jan Vidar Krey ac39ebf38a Merge pull request #10 from blairbonnett/fix-check-escapes
Fix msg_check_escapes() so it allows escaped backslashes.
2012-09-17 11:49:14 -07:00
Jan Vidar Krey b0aa690cb4 Merge branch 'master' of github.com:janvidar/uhub 2012-08-07 11:56:40 +02:00
Jan Vidar Krey fb11589bb0 Drop all ADC messages containing illegal ADC escapes. 2012-08-07 11:55:29 +02:00
Jan Vidar Krey 03c4292eea Merge pull request #8 from blairbonnett/upstart
Upstart script to run uhub as a service
2012-07-29 15:34:07 -07:00
Jan Vidar Krey ccaf755da3 Merge branch 'master' of github.com:janvidar/uhub 2012-07-30 00:08:38 +02:00
Jan Vidar Krey cba0121574 ADCH++ had a security bug that allowed UCMD extension to be relayed.
uhub did not have this security bug since the hub did not advertise support for the
UCMD extension, but the message was still correctly relayed as specified in the
protocol specification.

However, this commit adds support for the UCMD extension, but only to the extent
that uhub will advertise it and uhub will also drop any such CMD message
generated by a client and will (currently) never issues a CMD message by itself.
2012-07-30 00:08:12 +02:00
Jan Vidar Krey 949b54fcdd Merge pull request #7 from yorhel/master
TLS probing fix
2012-06-03 15:45:28 -07:00
Jan Vidar Krey 9651a99d46 Updated changelog. 2012-05-29 22:57:02 +02:00
Jan Vidar Krey 571abddd98 Cleaned up code generator for config file parsing. 2012-05-23 23:37:42 +02:00
Jan Vidar Krey 9ea85ad1ac Merge pull request #5 from yorhel/master
Small rewrite of convert_to_sqlite.pl
2012-05-14 14:38:22 -07:00
Jan Vidar Krey 3ae6da4a64 Print error message in case of shutting down due to errors loading plugins. 2012-05-14 23:35:53 +02:00
Jan Vidar Krey f3754fb4e4 Fix Windows file read discrepancy. 2012-05-14 23:33:54 +02:00
Jan Vidar Krey 210d5d276e Fix VS2010 project file - missing .c file. 2012-05-13 23:59:27 +02:00
Jan Vidar Krey a6d87f95ef Merge https://github.com/Tilka/uhub 2012-05-13 23:53:56 +02:00
Jan Vidar Krey c5516b5729 Merge branch 'master' of https://github.com/Tilka/uhub 2012-05-06 23:15:06 +02:00
Jan Vidar Krey 3aaabbc543 Fix issue with QUI messages being allowed through the hub 2012-05-06 23:09:02 +02:00
Jan Vidar Krey ccded3f642 Don't strip the U4/U6 port numbers if updated after login. 2012-05-02 20:45:31 +02:00
Jan Vidar Krey 216757a1f4 Fix compile issue with double typedefs. 2012-05-02 00:29:26 +02:00
Jan Vidar Krey 458c7fa741 Remove list assertion when removing element that is not in the list.
Breaks autotest.
2012-05-01 20:40:27 +02:00
Jan Vidar Krey 74ca5a0a33 Cleaned up command handling code, by splitting into multiple files. 2012-05-01 20:15:49 +02:00
Jan Vidar Krey 9efe4bce57 Fix bug #183 - Added proper OpenSSL license exception for the GPL. 2012-04-22 22:23:11 +02:00
Jan Vidar Krey 781f22edab Fixed tiny memory leak on reload/shutdown. 2012-04-19 20:05:37 +02:00
Jan Vidar Krey 55030935a7 Merge https://github.com/Tilka/uhub 2012-04-19 23:17:39 +02:00
Jan Vidar Krey 1dba731cc3 Fix bug #158 - Added plugin for setting topic (hub description).
Load plugin mod_topic, and it will provide 3 new user commands:

!topic - set new topic
!cleartopic - reset the topic (use default hub description)
!showtopic - show the current topic
2012-04-19 00:33:38 +02:00
Jan Vidar Krey df7bbc094f Command arguments handling + cleanups
Fix bug #185 - Args of !commands lost/damaged.
All string arguments were incorrectly freed after being added to the argument list for a command.
Instead this fix makes sure it is properly copied into a new string, and by doing so this requires
a new API for dealing with hub command arguments in a type safe manner, and also allows for each
argument to be cleaned up properly when the command is no longer needed.

This also fixes issues with parse errors for certain types, and optional arguments (previously it was impossible
to tell the difference for an integer with value 0 or if no integer was given).

All arguments can now be accessed through the new functions
hub_command_arg_reset() and hub_command_arg_next().

These functions are also exposed to plug-ins.

The argument type notations for 'n' has changed to mean nick (string),
and 'u' is used for a user (struct hub_user - must be online).
2012-04-18 23:03:05 +02:00
Jan Vidar Krey 5068fe8351 Cygwin/Mingw32 compile fixes. 2012-01-25 00:20:59 +01:00
Jan Vidar Krey 8607b40278 Fix bug #180 - Crash after signal SIGHUP. 2012-01-19 02:58:20 +01:00
Jan Vidar Krey a9b5c6db38 Fixed minor issues found with static code analyzis (Clang). 2012-01-13 01:31:34 +01:00
Jan Vidar Krey 0ae8a08f55 Revert "- add empty ./doc/users.db sqlite file"
This reverts commit 66215cc535.

This database is not created correctly.
Instead, create a database with the uhub-passwd tool:

uhub-passwd users.db create
2012-01-10 02:21:22 +01:00
Jan Vidar Krey ff639d87c3 Disable SQL debugging output. 2012-01-10 02:21:22 +01:00
Jan Vidar Krey 5edf2b60d4 Fixed bug #179 - !broadcast command does not work properly. 2012-01-10 02:21:22 +01:00
Jan Vidar Krey eee2636582 Added a chat only hub plugin that disables searching and connection setup.
This also deprecates the built-in chat_only configuration option.
If you need this functionality, then load the mod_chat_only plugin (if it is loaded then only operators
are able to search, connect, etc).
2012-01-09 20:58:19 +01:00
Jan Vidar Krey f44a420970 Updated the copyright to 2012 and git version display. 2012-01-04 11:08:07 +01:00
Jan Vidar Krey fcf6827a68 Also build the chat history plugin. 2012-01-03 22:41:56 +00:00
Jan Vidar Krey ca3782c570 Merge branch 'mod_chat_history_work'
Conflicts:
	doc/plugins.conf
2012-01-03 23:22:41 +01:00
Jan Vidar Krey 875f55a401 Added a chat history plugin.
The mod_chat_history plugin provides chat history for all public chat messages.

Can be configured in the following ways:

- history_max: max number of messages stored in history
- history_default: the default number of messages to be returned when invoking !history
- history_connect: if > 0, then this number of messages is automatically sent when connecting to the hub

Removed the built-in !history command in favour of the mod_chat_history plug-in.

Make sure we unescape all chat messages before forwarding any of them to plugins.

Update example plugins.conf in documentation directory.
2012-01-03 23:22:41 +01:00
Jan Vidar Krey a9ed03cf38 Cleaned up the mod_welcome parse failure code. 2012-01-02 12:54:35 +01:00
Jan Vidar Krey 2ebd916992 Added sqlite as a git submodule. 2011-12-28 18:08:11 +01:00
Jan Vidar Krey 3c6254d007 Partial revert of importing sqlite into this repository. 2011-12-28 18:06:19 +01:00
Jan Vidar Krey 7b392acbf5 Format the help list appropriately (as in older versions). 2011-12-28 10:45:02 +01:00
Jan Vidar Krey 66c77d5170 Don't broadcast the \!example command when issuing it (mod_example.c bug). 2011-12-28 10:44:03 +01:00