ccb318547d
Started using new file reader tokenizer.
2010-07-10 03:36:47 +02:00
394c8a5f95
Whitespace fixes.
2010-07-09 14:01:22 +02:00
4b22ccb73c
Added a proper config file tokenizer that supports escaping sequences
...
and comments.
This allows for:
'"foo bar"' can be represented as 'foo\ bar'.
And allows for comments using the hash symbol (#), but not inside
escapes or quotes. "#this is not a comment", \#this\ is\ not\ a comment.
All configuration file parsers should be rewritten using this functionality.
2010-07-09 14:01:03 +02:00
849a791f79
Fixed plugin handling when using the utils code from within a plugin.
2010-07-08 14:26:07 +02:00
490f7dd835
Merge branch 'plugin_work'
2010-06-30 19:24:03 +02:00
aa26052479
Misc plugin work
...
* Fix crash when unloading plugins.
* Fixed plugin loader and plugin unload handler.
* Added a new example plugin: mod_logging which logs users logging in and out of the hub to stdout.
2010-06-29 15:40:19 +02:00
7b96e2c912
Merge branch 'plugin_work' of git://github.com/janvidar/uhub
2010-06-22 14:35:15 +02:00
ccaa4860b4
Started working on the plugin configuration and loader code.
...
The example plugin works, but does not do anything.
2010-06-13 19:34:20 +02:00
7218011449
Added missing plugin file.
2010-06-07 15:42:38 +02:00
0810982b57
Fix bug #136 - !broadcast does not report status back to to sender.
2010-06-07 15:41:07 +02:00
baeba01835
Added file_plugins directive to configuration file.
2010-06-06 16:32:43 +02:00
07d4e4470c
More work on the plugin API.
2010-06-06 16:19:59 +02:00
ed53034ad5
Added plugin loader code, merely a wrapper around dlopen() and friends.
2010-05-30 23:33:06 +02:00
fc8965f1c5
Started working on an authentication plugin API.
2010-05-30 13:03:03 +02:00
b3ed3a5526
Fix a silly invalid read operation
2010-05-28 15:23:44 +02:00
1480b7e9c0
Fix bug #133 - Kqueue backend crash (BSD/OSX)
2010-05-28 15:22:33 +02:00
50fde1c5c8
Updated the broadcast command to not send the message back to the user that sent it, but
...
instead summarize the number of users that received it.
2010-05-26 09:38:14 +02:00
77faac0494
Fixed some minor issues found during code review.
2010-05-25 22:47:30 +02:00
473ff0e159
Fix static buffer overrun - Thanks BlackSonar.
2010-05-25 22:23:40 +02:00
62333c5f39
Update the command to send a PM originating from the operator/admin that sent it.
2010-05-25 22:21:56 +02:00
44860c8477
Fix bug #131 - Missing escape handling for # in config files.
...
Added support for escaping stuff in the configuration file parser.
2010-05-25 19:43:32 +02:00
c70119870a
Adding support for redirecting clients to other hubs when they fail to login
...
for various reasons.
Config variable is "redirect_addr".
2010-04-22 21:07:46 +02:00
b29f34af4a
FreeBSD kqueue backend fixes.
...
This fixes bug #126 - Core dump on FreeBSD with obsolete_clients=0
2010-04-22 16:11:50 +02:00
076492f1b9
Fix some small memory leaks.
2010-04-21 18:34:55 +02:00
b6fb2b41bd
Fix a potential crash
2010-04-21 18:34:39 +02:00
c82f8ba167
Fix compile error.
2010-04-16 06:31:47 +02:00
6c9cd4ca50
Fix some errors in the XML config spec.
2010-04-15 19:49:48 +02:00
201acad409
Do not use C macros for configuration files.
2010-04-15 19:49:23 +02:00
51c5b6169c
Fix last commit.
2010-04-11 20:17:36 +02:00
b7e62b46cc
Send message to old clients as a chat message not a status message.
2010-04-11 20:13:05 +02:00
321cddad8e
Fix bad boolean handling in config.
2010-04-09 10:41:01 +02:00
d3ebc409cb
Fix silly problem where default config is applied after reading the config file.
2010-04-09 10:22:45 +02:00
45462595ac
Fix defaults for limix_min_hubs
2010-04-09 09:41:38 +02:00
0a3fe10f16
Added XML file for configurations.
...
The XML file will be used to auto generate the configuratioin code
and the corresponding documentation in the future.
The perl script parses this XML format and outputs gen_config.{h,c} files
accordingly.
2010-04-07 17:26:27 +02:00
58630fde08
Fixed getip to return the ip address of the target user, not self.
2010-04-05 16:35:55 +02:00
8815118fde
Added flood control support.
...
This closes bug #79 : Flood control, and rate limits
2010-04-05 16:01:07 +02:00
5454ae279a
Fix bug #120 : !getip does not work
2010-04-05 14:21:40 +02:00
8e579f4601
Fix #123 : accept() fails if IP is banned.
2010-04-05 13:44:17 +02:00
e220357176
Added configuration option to enable support for obsolete pre-ADC/1.0 clients.
2010-04-05 13:43:28 +02:00
8bed952022
Fixed nasty hub freeze caused by timers being injected for the same timestamp as it is being removed from.
2010-03-23 01:06:04 +01:00
c4604a7e94
Make code clearer.
2010-03-23 00:46:25 +01:00
236daeae53
Assert if inserting an invalid timer.
2010-03-15 22:59:16 +01:00
862c6a1baf
Reduce timeout queue window size.
2010-03-13 00:16:15 +01:00
59ed268f4d
Added test cases for sid allocation.
...
This revealed a few bugs:
* when sid allocator is full, then uhub will loop indefinitely when allocating one more (unlikely to occur).
* looking up a user object based on a sid that is out of range (off by one) returns invalid memory.
2010-02-18 16:02:13 +01:00
963416ad73
Cleanup reference adc message reference counting somewhat.
2010-02-16 20:51:10 +01:00
29c162727c
Added lots of new asserts which should trigger in case we double delete a ADC message.
2010-02-15 19:03:19 +01:00
1ce258bccf
Tidy up the certificate loading code somewhat.
2010-02-15 19:02:31 +01:00
0de66286fa
Partially fix bug #117 - tls_require ignored entirely in 0.3.0 released
...
If tls_require is enabled then the hub will simply close the connection if a
user connects without TLS.
In the future we should redirect the user either to another server or to the adcs server.
2010-02-15 19:00:48 +01:00
5e6879dffb
Fix for partial read operations.
2010-02-12 20:33:17 +01:00
1b56adb8c0
Fix wrong IQUI message. Partially fixes bug #4 .
2010-02-12 19:25:09 +01:00
82eeaa1fba
Fix bug #114 : FreeBSD compile error.
2010-02-11 07:54:42 +01:00
19b9f72337
Make sure !version agrees with the connect time banner (same format).
2010-02-11 01:19:58 +01:00
915cb56448
Fix bug #106 : Show OS/CPU info in !version.
...
This can be controlled by the configuration variable "show_banner_sys_info" which is enabled by default.
2010-02-10 23:45:51 +01:00
6992043f9d
Fix bug #113 : crash when using epoll backend.
2010-02-10 22:06:49 +01:00
896bbfcb5d
Compile multiple network backends into the binary and choose which one to use at runtime.
...
This makes it possible to share more code between the backends and also work around
bugs of certain backends on some (versions of) operating systems.
2010-02-10 22:00:13 +01:00
6ac78e1a10
Fix autotest
2010-02-08 00:35:58 +01:00
be8db21561
Fix bug #109 : Confusing debug message for nat_ip.
2010-02-07 23:29:38 +01:00
8065903604
Fix bug #108 : share limits can be avoided.
...
This was due to updates to the share limit not being enforced after a succesful login.
2010-02-07 23:08:04 +01:00
2dc95eca47
SunOS support.
2010-01-28 01:35:09 +01:00
7637d9ba68
Added experimental Haiku OS support.
...
It compiles and it runs with some minor glitches.
2010-01-28 01:35:08 +01:00
4e9488dd4d
gcc 2.95 compile fixes.
2010-01-28 01:11:11 +01:00
e0003ebbb2
Only define MIN/MAX macros if not defined by the system.
2010-01-28 01:07:05 +01:00
8e7e8c68f5
gcc v2.95 compile fixes.
2010-01-28 01:06:41 +01:00
1599f63134
Make sure the autotests work.
2010-01-28 00:07:42 +01:00
c3ad006d07
Fix bug #76 : added support for multiple server listen ports.
...
Use server_alt_ports and supply a comma separated list of ports.
2010-01-27 23:55:52 +01:00
1faca92167
Added a generic string splitter utility function that is based on callbacks instead of populating a list.
2010-01-27 23:55:05 +01:00
ccd1c8f160
kqueue() BSD fixes
2010-01-27 17:50:02 +01:00
41418f21e7
Winsock compile fix.
2010-01-27 17:48:16 +01:00
7a8a737cad
More kqueue work in progress.
2010-01-27 01:04:32 +01:00
ac48ad01fb
Work in progress on the kqueue backend.
2010-01-27 00:43:10 +01:00
d7a1a52c1a
Started working kqueue() backend for OSX and BSD.
2010-01-26 23:30:32 +01:00
f54e8dbbba
Moved the timeout code to where it belongs, along with the network backend code.
2010-01-26 22:55:08 +01:00
2d7ffa37fe
Fix problem parsing configuration file if the last line is not empty
2010-01-26 16:16:41 +01:00
928225fb7b
On Mac OS X getrlimit() returns 2^(sizeof(size_t) * 8) instead of the actual number of available socket descriptors.
2010-01-26 08:40:10 +01:00
e3cf41cb97
BSD/OSX compile fix.
2010-01-25 14:23:22 +01:00
bfc7c184a7
Fix release build compile warnings.
2010-01-23 14:59:51 +01:00
304ecda16a
Enable the statistics timer again, so that !stats provide up to date network statistics.
2010-01-23 00:43:38 +01:00
c670d13369
Make sure we shutdown SSL connections when an error occurs.
2010-01-23 00:20:48 +01:00
b2e7a2848f
Optimize epoll to never modify the epoll mask unless it actually changed.
2010-01-23 00:03:45 +01:00
84bd2591d6
SSL fixes, seems to work with stunnel4 as a client but not linuxdcpp using SSL directly.
2010-01-22 23:43:23 +01:00
4aa65733d0
Poll as long as possible until next timeout the earliest.
2010-01-22 23:18:59 +01:00
230ca28b46
Some unfinished SSL work.
2010-01-22 18:52:38 +01:00
68a26e1160
Added proper POSIX signal handler.
2010-01-22 16:57:30 +01:00
4711d26c11
Fix broken net_address_to_string().
2010-01-22 16:09:19 +01:00
5e253e8442
Fix compile error.
2010-01-22 16:04:36 +01:00
8b7f09c7f4
Fixed two cases of bad connection close.
2010-01-21 23:54:38 +01:00
b29da11f3b
Make sure we call the timeout code.
2010-01-21 23:52:04 +01:00
78ad9b8572
Fixed bad logic inside the timer scheduling.
2010-01-21 23:13:52 +01:00
b04a20c66e
fixed off by one bug in due to message escape.
2010-01-21 22:20:26 +01:00
21a5981905
Make sure start_listening_socket does everything, this will lead the way to multiple listen ports.
2010-01-21 17:31:55 +01:00
c47ea14047
Code cleanup for starting the listening socket.
2010-01-21 01:54:41 +01:00
9f5aaf0148
Added a safe connection cleanup procedure for when a connection goes
...
down while it may be attempted to be used.
2010-01-21 01:12:57 +01:00
f645811f37
Merge branch 'master' of github.com:janvidar/uhub
2010-01-20 18:42:45 +01:00
2f09fcea84
Added select() backend which can be used as a fallback if epoll is not available.
2010-01-20 18:39:55 +01:00
efeb36c492
- update uhub.conf example after add !rules
...
- add example rules.txt
- fix compile warning in src/util/timeout.c
- add example config file for rotate log file in RHEL\CentOS
2010-01-20 11:12:43 +03:00
7e60919596
sorted the commands shown in help.
2010-01-20 00:24:57 +01:00
e7cb4cd277
remove extra space before !broadcast messages
2010-01-20 00:12:39 +01:00
e45511827f
Added the +rules command.
...
Also added the +motd command to see the message of the day, which is sent while connecting.
2010-01-19 23:30:26 +01:00
80c6ad9d76
Added mute/unmute functionality.
2010-01-19 23:07:55 +01:00
f84f3b1fff
Merge branch 'master' of github.com:janvidar/uhub into sans_libevent
2010-01-19 19:35:20 +01:00
f84073f7cc
Various fixes for epoll handling without libevent.
...
This should take care of most compile issues as well as busy loops caused by unhandled recv() calls returning 0 and general cleanups.
2010-01-19 17:52:58 +01:00
af8421fa47
Crash fix.
2010-01-18 21:57:51 +01:00
001fa6739a
Crash fix.
2010-01-18 19:38:07 +01:00
7dfa3162cb
Epoll fixes.
2010-01-18 19:34:18 +01:00
314707f499
Epoll fixes.
2010-01-18 16:15:38 +01:00
1c58a85de1
More work on epoll.
2010-01-17 23:00:28 +01:00
6a4b9c58f4
Work on removing libevent completely as a mandatory dependency.
2010-01-07 20:55:13 +01:00
f35b2c35cb
Fix some compile errors.
2009-12-14 16:17:59 +01:00
b3aa5332c8
Work on epoll backend, and removing dependency on libevent.
2009-12-10 23:12:04 +01:00
1f9cfe58c4
No need to allow users not yet logged in to send special hub commands to the hub.
...
Nothing bad will happen, except the hub will try to answer them even though the user is not yet fully logged in. This fix ensures that these messages are simply dropped instead.
2009-12-09 19:40:12 +01:00
50f5ce9d32
Fix bug #100 - Null pointer crash if sending a chat message without the message part.
2009-12-09 19:30:08 +01:00
4a4de0f2ac
Make sure we have libevent enabled for now, and add macro protection around the areas of the code that still depend on libevent.
2009-12-09 17:27:46 +01:00
2e2f93d0a4
Started working on new timeout handling which can be used when we remove libevent.
...
This will probably be used by default on UNIX platforms at some point.
The timeout handling accomplishes O(1) inserts, removes and reschedules
but the accuracy is limited to whole seconds.
2009-12-09 17:12:33 +01:00
7c093dc5da
Fix for very long messages that get dropped if they are sent alone (no other message before it) and does not fit inside one TCP packet.
...
(Thanks FleetCommand!)
2009-12-04 08:12:54 +01:00
8bcdbdc061
Removed assert.
2009-11-21 11:52:25 +01:00
53536f191d
Crash fix.
2009-11-21 11:47:26 +01:00
e994f23ea0
Crash fix part 2
2009-11-18 18:35:31 +01:00
f489e77602
Crash fix?
2009-11-18 18:27:31 +01:00
2526c8a9ed
Silly compile error.
2009-11-18 17:43:11 +01:00
4556623a87
Clarify flags as unsigned.
2009-11-18 17:41:22 +01:00
828c19cfc6
Fix a wrong open() if no motd is specified.
2009-11-18 17:41:55 +01:00
00995a1946
Fix potential memory leaks and crashes.
2009-11-18 17:41:28 +01:00
f4e82ef503
Cleanup the net_event handler.
2009-11-18 17:40:28 +01:00
eb7bec585e
Fix problems with write events not being processed due to a read event taking presendence.
...
Conflicts:
src/core/netevent.c
2009-11-18 17:40:23 +01:00
066b3f5243
Fix protocol probe. Will detect ADC and TLS handshake - any other request
...
will simply cause the hub to close the connection.
Conflicts:
src/core/netevent.c
src/core/probe.c
2009-11-18 17:38:25 +01:00
a51e8830ce
Log dropped messages.
2009-10-30 18:31:27 +01:00
e6cc47070c
A few minor TLS fixes
2009-10-09 21:38:14 +02:00
0c5d98c671
TLS compile and crash fixes.
2009-10-09 21:11:11 +02:00
0f30ebf045
Some stability fixes. Removed log messages.
2009-10-09 20:35:04 +02:00
4919c8f2f9
Fix compile error.
2009-10-09 00:11:09 +02:00
2910c571b0
Fix protocol probe. Will detect ADC and TLS handshake - any other request
...
will simply cause the hub to close the connection.
Fix problems with write events not being processed due to a read event taking presendence.
Fix bug #86 : Windows does not have "getrlimit()".
2009-10-08 23:16:15 +02:00
11e5683a79
Cleanup code somewhat.
2009-10-06 18:33:06 +02:00
17416def35
Make sure we flag JOIN/LEAVE messages as really verbose debug output.
2009-10-06 18:28:16 +02:00
234f04f495
Removed extra main block.
2009-10-06 18:25:50 +02:00
4898454c91
Removed redundant and ununsed operation mode for adcrush.
2009-10-06 18:24:21 +02:00
255255ff20
Allow for command line specified host.
2009-10-06 18:16:38 +02:00
f50b40fb92
Fix bug #85 - Do not broadcast unknown commands, but allow for commands to be broadcasted if they are double escaped with ++ or !!.
2009-10-06 18:02:37 +02:00
40fc09a7ef
Whitespace cleanups.
2009-10-06 17:40:09 +02:00
582bb58ff9
Refactor the address parsing bits of adcrush.
2009-10-06 17:25:38 +02:00
7472e9ae4a
Removed some old unused macros.
2009-10-06 15:53:24 +02:00
f076c67c33
Added a configurable listen() backlog (defaults to: server_listen_backlog=50)
2009-10-06 15:50:42 +02:00
7eef032584
Doc update.
2009-10-06 14:39:47 +02:00
de793ea9d2
Some compile fixes and memory leak fixes for ADCRush.
2009-10-06 14:36:49 +02:00
20ef6f8e53
Fix to net_con_close() which allows us to either delete the connection immediately if that is safe, or delete it later.
2009-10-06 14:36:05 +02:00
310ddf4e9d
More work on the ADC client lib.
2009-10-06 12:39:31 +02:00
8592aa80d4
Compile fix.
2009-10-06 12:24:44 +02:00
69f6d811bf
Added lots of asserts, and split out the ip address from the connection object.
...
Still a lot of work remains and a massive network connection cleanup is needed.
2009-09-29 00:30:52 +02:00
a53c219f05
Fix bug #82 - Crash writing a log larger than 2GB on a 32 bit system as _FILE_OFFSET_BITS was not declared to be 64.
2009-09-14 12:24:18 +02:00
96ce64ee07
Fix memory issues in ADC client lib.
2009-09-04 17:18:52 +02:00
4fd182c55e
Fix compile warning.
2009-08-31 20:36:25 +02:00
993d9ae33b
Fix some issues regarding header extraction.
2009-08-31 19:45:47 +02:00
1e380ecf0f
Fix bug #77 - Error in ACL command parsing.
2009-08-31 19:39:09 +02:00
aeba7188c0
Added a macro that can keep the line count down.
2009-08-28 18:10:41 +02:00
4ca5caa52b
Various fixes, the admin tool at least compiles and runs.
2009-08-28 18:05:58 +02:00
5203ecdadc
Split uhub.h
2009-08-28 16:18:18 +02:00
11b288a669
Various build fixes.
2009-08-28 16:04:45 +02:00
52cbec24b6
Started splitting up ADC rush. Need a test client before we can proceed anyway.
2009-08-28 14:29:19 +02:00
29d6d59d36
Misc connection changes.
2009-08-27 14:15:18 +02:00
96c006ee13
Cleanup some code.
2009-08-23 14:36:52 +02:00
e67587b997
Fix output handling.
2009-08-23 14:36:17 +02:00
1af613d9ce
Fixed printf issues with size_t. Since Windows do not support %zu we have to use %Iu there instead.
...
Solved that with an ugly but needed macro.
2009-08-20 10:44:44 +02:00
5bd258ca52
Move the network related flags from network.h to connection.h since that is where they are used.
2009-08-11 21:29:51 +02:00
86ba3ca86f
Complete moving all connection related data out of the hub_user object.
2009-08-07 00:22:30 +02:00
cfb450c3fc
Added net_set_nonblocking for Solaris.
2009-08-06 23:28:44 +02:00
cd389742e6
Solaris fixes.
2009-08-06 23:15:55 +02:00
4afa187f9a
Expose SSL/TLS related config variables.
2009-08-06 23:05:53 +02:00
d45383fe4d
Fix some asserts.
2009-08-04 04:58:55 +02:00
1642b8dfbe
Use new connection data structs.
2009-08-04 04:47:31 +02:00
ffd455474a
Fix use of wrong event types.
2009-08-04 04:47:02 +02:00
5baf277f5a
Various fixes.
2009-08-04 04:46:24 +02:00
ab6eda2bbb
Disabled SID allocation debug messages by default.
2009-08-04 03:38:12 +02:00
c17ae06b93
Added some memory debugging facilities to the adc_message structures.
2009-08-04 03:37:30 +02:00
faaa3d14e4
Dont clear the timer, instead set the TIMEOUT_IDLE when logging in (for now at least)
2009-08-04 01:07:12 +02:00
9f784e808e
Fix bug #70 - crash if client is in nat_ip zone, but does not provide an IP in the INF message.
2009-08-04 01:02:49 +02:00
b9adaa4f8b
Fix libevent init.
2009-08-04 00:22:08 +02:00
80dee0c020
Get rid of the event_base_set() calls.
2009-08-04 00:15:04 +02:00
eca0f931bd
Fixes to shutdown...
2009-08-03 23:59:02 +02:00
fbe98d6011
Move the timeout handling to the connection object.
2009-08-03 21:57:18 +02:00
4a5993ccc2
Added a generic SSL handshake mechanism.
2009-08-03 20:21:59 +02:00
a297c08bba
Dont use DEBUG messages, instead a much lower level messages for SSL related debug messages.
2009-08-03 19:55:57 +02:00
7229ad68ab
Make sure we send with the same arguments again if SSL_write() fails with SSL_ERROR_WANT_READ.
2009-08-03 19:54:28 +02:00
22f9be95d0
ensure we close the SSL connection if we get SSL_ERROR_ZERO_RETURN.
2009-08-03 18:20:08 +02:00
4e43746c1b
Moved the ipaddr object into the connection object.
2009-08-03 18:14:34 +02:00
27c71a75ee
Hook in the new connection work, also implemented some missing bits
...
and pieces of SSL.
SSL seems to work at some basic level, and is largely untested.
2009-08-03 17:25:52 +02:00
1d363ed0b4
Expose the SSL_connect() and SSL_accept() functions.
2009-08-03 14:21:53 +02:00
79cf5ee9db
Some work on integrating OpenSSL.
2009-08-03 03:55:38 +02:00
4666311516
Add a quit reason to the log messages printed by !log.
2009-08-02 22:53:25 +02:00
0e1cd903da
Make sure we create enough sids as there are socket descriptors.
2009-08-02 22:29:12 +02:00
4931dc5dcb
Added call functionality to figure out the maximum number of sockets (file descriptors) available on system.
2009-08-02 22:28:34 +02:00
077bffd74f
Fix capped whoip/history messages due to limit of 1024 bytes imposed wrongly on outgoing server generated messages.
2009-08-02 21:58:12 +02:00
cfb8a9f322
Started using the new connection abstraction.
2009-08-02 21:46:57 +02:00
653cfb285e
Started working on abstracting the connection data away from the user struct.
2009-08-02 21:37:55 +02:00
9bd0286c01
Fix bug #3 , sid allocation overflow. May lead to double SIDs being given out.
2009-08-02 21:04:10 +02:00
b78d48795b
!history had a wrong help description.
2009-08-02 19:26:21 +02:00
9b58ba6516
Use correct prefix for log command.
2009-07-28 02:17:57 +02:00
f322fbb197
Fix !log command, split it up into multiple messages, and allow for searches.
2009-07-28 02:02:19 +02:00
80348044c3
Make sure history messages are not escaped.
2009-07-26 18:22:53 +02:00
31d4b0f0b1
Fix history - do not cache private messages.
2009-07-26 15:08:34 +02:00
10615a9a1a
Whitespace
2009-07-26 06:32:15 +02:00
7b44036480
print ip address when using whoip.
2009-07-26 06:30:48 +02:00
Jan Vidar Krey
root