summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | Merged in sandervrijders/ouroboros/be-graph (pull request #402)Sander Vrijders2017-03-206-64/+539
| |\ \ \ | | | | | | | | | | | | | | | Be graph
| | * | | ipcpd: normal: routing: Listen to RIB eventsSander Vrijders2017-03-203-34/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets the routing component listen to RIB events. It listens to /fsdb which is populated with FSOs. The graph that is kept within the routing component is updated depending on the event that was received.
| | * | | ipcpd: normal: Add graph structureSander Vrijders2017-03-145-38/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a graph structure which will be updated by routing when it is notified about a new RIB event. The routing can then use this graph as input for calculating the shortest path to a destination.
| * | | | Merged in dstaesse/ouroboros/be-fixes (pull request #401)dimitri staessens2017-03-153-26/+57
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / Be fixes
| | * | ipcpd: Fix disregarding qs in connmgrdimitri staessens2017-03-141-2/+5
| | | |
| | * | lib: Fix CDAP with multiple fdsdimitri staessens2017-03-142-24/+52
| |/ /
| * | Merged in sandervrijders/ouroboros/be-rib-routing (pull request #400)Sander Vrijders2017-03-133-48/+132
| |\ \ | | | | | | | | | | | | ipcpd: normal: Add Flow State Objects to RIB
| | * | ipcpd: normal: Add Flow State Objects to RIBSander Vrijders2017-03-133-48/+132
| |/ / | | | | | | | | | | | | | | | | | | This makes the routing component create a Flow State Database (FSDB). An FSDB contains Flow State Objects (FSOs). An FSO is created when a neighbor is added, it is deleted when a neighbor is removed and its QoS is updated when a neighbor's QoS changes.
| * | Merged in dstaesse/ouroboros/be-cdap (pull request #399)dimitri staessens2017-03-031-2/+2
| |\ \ | | | | | | | | | | | | lib: Fix typo in cdap
| | * | lib: Fix typo in cdapdimitri staessens2017-03-031-2/+2
| |/ /
| * | Merged in dstaesse/ouroboros/be-cdap (pull request #398)dimitri staessens2017-03-036-139/+287
| |\ \ | | | | | | | | | | | | lib: Manage multiple flows with a single CDAP instance
| | * | lib: Manage multiple flows with a single CDAP instancedimitri staessens2017-03-036-139/+287
| |/ / | | | | | | | | | | | | | | | | | | | | | You can now add multiple flows to a CDAP instance. This will simplify sending messages to different peers (e.g. for syncing the RIB). A request will now return an array of keys terminated by CDAP_KEY_INVALID. Removes the enum from the CDAP proto file to just take the opcode as an integer.
| * | Merged in sandervrijders/ouroboros/be-cdap-flow (pull request #397)Sander Vrijders2017-03-03171-640/+542
| |\ \ | | | | | | | | | | | | Be cdap flow
| | * | Change email addresses to ugent.beSander Vrijders2017-03-03147-238/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Our mailserver was migrated from intec.ugent.be to the central ugent.be emailserver. This PR updates the header files to reflect this change as well. Some header files were also homogenized if the parameters within the functions were badly aligned.
| | * | build: Format CMakeLists.txt filesSander Vrijders2017-03-0321-169/+167
| | | | | | | | | | | | | | | | The CMakeLists files are now properly indented.
| | * | lib: Install cacep.h on installSander Vrijders2017-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | cacep.h was not installed on install, but other applications may want to use it as well.
| | * | ipcpd: normal: Deprecate CDAP flowSander Vrijders2017-03-033-233/+0
| |/ / | | | | | | | | | This removes the CDAP flow class, which is no longer needed.
| * | Merged in sandervrijders/ouroboros/be-ae-conn (pull request #396)Sander Vrijders2017-03-0324-725/+1065
| |\ \ | | | | | | | | | | | | ipcpd: normal: Refactor application entities and add neighbors struct
| | * | ipcpd: normal: Refactor application entities and add neighbors structSander Vrijders2017-03-0324-725/+1065
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the different Application Entities of the normal IPCP. They all listen to and use the connection manager to establish new application connections. This commit also adds a neighbors struct to the normal IPCP. It contains neighbor structs that contain application connection. Notifiers can be registered in case a neighbor changes (added, removed, QoS changed). The flow manager has an instance of this neighbors struct and listens to these events to update its flow set. The routing component also listens to these events so that it can update the FSDB if needed. The flow manager now also creates the PFF instances and the routing instances per QoS cube. The RIB manager also uses this an instance of the neighbors struct and listens to neighbor events as well.
| * | Merged in sandervrijders/ouroboros/be-aes (pull request #395)Sander Vrijders2017-03-0213-91/+452
| |\ \ | | | | | | | | | | | | ipcpd: normal: Add connection manager
| | * | ipcpd: normal: Add connection managerSander Vrijders2017-03-0213-91/+452
| |/ / | | | | | | | | | | | | | | | | | | This adds the connection manager which allows the different AEs of the normal IPCP to register with it. An AE can then use the connection manager to allocate a flow to a neighbor, or to wait for a new connection from a neighbor.
| * | Merged in dstaesse/ouroboros/be-cacep (pull request #394)dimitri staessens2017-02-284-39/+94
| |\ \ | | | | | | | | | | | | lib: Split CACEP into request/response protocol
| | * | lib: Split CACEP into request/response protocoldimitri staessens2017-02-284-39/+94
| | | |
| * | | Merged in dstaesse/ouroboros/be-cacep (pull request #393)dimitri staessens2017-02-2721-864/+186
| |\| | | | | | | | | | | | | | lib: Split authentication from CACEP
| | * | lib: Split authentication from CACEPdimitri staessens2017-02-2721-864/+186
| |/ / | | | | | | | | | | | | | | | | | | By removing authentication as part of CACEP, all policies disappear. CACEP becomes a policy-free connection establishment protocol between Application Entities. Authentication can later be added cleanly as a pure policy function when needed.
| * | Merged in sandervrijders/ouroboros/be-ae (pull request #392)Sander Vrijders2017-02-2436-199/+61
| |\ \ | | | | | | | | | | | | lib: Remove application entity name
| | * | lib: Remove application entity nameSander Vrijders2017-02-2436-199/+61
| |/ / | | | | | | | | | | | | The AE name should not be passed over the layer boundaries. If an application has more than one AE it should exchange this in CACEP.
| * | Merged in dstaesse/ouroboros/be-cacep (pull request #391)dimitri staessens2017-02-2415-154/+174
| |\ \ | | | | | | | | | | | | lib: Revise CACEP API
| | * | Revise CACEP APIdimitri staessens2017-02-2415-154/+174
| | | | | | | | | | | | | | | | | | | | | | | | The information passed to CACEP is split between the information about the connection and the information to be used during the authentication exchange.
* | | | Merge branch 'testing' into beSander Vrijders2017-03-215-14/+29
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merged in dstaesse/ouroboros/testing-waits (pull request #407)dimitri staessens2017-03-215-14/+29
| |\ \ | | | | | | | | | | | | irmd: Fix timeouts in reg_entry
| | * | irmd: Fix timeouts in reg_entrydimitri staessens2017-03-215-14/+29
| |/ / | | | | | | | | | | | | This fixes bad timedwaits for the state of the reg_entry. Also slightly revised timedwaits throughout the prototype.
* | / Merge branch 'testing' into beSander Vrijders2017-02-241-1/+1
|\| | | |/ |/|
| * Merged in dstaesse/ouroboros/testing-irmd (pull request #390)dimitri staessens2017-02-241-1/+1
| |\ | | | | | | | | | irmd: Fix bug in name comparison of IPCPs
| | * irmd: Fix bug in name comparison of IPCPsdimitri staessens2017-02-241-1/+1
| |/