summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ipcpd: Filter traffic on shim-eth-llcdimitri staessens2016-10-063-7/+31
| | | | Now correctly handles and drops non-ouroboros traffic.
* 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 table
| | * ipcpd: shim-eth-llc: Use correct SAP to lookup in the tableSander Vrijders2016-10-051-3/+5
| | | | | | | | | | | | | | | Upon deallocation, the remote's SAP was being used to lookup the fd instead of our own SAP. This resulted in strange behaviour.
| * | Merged in sandervrijders/ouroboros/be-bugfix (pull request #253)dimitri staessens2016-10-052-7/+4
| |\| | | | | | | | | | lib, ipcpd: Fix bad locking
* | | Merged in sandervrijders/ouroboros/be-bugfix (pull request #253)dimitri staessens2016-10-052-7/+4
|\ \ \ | |/ / |/| / | |/ lib, ipcpd: Fix bad locking
| * lib, ipcpd: Fix bad lockingSander Vrijders2016-10-052-7/+4
|/ | | | | | Some locks were taken at an inappropriate time, causing the shim-eth-llc to block indefinitely upon shutdown and causing flow allocation to halt since a response could never be given.
* Merged in dstaesse/ouroboros/be-unify (pull request #252)Sander Vrijders2016-10-041-8/+2
|\ | | | | | | lib: np1_flow.h: Remove bad includes
| * 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 interfaces
| * lib, ipcp: Revise fast path and flow interfacesdimitri staessens2016-10-0444-2840/+2065
| | | | | | | | | | | | | | | | | | | | | | | | IPCPs can now use ap_init() to initialize the memory. All flows are accessed using flow descriptors, this greatly simplifies IPCP development. Reverts the fast path to a single ap_rbuff per process. Splits lib/ipcp into irmd/ipcp and lib/ipcp-dev. Adds a lib/shim-dev holding tailored functions for shims. Moves the buffer_t to utils.h. Fixes the shim-eth-llc length field. Removes the flow from shared.h. Fixes #4 Fixes #5
* | Merged in dstaesse/ouroboros/be-apple (pull request #250)Sander Vrijders2016-09-083-6/+6
|\| | | | | | | lib: Fix shm for evil devices
| * lib: Fix shm for evil devicesdimitri staessens2016-09-083-6/+6
|/ | | | | | Cupertino's finest don't seem to support a write call with a filedescriptor that points to a shared memory file. ENOTSUP is not mentioned in their manpage either. Classic.
* Merged in sandervrijders/ouroboros/be (pull request #249)dimitri staessens2016-09-071-48/+48
|\ | | | | | | ipcpd: normal: Fix crapped up indentation
| * ipcpd: normal: Fix crapped up indentationSander Vrijders2016-09-071-48/+48
|/ | | | There was some crapped up indentation in the crc32 source file.
* Merged in sandervrijders/ouroboros/be-shm-pci (pull request #247)dimitri staessens2016-09-0718-317/+382
|\ | | | | | | ipcpd: normal: Add operations to get and set the PCI
| * ipcpd: normal: Add operations to get and set the PCISander Vrijders2016-09-0718-317/+382
| | | | | | | | | | | | | | | | | | This adds the operations needed in the normal IPCP to get and set the Protocol Control Information. It allows to allocate or release space in the current DU. The struct pci can be serialized into newly allocate space. Vice versa, a struct pci can be deserialized given a DU. It allows for decreasing the TTL in the DU and for calculating the CRC32. The TTL and CRC32 can now be selected when creating a new DIF.
* | Merged in dstaesse/ouroboros/be-shm (pull request #248)Sander Vrijders2016-09-074-17/+12
|\ \ | | | | | | | | | lib: Set umask for file creation permissions
| * | lib: Set umask for file creation permissionsdimitri staessens2016-09-074-17/+12
|/ / | | | | | | | | Permissions are now set correctly upon creation, removing the need to call fchmod.
* | Merged in dstaesse/ouroboros/be-fbsd (pull request #246)Sander Vrijders2016-09-071-0/+1
|\ \ | | | | | | | | | ipcpd: Add missing include for FreeBSD
| * | ipcpd: Add missing include for FreeBSDdimitri staessens2016-09-071-0/+1
| | |
* | | Merged in dstaesse/ouroboros/be-select (pull request #245)Sander Vrijders2016-09-071-8/+16
|\| | | | | | | | | | | lib: Add lazy copy of flow_set
| * | lib: Add lazy copy of flow_setdimitri staessens2016-09-071-8/+16
|/ / | | | | | | | | | | The flow_set now has a safe copy which is threadsafe for the select call without needing a lock. This greatly speeds up consecutive select calls.
* | Merged in dstaesse/ouroboros/be-irmd-fix (pull request #244)Sander Vrijders2016-09-061-0/+3
|\ \ | | | | | | | | | irmd: Fix register with unenrolled IPCPs in system
| * | irmd: Fix register with unenrolled IPCPs in systemdimitri staessens2016-09-061-0/+3
| | | | | | | | | | | | | | | If there are unregistered IPCPs (no DIF name set) the lookup should skip over them without segfaulting.
* | | Merged in dstaesse/ouroboros/be-select (pull request #243)Sander Vrijders2016-09-061-0/+2
|\| | | | | | | | | | | wrap: Add swig wrapper for select.h
| * | wrap: Add swig wrapper for select.hdimitri staessens2016-09-061-0/+2
| | |
* | | Merged in dstaesse/ouroboros/be-select (pull request #242)Sander Vrijders2016-09-069-35/+258
|\| | | | | | | | | | | lib: dev: Provide a set of fds to flow_select
| * | lib: dev: Provide a set of fds to flow_selectdimitri staessens2016-09-069-35/+258
|/ / | | | | | | | | | | | | The flow_select call now takes as a parameter a flow_set_t, which specifies a set of flow descriptors that will unblock the select call when an SDU for one of them arrives. The select call has been moved to its own header.
* | Merged in dstaesse/ouroboros/be-dev-refactor (pull request #241)Sander Vrijders2016-09-031-23/+25
|\ \ | | | | | | | | | lib: dev: Add fd lookup table
| * | lib: dev: Add fd lookup tabledimitri staessens2016-09-031-23/+25
| | |
* | | Merged in dstaesse/ouroboros/be-dev-refactor (pull request #240)Sander Vrijders2016-09-031-182/+188
|\| | | | | | | | | | | lib: dev: Refactor
| * | lib: dev: Refactordimitri staessens2016-09-031-182/+188
|/ / | | | | | | | | Renamed _ap_instance to ai, adds a char * daf_name (to be set by ipcps in ipcp-dev.h, later to be set when we generalise enrolment to DAFs).
* | Merged in dstaesse/ouroboros/be-split-fp (pull request #239)Sander Vrijders2016-09-023-7/+7
|\ \ | | | | | | | | | src: Fix grammar (SDU's -> SDUs)
| * | src: Fix grammar (SDU's -> SDUs)dimitri staessens2016-09-023-7/+7
| | |
* | | Merged in dstaesse/ouroboros/be-split-fp (pull request #238)Sander Vrijders2016-09-0210-35/+94
|\| | | |/ |/| | | lib: Add northbound ringbuffers
| * lib: Add northbound ringbuffersdimitri staessens2016-09-0210-35/+94
| | | | | | | | Fast path is split in north and southbound paths.
* | Merged in dstaesse/ouroboros/be-ipcp-dev (pull request #237)Sander Vrijders2016-09-025-40/+39
|\ \ | |/ |/| | | lib: ipcp: Decouple flow_dealloc
| * lib: ipcp: Decouple flow_deallocdimitri staessens2016-09-025-40/+39
| | | | | | | | Sending a dealloc to the irmd moved to its own call.
* | Merged in sandervrijders/ouroboros/be-swig-fix (pull request #236)dimitri staessens2016-09-021-0/+3
|\ \ | | | | | | | | | build: Add correct include directory for swig
| * | build: Add correct include directory for swigSander Vrijders2016-09-011-0/+3
| |/ | | | | | | | | | | The correct include directory was not added to the CMakeLists in the wrap directory. Before it was working since the headers were already installed system-wide on my own system.
* | Merged in sandervrijders/ouroboros/be-alloc-flow (pull request #235)dimitri staessens2016-09-023-17/+17
|\ \ | |/ |/| | | lib: Change rdrbuff API to use correct types
| * lib: Change rdrbuff API to use correct typesSander Vrijders2016-09-013-17/+17
|/ | | | | | The head and tail alloc and release operations were taking an int to identify the idx instead of a ssize_t. The size was a ssize_t instead of a size_t.
* Merged in dstaesse/ouroboros/be-bugfixing (pull request #234)Sander Vrijders2016-09-011-2/+7
|\ | | | | | | irmd: Fix registering AP-I before bind
| * irmd: Fix registering AP-I before binddimitri staessens2016-09-011-2/+7
| |
* | Merged in dstaesse/ouroboros/be-bugfixing (pull request #233)Sander Vrijders2016-09-011-2/+5
|\| | | | | | | lib, rdrbuff: Fix fast path lockup
| * lib, rdrbuff: Fix fast path lockupdimitri staessens2016-09-011-2/+5
|/ | | | Adds missing condition signals.
* Merged in dstaesse/ouroboros/be-bugfixing (pull request #232)Sander Vrijders2016-08-312-15/+20
|\ | | | | | | irmd: Fix binding after registering
| * lib, shm_rdrbuff: Fix preprocessor definedimitri staessens2016-08-311-15/+15
| |
| * irmd: Fix binding after registeringdimitri staessens2016-08-311-0/+5
| | | | | | | | | | Flow will now allocate correctly when the name is registered in a DIF before it is bound to an AP.