summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* ipcpd: shim-ipcp: fixed race conditionsdimitri staessens2016-05-201-40/+57
| | | | | | | | | | | There were two race conditions. The first was where client received the response message before the client UDP port was connected to the server UDP port and the first message of the client was sent to the LISTEN port instead of the server application port. This was solved by reordering the operations so the response is sent after the port is correctly connected. The second race condition is that the FD is not added to the set in time at the server side before the first SDU arrives. This was solved by adding a variable proteceted by a mutex.
* ipcpd: shim-udp: removed debug codedimitri staessens2016-05-191-12/+0
| | | | | some debug code for locking and a sleep check are removed from the shim-udp.
* Implementation of a full flow allocator for the shim UDP.dimitri staessens2016-05-186-258/+540
| | | | | | | | | It uses UDP port 0x0D1F on all hosts to send and receive flow allocation messages. It supports communication between server and client AP over a single shim IPCP. Implementation of full flow deallocation is pending. Both the client and the server still have to call flow_dealloc();
* lib: Add missing check upon garbage collectionSander Vrijders2016-05-171-2/+3
| | | | | | | There was a check missing upon garbage collection. If the whole DU map has been used once, all DUs will have their garbage bit set to one. This meant that the garbage collector would keep moving the tail indefinitely.
* lib: Fixed incorrect initializationSander Vrijders2016-05-171-3/+4
| | | | | When moving the tail pointer in the DU map, blocks was never reset to zero. This caused it to sometimes clean up too many DUs.
* irmd: fixed bad locksdimitri staessens2016-05-171-4/+2
|
* lib: Add missing modulo calculationSander Vrijders2016-05-163-13/+12
| | | | | | Adds a missing modulo calculation that would result in index -1 being returned instead of zero when the ringbuffer skipped back to the beginning.
* Merged in dstaesse/ouroboros/be-dev-locks (pull request #95)Sander Vrijders2016-05-161-28/+33
|\ | | | | | | lib: dev: small locking improvements
| * lib: dev: small locking improvementsdimitri staessens2016-05-161-28/+33
| | | | | | | | | | | | This avoids holding the long locks during accept() and alloc_res() calls. Small reduction of time of other locks held. No changes in locking logic.
| * Merge branch 'be-udp-locks' into be-dev-locksdimitri staessens2016-05-152-96/+97
| |\
* | \ Merged in dstaesse/ouroboros/be-irmd-locks (pull request #94)Sander Vrijders2016-05-161-175/+223
|\ \ \ | | | | | | | | | | | | irmd: new locking implementation
| * | | irmd: fixed unlock after freedimitri staessens2016-05-161-2/+4
| | | | | | | | | | | | | | | | unlock is now called before the object is destroyed.
| * | | irmd: new locking implementationdimitri staessens2016-05-161-175/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This locking should be more consistent, It now has three locks, one guarding flows and port_id's, one guarding the registered apps and ipcps, and one guarding the overall state of the irmd. There are two additional mutexes guarding the condition variables.
* | | | Merged in dstaesse/ouroboros/be-udp-locks (pull request #92)Sander Vrijders2016-05-162-103/+94
|\ \ \ \ | |_|/ / |/| | | | | | | ipcpd: shim-udp: Revised locking
| * | | fixed two unlocks, removed the thread_lock.dimitri staessens2016-05-151-13/+3
| | |/ | |/|
| * | ipcpd: shim-udp: Revised lockingdimitri staessens2016-05-152-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.
* / lib: dev.c: Revised lockingdimitri staessens2016-05-151-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.
* lib: allow accepting any flowsdimitri staessens2016-05-151-7/+7
| | | | The application can call accept(fd, NULL, NULL);
* lib: cleanup file descriptors for shared memorydimitri staessens2016-05-153-2/+21
| | | | | cleanup of file descriptors for the shared memory. also adds a missing NULL check and some invalidation in dev.c
* ipcpd: Move lock in ipcp_udp_listenerSander Vrijders2016-05-151-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.
* ipcpd: shim-udp: added missing checksdimitri staessens2016-05-151-10/+10
|
* lib: shm_ap_rbuff: simplified file offsetsdimitri staessens2016-05-151-13/+9
| | | | Used simpler pointer arithmetic to calculate the file offset pointers.
* lib: irmd: fixed flow deallocationdimitri staessens2016-05-152-7/+12
| | | | | Port_id's weren't correctly released. Also removes remaining debug logs from the library.
* ipcpd: shim-udp: fixed locking.dimitri staessens2016-05-141-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 staessens2016-05-1410-75/+59
|\ | | | | | | lib, ipcpd, irmd: Add QoS cube definition
| * lib: Fix header inclusionSander Vrijders2016-05-141-0/+1
| | | | | | | | | | | | 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 beSander Vrijders2016-05-142-0/+128
| |\
| * | lib, ipcpd, irmd: Add QoS cube definitionSander Vrijders2016-05-1410-75/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Vrijders2016-05-142-37/+179
|\ \ \ | | | | | | | | | | | | lib: dev.c: added locking
| * | | lib: dev.c: added lockingdimitri staessens2016-05-142-37/+179
| | |/ | |/| | | | | | | | | | Locking is required for multi-threaded applications. Flows are locked separately. Read/Write locks are used for concurrent reads.
| * | Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-rw_lockdimitri staessens2016-05-141-5/+4
| |\|
| | * lib: shm_ap_rbuff: removed bad memory allocationdimitri staessens2016-05-141-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: log error when failed sending SDUdimitri staessens2016-05-141-1/+2
| | |
* | | ipcpd: shim-udp: complete lockingdimitri staessens2016-05-144-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_lockdimitri staessens2016-05-141-3/+5
| | | | | | | | Locking the main mutex should happen while the counter is locked.
* | lib: implementation of read/write locksdimitri staessens2016-05-132-0/+126
|/ | | | | This adds read/write locks, allowing for concurrent reads on the locked datastructure. This is needed for the fast path.
* lib: shm_ap_rbuff: small fixesdimitri staessens2016-05-121-5/+0
| | | | Unnecessary filename string removed. Formatting fix.
* irmd: fixed bad locking and added cleanupdimitri staessens2016-05-121-1/+6
| | | | flow_alloc_res had missing cleanup, added missing unlock.
* dev: fixed wrong bracket placementdimitri staessens2016-05-121-2/+1
|
* lib: dev: implementation of flow_cntldimitri staessens2016-05-122-9/+35
| | | | | allows setting the oflags to make flow_read and flow_write blocking or non-blocking (FLOW_O_NONBLOCK).
* irmd: cleanupdimitri staessens2016-05-121-12/+115
| | | | improved cleanup when killing the IRMd.
* ipcpd: threading and cleanup of ipcpd_udpdimitri staessens2016-05-111-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.
* ipcpd: Fix unitialized valueSander Vrijders2016-05-101-2/+2
| | | | | A value that was unitialized was being treated as an error in the release build with gcc.
* ipcpd: Add nslookup to shim UDPSander Vrijders2016-05-103-25/+156
| | | | | This adds nslookup support to the shim UDP, so that a custom DNS server can be queried.
* ipcpd: Allow disabling of DNSSander Vrijders2016-05-104-41/+81
| | | | | | This allows someone to disable the use of DNS in the shim UDP. It also adds a config file specific for the shim UDP (which holds the nsupdate location). Certain defines were also moved to the global config file.
* irmd: added dedicated locks for signalingdimitri staessens2016-05-101-9/+40
| | | | | it's more robust to use dedicated locks for pthread_cond_signal so no other threads can be waiting for the mutex.
* irmd: fixed potential data racesdimitri staessens2016-05-101-8/+10
| | | | | bmp_allocate should be called under lock. Helgrind does not give warnings anymore during flow allocation.
* IRMd: set number of thread back to 3 (minimum)dimitri staessens2016-05-101-1/+1
|
* irmd: introduced lockingdimitri staessens2016-05-103-142/+287
| | | | | This commit adds locking to the IRMd with a single global lock. It also fixes some issues in cleaning up the daemon.
* Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into irmd-threadsdimitri staessens2016-05-103-9/+9
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 14:56:15 +0000