summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * ipcpd: normal: Fix compilation issueSander Vrijders2017-03-281-1/+1
| |/
| * ipcpd: normal: Avoid double freeSander Vrijders2017-03-253-5/+4
|/ | | | | The flow manager should clean up the buffer after the call to frct create instance has either failed or succeeded.
* Merged in dstaesse/ouroboros/be-cdap (pull request #423)dimitri staessens2017-03-252-52/+30
|\ | | | | | | lib: Fix invoke_ids and failure handling in CDAP
| * ipcpd: Register nb_notifiers before starting gamdimitri staessens2017-03-251-11/+12
| |
| * lib: Fix invoke_ids and failure handling in CDAPdimitri staessens2017-03-251-41/+18
|/ | | | | When something fails, the successfully sent CDAP messages should be reported back. Invoke_ids were not correctly released.
* Merged in dstaesse/ouroboros/be-ribmgr-dev (pull request #422)dimitri staessens2017-03-242-24/+264
|\ | | | | | | ipcpd: Initial synchronisation of the RIB
| * ipcpd: Initial synchronisation of the RIBdimitri staessens2017-03-242-24/+264
|/
* Merged in sandervrijders/ouroboros/be-full-pff (pull request #421)Sander Vrijders2017-03-246-21/+78
|\ | | | | | | ipcpd: normal: Fill in forwarding table
| * ipcpd: normal: Fill in forwarding tableSander Vrijders2017-03-246-21/+78
| | | | | | | | | | | | The routing now takes the results of the routing table to fill in the forwarding table, by going through the neighbors and filling in the right fd.
* | Merged in sandervrijders/ouroboros/be-free (pull request #420)Sander Vrijders2017-03-241-12/+12
|\| | | | | | | ipcpd: normal: Fix bad free
| * ipcpd: normal: Fix bad freeSander Vrijders2017-03-241-12/+12
|/ | | | | This fixes a bad free. The table was only freed if it was NULL, instead of the other way around.
* Merged in sandervrijders/ouroboros/be-neg-malloc (pull request #419)Sander Vrijders2017-03-241-0/+11
|\ | | | | | | ipcpd: normal: Fix negative malloc
| * ipcpd: normal: Fix negative mallocSander Vrijders2017-03-241-0/+11
|/ | | | | This adds a check to prevent a negative malloc in case the graph structure is empty.
* Merged in sandervrijders/ouroboros/be-segv (pull request #418)Sander Vrijders2017-03-241-1/+9
|\ | | | | | | ipcpd: normal: Fix segfault in dijkstra calculation
| * ipcpd: normal: Fix while loopSander Vrijders2017-03-241-0/+7
| | | | | | | | | | The next vertex was not taken at the end of the Dijkstra calculation loop.
| * ipcpd: normal: Fix segfault in dijkstra calculationSander Vrijders2017-03-241-1/+2
|/ | | | | | | This fixes a dumb segfault in the dijkstra calculation. If an entry can be removed from the table it was set to NULL. However, if the table is completely empty, the index was -1, resulting in an illegal access into the table.
* Merged in dstaesse/ouroboros/be-fmgr (pull request #417)dimitri staessens2017-03-231-1/+5
|\ | | | | | | ipcpd: Increase update timeout in fmgr
| * ipcpd: Increase update timeout in fmgrdimitri staessens2017-03-231-1/+5
| | | | | | | | This works around a possible bug in glibc 2.25.
* | Merged in sandervrijders/ouroboros/be-dijkstra (pull request #416)Sander Vrijders2017-03-233-28/+274
|\ \ | | | | | | | | | ipcpd: normal: Add routing table calculation
| * | ipcpd: normal: Add routing table calculationSander Vrijders2017-03-233-28/+274
|/ / | | | | | | | | | | This adds routing table calculation to the graph component. The routing instances can then periodically ask the graph component for the routing table, and update their PFFs accordingly.
* | Merged in sandervrijders/ouroboros/be-memset (pull request #415)Sander Vrijders2017-03-222-0/+4
|\ \ | | | | | | | | | ipcpd: normal: Add memset of conn_info
| * | ipcpd: normal: Add memset of conn_infoSander Vrijders2017-03-222-0/+4
|/ / | | | | | | | | This initializes conn_info in the ribmgr and fmgr before it is passed to cacep.
* | Merged in dstaesse/ouroboros/be-fixes (pull request #414)dimitri staessens2017-03-221-8/+23
|\| | | | | | | lib: Fix memleaks in cdap
| * lib: Fix memleaks in cdapdimitri staessens2017-03-221-8/+23
| |
* | Merged in dstaesse/ouroboros/be-fixes (pull request #413)dimitri staessens2017-03-223-16/+23
|\| | | | | | | Be fixes
| * include: fflush stdout after printing a log msgdimitri staessens2017-03-221-0/+1
| |
| * ipcpd: Create cdap instance at enroll_initdimitri staessens2017-03-221-14/+18
| |
| * ipcpd: Fix cleanup handler in connmgrdimitri staessens2017-03-221-2/+4
|/
* Merged in sandervrijders/ouroboros/be-routing-fix (pull request #412)Sander Vrijders2017-03-224-0/+8
|\ | | | | | | ipcpd: normal: Initialize qosspec
| * ipcpd: normal: Fix memory leaksSander Vrijders2017-03-223-0/+6
| | | | | | | | This fixes some memleaks as reported by valgrind.
| * ipcpd: normal: Initialize qosspecSander Vrijders2017-03-221-0/+2
|/ | | | | The QoS spec was not being initialized before being added to the graph structure, resulting in an error when compiled with clang.
* Merged in dstaesse/ouroboros/be-irmd (pull request #410)dimitri staessens2017-03-221-0/+3
|\ | | | | | | irmd: Fix some missing locks
| * irmd: Fix some missing locksdimitri staessens2017-03-221-0/+3
| |
* | Merged in dstaesse/ouroboros/be-irmd-clock (pull request #411)dimitri staessens2017-03-221-1/+1
|\ \ | | | | | | | | | irmd: Fix clock used for timedwait
| * | irmd: Fix clock used for timedwaitdimitri staessens2017-03-221-1/+1
|/ /
* | Merged in sandervrijders/ouroboros/be-fixes (pull request #409)Sander Vrijders2017-03-215-21/+23
|\ \ | | | | | | | | | ipcpd: normal: Several bugfixes
| * | ipcpd: normal: Several bugfixesSander Vrijders2017-03-215-21/+23
|/ / | | | | | | These solve several bugfixes in the normal.
* | Merge branch 'testing' into beSander Vrijders2017-03-212-3/+9
|\ \ | |/ |/|
| * Merged in sandervrijders/ouroboros/testing-local (pull request #408)Sander Vrijders2017-03-212-4/+10
| |\ | | | | | | | | | ipcpd: local: Handle failed flow allocation
| | * ipcpd: local: Handle failed flow allocationSander Vrijders2017-03-212-4/+10
| |/ | | | | | | | | | | When the flow_req_arr returned a negative error, it was not handled correctly in the local IPCP, and an access was made into a table with a negative integer. This handles it correctly.
* | Merged in sandervrijders/ouroboros/be-fmgr (pull request #406)Sander Vrijders2017-03-215-52/+78
|\ \ | | | | | | | | | ipcpd: normal: Split fmgr init into init and start
| * | ipcpd: normal: Split fmgr init into init and startSander Vrijders2017-03-215-52/+78
| | | | | | | | | | | | | | | | | | This split the initialization of the flow manager into an init part and a start part. This avoids the usage of data structures that have not been properly initialized yet.
* | | Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into beSander Vrijders2017-03-21190-2409/+3048
|\ \ \
| * \ \ Merged in dstaesse/ouroboros/be-lib-flowset (pull request #405)dimitri staessens2017-03-213-0/+28
| |\ \ \ | | | | | | | | | | | | | | | lib: Add queued SDUs when adding fd to flow_set
| | * | | lib: Add queued SDUs when adding fd to flow_setdimitri staessens2017-03-213-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | This solves some race conditions where packets arrive on a flow before it is added to a flow_set.
| * | | | Merged in dstaesse/ouroboros/be-complete (pull request #404)dimitri staessens2017-03-211-0/+3
| |\| | | | | |/ / | |/| | | | | | ipcpd: Fill qosspec in complete gam policy
| | * | ipcpd: Fill qosspec in complete gam policydimitri staessens2017-03-211-0/+3
| |/ / | | | | | | | | | | | | The temporary cube parameter must be initialized if a qosspec is passed to avoid uninitialized values for the qoscube in the prototype.
| * | Merged in dstaesse/ouroboros/be-connmgr (pull request #403)dimitri staessens2017-03-203-31/+39
| |\ \ | | | | | | | | | | | | ipcpd: Fix cleanup of connmgr
| | * | ipcpd: Create CDAP instance before connectingdimitri staessens2017-03-201-11/+12
| | | | | | | | | | | | | | | | | | | | This lessens the likelyhood that the CDAP SDU thread is not yet active when a new connection starts sending CDAP messages.
| | * | ipcpd: Fix cleanup of connmgrdimitri staessens2017-03-202-20/+27
| | | | | | | | | | | | | | | | Fixed trying to double lock and cleanup order in main.