Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged in dstaesse/ouroboros/be-timeo-const (pull request #474) | dimitri staessens | 2017-04-10 | 2 | -20/+20 |
|\ | | | | | | | lib: Make timeout for flow allocation const | ||||
| * | dev: Return descriptive errors for flow_alloc | dimitri staessens | 2017-04-10 | 1 | -10/+10 |
| | | |||||
| * | lib: Make timeout for flow allocation const | dimitri staessens | 2017-04-10 | 2 | -10/+10 |
| | | |||||
* | | Merged in dstaesse/ouroboros/be-query-timeo (pull request #473) | dimitri staessens | 2017-04-08 | 1 | -3/+2 |
|\| | | | | | | | ipcpd: Fix wrong timeval value in LLC shim | ||||
| * | ipcpd: Fix wrong timeval value in LLC shim | dimitri staessens | 2017-04-08 | 1 | -3/+2 |
| | | |||||
* | | Merged in dstaesse/ouroboros/be-query-timeo (pull request #472) | dimitri staessens | 2017-04-08 | 1 | -2/+9 |
|\| | | | | | | | ipcpd: Increase query timeout in shim LLC | ||||
| * | ipcpd: Increase query timeout in shim LLC | dimitri staessens | 2017-04-08 | 1 | -2/+9 |
|/ | |||||
* | Merged in dstaesse/ouroboros/be-netmap (pull request #471) | dimitri staessens | 2017-04-07 | 1 | -52/+124 |
|\ | | | | | | | ipcpd: Add netmap support for LLC shim | ||||
| * | ipcpd: Add netmap support for LLC shim | dimitri staessens | 2017-04-07 | 1 | -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 Vrijders | 2017-04-07 | 3 | -4/+15 |
|\ | | | | | | | ipcpd: shim-eth-llc: Add check for netmap headers | ||||
| * | build: Change compiler check output and update wrap | Sander Vrijders | 2017-04-07 | 2 | -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 headers | Sander Vrijders | 2017-04-07 | 1 | -0/+14 |
|/ | | | | This checks if the netmap headers are available on the system. | ||||
* | Merged in dstaesse/ouroboros/be-race-fix (pull request #469) | dimitri staessens | 2017-04-06 | 6 | -23/+167 |
|\ | | | | | | | ipcpd: Fix race condition with concurrent allocs | ||||
| * | ipcpd: Fix race condition with concurrent allocs | dimitri staessens | 2017-04-06 | 6 | -23/+167 |
|/ | |||||
* | Merged in dstaesse/ouroboros/be-irmd-locks (pull request #468) | dimitri staessens | 2017-04-06 | 1 | -207/+36 |
|\ | | | | | | | irmd: Remove unnecessary state locks | ||||
| * | irmd: Remove unnecessary state locks | dimitri staessens | 2017-04-06 | 1 | -207/+36 |
| | | |||||
* | | Merged in sandervrijders/ouroboros/be-frct-fix (pull request #467) | Sander Vrijders | 2017-04-06 | 1 | -1/+5 |
|\ \ | | | | | | | | | | ipcpd: normal: Change assert to NULL check | ||||
| * | | ipcpd: normal: Change assert to NULL check | Sander Vrijders | 2017-04-06 | 1 | -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 Vrijders | 2017-04-06 | 1 | -4/+3 |
|\ \ | | | | | | | | | | ipcpd: shim-eth-llc: Avoid handling mgmt frame under lock | ||||
| * | | ipcpd: shim-eth-llc: Avoid handling mgmt frame under lock | Sander Vrijders | 2017-04-06 | 1 | -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 staessens | 2017-04-06 | 1 | -0/+18 |
|\ \ \ | |/ / |/| / | |/ | irmd: Prevent impatient user deadlock on shutdown | ||||
| * | irmd: Prevent impatient user deadlock on shutdown | dimitri staessens | 2017-04-06 | 1 | -0/+18 |
| | | |||||
* | | Merged in dstaesse/ouroboros/be-tim (pull request #464) | dimitri staessens | 2017-04-06 | 12 | -139/+243 |
|\| | | | | | | | lib, irmd: Implement flow allocation timeout | ||||
| * | lib, irmd: Implement flow allocation timeout | dimitri staessens | 2017-04-06 | 12 | -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 Vrijders | 2017-04-05 | 3 | -31/+49 |
|\ | | | | | | | ipcpd: normal: Add missing else clause | ||||
| * | ipcpd: shim-eth-llc: Fix overwrite mgmt frames | Sander Vrijders | 2017-04-05 | 1 | -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. | ||||
| * | ipcpd: normal: Add missing else clause | Sander Vrijders | 2017-04-05 | 2 | -10/+7 |
|/ | | | | | A missing else clause was missing in the fast path, causing the PCI to be shrunk when it should not be. A double free has also been fixed. | ||||
* | Merged in sandervrijders/ouroboros/be-fix-llc (pull request #462) | Sander Vrijders | 2017-04-05 | 6 | -106/+82 |
|\ | | | | | | | Be fix llc | ||||
| * | ipcpd: Add lock for allocation requests | Sander Vrijders | 2017-04-05 | 6 | -103/+79 |
| | | | | | | | | | | This adds a lock to prevent a race condition between flow_req_arr and flow_alloc_resp. | ||||
| * | ipcpd: shim-eth-llc: Fix state check in reader | Sander Vrijders | 2017-04-05 | 1 | -3/+3 |
|/ | | | | | The state check should be done first to avoid blocking on the recv call. | ||||
* | Merged in dstaesse/ouroboros/be-local (pull request #461) | dimitri staessens | 2017-04-04 | 2 | -34/+5 |
|\ | | | | | | | ipcpd: Remove unnecessary locks in local | ||||
| * | lib: Fix insertion in lockless rbuff | dimitri staessens | 2017-04-04 | 1 | -2/+2 |
| | | |||||
| * | ipcpd: Remove unnecessary locks in local | dimitri staessens | 2017-04-04 | 1 | -32/+3 |
| | | |||||
* | | Merged in dstaesse/ouroboros/be-irmd-res (pull request #460) | dimitri staessens | 2017-04-04 | 2 | -521/+511 |
|\| | | | | | | | Be irmd res | ||||
| * | irmd: Initialize in stack memory | dimitri staessens | 2017-04-04 | 1 | -482/+485 |
| | | |||||
| * | ipcpd, irmd: Fix cleanup of thread resources | dimitri staessens | 2017-04-04 | 2 | -46/+33 |
| | | |||||
* | | Merged in sandervrijders/ouroboros/be-eth-mgmt (pull request #459) | Sander Vrijders | 2017-04-04 | 1 | -295/+164 |
|\ \ | | | | | | | | | | Be eth mgmt | ||||
| * | | ipcpd: shim-eth-llc: Remove IPCP rwlock | Sander Vrijders | 2017-04-04 | 1 | -73/+23 |
| | | | | | | | | | | | | | | | This removes the rwlock in the shim-eth-llc IPCP since it is already protected by a mutex. | ||||
| * | | ipcpd: shim-eth-llc: Remove pthread_cancel | Sander Vrijders | 2017-04-04 | 1 | -78/+117 |
| | | | | | | | | | | | | | | | This removes cancellation calls from the shim Ethernet. The different threads now check if the IPCP is still operational or not. | ||||
| * | | ipcpd: shim-eth-llc: Deprecate PACKET_RX|TX_RING | Sander Vrijders | 2017-04-04 | 1 | -203/+11 |
| | | | | | | | | | | | | | | | | | | This deprecates these special socket options of the raw socket since they are less efficient for regular packet I/O. They should be more performant for batch processing of SDUs. | ||||
| * | | ipcpd: shim-eth-llc: Add thread for mgmt frames | Sander Vrijders | 2017-04-04 | 1 | -29/+101 |
|/ / | | | | | | | | | | | This adds a thread to handle management frames, since otherwise a deadlock can occur by blocking SDUs until flow allocation can be handled. | ||||
* | | Merged in dstaesse/ouroboros/be-stable (pull request #458) | dimitri staessens | 2017-04-04 | 1 | -1/+1 |
|\| | | | | | | | ipcpd: Fix lock order in local sdu_loop | ||||
| * | ipcpd: Fix lock order in local sdu_loop | dimitri staessens | 2017-04-04 | 1 | -1/+1 |
|/ | |||||
* | Merged in dstaesse/ouroboros/be-stable (pull request #457) | dimitri staessens | 2017-04-04 | 6 | -105/+186 |
|\ | | | | | | | lib, irmd, ipcpd: Stabilize flow allocation | ||||
| * | lib, irmd, ipcpd: Stabilize flow allocation | dimitri staessens | 2017-04-04 | 6 | -105/+186 |
| | | |||||
* | | Merged in dstaesse/ouroboros/be-ipcp-req-arr (pull request #456) | dimitri staessens | 2017-04-03 | 3 | -48/+43 |
|\| | | | | | | | ipcpd: Fix some bad locking | ||||
| * | ipcpd: Fix some bad locking | dimitri staessens | 2017-04-03 | 3 | -48/+43 |
|/ | |||||
* | Merged in dstaesse/ouroboros/be-oping (pull request #455) | dimitri staessens | 2017-04-03 | 1 | -2/+2 |
|\ | | | | | | | tools: Fix oping client output | ||||
| * | tools: Fix oping client output | dimitri staessens | 2017-04-03 | 1 | -2/+2 |
| | | |||||
* | | Merged in dstaesse/ouroboros/be-irmd (pull request #454) | dimitri staessens | 2017-04-02 | 1 | -2/+5 |
|\| | | | | | | | irmd: Fix dealloc of pending flow |