summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* include: Add header for endiannessdimitri staessens2017-02-103-88/+156
| | | | | | | | | This adds a header for dealing with endianness in ouroboros. It is extracted from the byte_order header in the library (which now includes this header). It also exposes the functions ntohl, ntohll, htonl and htonll, necessary for converting 32 and 64 bit values for storage and retrieval from the RIB (which should store multi-byte values in network byte order).
* Merged in sandervrijders/ouroboros/be-ipcpd-logs (pull request #370)Sander Vrijders2017-02-105-7/+1
|\ | | | | | | ipcpd: Remove logging if not initialized yet
| * ipcpd: Remove logging if not initialized yetSander Vrijders2017-02-105-7/+1
| | | | | | | | | | | | This removes the logs that would print to stdout if the IPCP fails to initialize. If the user had asked that logs would be printed to the syslog this would be unwanted behaviour.
* | Merged in dstaesse/ouroboros/be-cacep (pull request #369)dimitri staessens2017-02-102-0/+3
|\ \ | |/ |/| | | ipcpd: Fix leaking name in cacep_info
| * ipcpd: Fix leaking name in cacep_infodimitri staessens2017-02-102-0/+3
|/
* Merged in dstaesse/ouroboros/be-bsd (pull request #368)dimitri staessens2017-02-109-23/+39
|\ | | | | | | Be bsd
| * lib: Fix bad lock in ribdimitri staessens2017-02-101-1/+1
| |
| * lib, ipcp: Correctly init condvarsdimitri staessens2017-02-093-12/+23
| | | | | | | | | | The timerwheel and RIB use timedwaits. The condition variables are now correctly initialised to use the configuration defined clock.
| * ipcpd: Print size_t and uint64_t in portable waydimitri staessens2017-02-092-6/+7
| | | | | | | | | | | | On 32-bit systems size_t is different than on 64 bit systems. The correct way to print a size_t is with %z. uint64_t is printed portably with the PRIu64 macro.
| * lib: Fix bug in rib_testdimitri staessens2017-02-091-1/+1
| |
| * lib, tools, ipcpd: Fix compilation on FreeBSDdimitri staessens2017-02-093-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | FreeBSD defines its own bswap64 in the <sys/endian.h> header, which is now included correctly. POSIX requires XSI or RTS extensions to be enabled for the sa_sigaction field to be visible. Linux doesn't do the check correctly, but FreeBSD does. Removes the LOG_MISSING call which was deprecated with the last revision of the logging system.
* | Merged in dstaesse/ouroboros/be-create_r (pull request #367)Sander Vrijders2017-02-0916-127/+201
|\| | | | | | | ipcpd, lib: Report IPCP creation failure
| * ipcpd, lib: Report IPCP creation failuredimitri staessens2017-02-0916-127/+201
|/ | | | | | | | The IPCP will now respond with an ipcp_create_r message when it fails, informing the IRMd. Also adds some const qualifiers in the public headers and fixes some formatting in dev.c.
* Merged in dstaesse/ouroboros/be-fixes (pull request #366)Sander Vrijders2017-02-092-5/+14
|\ | | | | | | Be fixes
| * ipcpd: Add cleanup handler to gamdimitri staessens2017-02-081-1/+4
| |
| * ipcpd: Fix boot order of normaldimitri staessens2017-02-081-4/+10
| | | | | | | | | | | | irm_bind has to be called after ipcp_init() since it targets the AP-I and needs the pid to be registered with the IRMd. Also fixes missing unbinding of the AP-I.
* | Merged in sandervrijders/ouroboros/be-pedantic-sometimes (pull request #365)dimitri staessens2017-02-082-29/+26
|\| | | | | | | lib, ipcpd: Comply to pedantic C99
| * lib, ipcpd: Comply to pedantic C99Sander Vrijders2017-02-082-29/+26
|/ | | | | | With the changes in this commit Ouroboros will compile with the pedantic flag on when the standard is C99. The main problem was the used of unnamed structs and unions, which is C11.
* Merged in dstaesse/ouroboros/be-syslog (pull request #364)Sander Vrijders2017-02-0825-691/+621
|\ | | | | | | lib: Log to the logging system
| * lib: Log to the logging systemdimitri staessens2017-02-0825-691/+621
|/ | | | | | | | | | This removes the logfile and outputs log messages to the logging system. The creation of the logfiles (as well as the ap_init() call) were moved into ipcp_init() to simplify the IPCP creation and shutdown. Fixes #25 Fixes #27
* Merged in dstaesse/ouroboros/be-ipcp (pull request #363)Sander Vrijders2017-02-079-141/+161
|\ | | | | | | ipcpd: Refactor ipcpi struct
| * ipcpd: Refactor ipcpi structdimitri staessens2017-02-079-141/+161
|/ | | | | | | | | The ipcp-ops header was removed and merged into ipcp.h. The common components dif_name and ipcp_type have been moved to the main ipcp struct. After this move, ipcp_data only contained shim information, so it was renamed to shim_data. The ipcp_init() function checks the type and will only include the shim_data if the type is not an IPCP_NORMAL. All ipcps have been adapted to this change in API.
* Merged in dstaesse/ouroboros/be-wip (pull request #362)Sander Vrijders2017-02-0733-2658/+1103
|\ | | | | | | ipcpd, lib: Revise normal IPCP
| * ipcpd: Revise PCI manipulation in normaldimitri staessens2017-02-075-150/+100
| | | | | | | | | | | | | | | | | | | | | | The pci function will store offsets to avoid having to recalculate them every time. TTL handling is removed from the fmgr, the TTL is automatically decreased when deserializing the PCI (or set to 1 if there is no TTL present so the PDU will be forwarded). The deserialisation function now takes a pointer to a struct pci as input to avoid memory allocation and release each time a PDU is processed. Some checks have been replaced with assert() and return values replaced with void where it makes sense.
| * ipcpd, lib: Revise normal IPCPdimitri staessens2017-02-0631-2550/+1045
| | | | | | | | | | | | | | | | | | | | This PR updates the normal IPCP to use the new RIB. The old ribmgr is removed and replaced by a stub that needs to be implemented. All components (dir, fmgr, frct) were adapted to the new RIB API. A lot of functionality was moved outside of the ribmgr, such as the addr_auth, which is now a component of the IPCP. The address is also stored to the ipcpi struct. The irm tool has an option to set the gam policy of the rib manager.
* | Merged in dstaesse/ouroboros/be-cacep (pull request #361)Sander Vrijders2017-02-061-0/+1
|\| | | | | | | lib: Fix memleak in cacep
| * lib: Fix memleak in cacepdimitri staessens2017-02-061-0/+1
| |
* | Merged in dstaesse/ouroboros/be-wip (pull request #360)Sander Vrijders2017-02-054-13/+39
|\| | | | | | | Be wip
| * irmd: Handle death of IPCP gracefullydimitri staessens2017-02-043-12/+30
| | | | | | | | | | | | | | If an IPCP SEGVs abruptly, the sanitizer in the IRMd would also cause a SEGV because of looping over a registry linked list inside another safe loop over the same list. A function is added to the registry to avoid this.
| * lib: Handle receiving CDAP reply before waitdimitri staessens2017-02-041-1/+9
| | | | | | | | | | | | In extreme cases, the response to a CDAP request can arrive before the AE doing the request has called cdap_request_wait. This PR handles it by waiting for the state to move away from INIT before responding.
* | Merged in dstaesse/ouroboros/be-wip (pull request #359)Sander Vrijders2017-02-046-11/+27
|\| | | | | | | irmd: Fix memleak in registry
| * ipcpd: Remove strdup() from ipcp main loopdimitri staessens2017-02-035-11/+26
| |
| * irmd: Fix memleak in registrydimitri staessens2017-02-031-0/+1
| |
* | Merged in dstaesse/ouroboros/be-wip (pull request #358)Sander Vrijders2017-02-031-3/+10
|\| | | | | | | lib: Retrieve number of children of a RIB node
| * lib: Retrieve number of children of a RIB nodedimitri staessens2017-02-031-3/+10
| |
* | Merged in dstaesse/ouroboros/be-wip (pull request #357)Sander Vrijders2017-02-021-8/+13
|\| | | | | | | lib: Fix insertion order in RIB
| * lib: Fix insertion order in RIBdimitri staessens2017-02-021-8/+13
| | | | | | | | | | | | | | | | The new element must be added before the larger element (list_add_tail, since it's a circular list). Also fixes a bug and improves the locking in rib_pack (rib must be locked until the subtree is fully packed in the buffer).
* | Merged in dstaesse/ouroboros/be-ribmgrv2 (pull request #356)Sander Vrijders2017-01-315-50/+359
|\| | | | | | | lib: Add packing and unpacking RIB
| * lib: Add packing and unpacking RIBdimitri staessens2017-01-315-50/+359
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rib_pack function allows packing a subtree of the RIB for dissemination. The options PACK_HASH_ROOT and PACK_HASH_ALL will add the hashes for the root object of the packed subtree or every object to the packed message respectively. Checking of the hashes is currently only performed at the top level object, verifying the complete operation. The rib_unpack function unpacks a packed message and inserts its contents in the RIB. The option UNPACK_CREATE flags that the unpack operation is allowed to create new objects, else it will only update existing objects. More advanced options could be added in the future. The packed message structure uses Google Protocol Buffers, as defined in ro.proto. It adds tests for these functions to the rib_test.
* | Merged in dstaesse/ouroboros/be-irmd (pull request #355)Sander Vrijders2017-01-291-8/+6
|\| | | | | | | irmd: Fix memleak attempting double bootstrap
| * irmd: Fix memleak attempting double bootstrapdimitri staessens2017-01-291-8/+6
| | | | | | | | | | | | When trying to double bootstrap, the entry name was strdup'd before the bootstrap leaking the previous name. Now it bootstraps first and sets the name after a successful bootstrap only.
* | Merged in dstaesse/ouroboros/be-rib (pull request #354)Sander Vrijders2017-01-293-0/+94
|\| | | | | | | lib: Add function to get children of node in RIB
| * lib: Add function to get children of node in RIBdimitri staessens2017-01-293-0/+94
| | | | | | | | | | Returns the names of the nodes (not the full paths). The function allocates memory to the children pointer that should be freed.
* | Merged in dstaesse/ouroboros/be-ipcpd (pull request #353)Sander Vrijders2017-01-291-0/+2
|\| | | | | | | ipcpd: Fix unused parameter in local IPCP
| * ipcpd: Fix unused parameter in local IPCPdimitri staessens2017-01-291-0/+2
| |
* | Merged in dstaesse/ouroboros/be-ipcpd (pull request #352)Sander Vrijders2017-01-295-14/+8
|\| | | | | | | ipcpd: Don't strdup() the dif_name in main loop
| * ipcpd: Don't strdup() the dif_name in main loopdimitri staessens2017-01-295-14/+8
|/
* Merged in dstaesse/ouroboros/be-fix (pull request #351)Sander Vrijders2017-01-251-4/+3
|\ | | | | | | lib: Fix reading non-blocking flows
| * lib: Fix reading from non-blocking flowsdimitri staessens2017-01-241-4/+3
|/ | | | | The -EAGAIN from a failed non-blocking flow read would trigger the assertion. This snuck in somehow (we need some unit tests for dev.c).
* Merged in dstaesse/ouroboros/be-rib (pull request #350)Sander Vrijders2017-01-2111-2/+1471
|\ | | | | | | Be rib