diff options
| author | dimitri staessens <[email protected]> | 2017-02-06 16:05:44 +0100 |
|---|---|---|
| committer | dimitri staessens <[email protected]> | 2017-02-06 20:04:34 +0100 |
| commit | 373efaf24d3600fe4dadf6bfaaee8d19e2ec32d7 (patch) | |
| tree | 8711a4edbc2a6defaab63f0dcc2b0690252307b4 /include | |
| parent | 4b11f952c521315883f64571e1790389e8d20f64 (diff) | |
| download | ouroboros-373efaf24d3600fe4dadf6bfaaee8d19e2ec32d7.tar.gz ouroboros-373efaf24d3600fe4dadf6bfaaee8d19e2ec32d7.zip | |
ipcpd, lib: Revise normal IPCP
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ouroboros/config.h.in | 9 | ||||
| -rw-r--r-- | include/ouroboros/irm_config.h | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in index 5597bb0b..b95fe927 100644 --- a/include/ouroboros/config.h.in +++ b/include/ouroboros/config.h.in @@ -47,7 +47,7 @@ #define SHM_RBUFF_PREFIX "/ouroboros.rbuff." #define SHM_FLOW_SET_PREFIX "/ouroboros.sets." #define IRMD_MAX_FLOWS 4096 -#define IRMD_THREADPOOL_SIZE 5 +#define IRMD_THREADPOOL_SIZE 16 #define IPCPD_THREADPOOL_SIZE 3 #define IPCPD_MAX_CONNS IRMD_MAX_FLOWS #define LOG_DIR "/@LOG_DIR@/" @@ -61,6 +61,11 @@ #define SOCKET_TIMEOUT 4000 #define CDAP_REPLY_TIMEOUT 1000 #define ENROLL_TIMEOUT 2000 +/* RIB configuration for normal */ #define RIB_MAX_PATH_LEN 256 +#define BOOT_NAME "boot" +#define MEMBERS_NAME "members" +#define DIF_NAME "dif_name" +#define DIR_NAME "directory" -#endif +#endif /* OUROBOROS_CONFIG */ diff --git a/include/ouroboros/irm_config.h b/include/ouroboros/irm_config.h index c4a81c23..2be4273e 100644 --- a/include/ouroboros/irm_config.h +++ b/include/ouroboros/irm_config.h @@ -47,6 +47,10 @@ enum pol_gam { COMPLETE = 0 }; +enum pol_cacep { + NO_AUTH = 0 +}; + struct dif_config { char * dif_name; enum ipcp_type type; @@ -57,7 +61,6 @@ struct dif_config { uint8_t addr_size; uint8_t cep_id_size; uint8_t pdu_length_size; - uint8_t qos_id_size; uint8_t seqno_size; bool has_ttl; @@ -68,6 +71,7 @@ struct dif_config { enum pol_addr_auth addr_auth_type; enum pol_gam dt_gam_type; + enum pol_gam rm_gam_type; }; /* Shim UDP */ struct { |