diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ouroboros/cacep.h | 4 | ||||
| -rw-r--r-- | include/ouroboros/ipcp.h | 10 | ||||
| -rw-r--r-- | include/ouroboros/irm.h | 10 | ||||
| -rw-r--r-- | include/ouroboros/sockets.h | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/include/ouroboros/cacep.h b/include/ouroboros/cacep.h index 974c5b7f..b9fd0efb 100644 --- a/include/ouroboros/cacep.h +++ b/include/ouroboros/cacep.h @@ -32,13 +32,13 @@ #define CACEP_BUF_STRLEN 64 struct conn_info { - char ae_name[CACEP_BUF_STRLEN + 1]; + char comp_name[CACEP_BUF_STRLEN + 1]; char protocol[CACEP_BUF_STRLEN + 1]; uint32_t pref_version; enum proto_concrete_syntax pref_syntax; struct proto_field fixed_conc_syntax[PROTO_MAX_FIELDS]; size_t num_fields; - uint64_t addr; /* AE-I name */ + uint64_t addr; }; __BEGIN_DECLS diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h index d3a9bdd8..e39137db 100644 --- a/include/ouroboros/ipcp.h +++ b/include/ouroboros/ipcp.h @@ -64,21 +64,21 @@ enum pol_dir_hash { }; /* Info reported back to the IRMd about the layer on enrollment */ -struct dif_info { - char dif_name[LAYER_NAME_SIZE]; +struct layer_info { + char layer_name[LAYER_NAME_SIZE]; int dir_hash_algo; }; /* Structure to configure the first IPCP */ struct ipcp_config { - struct dif_info dif_info; + struct layer_info layer_info; enum ipcp_type type; /* Normal */ uint8_t addr_size; - uint8_t fd_size; - bool has_ttl; + uint8_t eid_size; + uint8_t max_ttl; enum pol_addr_auth addr_auth_type; enum pol_routing routing_type; diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h index cac981a2..ed0b2f71 100644 --- a/include/ouroboros/irm.h +++ b/include/ouroboros/irm.h @@ -29,8 +29,8 @@ #include <sys/types.h> /* Normal IPCP components. */ -#define DT_AE "Data Transfer" -#define MGMT_AE "Management" +#define DT_COMP "Data Transfer" +#define MGMT_COMP "Management" /* Name binding options. */ #define BIND_AUTO 0x01 @@ -47,7 +47,7 @@ ssize_t irm_list_ipcps(const char * name, pid_t ** pids); int irm_enroll_ipcp(pid_t pid, - const char * dif_name); + const char * layer_name); int irm_bootstrap_ipcp(pid_t pid, const struct ipcp_config * conf); @@ -76,11 +76,11 @@ int irm_unbind_process(pid_t pid, const char * name); int irm_reg(const char * name, - char ** difs, + char ** layers, size_t len); int irm_unreg(const char * name, - char ** difs, + char ** layers, size_t len); __END_DECLS diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h index 6bede740..da3e36d0 100644 --- a/include/ouroboros/sockets.h +++ b/include/ouroboros/sockets.h @@ -27,7 +27,7 @@ #include "ipcp_config.pb-c.h" typedef IpcpConfigMsg ipcp_config_msg_t; -typedef DifInfoMsg dif_info_msg_t; +typedef LayerInfoMsg layer_info_msg_t; #include "irmd_messages.pb-c.h" typedef IrmMsg irm_msg_t; |