summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'testing' into beSander Vrijders2017-07-201-8/+11
|\|
| * Merged in dstaesse/ouroboros/testing-cdap-destroy (pull request #534)dimitri staessens2017-07-201-8/+11
| |\ | | | | | | | | | lib: Fix destruction of CDAP instances
| | * lib: Fix destruction of CDAP instancesdimitri staessens2017-07-201-8/+11
| | | | | | | | | | | | | | | | | | | | | The received message list was not correctly freed upon destruction of the CDAP object. There was also still a rare case in which thread cancellation would keep a lock, blocking the IPCP shutdown, which is also fixed.
* | | Merge branch 'testing' into beSander Vrijders2017-07-201-7/+19
|\| |
| * | Merged in dstaesse/ouroboros/testing-cdap (pull request #533)dimitri staessens2017-07-201-7/+19
| |\| | | | | | | | | | lib: Fix processing state in CDAP
| | * lib: Fix processing state in CDAPdimitri staessens2017-07-201-7/+19
| |/ | | | | | | | | | | The processing state was not correctly reset at all points in the loop, causing CDAP to block the IPCP on shutdown in some cases. This also adds a missing unlock and reorders some other unlocks.
* | Merged in dstaesse/ouroboros/be-dht-lookup (pull request #532)dimitri staessens2017-07-201-20/+25
|\ \ | | | | | | | | | ipcpd: Fix DHT lookup processing
| * | ipcpd: Fix DHT lookup processingdimitri staessens2017-07-201-20/+25
|/ / | | | | | | | | Not all returned contacts were processed when a FIND_NODE or FIND_VALUE message was returned.
* | Merged in sandervrijders/ouroboros/be-ipcp-select (pull request #531)Sander Vrijders2017-07-181-1/+1
|\ \ | | | | | | | | | irmd: Fix order of IPCPs
| * | irmd: Fix order of IPCPsSander Vrijders2017-07-181-1/+1
|/ / | | | | | | | | This fixes the order of the IPCPs in the IRMd, so that the right type is queried first on flow allocation.
* | Merged in dstaesse/ouroboros/be-dht (pull request #529)dimitri staessens2017-07-1817-163/+2745
|\ \ | |/ |/| | | ipcpd: Add DHT as directory in normal IPCP
| * ipcpd: Add DHT as directory in normal IPCPdimitri staessens2017-07-1817-163/+2745
| | | | | | | | | | | | | | | | | | This implements a Distributed Hash Table (DHT) based on the Kademlia protocol, with default parameters set as used in the BitTorrent Mainline DHT. This initial implementation is almost feature complete, except for some things to be done after a testing period: caching and stale peer bumping, and setting the expiration timeout via the IRM tool.
* | Merged in dstaesse/ouroboros/be-fixes (pull request #530)0.5dimitri staessens2017-07-182-64/+82
|\ \ | |/ |/| | | Be fixes
| * lib: Wait for fqueue loop at cdap_del_flowdimitri staessens2017-07-161-62/+80
| | | | | | | | | | | | | | The enrollment calls dealloc immediately after cdap_del_flow(), but the CDAP instance may still have that fd in its fqueue loop. cdap_del_flow will now wait for an fqueue loop to end before returning, to make sure the flow is not needed anymore.
| * ipcpd: Log exit status before log_fini()dimitri staessens2017-07-161-2/+2
|/
* Merged in sandervrijders/ouroboros/be-hash (pull request #528)Sander Vrijders2017-07-128-51/+69
|\ | | | | | | | | | | ipcpd, lib, irmd: Hardcode shim hash algorithms Approved-by: dimitri staessens <dimitri.staessens@ugent.be>
| * ipcpd, lib, irmd: Hardcode shim hash algorithmsSander Vrijders2017-07-128-51/+69
|/ | | | | | | This will hardcode the shim hash algorithms as they don't have an enrollment phase. Fixes #44
* Merged in dstaesse/ouroboros/be-irmd-shutdown (pull request #527)dimitri staessens2017-07-123-13/+31
|\ | | | | | | irmd: Shutdown sanitizer without cancellation
| * irmd: Shutdown sanitizer without cancellationdimitri staessens2017-07-123-13/+31
| |
* | Merged in dstaesse/ouroboros/be-fixes (pull request #526)dimitri staessens2017-07-124-22/+19
|\| | | | | | | Be fixes
| * ipcpd: Shutdown shim-udp without cancellationdimitri staessens2017-07-121-17/+14
| |
| * ipcpd: Check connmgr acceptor thread at createdimitri staessens2017-07-121-1/+2
| |
| * lib: Fix formatting in irm.cdimitri staessens2017-07-121-2/+1
| |
| * lib: Make read_msg static in cacep.cdimitri staessens2017-07-121-2/+2
| |
* | Merged in dstaesse/ouroboros/be-list (pull request #525)dimitri staessens2017-07-121-1/+2
|\| | | | | | | include: Use offsetof in list.h
| * include: Use offsetof in list.hdimitri staessens2017-07-121-1/+2
| |
* | Merged in dstaesse/ouroboros/be-fmt (pull request #524)dimitri staessens2017-07-102-11/+14
|\| | | | | | | include: Fix formatting in list.h
| * include: Fix formatting in list.hdimitri staessens2017-07-092-11/+14
| |
* | Merged in dstaesse/ouroboros/be-rng (pull request #523)dimitri staessens2017-07-093-5/+113
|\| | | | | | | Be rng
| * lib: Add secure random generatordimitri staessens2017-07-093-5/+113
| | | | | | | | | | This adds a secure random number generator. It will use OS specific calls with a fallback to OpenSSL if available.
* | Merged in dstaesse/ouroboros/be-time (pull request #522)dimitri staessens2017-07-093-6/+173
|\| | | | | | | lib: Fix bug and add test for time_utils
| * lib: Fix bug and add test for time_utilsdimitri staessens2017-07-053-6/+173
| |
* | Merged in dstaesse/ouroboros/be-cdap-req (pull request #521)dimitri staessens2017-07-041-2/+13
|\| | | | | | | lib: Handle errors when creating cdap_req structs
| * lib: Handle errors when creating cdap_req structsdimitri staessens2017-07-041-2/+13
| |
* | Merged in dstaesse/ouroboros/be-lib (pull request #520)dimitri staessens2017-07-031-0/+3
|\| | | | | | | lib: Fix memleak in FRCT enrollment
| * lib: Fix memleak in FRCT enrollmentdimitri staessens2017-07-031-0/+3
|/
* Merged in sandervrijders/ouroboros/be-qos (pull request #517)Sander Vrijders2017-06-2120-68/+298
|\ | | | | | | lib, ipcpd, irmd: Add full-fledged QoS
| * lib, ipcpd, irmd: Add full-fledged QoSSander Vrijders2017-06-2120-68/+298
|/ | | | | | | This adds more Quality of Service support to Ouroboros. One part is the network specific characteristics such as bandwidth, delay, ... The other part is end-to-end QoS like reliability, window based flow control, ...
* Merged in dstaesse/ouroboros/be-dev-include (pull request #519)dimitri staessens2017-06-211-8/+8
|\ | | | | | | lib: include missing headers in dev.c
| * lib: include missing headers in dev.cdimitri staessens2017-06-211-8/+8
| | | | | | | | | | The dev.c source file had some missing include headers. This PR fixes inconsistencies between the definitions and declarations in ipcp-dev.h
* | Merged in dstaesse/ouroboros/be-fix-alloc (pull request #518)dimitri staessens2017-06-192-3/+1
|\| | | | | | | ipcpd: Fix flow allocation over normal
| * ipcpd: Fix flow allocation over normaldimitri staessens2017-06-192-3/+1
|/
* Merged in dstaesse/ouroboros/be-macro (pull request #514)dimitri staessens2017-06-056-9/+16
|\ | | | | | | include: Fix macro for printing hash
| * include: Fix macro for printing hashdimitri staessens2017-06-046-9/+16
| |
* | Merged in dstaesse/ouroboros/be-routing-type (pull request #516)dimitri staessens2017-06-051-5/+6
|\ \ | | | | | | | | | ipcpd: Fix routing type configuration
| * | ipcpd: Fix routing type configurationdimitri staessens2017-06-051-5/+6
| | |
* | | Merged in dstaesse/ouroboros/be-udp-fix (pull request #515)dimitri staessens2017-06-051-1/+1
|\| | | | | | | | | | | ipcpd: Fix flow allocation over UDP shim
| * | ipcpd: Fix flow allocation over UDP shimdimitri staessens2017-06-041-1/+1
| | |
* | | Merged in dstaesse/ouroboros/be-gcc7 (pull request #513)dimitri staessens2017-06-042-0/+2
|\| | | |/ |/| | | lib, irmd: Handle case fallthrough in gcc 7
| * lib, irmd: Handle case fallthrough in gcc 7dimitri staessens2017-06-042-0/+2
| |