umurmur.git
8 years agoMark Log_fatal noreturn
Daniel M. Weeks [Thu, 11 Jun 2015 15:26:04 +0000 (11:26 -0400)]
Mark Log_fatal noreturn

8 years agoAdd compile-time check for POLARSSL_VERSION_FEATURES before using version_get_string().
Martin Johansson [Tue, 19 May 2015 16:49:31 +0000 (18:49 +0200)]
Add compile-time check for POLARSSL_VERSION_FEATURES before using version_get_string().

8 years agoMerge pull request #59 from Hello71/patch-1
Felix Morgner [Thu, 14 May 2015 08:47:05 +0000 (10:47 +0200)]
Merge pull request #59 from Hello71/patch-1

ChangeLog: fix typo

9 years agoChangeLog: fix typo
Alex Xu [Sun, 12 Apr 2015 14:25:20 +0000 (10:25 -0400)]
ChangeLog: fix typo

9 years agoRelease 0.2.16
Felix Morgner [Tue, 7 Apr 2015 10:01:12 +0000 (12:01 +0200)]
Release 0.2.16

9 years agoChecking for GnuTLS version. Fixes #58
Felix Morgner [Tue, 7 Apr 2015 09:37:56 +0000 (11:37 +0200)]
Checking for GnuTLS version. Fixes #58

9 years agoupdated umurmur-monitor
Felix Morgner [Mon, 16 Feb 2015 07:44:30 +0000 (08:44 +0100)]
updated umurmur-monitor

9 years agosilenced two warnings
Felix Morgner [Mon, 16 Feb 2015 06:14:19 +0000 (07:14 +0100)]
silenced two warnings

9 years agofixed GnuTLS related crash when daemonizing
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

9 years agoadded support for building umurmur-monitor
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.

9 years agoadded umurmur-monitor as a submodule
Felix Morgner [Wed, 11 Feb 2015 10:08:52 +0000 (11:08 +0100)]
added umurmur-monitor as a submodule

9 years agoMerge pull request #56 from fmorgner/master
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

9 years agofixed qualification warnings
Felix Morgner [Wed, 11 Feb 2015 10:00:52 +0000 (11:00 +0100)]
fixed qualification warnings

9 years agofixed type conversion warnings
Felix Morgner [Wed, 11 Feb 2015 09:57:42 +0000 (10:57 +0100)]
fixed type conversion warnings

9 years agomoved mon-umurmurd into seperate project
Felix Morgner [Wed, 11 Feb 2015 09:49:47 +0000 (10:49 +0100)]
moved mon-umurmurd into seperate project

9 years agofixed copy/paste mistake
Felix Morgner [Wed, 11 Feb 2015 09:44:22 +0000 (10:44 +0100)]
fixed copy/paste mistake

9 years agoMerge pull request #55 from fmorgner/master
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

9 years agoMerge branch 'master' of github.com:umurmur/umurmur
Felix Morgner [Tue, 10 Feb 2015 18:46:04 +0000 (19:46 +0100)]
Merge branch 'master' of github.com:umurmur/umurmur

9 years agoadded autotools support for GnuTLS
Felix Morgner [Tue, 10 Feb 2015 18:36:23 +0000 (19:36 +0100)]
added autotools support for GnuTLS

9 years agoMerge pull request #54 from fmorgner/master
Felix Morgner [Fri, 6 Feb 2015 13:03:56 +0000 (14:03 +0100)]
Merge pull request #54 from fmorgner/master

Fixes for issue #52

9 years agofixed memory leaks. closes issue #52
Felix Morgner [Fri, 6 Feb 2015 12:58:13 +0000 (13:58 +0100)]
fixed memory leaks. closes issue #52

9 years agosmall cleanup
Felix Morgner [Fri, 6 Feb 2015 12:57:59 +0000 (13:57 +0100)]
small cleanup

9 years agofixed debug logging
Felix Morgner [Fri, 6 Feb 2015 12:24:26 +0000 (13:24 +0100)]
fixed debug logging

9 years agoclosed some memory leaks
Felix Morgner [Fri, 6 Feb 2015 12:07:01 +0000 (13:07 +0100)]
closed some memory leaks

9 years agoMerge pull request #53 from fmorgner/master
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

9 years agocleaned indentation
Felix Morgner [Thu, 5 Feb 2015 09:54:11 +0000 (10:54 +0100)]
cleaned indentation

9 years agofix memory leak
Felix Morgner [Thu, 5 Feb 2015 09:53:34 +0000 (10:53 +0100)]
fix memory leak

9 years agodeinitialize shm when ftruncate fails
Felix Morgner [Thu, 5 Feb 2015 09:53:05 +0000 (10:53 +0100)]
deinitialize shm when ftruncate fails

9 years agoremoved trailing whitespace
Felix Morgner [Thu, 5 Feb 2015 07:41:19 +0000 (08:41 +0100)]
removed trailing whitespace

9 years agoupdated readme
Felix Morgner [Thu, 5 Feb 2015 09:49:32 +0000 (10:49 +0100)]
updated readme

9 years agoMerge pull request #51 from fmorgner/master
Martin Johansson [Wed, 4 Feb 2015 18:50:55 +0000 (19:50 +0100)]
Merge pull request #51 from fmorgner/master

GnuTLS support

9 years agoindenting and license header
Felix Morgner [Sat, 31 Jan 2015 13:58:20 +0000 (14:58 +0100)]
indenting and license header

9 years agofixed defines
Felix Morgner [Sat, 31 Jan 2015 13:50:05 +0000 (14:50 +0100)]
fixed defines

9 years agoclosed memory leak
Felix Morgner [Sat, 31 Jan 2015 13:32:29 +0000 (14:32 +0100)]
closed memory leak

9 years agoadded hash calculation
Felix Morgner [Sat, 31 Jan 2015 13:30:38 +0000 (14:30 +0100)]
added hash calculation

9 years agofixed up CMakeFiles for nettle and gnutls
Felix Morgner [Sat, 31 Jan 2015 11:57:16 +0000 (12:57 +0100)]
fixed up CMakeFiles for nettle and gnutls

9 years agoadded cmake file to find nettle
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

9 years agochanged cipher suite spec
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

9 years agomade SSL error non fatal
Felix Morgner [Sat, 31 Jan 2015 11:47:57 +0000 (12:47 +0100)]
made SSL error non fatal

9 years agoAdded nettle implementation
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.

9 years agook, now it actually builds...
Felix Morgner [Fri, 30 Jan 2015 16:32:16 +0000 (17:32 +0100)]
ok, now it actually builds...

9 years agobuilding with gnutls is now possible
Felix Morgner [Fri, 30 Jan 2015 16:25:03 +0000 (17:25 +0100)]
building with gnutls is now possible

9 years agoadded GnuTLS USE flag
Felix Morgner [Fri, 30 Jan 2015 16:23:15 +0000 (17:23 +0100)]
added GnuTLS USE flag

9 years agofixed cipher suite and implemented shutdown/free
Felix Morgner [Fri, 30 Jan 2015 16:21:46 +0000 (17:21 +0100)]
fixed cipher suite and implemented shutdown/free

9 years agoadded error return and available check
Felix Morgner [Fri, 30 Jan 2015 13:44:20 +0000 (14:44 +0100)]
added error return and available check

9 years agoadded writing
Felix Morgner [Fri, 30 Jan 2015 13:41:32 +0000 (14:41 +0100)]
added writing

9 years agoadded reading
Felix Morgner [Fri, 30 Jan 2015 13:39:49 +0000 (14:39 +0100)]
added reading

9 years agoadded stubs
Felix Morgner [Fri, 30 Jan 2015 13:35:38 +0000 (14:35 +0100)]
added stubs

9 years agomoved code to right place
Felix Morgner [Fri, 30 Jan 2015 13:33:50 +0000 (14:33 +0100)]
moved code to right place

9 years agoadded forgotten ssl ready output
Felix Morgner [Fri, 30 Jan 2015 13:27:40 +0000 (14:27 +0100)]
added forgotten ssl ready output

9 years agoadded hash stub
Felix Morgner [Fri, 30 Jan 2015 13:26:13 +0000 (14:26 +0100)]
added hash stub

9 years agoadded connection handling
Felix Morgner [Fri, 30 Jan 2015 13:25:12 +0000 (14:25 +0100)]
added connection handling

9 years agoadded cipher cache to cleanup
Felix Morgner [Fri, 30 Jan 2015 13:08:38 +0000 (14:08 +0100)]
added cipher cache to cleanup

9 years agofixed up some stuff
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"

9 years agoadded GnuTLS deinitialization code
Felix Morgner [Fri, 30 Jan 2015 12:35:42 +0000 (13:35 +0100)]
added GnuTLS deinitialization code

9 years agoadded GNUTLS initialization code
Felix Morgner [Fri, 30 Jan 2015 12:32:18 +0000 (13:32 +0100)]
added GNUTLS initialization code

9 years agosilenced some warnings
Felix Morgner [Sat, 31 Jan 2015 12:11:50 +0000 (13:11 +0100)]
silenced some warnings

9 years agosmall restructuring
Felix Morgner [Fri, 30 Jan 2015 11:46:44 +0000 (12:46 +0100)]
small restructuring

9 years agofixed typo
Felix Morgner [Fri, 30 Jan 2015 11:46:01 +0000 (12:46 +0100)]
fixed typo

9 years agorestructured for clarity
Felix Morgner [Fri, 30 Jan 2015 11:31:12 +0000 (12:31 +0100)]
restructured for clarity

9 years agoFix multiple channel links to one destination channel giving segfault and also make...
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.

9 years agoUse include flag to compiler instead of relative path in source
Martin Johansson [Mon, 15 Dec 2014 18:59:01 +0000 (19:59 +0100)]
Use include flag to compiler instead of relative path in source

9 years agoSome cleanup. Removed sharedmemory_global.h
Martin Johansson [Sun, 7 Dec 2014 20:37:16 +0000 (21:37 +0100)]
Some cleanup. Removed sharedmemory_global.h

9 years agoAdd check for shm_open() since these functions quite often are located in librt
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

9 years agoMerge pull request #48 from snowblind/sharedmemory
Martin Johansson [Sun, 7 Dec 2014 20:01:03 +0000 (21:01 +0100)]
Merge pull request #48 from snowblind/sharedmemory

Sharedmemory API

9 years agoMerge pull request #49 from fmorgner/master
Martin Johansson [Sun, 7 Dec 2014 13:19:10 +0000 (14:19 +0100)]
Merge pull request #49 from fmorgner/master

Fix banning

9 years agoCode changes requested by fmorgner
Michael J. Pounders [Thu, 4 Dec 2014 02:35:19 +0000 (21:35 -0500)]
Code changes requested by fmorgner

9 years agofixed banning (hopefully)
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.

9 years agoFix ban timestamp handling when reading banlist from client. This has probably been...
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.

9 years agoLast bit of code clean up, and bug fixes. Release?
Michael J. Pounders [Sun, 30 Nov 2014 07:04:43 +0000 (02:04 -0500)]
Last bit of code clean up, and bug fixes. Release?

9 years agoremove comment from client.h file.. no need for it now
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

9 years agoremove world readable bit on shm_area. Fix cmake build
Michael J. Pounders [Wed, 26 Nov 2014 03:00:56 +0000 (22:00 -0500)]
remove world readable bit on shm_area. Fix cmake build

9 years agocommit missing config.h.in filey
Michael J. Pounders [Wed, 26 Nov 2014 01:53:58 +0000 (20:53 -0500)]
commit missing config.h.in filey

9 years agoFix a few bugs
Michael J. Pounders [Wed, 26 Nov 2014 00:33:48 +0000 (19:33 -0500)]
Fix a few bugs

9 years agoCode clean up
Michael J. Pounders [Sun, 23 Nov 2014 03:25:20 +0000 (22:25 -0500)]
Code clean up

9 years agorework Sharedmemory_update() to not use memcpy (requested by fatbob)
Michael J. Pounders [Sun, 23 Nov 2014 02:55:01 +0000 (21:55 -0500)]
rework Sharedmemory_update() to not use memcpy (requested by fatbob)

9 years agoremove umurmurd-websocket moving to own git (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)

9 years agoSwitch over to more modern unix sharedmemory API (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)

9 years agoMake sharedmemory api a compile time option
Michael J. Pounders [Thu, 2 Oct 2014 02:39:26 +0000 (22:39 -0400)]
Make sharedmemory api a compile time option

9 years agoMerge branch 'sharedmemory' of github.com:snowblind/umurmur into sharedmemory
Michael J. Pounders [Sun, 28 Sep 2014 01:20:06 +0000 (21:20 -0400)]
Merge branch 'sharedmemory' of github.com:snowblind/umurmur into sharedmemory

9 years agoFix displayed idle and online time, add CHANGES files, and some code clean up
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

9 years agoFit README.md format errors
snowblind [Mon, 22 Sep 2014 02:40:12 +0000 (22:40 -0400)]
Fit README.md format errors

9 years agoUpdate README.md
snowblind [Mon, 22 Sep 2014 02:37:40 +0000 (22:37 -0400)]
Update README.md

9 years agoupdate
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

9 years agoInitial shm_utils commit
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

9 years agoRemove unused offset variable in src/ssl.h
Michael J. Pounders [Sun, 21 Sep 2014 18:38:00 +0000 (14:38 -0400)]
Remove unused offset variable in src/ssl.h

9 years agoInitial sharedmemory API release
Michael J. Pounders [Sun, 14 Sep 2014 22:51:54 +0000 (18:51 -0400)]
Initial sharedmemory API release

9 years agofixed typo
Felix Morgner [Mon, 8 Sep 2014 23:20:53 +0000 (01:20 +0200)]
fixed typo

9 years agofix address comparison
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.

9 years agoHotfix for banning issues
Felix Morgner [Thu, 4 Sep 2014 18:53:34 +0000 (20:53 +0200)]
Hotfix for banning issues

9 years agoUpdate Changelog and README
Martin Johansson [Fri, 8 Aug 2014 06:37:03 +0000 (08:37 +0200)]
Update Changelog and README

9 years agoUpdate to version 0.2.15
Martin Johansson [Fri, 8 Aug 2014 06:15:36 +0000 (08:15 +0200)]
Update to version 0.2.15

9 years agoUpdate to use Protobuf-C 1.0.0. This change required regenerated Mumble.pb-c.[h|c...
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.

9 years agoAdded util.c to Makefile.am
Martin Johansson [Sat, 28 Jun 2014 20:30:38 +0000 (22:30 +0200)]
Added util.c to Makefile.am

9 years agoMerge pull request #39 from fmorgner/master
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

9 years agoIPv6 dual-stack 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).

9 years agoFixed IPv4/v6 support checks
Felix Morgner [Mon, 2 Jun 2014 12:55:22 +0000 (14:55 +0200)]
Fixed IPv4/v6 support checks

9 years agoSome optimizations
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.

9 years agoMerge branch 'ipv6' of github.com:fmorgner/umurmur into ipv6
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

9 years agoHandle systems without IPv6 support correctly
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.