summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merged in dstaesse/ouroboros/be-fix-build (pull request #270)Sander Vrijders2016-10-237-21/+27
|\
| * lib: Fix closing applications with active flowsdimitri staessens2016-10-221-1/+2
| * lib: Revert bad fqueue modificationdimitri staessens2016-10-222-2/+5
| * irmd, tools: Fix missing initializersdimitri staessens2016-10-225-16/+18
| * lib: Fix wrong comparisondimitri staessens2016-10-221-2/+2
* | Merged in dstaesse/ouroboros/be-fix-build (pull request #269)dimitri staessens2016-10-221-0/+1
|\|
| * build: Fix missing includedimitri staessens2016-10-221-0/+1
|/
* Merged in dstaesse/ouroboros/be-extra (pull request #268)Sander Vrijders2016-10-2268-299/+441
|\
| * build: Compile with strict conversiondimitri staessens2016-10-2262-293/+333
| * build: Comply with -Wextra compiler flagdimitri staessens2016-10-2123-13/+115
|/
* Merged in dstaesse/ouroboros/be-demux (pull request #267)Sander Vrijders2016-10-2129-1164/+1682
|\
| * lib: Move rbuff creation/destruction to IRMddimitri staessens2016-10-217-85/+106
| * lib: Demultiplex the fast pathdimitri staessens2016-10-2127-1145/+1642
* | Merged in sandervrijders/ouroboros/be-fix-normal (pull request #266)dimitri staessens2016-10-171-0/+10
|\ \
| * | ipcpd: normal: Avoid allocating flow over unenrolled IPCP.Sander Vrijders2016-10-171-0/+10
|/ /
* | Merged in dstaesse/ouroboros/be-fp (pull request #265)Sander Vrijders2016-10-175-54/+72
|\|
| * lib, dev: Implement read/write options for flowsdimitri staessens2016-10-162-0/+19
| * lib: Stabilize fast flow deallocation over local IPCPdimitri staessens2016-10-155-54/+53
* | Merged in dstaesse/ouroboros/be-fix-select (pull request #264)Sander Vrijders2016-10-151-2/+3
|\|
| * lib: Fix initialisation of flow_setdimitri staessens2016-10-151-2/+3
|/
* Merged in dstaesse/ouroboros/be-dealloc (pull request #263)Sander Vrijders2016-10-137-34/+35
|\
| * lib: Fix flow deallocation logicdimitri staessens2016-10-137-34/+35
|/
* Merged in sandervrijders/ouroboros/be-connection (pull request #262)dimitri staessens2016-10-1212-465/+790
|\
| * ipcpd: normal: Improve upon the internal designSander Vrijders2016-10-1211-574/+411
| * Merge remote-tracking branch 'upstream/be' into be-connectionSander Vrijders2016-10-128-104/+196
| |\ | |/ |/|
* | Merged in dstaesse/ouroboros/be-fp (pull request #261)Sander Vrijders2016-10-114-88/+180
|\ \
| * | lib: Track SDUs in the fast pathdimitri staessens2016-10-114-88/+180
|/ /
* | Merged in dstaesse/ouroboros/be-flowsett (pull request #259)Sander Vrijders2016-10-114-16/+16
|\ \
| * | lib: Add a type for struct flow_setdimitri staessens2016-10-094-16/+16
| | * ipcpd: normal: First version of the fast path bootstrapSander Vrijders2016-10-1111-209/+697
| |/ |/|
* | Merged in dstaesse/ouroboros/be-ipcp-read-fd (pull request #258)Sander Vrijders2016-10-074-12/+50
|\|
| * lib: Add non-copy reading from fd for IPCPsdimitri staessens2016-10-074-12/+50
* | Merged in dstaesse/ouroboros/be-async-dealloc (pull request #257)Sander Vrijders2016-10-075-55/+74
|\|
| * lib, dev: Add asynchronous deallocationdimitri staessens2016-10-075-55/+74
* | Merged in dstaesse/ouroboros/be-fix-shutdown (pull request #256)Sander Vrijders2016-10-063-3/+5
|\|
| * lib: Fix shutdown with pending SDUsdimitri staessens2016-10-063-3/+5
|/
* Merged in dstaesse/ouroboros/be-debug-llc (pull request #255)Sander Vrijders2016-10-063-7/+31
|\
| * ipcpd: Filter traffic on shim-eth-llcdimitri staessens2016-10-063-7/+31
| * Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into bedimitri staessens2016-10-051-3/+5
| |\ | |/ |/|
* | Merged in sandervrijders/ouroboros/be-bugfix (pull request #254)dimitri staessens2016-10-051-3/+5
|\ \
| * | ipcpd: shim-eth-llc: Use correct SAP to lookup in the tableSander Vrijders2016-10-051-3/+5
* | | Merged in sandervrijders/ouroboros/be-bugfix (pull request #253)dimitri staessens2016-10-052-7/+4
|\| |
| | * Merged in sandervrijders/ouroboros/be-bugfix (pull request #253)dimitri staessens2016-10-052-7/+4
| |/| |/|/
| * lib, ipcpd: Fix bad lockingSander Vrijders2016-10-052-7/+4
|/
* Merged in dstaesse/ouroboros/be-unify (pull request #252)Sander Vrijders2016-10-041-8/+2
|\
| * lib: np1_flow.h: Remove bad includesdimitri staessens2016-10-041-8/+2
* | Merged in dstaesse/ouroboros/be-unify (pull request #251)Sander Vrijders2016-10-0444-2840/+2065
|\|
| * lib, ipcp: Revise fast path and flow interfacesdimitri staessens2016-10-0444-2840/+2065
* | Merged in dstaesse/ouroboros/be-apple (pull request #250)Sander Vrijders2016-09-083-6/+6
|\|
| * lib: Fix shm for evil devicesdimitri staessens2016-09-083-6/+6
|/