summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
* | Merged in dstaesse/ouroboros/be-move-flow (pull request #58)Sander Vrijders2016-04-198-6/+4
|\ \ | | | | | | | | | lib: moved flow header and source to ipcpd
| * | lib: moved flow header and source to ipcpddimitri staessens2016-04-198-6/+4
|/ /
* | Merged in dstaesse/ouroboros/ipcpd-udp (pull request #57)Sander Vrijders2016-04-1931-149/+1652
|\ \ | | | | | | | | | ipcpd: initial IPC processes
| * | ipcpd: alignment fixes in ipcp-ops.hdimitri staessens2016-04-191-4/+4
| | |
| * | ipcpd: added checksdimitri staessens2016-04-193-19/+62
| | | | | | | | | | | | | | | added missing NULL checks common argument check function for ipcps
| * | ipcpd: alignment fixes in ipcp-ops.hdimitri staessens2016-04-191-6/+6
| | |
| * | ipcpd: initial IPC processesdimitri staessens2016-04-1831-149/+1609
|/ / | | | | | | | | | | | | | | | | | | | | Basic functions for implementation of IPC processes, and implementation of core functions of the shim IPCP over UDP. Updates to the build system to compile these IPC processes, as well as some fixes in the irmd (rudimentary capturing exit signals) and some fixes in the library, mainly relating to the messaging. Basic implementation of creation / bootstrapping / deletion of the shim UDP. Placeholders for other functions.
* | Merged in dstaesse/ouroboros/buildfix (pull request #56)Dimitri Staessens2016-04-171-1/+1
|\ \ | | | | | | | | | build: fixes wrong target for install_release.sh
| * | build: fixes wrong target for install_release.shdimitri staessens2016-04-161-1/+1
|/ /
* | Merged in dstaesse/ouroboros/instance-name (pull request #55)Sander Vrijders2016-04-131-0/+2
|\ \ | | | | | | | | | lib: fixed missing check in instance_name_create
| * | lib: fixed missing check in instance_name_createdimitri staessens2016-04-131-0/+2
|/ /
* | Merged in sandervrijders/ouroboros/be (pull request #54)Dimitri Staessens2016-04-1116-71/+292
|\ \ | | | | | | | | | Dif config now correctly passed to the IPCP
| | * Merge branch 'be' of bitbucket.org:sandervrijders/ouroboros into beSander Vrijders2016-04-1616-71/+292
| |/| |/|/
| * lib: Change ipcp typesSander Vrijders2016-04-114-10/+8
| | | | | | | | | | This changes the name of the IPCP types after discussions with Dimitri.
| * tools: Update irm bootstrapSander Vrijders2016-04-111-4/+106
| | | | | | | | | | This updates irm bootstrap so that the parameters from the struct dif_config can be correctly filled in from the command line.
| * lib, irmd, irm: Add dif_configSander Vrijders2016-04-0816-67/+188
| | | | | | | | | | | | | | | | | | This adds dif_config to the prototype, in which one is able to specify the parameters a DIF should have. The bootstrap operation of an IPCP takes this as parameter and is oblivious to whether it is a shim or a normal IPCP. The dif_config struct is also correctly serialized and deserialized and passed opaquely to the correct IPCP. This IPCP is in charge of deserializing it correctly.
* | Merged in dstaesse/ouroboros/be-malloc (pull request #53)Sander Vrijders2016-04-025-5/+5
|\ \ | |/ |/| | | lib: include stdlib.h, not malloc.h
| * lib: include stdlib.h, not malloc.hdimitri staessens2016-04-025-5/+5
|/
* Merged in sandervrijders/ouroboros/be (pull request #52)Dimitri Staessens2016-04-026-55/+101
|\ | | | | | | Strdup changes
| * lib: Remove check for equal namesSander Vrijders2016-04-022-4/+0
| | | | | | | | | | Removes name_is_equal. Just using instance_name_cmp is encouraged. It also removes a wrong initialization in the irm tool.
| * irmd: Rename name_to_pid to ipcp_dataSander Vrijders2016-04-021-31/+75
| | | | | | | | | | | | Did a rename of the struct so that it can hold all data related to an IPCP in the system. The DIF name an IPCP belongs to is set on bootstrap and enrolment.
| * lib: Move strdup to utilsSander Vrijders2016-04-024-20/+26
|/ | | | This moves strdup to utils to make it globally available.
* Merged in dstaesse/ouroboros/be-build (pull request #51)Sander Vrijders2016-04-011-8/+8
|\ | | | | | | build: Cleanup of tests build
| * Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-builddimitri staessens2016-04-0136-1327/+1706
| |\ | |/ |/|
* | Merged in sandervrijders/ouroboros/be-ipcp (pull request #50)Dimitri Staessens2016-03-316-47/+376
|\ \ | | | | | | | | | lib: Implementation of flow related ops
| * | lib: Implementation of flow related opsSander Vrijders2016-03-316-47/+376
| | | | | | | | | | | | | | | | | | This adds the messages that are sent to the IPCPs related to flows. Some messages are also sent to the IRMd (e.g. when a new flow arrives).
* | | Merged in sandervrijders/ouroboros/be-ipcp (pull request #49)Dimitri Staessens2016-03-311-11/+48
|\| | | | | | | | | | | lib: Add flow related ops to ipcp.h
| * | lib: Add flow related ops to ipcp.hSander Vrijders2016-03-311-11/+48
|/ / | | | | | | | | This adds the operations related to flows to ipcp.h. Previously it only contained operations on the IPCP level.
* | Merged in sandervrijders/ouroboros/be-irmd (pull request #48)Dimitri Staessens2016-03-3010-183/+379
|\ \ | | | | | | | | | lib, irmd: Update communication with IRMd
| * | lib, irmd: Update communication with IRMdSander Vrijders2016-03-3010-183/+379
| | | | | | | | | | | | | | | All messages sent to the IRMd now also get a reply back with the result of the operation.
* | | Merged in dstaesse/ouroboros/be-flow (pull request #47)Sander Vrijders2016-03-304-0/+146
|\ \ \ | |/ / |/| | | | | API for handling flows
| * | 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.