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
444f991f44
Fix bug #44 - [Request] IP log in the memory
2009-07-26 06:03:43 +02:00
b125ffe3c1
Fix bug #52 - [Request] Chat history command
2009-07-26 05:23:56 +02:00
76b84499bc
Fix bug #46 : [Request] A broadcast command.
...
Use !broadcast <message>
2009-07-26 04:47:43 +02:00
6358c7f9cd
Fix bug #45 : [Request] Whoip command.
...
Rewrote patches from Zoltan to support ip ranges and multiple results per IP.
Needed to make sure IPv6 mapped IPv4 addresses were converted to proper IPv4 addresses after accept().
2009-07-26 04:31:36 +02:00
041ce7a1fb
Generalized the IP range and mask parsing code.
2009-07-26 03:56:55 +02:00
78bb1d3527
Typo - compilefix.
2009-07-26 02:06:02 +02:00
48f3cae22b
Ensure we delete the global evtimer only if it is initialized.
2009-07-26 02:05:01 +02:00
817250c528
Fix wrong #if to #ifdef
2009-07-26 01:53:53 +02:00
f176e790e2
Whitespace fixes.
2009-07-26 01:53:01 +02:00
367871e476
Renamed all "struct user" to hub_user in order to resolve a naming conflict on OpenWRT.
...
Basically: sed -i 's/struct user/struct hub_user/g' `find -type f`
2009-07-26 01:47:17 +02:00
2ac5cc19cb
Removed plugin.h, not in use.
2009-07-26 01:39:16 +02:00
6e5d28c2d4
Rework logging code to be able to turn it off completely.
2009-07-26 01:38:38 +02:00
5048ff9ae5
Whitespace fixes.
2009-07-26 00:58:25 +02:00
36a07e3f7e
Reorganized sources slightly.
2009-07-25 20:05:27 +02:00
e281f61472
Add support for better pipelining of commands, in order to reduce the number of send() calls.
2009-07-25 03:54:59 +02:00
bb27ff617c
Re-fix chat_is_privileged.
2009-07-25 03:33:36 +02:00
dc90245ade
No need to store event mask in the user object since libevent already does it for us.
2009-07-25 03:26:59 +02:00
0ec4913e15
Debug for send queue fix.
2009-07-25 03:24:06 +02:00
61d639bfa2
Fix to hub_sendq_is_empty in order to prevent event_add calls.
2009-07-25 03:23:06 +02:00
adeaf23f9c
Kept spinning in send()
2009-07-19 14:45:15 +02:00
03d3ffd20f
Fix socket error due to EWOULDBLOCK.
2009-07-19 14:29:33 +02:00
bbae2603b0
Make sure we detect send errors.
2009-07-19 03:39:11 +02:00
5f0c84f46a
Fix shutdown problem and reduce event_{add,del,set} calls.
2009-07-19 03:12:47 +02:00
b02618d19c
Bad mistake - never added message to send queue.
2009-07-19 02:46:01 +02:00
927faf70fc
Re-enabled send queue fixes. This will more aggressively prevent unimportant messages (like searches) to be forwarded to slow clients that cannot swallow what is sent to it. This should reduce memory usage somewhat on really large hubs.
2009-07-19 02:31:23 +02:00
4a173bf066
Fix some nasty bugs related to read/write events and timeout events.
...
This would have caused users not being able to log in, and in some cases
100% cpu usage.
2009-07-19 02:12:50 +02:00
abd097acf0
This is a somewhat risky patch, but it has been intended for quite some time:
...
Remove the libevent handler for write events, only use one common event handler for both reading and writing.
2009-07-09 17:03:31 +02:00
3db2ec5e22
Added macros that can possibly make it easier to optimize functions using forced inlining and regparm.
2009-07-09 17:01:30 +02:00
e68cbd0cde
Minor cleanups of old authentication stuff, and some documentation.
2009-07-03 01:29:04 +02:00
98bffd93e9
Fix stupid crash on empty command.
2009-07-01 11:31:55 +02:00
e53119e92c
Server did not answer due to wrong checks.
2009-07-01 09:50:46 +02:00
ee0ea5a427
Crash fix.
2009-06-30 22:15:08 +02:00
aa7be1dc4b
Fix a command parse error output problem, plus some minor cleaning up.
2009-06-30 11:48:58 +02:00
0ef248759c
Minor cleanups.
...
Enabled !crash command if compiled with debug (not release).
2009-06-29 23:22:13 +02:00
1f7f6a43f9
Fixed small memory leak.
2009-06-26 01:16:07 +02:00
3cf005a08e
Fixed command parsing for in hub user commands.
...
Added a framework for automatic syntax checks, and correct number
of arguments to commands.
2009-06-26 01:15:06 +02:00
f3c5fced47
Documentation
2009-06-25 22:05:40 +02:00
9c49f07826
Fixed the format of the git revision.
...
Removed the product title.
2009-06-25 22:04:48 +02:00
5f3f2d4f4d
Autotest crash fix.
2009-06-25 17:31:39 +02:00
7e3a26b0f3
Winsock fixes for shutdown() - typo
2009-06-25 17:07:21 +02:00
9ebb38ae15
Winsock fixes for shutdown()
2009-06-25 17:05:59 +02:00
75c4272a1b
Fix problem with the !stats byte counter.
2009-06-25 09:29:23 +02:00
ddba669af0
Some basic work on getting bans working.
...
Basically now it can ban a user (nick + cid), it will be added to the
ban list temporarily, and will not be enabled if you restart the hub.
A banned user will automatically be kicked.
unban does not work correctly.
2009-06-23 23:16:09 +02:00
ca33461851
Suppress send() or recv() errors from logs. They happen quite often and are not considered errors.
2009-06-23 01:57:55 +02:00
4abdc3edbd
Cleanup read/write socket handling somewhat.
2009-06-23 01:57:26 +02:00
90078ad4b6
Minor cleanups and some work to prepare SSL.
2009-06-23 01:56:37 +02:00
3bd5c36455
SSL work.
2009-06-23 01:09:55 +02:00
8f0943621e
Dont set socket buffers.
2009-06-22 21:13:41 +02:00
155350b61b
Fixed crash bug #33
2009-06-22 21:05:02 +02:00
1c58120c03
Oportunistic write.
2009-06-22 20:25:22 +02:00
1d9acece34
Ensure we set a max recv and send buffer per user, and that it does not
...
exceed the one used internally by the application.
2009-06-22 19:50:10 +02:00
57fd872f14
Added a state check for protocol negotiation.
...
Will be used to negotiate SSL.
2009-06-22 19:38:24 +02:00
ca7544df9b
Cleanups.
2009-06-22 19:37:56 +02:00
c7777e2624
Added functions:
...
* net_get_recvbuf_size
* net_set_recvbuf_size
* net_get_sendbuf_size
* net_set_sendbuf_size
Did some minor cleanups.
2009-06-22 19:36:55 +02:00
b2d543d433
Started work on SSL
2009-06-22 18:44:07 +02:00
ff47281197
Added a generic way to reset last read/write variables.
2009-06-22 18:38:39 +02:00
ddc91d1640
Make sure we close stdout, stdin and stderr after forking to background in order to properly detach from the TTY.
2009-06-22 18:36:48 +02:00
e6e26a02e7
Added a known crash for the admin only to use if compiled with CRASH_DEBUG enabled.
2009-06-22 01:18:51 +02:00
ea3cd1bd90
Work on optimizing send(), to use fewer send function calls.
2009-06-21 14:21:34 +02:00
7f24238ab5
Disable sendq debugging.
2009-06-20 22:46:11 +02:00
1d2d4e74f6
!stats did not work.
2009-06-18 01:46:17 +02:00
5250fdaf57
Fix bug #38 - Pid file support.
2009-06-17 12:52:49 +02:00
513ab422f2
Compile fix.
2009-06-01 14:34:23 +02:00
0eb91763fa
Potential crash fix.
2009-06-01 01:52:57 +02:00
507f429035
Fix send queue issue.
2009-05-28 23:44:28 +02:00
b1ab64242e
Renamed a function.
2009-05-28 01:48:31 +02:00
8b90f79bac
Work in progress on optimizing the send() function calls, to use as few as possible.
...
(Although, this does not enable that code).
2009-05-28 01:47:48 +02:00
8f7cc0b7a7
Fixed MAX and MIN macros.
2009-05-28 01:45:36 +02:00
860310caff
Massive restructuring.
2009-05-26 21:05:06 +02:00
8167d79f5a
Large reorganizations of the code base.
2009-05-26 19:46:51 +02:00
9706a0a501
Fix compiler warning (bug #30 )
2009-05-24 21:07:16 +02:00
9309c925d3
Started working on new pipelines for sending and receiving data.
...
This will be useful for the next step; SSL.
(NOTE: This code is very chatty about debug messages)
2009-05-19 22:57:50 +02:00
9a3a5bc2de
Make sure the send() signature is correct, buf should be const.
2009-05-19 22:36:45 +02:00
e382e24337
Fix crash due to user->hub deref in acl handling.
2009-05-19 16:40:14 +02:00
be4ff1d8cc
Fix command parsing for in-hub commands.
2009-05-19 11:22:57 +02:00
aa18ac047d
Crash fix
2009-05-19 09:38:57 +02:00
e120d5c76d
Minor cleanup - this code crashes.
2009-05-19 09:15:14 +02:00
6853e92f89
Move user_is_protected() and user_is_registered() into user.h/.c
2009-05-18 17:52:30 +02:00
1dbf2640d2
More API fixes; remove implicit relationship between hub and user
...
in APIs.
2009-05-18 16:30:17 +02:00
caec28f63f
Warn on bad UTF-8 in the configuration file.
2009-05-16 12:48:17 +02:00
5ea5efb875
Smome user manager functions did not have the uman_ prefix.
2009-05-16 12:42:30 +02:00
326fcc467c
Moved the update_user_info code into user_update_info
2009-05-16 12:32:48 +02:00
078470ce64
Minor cleanup
2009-05-16 12:25:28 +02:00
82ac450b4b
Fixed further memory leaks in autotests.
2009-05-16 04:03:00 +02:00
b4f24b21f9
Document bandwidth optimization potential.
2009-05-16 03:45:05 +02:00
548867de10
Removed ADC_UDP_OPERATION code as it is not used or needed. on_kick is also gone.
2009-05-16 03:14:20 +02:00
953db2dcbc
Fixed some autotest memory leaks.
2009-05-16 03:06:14 +02:00
604364ffa5
Fixed various code deprecations
...
Signed-off-by: Jan Vidar Krey <janvidar@extatic.org>
2009-05-15 18:45:26 +02:00
6cc1af5671
Disable code to prevent warnings.
2009-05-15 16:52:55 +02:00
15e2053699
Fix #28 - Request: +/! characters for command handling (FleetCommand)
2009-05-15 16:52:04 +02:00
df1e832a3c
Started working on a red-black tree implementation, need to speed up
...
certain operations, such as SID to user lookups, and nick to user.
2009-05-01 17:07:38 +02:00
4c4cb4fb36
Dont allow clients that do not support BASE
...
Signed-off-by: Jan Vidar Krey <janvidar@extatic.org>
2009-04-13 05:31:41 +02:00
Jan Vidar Krey
root
root