summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/be' into be-enrolmentSander Vrijders2016-07-281-1/+15
|\
| * Merged in sandervrijders/ouroboros/be-llc-len (pull request #180)dimitri staessens2016-07-281-1/+15
| |\
| | * ipcpd: shim-eth-llc: Use correct frame lengthSander Vrijders2016-07-281-1/+15
| |/
* | Merge remote-tracking branch 'upstream/be' into be-enrolmentSander Vrijders2016-07-282-32/+23
|\|
| * Merged in dstaesse/ouroboros/be-irmd-res (pull request #179)Sander Vrijders2016-07-281-10/+6
| |\
| | * irmd: Fix allocation resultdimitri staessens2016-07-281-10/+6
| |/
| * Merged in dstaesse/ouroboros/be-irmd (pull request #178)Sander Vrijders2016-07-272-22/+17
| |\
| | * irmd: Fix shutdowndimitri staessens2016-07-272-22/+17
| |/
* | Merge remote-tracking branch 'upstream/be' into be-enrolmentSander Vrijders2016-07-279-499/+515
|\|
| * Merged in dstaesse/ouroboros/be-irmd (pull request #177)Sander Vrijders2016-07-274-493/+510
| |\
| | * irmd: Revised flow allocationdimitri staessens2016-07-274-493/+510
| * | Merged in sandervrijders/ouroboros/be-fixprotobuf (pull request #176)dimitri staessens2016-07-265-6/+5
| |\ \ | | |/ | |/|
| | * build: Fix wrong inclusionSander Vrijders2016-07-265-6/+5
| |/
* / ipcpd: normal: Provide initial steps for enrollmentSander Vrijders2016-07-2711-72/+396
|/
* Merged in sandervrijders/ouroboros/be-normal (pull request #175)dimitri staessens2016-07-153-10/+261
|\
| * ipcpd: normal: Add main loop to normal IPCPSander Vrijders2016-07-153-10/+261
* | Merged in dstaesse/ouroboros/be-irmd-fix (pull request #174)Sander Vrijders2016-07-153-36/+45
|\ \ | |/ |/|
| * irmd: Fix accessing reg_api struct after destroydimitri staessens2016-07-153-36/+45
|/
* Merged in sandervrijders/ouroboros/be (pull request #172)dimitri staessens2016-07-1412-25/+417
|\
| * Merge remote-tracking branch 'upstream/be' into beSander Vrijders2016-07-141-8/+7
| |\
| * | ipcpd: normal: Establish N-1 management flowsSander Vrijders2016-07-1412-25/+417
* | | Merged in dstaesse/ouroboros/be-irmd-ae (pull request #173)Sander Vrijders2016-07-141-5/+6
|\ \ \ | |_|/ |/| |
| * | irmd: Fix AE name always set to NULLdimitri staessens2016-07-141-5/+6
|/ /
* | Merged in dstaesse/ouroboros/be-gpb (pull request #171)Sander Vrijders2016-07-121-8/+7
|\ \
| * | lib: Remove src_ap_name from ipcpd messagesdimitri staessens2016-07-121-8/+7
|/ /
* | Merged in sandervrijders/ouroboros/be (pull request #170)dimitri staessens2016-07-129-40/+146
|\|
| * ipcpd: Add initial headers for the normal IPCPSander Vrijders2016-07-123-0/+124
| * lib: Remove N-1 DIF param from enroll operationSander Vrijders2016-07-126-40/+22
|/
* Merged in dstaesse/ouroboros/be-shm-pci (pull request #169)Sander Vrijders2016-07-112-45/+103
|\
| * lib: shm_du_map: PCI allocation / deallocationdimitri staessens2016-07-112-45/+103
|/
* Merged in dstaesse/ouroboros/be-registry-refactor (pull request #168)Sander Vrijders2016-07-114-405/+421
|\
| * irmd: Refactor of registrydimitri staessens2016-07-114-405/+421
|/
* Merged in dstaesse/ouroboros/be-ops (pull request #167)Sander Vrijders2016-07-088-111/+6
|\
| * ipcpd: Deprecate ipcp_reg/ipcp_unregdimitri staessens2016-07-088-111/+6
|/
* Merged in dstaesse/ouroboros/be-ipcp-priority (pull request #166)Sander Vrijders2016-07-074-47/+160
|\
| * irmd: Prioritize local ipcp for local flowsdimitri staessens2016-07-074-47/+160
* | Merged in dstaesse/ouroboros/be-lockfile (pull request #165)Sander Vrijders2016-07-0715-39/+253
|\|
| * ouroboros: Use ouroboros errno.hdimitri staessens2016-07-0710-10/+11
| * lib: Add lockfiledimitri staessens2016-07-079-31/+244
|/
* Merged in dstaesse/ouroboros/be-irmd-fix-create (pull request #164)Sander Vrijders2016-07-076-29/+58
|\
| * irmd, ipcps: Close logfile on exitdimitri staessens2016-07-074-17/+33
| * lib:irmd: Fix logs and irm_createdimitri staessens2016-07-063-12/+25
* | Merged in dstaesse/ouroboros/be-fix-stale (pull request #163)Sander Vrijders2016-07-061-1/+1
|\ \ | |/ |/|
| * lib: shm_du_map: Fix cleaning stale DU mapdimitri staessens2016-07-061-1/+1
* | Merged in dstaesse/ouroboros/be-clean-exit (pull request #162)Sander Vrijders2016-07-061-5/+5
|\|
| * lib: shm_du_map: Don't open rbuff when process exitsdimitri staessens2016-07-061-5/+5
* | Merged in dstaesse/ouroboros/be-clean-exit (pull request #160)Sander Vrijders2016-07-068-8/+36
|\|
| * Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-clean-exitdimitri staessens2016-07-0612-29/+196
| |\ | |/ |/|
* | Merged in sandervrijders/ouroboros/be (pull request #161)dimitri staessens2016-07-0612-29/+196
|\ \
| * | lib: Fix crapped up indentationSander Vrijders2016-07-061-2/+2