summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merged in dstaesse/ouroboros/be-bsd (pull request #485)dimitri staessens2017-04-162-2/+2
|\ \ | |/ |/| | | irmd, ipcpd: Include socket in select() for FreeBSD
| * irmd, ipcpd: Include socket in select() for FreeBSDdimitri staessens2017-04-162-2/+2
|/ | | | Fixes #41
* Merged in dstaesse/ouroboros/be-bsd (pull request #483)dimitri staessens2017-04-131-7/+5
|\ | | | | | | ipcpd: Fix LLC shim for BSD using netmap
| * ipcpd: Fix LLC shim for BSD using netmapdimitri staessens2017-04-131-7/+5
|/ | | | Fixes #22
* Merged in dstaesse/ouroboros/be-fix-unreg (pull request #482)dimitri staessens2017-04-131-0/+2
|\ | | | | | | ipcpd: Fix unregistration in normal
| * ipcpd: Fix unregistration in normaldimitri staessens2017-04-131-0/+2
| |
* | Merged in sandervrijders/ouroboros/be-swig (pull request #481)Sander Vrijders2017-04-131-1/+3
|\ \ | |/ |/| | | lib: Fix error in SWIG wrapper
| * lib: Fix error in SWIG wrapperSander Vrijders2017-04-131-1/+3
|/ | | | This fixes an error in the SWIG wrapper.
* Merged in dstaesse/ouroboros/be-ap_init (pull request #480)dimitri staessens2017-04-1323-95/+175
|\ | | | | | | include, lib: Rename ap_init/ap_fini
| * include: Add C++ directives in headersdimitri staessens2017-04-139-2/+79
| | | | | | | | Fixes #34
| * include, lib: Rename ap_init/ap_finidimitri staessens2017-04-1315-93/+96
|/ | | | Fixes #35
* Merged in dstaesse/ouroboros/be-hashes (pull request #479)dimitri staessens2017-04-1356-1081/+1054
|\ | | | | | | lib, ipcpd, irmd: Register hash instead of name
| * lib, ipcpd, irmd: Register hash instead of namedimitri staessens2017-04-1356-1081/+1054
| | | | | | | | | | | | | | | | | | All information passed over the IRMd/IPCP boundary for using IPC services (flow allocation, registration) is now hashed. This effectively fixes the shared namespace between DIFs and the IRMDs. This PR also fixes some API issues (adding const identifiers), shuffles the include headers a bit and some small bugs.
* | Merged in sandervrijders/ouroboros/be-cmake-msg (pull request #478)Sander Vrijders2017-04-123-8/+8
|\ \ | | | | | | | | | build: Add STATUS to message statements
| * | build: Add STATUS to message statementsSander Vrijders2017-04-123-8/+8
|/ / | | | | | | | | | | This adds the STATUS variable to the message() call in CMakeLists.txt in places where it was missing. This ensures that the message is printed to stdout instead of stderr.
* | Merged in sandervrijders/ouroboros/be-man-install (pull request #477)Sander Vrijders2017-04-123-0/+42
|\ \ | | | | | | | | | build: Install manpages
| * | build: Install manpagesSander Vrijders2017-04-123-0/+42
|/ / | | | | | | | | | | This will install the manpages found in doc/man/ during installation. Fixes #38
* | Merged in dstaesse/ouroboros/be-man (pull request #475)dimitri staessens2017-04-128-4/+265
|\ \ | | | | | | | | | doc: Add man pages for flow allocation
| * | lib: Fix return values in ap_init()dimitri staessens2017-04-111-4/+4
| | |
| * | doc: Add man pages for ap_init/ap_finidimitri staessens2017-04-112-0/+68
| | |
| * | doc: Add man page for flow_read and flow_writedimitri staessens2017-04-102-0/+75
| | |
| * | doc: Add man pages for flow_allocationdimitri staessens2017-04-103-0/+118
| |/ | | | | | | | | | | | | This commit contains only the sources, correct installation requires gzip and copying the files to /usr/local/man/man3/flow_alloc.3.gz. We need to have a look at integrating this in the build system in an efficient way.
* | Merged in dstaesse/ouroboros/be-irmd (pull request #476)dimitri staessens2017-04-111-2/+2
|\ \ | | | | | | | | | irmd: Fix mixed declaration
| * | irmd: Fix mixed declarationdimitri staessens2017-04-111-2/+2
|/ /
* | Merged in dstaesse/ouroboros/be-timeo-const (pull request #474)dimitri staessens2017-04-102-20/+20
|\| | | | | | | lib: Make timeout for flow allocation const
| * dev: Return descriptive errors for flow_allocdimitri staessens2017-04-101-10/+10
| |
| * lib: Make timeout for flow allocation constdimitri staessens2017-04-102-10/+10
| |
* | Merged in dstaesse/ouroboros/be-query-timeo (pull request #473)dimitri staessens2017-04-081-3/+2
|\| | | | | | | ipcpd: Fix wrong timeval value in LLC shim
| * ipcpd: Fix wrong timeval value in LLC shimdimitri staessens2017-04-081-3/+2
| |
* | Merged in dstaesse/ouroboros/be-query-timeo (pull request #472)dimitri staessens2017-04-081-2/+9
|\| | | | | | | ipcpd: Increase query timeout in shim LLC
| * ipcpd: Increase query timeout in shim LLCdimitri staessens2017-04-081-2/+9
|/
* Merged in dstaesse/ouroboros/be-netmap (pull request #471)dimitri staessens2017-04-071-52/+124
|\ | | | | | | ipcpd: Add netmap support for LLC shim
| * ipcpd: Add netmap support for LLC shimdimitri staessens2017-04-071-52/+124
|/ | | | | Adds support for netmap (https://github.com/luigirizzo/netmap) to increase the performance of packet transfer over the LLC shim.
* Merged in sandervrijders/ouroboros/be-netmap-cmake (pull request #470)Sander Vrijders2017-04-073-4/+15
|\ | | | | | | ipcpd: shim-eth-llc: Add check for netmap headers
| * build: Change compiler check output and update wrapSander Vrijders2017-04-072-4/+1
| | | | | | | | | | | | This removes some of the log messages spewed out during a check of a compiler flag. It also makes the SWIG compiler flag for C99 independent of the compiler.
| * ipcpd: shim-eth-llc: Add check for netmap headersSander Vrijders2017-04-071-0/+14
|/ | | | This checks if the netmap headers are available on the system.
* Merged in dstaesse/ouroboros/be-race-fix (pull request #469)dimitri staessens2017-04-066-23/+167
|\ | | | | | | ipcpd: Fix race condition with concurrent allocs
| * ipcpd: Fix race condition with concurrent allocsdimitri staessens2017-04-066-23/+167
|/
* Merged in dstaesse/ouroboros/be-irmd-locks (pull request #468)dimitri staessens2017-04-061-207/+36
|\ | | | | | | irmd: Remove unnecessary state locks
| * irmd: Remove unnecessary state locksdimitri staessens2017-04-061-207/+36
| |
* | Merged in sandervrijders/ouroboros/be-frct-fix (pull request #467)Sander Vrijders2017-04-061-1/+5
|\ \ | | | | | | | | | ipcpd: normal: Change assert to NULL check
| * | ipcpd: normal: Change assert to NULL checkSander Vrijders2017-04-061-1/+5
|/ / | | | | | | | | | | An assertion was done instead of NULL check, where the FRCT instance could legitimately be NULL, resulting in the IPCP dying when it shouldn't.
* | Merged in sandervrijders/ouroboros/be-mgmt-eth (pull request #466)Sander Vrijders2017-04-061-4/+3
|\ \ | | | | | | | | | ipcpd: shim-eth-llc: Avoid handling mgmt frame under lock
| * | ipcpd: shim-eth-llc: Avoid handling mgmt frame under lockSander Vrijders2017-04-061-4/+3
| | | | | | | | | | | | | | | This avoids handling the mgmt frames under lock, since it may deadlock if a new mgmt frame arrives in the meantime.
* | | Merged in dstaesse/ouroboros/be-patience (pull request #465)dimitri staessens2017-04-061-0/+18
|\ \ \ | |/ / |/| / | |/ irmd: Prevent impatient user deadlock on shutdown
| * irmd: Prevent impatient user deadlock on shutdowndimitri staessens2017-04-061-0/+18
| |
* | Merged in dstaesse/ouroboros/be-tim (pull request #464)dimitri staessens2017-04-0612-139/+243
|\| | | | | | | lib, irmd: Implement flow allocation timeout
| * lib, irmd: Implement flow allocation timeoutdimitri staessens2017-04-0612-139/+243
|/ | | | | | Setting the timeouts on flow_alloc and flow_accept will now work. This makes some changes to the UNIX sockets used for management communication between the APs, IRMd and IPCPs.
* Merged in sandervrijders/ouroboros/be-fix-fmgr (pull request #463)Sander Vrijders2017-04-053-31/+49
|\ | | | | | | ipcpd: normal: Add missing else clause
| * ipcpd: shim-eth-llc: Fix overwrite mgmt framesSander Vrijders2017-04-051-21/+42
| | | | | | | | | | | | This fixes the overwriting of management frames by adding a list in the shim Ethernet that keeps track of management frames instead of a single buffer.