summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merged in sandervrijders/ouroboros/be (pull request #72)dimitri staessens2016-05-105-68/+240
|\ | | | | | | ipcpd: Allow disabling of DNS
| * 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-105-43/+84
|/ | | | | | 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.
* Merged in dstaesse/ouroboros/irmd-threads (pull request #70)Sander Vrijders2016-05-103-137/+321
|\ | | | | | | irmd: use pthread_cond_wait
| * 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
| |\ | |/ |/|
* | Merged in sandervrijders/ouroboros/be (pull request #71)dimitri staessens2016-05-103-9/+9
|\ \ | | | | | | | | | Fixes some log messages
| * | tools: Fix log messages in echo appSander Vrijders2016-05-102-8/+8
| | | | | | | | | | | | | | | This fixes bad indentation and log messages without a newline in the echo application.
| * | tools: Fix log message in irm toolSander Vrijders2016-05-101-1/+1
| | | | | | | | | | | | | | | A wrong log message was being printed if the bootstrap command was called with a wrong parameter.
| | * irmd: use pthread_cond_waitdimitri staessens2016-05-091-23/+29
| |/ |/| | | | | | | | | The initial implementation looped on a nanosleep to wait for an incoming flow allocation request. This implementation is now corrected with the necessary locks and the thread sleeps on a condition variable.
* | Merged in dstaesse/ouroboros/be-rm-shm-test (pull request #69)Sander Vrijders2016-05-093-197/+1
|\ \ | |/ |/| | | lib/test: removed the test for the shm_du_map
| * lib/test: removed the test for the shm_du_mapdimitri staessens2016-05-093-197/+1
|/ | | | | | | The test had a synchronisation issue. Due to rebuild of the shm_du_map for random access, there was also a hack in the shm_du_map specifically to run this test. Because of this hack, the decision was made to drop this test.
* Merged in dstaesse/ouroboros/be-fast-path (pull request #68)dimitri staessens2016-05-081-0/+1
|\ | | | | | | ipcpd-udp: fixed missing close
| * ipcpd-udp: fixed missing closedimitri staessens2016-05-081-0/+1
| | | | | | | | caused the shim to run out of file descriptors fast...
* | Merged in dstaesse/ouroboros/be-fast-path (pull request #67)Sander Vrijders2016-05-081-3/+6
|\| | | | | | | lib: fixed enormous memory leak in shm_ap_rbuff
| * lib: fixed enormous memory leak in shm_ap_rbuffdimitri staessens2016-05-081-3/+6
| | | | | | | | thanks Sander ;)
* | Merged in dstaesse/ouroboros/be-fast-path (pull request #66)Sander Vrijders2016-05-0810-76/+73
|\| | | | | | | lib: changed port_id to int
| * lib: changed port_id to intdimitri staessens2016-05-0810-76/+73
| | | | | | | | | | returning -1 as uint32_t leads to bugs. also changed types in GPB to sint to use zigzag encoding.
* | Merged in dstaesse/ouroboros/be-fast-path (pull request #65)Sander Vrijders2016-05-0828-773/+1859
|\| | | | | | | irmd: flow allocation and fast path
| * lib: changed SHM_AP_RBUFF to SHM_AP_RBUFF_PREFIXdimitri staessens2016-05-082-5/+5
| | | | | | | | This better reflects the use as the pid is appended to that name.
| * lib/irmd/ipcpd/tools: fixes comments on eb9f443dimitri staessens2016-05-085-21/+38
| |
| * irmd: flow allocation and fast pathdimitri staessens2016-05-0728-772/+1841
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit has a first implementation of flow allocation (the "slow path") and read/write (the "fast path") for ouroboros. It provides basic but unstable communications over the shared memory. It required a lot of changes all over the stack, and fixes a number of previously undetected issues. This PR still need heavy revision regarding data model, locking and cleanup. lib/dev: modifications to the API. It now uses an ap_init() call to set the AP name and sets the Instance ID to the pid of the process. It also binds the AP to the shared memory and creates tables for mappings in the fast path. A call to ap_fini() releases the resources. lib/shm_ap_rbuff: added ring buffer for data exchange between processes in the fast path. It passes an index in the shm_du_map. lib/shm_du_map: rewrote API to work with calls from dev.c. Garbage collector added. Tests updated to new API. ipcpd/ipcp-data: removed everything related to flows, as these are universal for all ap's and kept in ap_data (dev.c), or similar structs for shim ipcps. shim-udp: added flow allocator and read/write functions and shm elements. irmd: revised data model and structures necessary for flow allocation. tools: echo updated to new dev.h API. messaging system was updated to comply with new flow allocation messages. All exchanges use pid and port_id to bootstrap the fast path.
* Merged in sandervrijders/ouroboros/be (pull request #64)Dimitri Staessens2016-04-273-19/+121
|\ | | | | | | ipcpd: Add registration to DNS server
| * ipcpd: Add registration to DNS serverSander Vrijders2016-04-273-19/+121
|/ | | | | This adds support for adding the application name to a BIND DNS server through the nsupdate utility.
* Merged in dstaesse/ouroboros/udp-flow-alloc (pull request #63)Sander Vrijders2016-04-275-13/+52
|\ | | | | | | lib: client-side flow allocation
| * lib: client-side flow allocationdimitri staessens2016-04-275-13/+52
|/ | | | | flow allocation now propagates on the client side up to the IPCP. added UNKNOWN_AP and UNKNOWN_AE definitions to dev.h
* Merged in sandervrijders/ouroboros/be (pull request #62)Dimitri Staessens2016-04-273-64/+40
|\ | | | | | | ipcpd: Hide IRMd messages and fix formatting
| * ipcpd: Hide IRMd messages and fix formattingSander Vrijders2016-04-273-64/+40
| | | | | | | | | | This abstracts away the IRMd messages by calling the functions from ipcp.h in the ouroboros library. It also fixes some formatting issues.
* | Merged in sandervrijders/ouroboros/be (pull request #61)Dimitri Staessens2016-04-271-2/+2
|\| | | | | | | ipcpd: Fix shim-udp-test
| * ipcpd: Fix shim-udp-testSander Vrijders2016-04-271-2/+2
| | | | | | | | | | This fixes the shim-udp-test, which was using a non null-terminated string, which caused it to fail on some systems.
| * Merge remote-tracking branch 'upstream/be' into beSander Vrijders2016-04-2718-395/+938
| |\ | |/ |/|
* | Merged in dstaesse/ouroboros/udp-dev (pull request #60)Sander Vrijders2016-04-2718-395/+938
|\ \ | | | | | | | | | shim-udp: flow allocation added
| * | shim-udp: resolve dst_name using DNSdimitri staessens2016-04-263-20/+37
| | | | | | | | | | | | | | | | | | This commits adds the gethostbyname call to resolve the dst_name for a flow allocation using DNS. The DNS server should be specified using the method mandated by the system (e.g. added to /etc/resolv.conf).
| * | lib: irm.h create_ipcp now returns pid_tdimitri staessens2016-04-264-8/+10
| | | | | | | | | | | | | | | ipcp_create now returns the pid of the created process to allow for more efficient scripting.
| * | lib: instance ID's are now set to the process PIDdimitri staessens2016-04-2611-131/+101
| | | | | | | | | | | | | | | | | | | | | | | | All instance-id's in ouroboros will be set by the system to the pid of the process associated with this application process instance. This means that the user has no way to choose the instance id's. Function calls that assumed manually defined instance id's have been replaced throughout the system.
| * | irmd/shim-udp: formatting fixesdimitri staessens2016-04-252-17/+23
| | |
| * | irmd: reg/unreg whatevercast namesdimitri staessens2016-04-2212-269/+453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unregistering ap's now works. An AP now registers/unregisters its AP-I by sending its AP name and its pid to the IRMd. The IPCPs register whatevercast names. An AP name is currently mapped on a whatevercast name represented by the same string literal. The IRMd allows registration of only one AP-I per AP. A Name Space Management system is needed in the processing system so we can resolve this completely. Changing the stack to register whatevercast names required some changes all over the ipcpd implemented and in the library.
| * | Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into udp-devdimitri staessens2016-04-210-0/+0
| |\ \ | |/ / |/| |
| * | ipcpd: fixes comments on 18c5da3dimitri staessens2016-04-213-10/+10
| | |
| * | irmd: application registrationdimitri staessens2016-04-213-10/+59
| | | | | | | | | | | | | | | | | | Initial code for application registration. Specifying "*" will (for now) register with the first IPCP available in the system. Modified the echo server not to barf messages on failed accept()
| * | ipdpd: shim UDP: listen to incoming SDUsdimitri staessens2016-04-201-28/+74
| | | | | | | | | | | | | | | | | | The shim UDP will listen to incoming SDU's for a flow. If the flow is FLOW_PENDING, it will set it to FLOW_ALLOCATED on the reception of the first SDU, and connect() to set the destination server_host:sp.
| * | ipdpd: defined ANONYMOUS_AP namedimitri staessens2016-04-202-23/+11
| | | | | | | | | | | | fixes comments on 38c4169 (memleaks)
| * | Merge branch 'be-ipcp-data' of bitbucket.org:dstaesse/ouroboros into udp-devdimitri staessens2016-04-190-0/+0
| |\ \
| * | | shim-udp: flow allocation addeddimitri staessens2016-04-197-26/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the API for flow allocation. The shims currently does the following. The shim IPCP binds to an interface (IP address) and listens for flow allocation requests on UDP port 0x0D1F (3359), referenced as the listen port (lp). It will treat any datagram received on lp as a flow allocation request. Upon receiving an allocation request IRM_MSG_CODE__IPCP_FLOW_ALLOC from the IRMd, the shim IPCP will bind a UDP socket to a port (cp) allocated by the host OS. From that port it will send a UDP packet containing the destination ap_name to server_host:lp and wait for a response. Upon reception of a packet on server_host:lp, the shim_IPCP creates a UDP socket for the flow with a port set by the host os (sp), binds to it and echoes the received datagram back from server_host:sp to client_host:cp. It will also notify the IRMd of an incoming flow allocation request IRM_MSG_CODE__IPCP_FLOW_REQ_ARR, with as src_ap_name ("John Day"). It will get the port_id as a return value of that message and create a flow with status FLOW_PENDING with that port_id. If the server responds negatively to the flow allocation request (i.e. the shim IPCP on the server side receives a IRM_MSG_CODE__IPCP_FLOW_ALLOC_RESPONSE with a response != 0, it will delete the pending flow. If response == 0, it will set the status to FLOW_ALLOCATED. On the client machine the IPCP will learn sp upon reception of the echoed datagram. It will then create a flow with the port_id it received with the message from the IRMd and set it to ALLOCATED. Pending implementation: DNS support, this PR only supports local flows on the loopback adapter 127.0.0.1. A thread to listen for the echoed message, to avoid the entire IPCP to block when the echoed message is lost. This PR compiles but is untested pending necessary implementations elsewhere in the stack.
| | | * Merge remote-tracking branch 'upstream/be' into beSander Vrijders2016-04-2335-153/+1678
| | | |\ | |_|_|/ |/| | |
* | | | Merged in dstaesse/ouroboros/be-ipcp-data (pull request #59)Sander Vrijders2016-04-212-8/+30
|\ \ \ \ | |/ / / |/| / / | |/ / ipcpd: fixes in ipcp-data
| * / ipcpd: fixes in ipcp-datadimitri staessens2016-04-192-8/+30
|/ / | | | | | | | | | | deletion of flows was not implemented, renamed to ipcp_data_del_flow removal of stub for has_flow_s (not needed) made find_flow public, renamed to ipcp_data_find_flow