Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged in dstaesse/ouroboros/be-udp-locks (pull request #92) | Sander Vrijders | 2016-05-16 | 2 | -103/+94 |
|\ | | | | | | | ipcpd: shim-udp: Revised locking | ||||
| * | fixed two unlocks, removed the thread_lock. | dimitri staessens | 2016-05-15 | 1 | -13/+3 |
| | | |||||
| * | ipcpd: shim-udp: Revised locking | dimitri staessens | 2016-05-15 | 2 | -96/+97 |
| | | | | | | | | | | | | | | | | | | | | Simplified locking to take only two locks: the first lock guards the state of the ipcp. This lock must be held for writing on bootstrap and closing, and held for reading during all other operations. The second lock guards operations on flows, and must be held for writing during allocation and deallocation, and held for reading when sending sdu's. After adding a fd to FD_SET, the shim will wait for 1 ms to ensure that the FD is added to the select call. | ||||
* | | Merged in dstaesse/ouroboros/be-dev-locks (pull request #93) | Sander Vrijders | 2016-05-16 | 1 | -69/+65 |
|\ \ | |/ |/| | | | lib: dev.c: Revised locking | ||||
| * | lib: dev.c: Revised locking | dimitri staessens | 2016-05-15 | 1 | -69/+65 |
|/ | | | | | fd and flows are now all protected by the flows_lock while the overall state of the AP is protected by the data_lock. | ||||
* | Merged in dstaesse/ouroboros/release-fd (pull request #90) | Sander Vrijders | 2016-05-15 | 1 | -7/+7 |
|\ | | | | | | | lib: allow accepting any flows | ||||
| * | lib: allow accepting any flows | dimitri staessens | 2016-05-15 | 1 | -7/+7 |
| | | | | | | | | The application can call accept(fd, NULL, NULL); | ||||
* | | Merged in dstaesse/ouroboros/release-fd (pull request #89) | Sander Vrijders | 2016-05-15 | 3 | -2/+21 |
|\| | | | | | | | lib: cleanup file descriptors for shared memory | ||||
| * | lib: cleanup file descriptors for shared memory | dimitri staessens | 2016-05-15 | 3 | -2/+21 |
|/ | | | | | cleanup of file descriptors for the shared memory. also adds a missing NULL check and some invalidation in dev.c | ||||
* | Merged in sandervrijders/ouroboros/be (pull request #88) | dimitri staessens | 2016-05-15 | 1 | -2/+2 |
|\ | | | | | | | ipcpd: Move lock in ipcp_udp_listener | ||||
| * | ipcpd: Move lock in ipcp_udp_listener | Sander Vrijders | 2016-05-15 | 1 | -2/+2 |
|/ | | | | | This takes a lock before notifying the IRMd of a new flow request, to avoid race conditions when trying to retrieve the fd by port-id. | ||||
* | Merged in dstaesse/ouroboros/be-udp (pull request #87) | Sander Vrijders | 2016-05-15 | 1 | -10/+10 |
|\ | | | | | | | ipcpd: shim-udp: added missing checks | ||||
| * | ipcpd: shim-udp: added missing checks | dimitri staessens | 2016-05-15 | 1 | -10/+10 |
|/ | |||||
* | Merged in dstaesse/ouroboros/udp-lockfix (pull request #86) | Sander Vrijders | 2016-05-15 | 4 | -35/+42 |
|\ | | | | | | | ipcpd: shim-udp: fixed locking. | ||||
| * | lib: shm_ap_rbuff: simplified file offsets | dimitri staessens | 2016-05-15 | 1 | -13/+9 |
| | | | | | | | | Used simpler pointer arithmetic to calculate the file offset pointers. | ||||
| * | lib: irmd: fixed flow deallocation | dimitri staessens | 2016-05-15 | 2 | -7/+12 |
| | | | | | | | | | | Port_id's weren't correctly released. Also removes remaining debug logs from the library. | ||||
| * | ipcpd: shim-udp: fixed locking. | dimitri staessens | 2016-05-14 | 1 | -15/+21 |
|/ | | | | | The fd_to_port_id function has no internal locking and must now be called under lock. | ||||
* | Merged in sandervrijders/ouroboros/be (pull request #84) | dimitri staessens | 2016-05-14 | 20 | -135/+144 |
|\ | | | | | | | lib, ipcpd, irmd: Add QoS cube definition | ||||
| * | lib: Fix header inclusion | Sander Vrijders | 2016-05-14 | 6 | -26/+28 |
| | | | | | | | | | | | | This fixes wrong header inclusion that would make programs which are not developed within ouroboros fail upon compilation, since they would not find certain headers on their system. | ||||
| * | Merge remote-tracking branch 'upstream/be' into be | Sander Vrijders | 2016-05-14 | 3 | -0/+169 |
| |\ | |||||
| * | | lib, ipcpd, irmd: Add QoS cube definition | Sander Vrijders | 2016-05-14 | 16 | -109/+117 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the QoS cube definition, which is an enum to select which QoS is needed in the IPCP. An application has to use the qos_spec in qos.h to define what it needs. The IRMd will map this unto a qos cube definition. Some headers are now also no longer installed on the system, since they are only to be used within the irmd and ipcps. | ||||
* | | | Merged in dstaesse/ouroboros/dev-initialise (pull request #85) | Sander Vrijders | 2016-05-14 | 2 | -37/+179 |
|\ \ \ | | | | | | | | | | | | | lib: dev.c: added locking | ||||
| * | | | lib: dev.c: added locking | dimitri staessens | 2016-05-14 | 2 | -37/+179 |
| | |/ | |/| | | | | | | | | | | Locking is required for multi-threaded applications. Flows are locked separately. Read/Write locks are used for concurrent reads. | ||||
* | | | Merged in dstaesse/ouroboros/be-udp (pull request #82) | Sander Vrijders | 2016-05-14 | 3 | -109/+387 |
|\ \ \ | |/ / |/| | | | | | Be udp | ||||
| * | | ipcpd: shim-udp: log error when failed sending SDU | dimitri staessens | 2016-05-14 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-udp | dimitri staessens | 2016-05-14 | 0 | -0/+0 |
| |\ \ | |/ / |/| | | |||||
* | | | Merged in dstaesse/ouroboros/be-rw_lock (pull request #80) | dimitri staessens | 2016-05-14 | 4 | -0/+170 |
|\ \ \ | |_|/ |/| | | | | | lib: implementation of read/write locks | ||||
| * | | Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-rw_lock | dimitri staessens | 2016-05-14 | 1 | -5/+4 |
| |\ \ | |/ / |/| | | |||||
* | | | Merged in dstaesse/ouroboros/be (pull request #83) | dimitri staessens | 2016-05-14 | 1 | -5/+4 |
|\ \ \ | | | | | | | | | | | | | lib: shm_ap_rbuff: removed bad memory allocation | ||||
| * | | | lib: shm_ap_rbuff: removed bad memory allocation | dimitri staessens | 2016-05-14 | 1 | -5/+4 |
|/ / / | | | | | | | | | | | | | moved a malloc so there is no malloc/free when there is no data to be read from the shm_ap_rbuff. | ||||
| | * | ipcpd: shim-udp: complete locking | dimitri staessens | 2016-05-14 | 4 | -114/+390 |
| |/ | | | | | | | | | | | | | Added necessary locks for the shim-udp. This PR also improves thread management, the main thread now starts a mainloop thread, which spawns sdu handler threads when it the IPCP is enrolled. If the IPCP exits the enrolled state, the sdu loop is cancelled. | ||||
| * | lib: fixed a bug in the rw_lock | dimitri staessens | 2016-05-14 | 1 | -3/+5 |
| | | | | | | | | Locking the main mutex should happen while the counter is locked. | ||||
| * | lib: implementation of read/write locks | dimitri staessens | 2016-05-13 | 4 | -0/+168 |
|/ | | | | | This adds read/write locks, allowing for concurrent reads on the locked datastructure. This is needed for the fast path. | ||||
* | Merged in dstaesse/ouroboros/be-rbuff (pull request #79) | Sander Vrijders | 2016-05-12 | 1 | -5/+0 |
|\ | | | | | | | lib: shm_ap_rbuff: small fixes | ||||
| * | lib: shm_ap_rbuff: small fixes | dimitri staessens | 2016-05-12 | 1 | -5/+0 |
|/ | | | | Unnecessary filename string removed. Formatting fix. | ||||
* | Merged in dstaesse/ouroboros/be-irmd (pull request #78) | Sander Vrijders | 2016-05-12 | 1 | -1/+6 |
|\ | | | | | | | irmd: fixed bad locking and added cleanup | ||||
| * | irmd: fixed bad locking and added cleanup | dimitri staessens | 2016-05-12 | 1 | -1/+6 |
|/ | | | | flow_alloc_res had missing cleanup, added missing unlock. | ||||
* | Merged in dstaesse/ouroboros/be-flow_opts (pull request #77) | Sander Vrijders | 2016-05-12 | 1 | -0/+1 |
|\ | | | | | | | include: added flows.h to CMakelists | ||||
| * | include: added flow.h to CMakelists | dimitri staessens | 2016-05-12 | 1 | -0/+1 |
| | | |||||
* | | Merged in dstaesse/ouroboros/be-flow_opts (pull request #76) | Sander Vrijders | 2016-05-12 | 4 | -10/+38 |
|\| | | | | | | | lib: dev: implementation of flow_cntl | ||||
| * | dev: fixed wrong bracket placement | dimitri staessens | 2016-05-12 | 1 | -2/+1 |
| | | |||||
| * | lib: dev: implementation of flow_cntl | dimitri staessens | 2016-05-12 | 4 | -10/+39 |
|/ | | | | | allows setting the oflags to make flow_read and flow_write blocking or non-blocking (FLOW_O_NONBLOCK). | ||||
* | Merged in dstaesse/ouroboros/irmd-cleanup (pull request #75) | Sander Vrijders | 2016-05-12 | 1 | -12/+115 |
|\ | | | | | | | irmd: cleanup | ||||
| * | irmd: cleanup | dimitri staessens | 2016-05-12 | 1 | -12/+115 |
|/ | | | | improved cleanup when killing the IRMd. | ||||
* | Merged in dstaesse/ouroboros/udp-static (pull request #74) | Sander Vrijders | 2016-05-11 | 1 | -98/+40 |
|\ | | | | | | | ipcpd: threading and cleanup of ipcpd_udp | ||||
| * | ipcpd: threading and cleanup of ipcpd_udp | dimitri staessens | 2016-05-11 | 1 | -98/+40 |
|/ | | | | | The shim_udp now correctly destroys its ringbuffer on exit. Now handles sdu's in a single thread using select() with a 10 us timeout. | ||||
* | Merged in sandervrijders/ouroboros/be (pull request #73) | Sander Vrijders | 2016-05-10 | 1 | -2/+2 |
|\ | | | | | | | ipcpd: Fix unitialized value | ||||
| * | ipcpd: Fix unitialized value | Sander Vrijders | 2016-05-10 | 1 | -2/+2 |
|/ | | | | | A value that was unitialized was being treated as an error in the release build with gcc. | ||||
* | Merged in sandervrijders/ouroboros/be (pull request #72) | dimitri staessens | 2016-05-10 | 5 | -68/+240 |
|\ | | | | | | | ipcpd: Allow disabling of DNS | ||||
| * | ipcpd: Add nslookup to shim UDP | Sander Vrijders | 2016-05-10 | 3 | -25/+156 |
| | | | | | | | | | | This adds nslookup support to the shim UDP, so that a custom DNS server can be queried. |