Felix Morgner [Wed, 11 Feb 2015 13:25:06 +0000 (14:25 +0100)]
fixed GnuTLS related crash when daemonizing
additional fix for DH-parameters not being set
Felix Morgner [Wed, 11 Feb 2015 12:01:15 +0000 (13:01 +0100)]
added support for building umurmur-monitor
It is now possible (with cmake) to build umurmur-monitor as a
subproject of umumur. To do so, use the following command line to clone
umurmur:
git clone --recursive <url-to-repo>
or simply update your current copy (fetch, rebase, merge, whatever you
prefer) and then run:
git submodule udate --init
Afterwards, create your build directory and use either ccmake or a
command line similiar to the following:
cmake <path-to-CMakeLists.txt-of-umurmur> -DUSE_SHAREDMEMORY_API=ON \
-DBUILD_UMURMUR_MONITOR=ON <other-flags>
Currently, building umurmur-monitor is OFF by default, even if cmake
finds the sources for the project. This might change in the future when
demanded.
Felix Morgner [Wed, 11 Feb 2015 10:08:52 +0000 (11:08 +0100)]
added umurmur-monitor as a submodule
Felix Morgner [Wed, 11 Feb 2015 10:03:49 +0000 (11:03 +0100)]
Merge pull request #56 from fmorgner/master
A little bit of warning related cleanup
Felix Morgner [Wed, 11 Feb 2015 10:00:52 +0000 (11:00 +0100)]
fixed qualification warnings
Felix Morgner [Wed, 11 Feb 2015 09:57:42 +0000 (10:57 +0100)]
fixed type conversion warnings
Felix Morgner [Wed, 11 Feb 2015 09:49:47 +0000 (10:49 +0100)]
moved mon-umurmurd into seperate project
Felix Morgner [Wed, 11 Feb 2015 09:44:22 +0000 (10:44 +0100)]
fixed copy/paste mistake
Felix Morgner [Tue, 10 Feb 2015 18:55:18 +0000 (19:55 +0100)]
Merge pull request #55 from fmorgner/master
Added GnuTLS support to the autotools build environment
Felix Morgner [Tue, 10 Feb 2015 18:46:04 +0000 (19:46 +0100)]
Merge branch 'master' of github.com:umurmur/umurmur
Felix Morgner [Tue, 10 Feb 2015 18:36:23 +0000 (19:36 +0100)]
added autotools support for GnuTLS
Felix Morgner [Fri, 6 Feb 2015 13:03:56 +0000 (14:03 +0100)]
Merge pull request #54 from fmorgner/master
Fixes for issue #52
Felix Morgner [Fri, 6 Feb 2015 12:58:13 +0000 (13:58 +0100)]
fixed memory leaks. closes issue #52
Felix Morgner [Fri, 6 Feb 2015 12:57:59 +0000 (13:57 +0100)]
small cleanup
Felix Morgner [Fri, 6 Feb 2015 12:24:26 +0000 (13:24 +0100)]
fixed debug logging
Felix Morgner [Fri, 6 Feb 2015 12:07:01 +0000 (13:07 +0100)]
closed some memory leaks
Felix Morgner [Thu, 5 Feb 2015 09:58:35 +0000 (10:58 +0100)]
Merge pull request #53 from fmorgner/master
Fixed a memory leak in the shared memory part
Felix Morgner [Thu, 5 Feb 2015 09:54:11 +0000 (10:54 +0100)]
cleaned indentation
Felix Morgner [Thu, 5 Feb 2015 09:53:34 +0000 (10:53 +0100)]
fix memory leak
Felix Morgner [Thu, 5 Feb 2015 09:53:05 +0000 (10:53 +0100)]
deinitialize shm when ftruncate fails
Felix Morgner [Thu, 5 Feb 2015 07:41:19 +0000 (08:41 +0100)]
removed trailing whitespace
Felix Morgner [Thu, 5 Feb 2015 09:49:32 +0000 (10:49 +0100)]
updated readme
Martin Johansson [Wed, 4 Feb 2015 18:50:55 +0000 (19:50 +0100)]
Merge pull request #51 from fmorgner/master
GnuTLS support
Felix Morgner [Sat, 31 Jan 2015 13:58:20 +0000 (14:58 +0100)]
indenting and license header
Felix Morgner [Sat, 31 Jan 2015 13:50:05 +0000 (14:50 +0100)]
fixed defines
Felix Morgner [Sat, 31 Jan 2015 13:32:29 +0000 (14:32 +0100)]
closed memory leak
Felix Morgner [Sat, 31 Jan 2015 13:30:38 +0000 (14:30 +0100)]
added hash calculation
Felix Morgner [Sat, 31 Jan 2015 11:57:16 +0000 (12:57 +0100)]
fixed up CMakeFiles for nettle and gnutls
Felix Morgner [Sat, 31 Jan 2015 11:51:54 +0000 (12:51 +0100)]
added cmake file to find nettle
credit:
https://github.com/Kitware/CMake/blob/master/Utilities/cmlibarchive/build/cmake/FindNettle.cmake
Felix Morgner [Sat, 31 Jan 2015 11:48:16 +0000 (12:48 +0100)]
changed cipher suite spec
I will need to work on that, but for now, this works
Felix Morgner [Sat, 31 Jan 2015 11:47:57 +0000 (12:47 +0100)]
made SSL error non fatal
Felix Morgner [Sat, 31 Jan 2015 11:46:18 +0000 (12:46 +0100)]
Added nettle implementation
I also cleaned up the files a little bit, to get rid of some #ifdef
statements.
Felix Morgner [Fri, 30 Jan 2015 16:32:16 +0000 (17:32 +0100)]
ok, now it actually builds...
Felix Morgner [Fri, 30 Jan 2015 16:25:03 +0000 (17:25 +0100)]
building with gnutls is now possible
Felix Morgner [Fri, 30 Jan 2015 16:23:15 +0000 (17:23 +0100)]
added GnuTLS USE flag
Felix Morgner [Fri, 30 Jan 2015 16:21:46 +0000 (17:21 +0100)]
fixed cipher suite and implemented shutdown/free
Felix Morgner [Fri, 30 Jan 2015 13:44:20 +0000 (14:44 +0100)]
added error return and available check
Felix Morgner [Fri, 30 Jan 2015 13:41:32 +0000 (14:41 +0100)]
added writing
Felix Morgner [Fri, 30 Jan 2015 13:39:49 +0000 (14:39 +0100)]
added reading
Felix Morgner [Fri, 30 Jan 2015 13:35:38 +0000 (14:35 +0100)]
added stubs
Felix Morgner [Fri, 30 Jan 2015 13:33:50 +0000 (14:33 +0100)]
moved code to right place
Felix Morgner [Fri, 30 Jan 2015 13:27:40 +0000 (14:27 +0100)]
added forgotten ssl ready output
Felix Morgner [Fri, 30 Jan 2015 13:26:13 +0000 (14:26 +0100)]
added hash stub
Felix Morgner [Fri, 30 Jan 2015 13:25:12 +0000 (14:25 +0100)]
added connection handling
Felix Morgner [Fri, 30 Jan 2015 13:08:38 +0000 (14:08 +0100)]
added cipher cache to cleanup
Felix Morgner [Fri, 30 Jan 2015 13:07:00 +0000 (14:07 +0100)]
fixed up some stuff
additionally it seems like i can't spell "initialize"
Felix Morgner [Fri, 30 Jan 2015 12:35:42 +0000 (13:35 +0100)]
added GnuTLS deinitialization code
Felix Morgner [Fri, 30 Jan 2015 12:32:18 +0000 (13:32 +0100)]
added GNUTLS initialization code
Felix Morgner [Sat, 31 Jan 2015 12:11:50 +0000 (13:11 +0100)]
silenced some warnings
Felix Morgner [Fri, 30 Jan 2015 11:46:44 +0000 (12:46 +0100)]
small restructuring
Felix Morgner [Fri, 30 Jan 2015 11:46:01 +0000 (12:46 +0100)]
fixed typo
Felix Morgner [Fri, 30 Jan 2015 11:31:12 +0000 (12:31 +0100)]
restructured for clarity
Martin Johansson [Tue, 16 Dec 2014 21:48:58 +0000 (22:48 +0100)]
Fix multiple channel links to one destination channel giving segfault and also make it work.
Martin Johansson [Mon, 15 Dec 2014 18:59:01 +0000 (19:59 +0100)]
Use include flag to compiler instead of relative path in source
Martin Johansson [Sun, 7 Dec 2014 20:37:16 +0000 (21:37 +0100)]
Some cleanup. Removed sharedmemory_global.h
Martin Johansson [Sun, 7 Dec 2014 20:16:26 +0000 (21:16 +0100)]
Add check for shm_open() since these functions quite often are located in librt
Martin Johansson [Sun, 7 Dec 2014 20:01:03 +0000 (21:01 +0100)]
Merge pull request #48 from snowblind/sharedmemory
Sharedmemory API
Martin Johansson [Sun, 7 Dec 2014 13:19:10 +0000 (14:19 +0100)]
Merge pull request #49 from fmorgner/master
Fix banning
Michael J. Pounders [Thu, 4 Dec 2014 02:35:19 +0000 (21:35 -0500)]
Code changes requested by fmorgner
Felix Morgner [Mon, 1 Dec 2014 09:29:32 +0000 (10:29 +0100)]
fixed banning (hopefully)
The original code used ^ which in C is the XOR operator. I believe the
author meant to raise 2 to the power of ban->mask, the new code should
calculate the mask correctly.
Martin Johansson [Tue, 9 Sep 2014 10:39:57 +0000 (12:39 +0200)]
Fix ban timestamp handling when reading banlist from client. This has probably been broken from the start.
Don't use timers since this broke when changing the timer clock source from gettimeofday() -> clock_gettime(). Instead use regular Unix timestamps.
Mimic the way regular Murmur matches ban address with masks. Unclear if this works for at least IPv6.
Michael J. Pounders [Sun, 30 Nov 2014 07:04:43 +0000 (02:04 -0500)]
Last bit of code clean up, and bug fixes. Release?
Michael J. Pounders [Wed, 26 Nov 2014 03:14:27 +0000 (22:14 -0500)]
remove comment from client.h file.. no need for it now
Michael J. Pounders [Wed, 26 Nov 2014 03:00:56 +0000 (22:00 -0500)]
remove world readable bit on shm_area. Fix cmake build
Michael J. Pounders [Wed, 26 Nov 2014 01:53:58 +0000 (20:53 -0500)]
commit missing config.h.in filey
Michael J. Pounders [Wed, 26 Nov 2014 00:33:48 +0000 (19:33 -0500)]
Fix a few bugs
Michael J. Pounders [Sun, 23 Nov 2014 03:25:20 +0000 (22:25 -0500)]
Code clean up
Michael J. Pounders [Sun, 23 Nov 2014 02:55:01 +0000 (21:55 -0500)]
rework Sharedmemory_update() to not use memcpy (requested by fatbob)
Michael J. Pounders [Mon, 17 Nov 2014 04:59:10 +0000 (23:59 -0500)]
remove umurmurd-websocket moving to own git (requested by fatbob)
Michael J. Pounders [Mon, 17 Nov 2014 04:40:59 +0000 (23:40 -0500)]
Switch over to more modern unix sharedmemory API (requested by fatbob)
Michael J. Pounders [Thu, 2 Oct 2014 02:39:26 +0000 (22:39 -0400)]
Make sharedmemory api a compile time option
Michael J. Pounders [Sun, 28 Sep 2014 01:20:06 +0000 (21:20 -0400)]
Merge branch 'sharedmemory' of github.com:snowblind/umurmur into sharedmemory
Michael J. Pounders [Sun, 28 Sep 2014 01:11:53 +0000 (21:11 -0400)]
Fix displayed idle and online time, add CHANGES files, and some code clean up
snowblind [Mon, 22 Sep 2014 02:40:12 +0000 (22:40 -0400)]
Fit README.md format errors
snowblind [Mon, 22 Sep 2014 02:37:40 +0000 (22:37 -0400)]
Update README.md
Michael J. Pounders [Mon, 22 Sep 2014 01:50:44 +0000 (21:50 -0400)]
update
shm_utils/mon-umurmurd/README.md
shm_utils/umurmurd-websocket/README.md
Michael J. Pounders [Mon, 22 Sep 2014 00:50:56 +0000 (20:50 -0400)]
Initial shm_utils commit
shm_utils/umurmurd-websocket:
SEE: shm_utils/umurmurd-websocket/README.md
shm_utils/mon-umurmurd:
SEE: shm_utils/mon-umurmurd/README.md
Michael J. Pounders [Sun, 21 Sep 2014 18:38:00 +0000 (14:38 -0400)]
Remove unused offset variable in src/ssl.h
Michael J. Pounders [Sun, 14 Sep 2014 22:51:54 +0000 (18:51 -0400)]
Initial sharedmemory API release
Felix Morgner [Mon, 8 Sep 2014 23:20:53 +0000 (01:20 +0200)]
fixed typo
Felix Morgner [Mon, 8 Sep 2014 23:03:16 +0000 (01:03 +0200)]
fix address comparison
This should fix the emberassing address comparison bug from my previous
commit.
Felix Morgner [Thu, 4 Sep 2014 18:53:34 +0000 (20:53 +0200)]
Hotfix for banning issues
Martin Johansson [Fri, 8 Aug 2014 06:37:03 +0000 (08:37 +0200)]
Update Changelog and README
Martin Johansson [Fri, 8 Aug 2014 06:15:36 +0000 (08:15 +0200)]
Update to version 0.2.15
Martin Johansson [Thu, 31 Jul 2014 21:31:04 +0000 (23:31 +0200)]
Update to use Protobuf-C 1.0.0. This change required regenerated Mumble.pb-c.[h|c] and it is not backwards compatible with Protobuf-C 0.15 or earlier.
Martin Johansson [Sat, 28 Jun 2014 20:30:38 +0000 (22:30 +0200)]
Added util.c to Makefile.am
Martin Johansson [Wed, 18 Jun 2014 20:51:59 +0000 (22:51 +0200)]
Merge pull request #39 from fmorgner/master
Full dual-stack IPv6 support
Felix Morgner [Fri, 6 Jun 2014 08:21:59 +0000 (10:21 +0200)]
IPv6 dual-stack support
This patch implements full IPv4-IPv6-dual-stack support for umurmur. It
introduces some new configuration and command line options:
- The '-A' and '-B' options which work similar to the old '-a' and
'-b' options but for IPv6.
- The 'bindaddr6' and 'bindport6' options, which too, work like their
IPv4 counterparts.
By default, the IPv6 implementation listens on all addresses and the
default port 64738, just like the IPv4 part. If your system does
support IPv6 and you haven't setup a proper IPv6 firewall, now is the
time to do it. In the meantime you could simply listen on the loopback
device (::1), if you'd like to 'disable' IPv6 functionality.
Note that since the implementation is fully dual-stack, umurmur will
simply warn you if either IPv4 or IPv6 is unavailable but it will still
run fine with no further action is required (unless of course you want
to use one of the unavailable protocols, which would mean you'd have to
enable it in your kernel configuration).
Felix Morgner [Mon, 2 Jun 2014 12:55:22 +0000 (14:55 +0200)]
Fixed IPv4/v6 support checks
Felix Morgner [Sun, 1 Jun 2014 14:58:23 +0000 (16:58 +0200)]
Some optimizations
Firstly, eliminated a stupid if statement which could be replaced by a
for loop. Secondly, on systems with no IPv6 support, there are no
unnecessary pollfd structures being allocated anymore.
Felix Morgner [Thu, 22 May 2014 16:20:46 +0000 (18:20 +0200)]
Merge branch 'ipv6' of github.com:fmorgner/umurmur into ipv6
Conflicts:
src/client.c
src/server.c
Felix Morgner [Thu, 22 May 2014 16:06:56 +0000 (18:06 +0200)]
Handle systems without IPv6 support correctly
Systems without IPv6 support should now be handled correctly. This
patchset also should be able to handle systems with IPv6 but without
IPv4. This might seem a little odd, but i see no reason not to
implement it.
Felix Morgner [Thu, 22 May 2014 16:06:56 +0000 (18:06 +0200)]
Handle systems without IPv6 support correctly
Systems without IPv6 support should now be handled correctly. This
patchset also should be able to handle systems with IPv6 but without
IPv4. This might seem a little odd, but i see no reason not to
implement it.
Felix Morgner [Fri, 16 May 2014 14:02:55 +0000 (16:02 +0200)]
Minor code cleanup
Felix Morgner [Fri, 2 May 2014 10:05:21 +0000 (12:05 +0200)]
Code cleanup
This patchset is mainly consisting of code cleanups and maintainance.
- Introduced new header util.h containing utility functions to convert
addresses to char* typed string representations in a generic way and
to get the port of an address as an int. There are also functions that
work with client structures
- Replaced occurences of older conversions with the new functions
- Replaced hardcoded values with preprocessor macros where applicable
- Reduced code duplication resulting from new IPv6 support where
possible
- Other general cleanups where applicable
Felix Morgner [Fri, 2 May 2014 07:23:02 +0000 (09:23 +0200)]
Fixed OS detection
Felix Morgner [Fri, 2 May 2014 07:10:36 +0000 (09:10 +0200)]
Fixed banning to work for both v4 and v6
Felix Morgner [Thu, 1 May 2014 12:54:00 +0000 (14:54 +0200)]
Fixed preprocessor defines
Felix Morgner [Thu, 1 May 2014 11:48:53 +0000 (13:48 +0200)]
Linux vs. BSD sockaddr_storage fix
Felix Morgner [Thu, 1 May 2014 10:24:48 +0000 (12:24 +0200)]
Indentation fixed