summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-flowdimitri staessens2016-03-3021-274/+236
|\
| * Merged in dstaesse/ouroboros/be-rina-name (pull request #46)Sander Vrijders2016-03-3021-274/+236
| |\ | | | | | | | | | lib: renamed rina_name_t to instance_name_t
| | * lib: fixes for instance_namedimitri staessens2016-03-303-39/+18
| | | | | | | | | | | | | | | fixes wrong check, checks now use lazy evaluation changed the order of instance_name_cpy to (dst, src)
| | * lib: renamed rina_name_t to instance_name_tdimitri staessens2016-03-3021-270/+253
| |/ | | | | | | | | all functions taking a char * ap_name and uint id now take either a instance_name_t or instance_name_t *
* | lib: further fixes to flow APIdimitri staessens2016-03-302-2/+2
| | | | | | | | | | FLOW_O_INVALID now defined in terms of conflicting options bugfix in setopts
* | lib: bugfixes in flowdimitri staessens2016-03-301-2/+8
| | | | | | | | | | forgotten return statement forgotten NULL check
* | Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into HEADdimitri staessens2016-03-3022-1053/+572
|\|
| * Merged in sandervrijders/ouroboros/be-gpb (pull request #45)Dimitri Staessens2016-03-2922-1052/+571
| |\ | | | | | | | | | Replace custom ser/des with GPB
| | * Merge remote-tracking branch 'upstream/be' into be-gpbSander Vrijders2016-03-284-1/+193
| | |\ | | |/ | |/|
| | * lib: Add ipcp_messages proto fileSander Vrijders2016-03-287-346/+115
| | | | | | | | | | | | | | | This removes the custom ser/des methods for communicating with the IPCP daemon and also uses GPB instead.
| | * lib, irmd: Use GPB for dev.c and IRMdSander Vrijders2016-03-284-560/+155
| | | | | | | | | | | | | | | IRMd and dev.c now also use GPB instead of our own ser/des. irm_msg struct has been dropped as well as the methods associated with it.
| | * lib: Update irm.h APISander Vrijders2016-03-2815-169/+207
| | | | | | | | | | | | | | | | | | Removes rina_name_t from that API. Passing ap_name and api_id as params instead. The IRM tool has been updated accordingly. Some errors in the build related to protobuf-c have also been resolved.
| | * build: Add protobuf-c commands for cmakeSander Vrijders2016-03-254-3/+118
| | | | | | | | | | | | | | | | | | This adds a cmake file so that the build can ask to generate protobuf-c files from .proto files. The messages between the IRM and the library are compiled into the library.
* | | lib: api for handling flowsdimitri staessens2016-03-305-28/+18
| | | | | | | | | | | | | | | moved the flow definition to the library and made it public. thread-safety implemented without compiler checks.
* | | ipcpd: flow structure for maintaining flowsdimitri staessens2016-03-273-0/+150
|/ / | | | | | | | | | | | | | | The flow structure can be used to maintain the status of flows in ipcp instances. It should probably not be exposed outside ipcpd's. It has a flag FLOW_MT_SAFE which includes locking in case the IPCP has a multithreaded implementation that may require it.
* | Merged in dstaesse/ouroboros/be-shm_pci (pull request #42)Sander Vrijders2016-03-263-0/+190
|\ \ | | | | | | | | | ipcpd: added shm_pci_t to manipulate PCI in shm
| * | ipcpd: added shm_pci_t to manipulate PCI in shmdimitri staessens2016-03-253-0/+190
| |/ | | | | | | | | Provides access to the members of the PCI for shm_du_buffs stored in the shared memory ringbuffer.
* | Merged in dstaesse/ouroboros/be-build (pull request #43)Sander Vrijders2016-03-261-1/+1
|\ \ | |/ |/| | | build: lib/CMakelist now uses variables
| * build: lib/CMakelist now uses variablesdimitri staessens2016-03-261-1/+1
|/
* Merged in dstaesse/ouroboros/be-logfix (pull request #41)Sander Vrijders2016-03-255-6/+13
|\ | | | | | | lib/ipcpd: fixed logging mistake
| * lib/ipcpd: fixed logging mistakedimitri staessens2016-03-255-6/+13
|/ | | | logs should be included in source, not in header
* Merged in dstaesse/ouroboros/be-shm (pull request #37)Sander Vrijders2016-03-256-0/+635
|\ | | | | | | lib: shared memory map
| * lib: Shared Memorydimitri staessens2016-03-247-318/+134
| | | | | | | | | | | | | | | | Updated tests. Added code to drop a corner case (packet where the tail PCI would cross the edge of the ring buffer) because solving this very rare case is not worth the performance hit on the ringbuffer the extra code would incur. This means the ringbuffer might drop a very small percentage of packets.
| * Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-shmdimitri staessens2016-03-2422-239/+510
| |\ | |/ |/|
* | Merged in sandervrijders/ouroboros/be-irm-msg (pull request #40)Dimitri Staessens2016-03-2421-231/+490
|\ \ | | | | | | | | | lib: Adds IRMd messages for the dev.h API calls
| * | lib: Adds IRMd messages for the dev.h API callsSander Vrijders2016-03-2421-231/+490
| | | | | | | | | | | | | | | | | | This adds several messages for the dev.h API calls to communicate with the IRM daemon. The deserializing of these messages is still missing and the irmd hasn't been updated with them either.
* | | Merged in dstaesse/ouroboros/be-log (pull request #39)Sander Vrijders2016-03-241-8/+20
|\ \ \ | |/ / |/| | | | | lib: updated log message formatting
| * | lib: updated log message formattingdimitri staessens2016-03-241-8/+20
|/ / | | | | | | | | | | | | | | | | logs will now display as follows: (EE): error, in red (WW): warning, in yellow (II): info, in green (NI): missing code, in blue (DB): debug messages in white
| * Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-shmdimitri staessens2016-03-2310-20/+368
| |\ | |/ |/|
* | Merged in sandervrijders/ouroboros/be (pull request #38)Dimitri Staessens2016-03-2210-20/+368
|\ \ | | | | | | | | | tools: Simple echo application
| * | tools: Simple echo applicationSander Vrijders2016-03-2110-20/+368
| | | | | | | | | | | | | | | | | | This adds a simple echo application written to show application how to use the API. It also updates the dev.h header file with the insights gained from performing this excercise.
| | * lib: optimization of ringbufferDimitri Staessens2016-03-202-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | Got rid of divisions and modulo operations. Change in the meaning of a #define. SHM_DU_MAP_SIZE: is now an exponent of 2. Default is 10, allowing for 1024 blocks in the map.
| | * lib: updated shm_du_map to be a hybrid ring bufferDimitri Staessens2016-03-194-174/+89
| | | | | | | | | | | | | | | | | | Elements must be created/destroyed in order, but IPCPs can access PCI while the PDU is in the ring buffer. Test updated, no more waits are needed.
| | * lib: shared memory mapDimitri Staessens2016-03-197-1/+906
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shared memory map will allow passing SDU's between IPCPs efficiently. It is a single block of managed memory. SDU's are stored in a shm_du_buff datastructure, which is a list of blocks inside the shared memory region. The mechanism for passing SDU's is not yet implemented and could be either within the region or using another local IPC mechanism. The following things are configured at compile time: SHM_FILE_NAME : the name. Default is "ouroboros_du_map". SHM_DU_BUFF_BLOCK_SIZE: size of a block inside the shared memory region. Default is the pagesize of the system. SHM_DU_MAP_SIZE : the approximate size in bytes of the shared memory map. The actual filesize may differ by a small margin. Default is 4MB.
* | Merged in dstaesse/ouroboros/be-dubuff (pull request #36)Sander Vrijders2016-03-172-11/+18
|\ \ | | | | | | | | | lib: fixes to du_buff
| * | lib: fixes to du_buffDimitri Staessens2016-03-172-11/+18
|/ / | | | | | | | | fixes memleaks in du_buff and du_buff_test fixes bug in copy operation
* | Merged in sandervrijders/ouroboros/be (pull request #35)Dimitri Staessens2016-03-174-85/+435
|\| | | | | | | lib: Add communication with IPCP daemon
| * lib: Clean up memleaksSander Vrijders2016-03-171-4/+10
| | | | | | | | | | Some allocations were not freed in case the creation of a new IPCP failed.
| * lib: Add communication with IPCP daemonSander Vrijders2016-03-174-81/+425
| | | | | | | | | | This adds the messages required for the IRMd to communicate with an IPC Process through the library.
* | Merged in sandervrijders/ouroboros/be (pull request #34)Dimitri Staessens2016-03-173-1/+15
|\| | | | | | | lib, irmd: Fix memleaks
| * lib, irmd: Fix memleaksSander Vrijders2016-03-173-1/+15
|/ | | | | This removes some memleaks present in the sockets layer. It also fixes the bad initialization of the difs_size param in the irm_msg.
* Merged in dstaesse/ouroboros/b-du_buff (pull request #32)Sander Vrijders2016-03-153-23/+34
|\ | | | | | | lib: Updated du_buff to limit allowable PCI size
| * lib: du_buff log an error when PCI > block sizeDimitri Staessens2016-03-151-1/+1
| | | | | | | | du_buff.c: LOG_WARN changed to LOG_ERR
| * lib: indentation fixes in du_buffDimitri Staessens2016-03-151-6/+5
| |
| * Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into b-du_buffDimitri Staessens2016-03-1513-41/+267
| |\ | |/ |/|
* | Merged in sandervrijders/ouroboros/be-ipcp (pull request #31)Dimitri Staessens2016-03-1513-41/+267
|\ \ | | | | | | | | | irmd, lib: Create and destroy IPC Processes
| * | irmd, lib: Create and destroy IPC ProcessesSander Vrijders2016-03-1513-41/+267
|/ / | | | | | | | | | | This adds the functionality to create and destroy IPCPs. Upon creation a new process is forked and execve'd. Upon destruction the IPCP is destroyed by killing it with SIGTERM.
| * lib: Updated du_buff not limit allowable PCI sizeDimitri Staessens2016-03-153-22/+34
|/ | | | PCI can now occupy at most one block
* Merged in dstaesse/ouroboros/be-clang (pull request #30)Sander Vrijders2016-03-142-1/+3
|\ | | | | | | Fixed clang compilation errors
| * Fixed clang compilation errorsDimitri Staessens2016-03-142-1/+3
|/ | | | | fixed a signed-unsigned mismatch in du_buff.c fixed an uninitialised variable in irm