Also few leftovers from cfg is removed and version of totempg is
increased to 5 to reflect all changes we made
Signed-off-by: Jan Friesse <jfriesse@xxxxxxxxxx>
---
configure.ac | 2 +-
exec/totemiba.c | 3 ++-
exec/totemiba.h | 3 ++-
exec/totemmrp.c | 6 ++++--
exec/totemmrp.h | 2 +-
exec/totemnet.c | 9 ++++++---
exec/totemnet.h | 3 ++-
exec/totempg.c | 6 +++---
exec/totemrrp.c | 5 +++--
exec/totemrrp.h | 3 ++-
exec/totemsrp.c | 5 +++--
exec/totemsrp.h | 3 ++-
exec/totemudp.c | 3 ++-
exec/totemudp.h | 3 ++-
exec/totemudpu.c | 3 ++-
exec/totemudpu.h | 3 ++-
include/corosync/cfg.h | 5 -----
include/corosync/coroapi.h | 2 +-
include/corosync/ipc_cfg.h | 9 ---------
include/corosync/totem/totempg.h | 2 +-
20 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/configure.ac b/configure.ac
index c6b04e7..dc374ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,7 @@ LINT_FLAGS="-weak -unrecog +posixlib +ignoresigns -fcnuse \
-badflag -D__gnuc_va_list=va_list -D__attribute\(x\)="
# default libraries SONAME
-SOMAJOR="4"
+SOMAJOR="5"
SOMINOR="0"
SOMICRO="0"
SONAME="${SOMAJOR}.${SOMINOR}.${SOMICRO}"
diff --git a/exec/totemiba.c b/exec/totemiba.c
index 0bed4cf..a419d1a 100644
--- a/exec/totemiba.c
+++ b/exec/totemiba.c
@@ -1253,7 +1253,8 @@ static void timer_function_netif_check_timeout (
int totemiba_crypto_set (
void *iba_context,
- unsigned int type)
+ const char *cipher_type,
+ const char *hash_type)
{
struct totemiba_instance *instance = (struct totemiba_instance *)iba_context;
int res = 0;
diff --git a/exec/totemiba.h b/exec/totemiba.h
index 4b6e09d..de19756 100644
--- a/exec/totemiba.h
+++ b/exec/totemiba.h
@@ -108,7 +108,8 @@ extern int totemiba_token_target_set (
extern int totemiba_crypto_set (
void *iba_context,
- unsigned int type);
+ const char *cipher_type,
+ const char *hash_type);
extern int totemiba_recv_mcast_empty (
void *iba_context);
diff --git a/exec/totemmrp.c b/exec/totemmrp.c
index df5caaf..f7763fd 100644
--- a/exec/totemmrp.c
+++ b/exec/totemmrp.c
@@ -212,10 +212,12 @@ int totemmrp_ifaces_get (
}
int totemmrp_crypto_set (
- unsigned int type)
+ const char *cipher_type,
+ const char *hash_type)
{
return totemsrp_crypto_set (totemsrp_context,
- type);
+ cipher_type,
+ hash_type);
}
unsigned int totemmrp_my_nodeid_get (void)
diff --git a/exec/totemmrp.h b/exec/totemmrp.h
index bb26f2a..12cc1a8 100644
--- a/exec/totemmrp.h
+++ b/exec/totemmrp.h
@@ -113,7 +113,7 @@ extern unsigned int totemmrp_my_nodeid_get (void);
extern int totemmrp_my_family_get (void);
-extern int totemmrp_crypto_set (unsigned int);
+extern int totemmrp_crypto_set (const char *cipher_type, const char *hash_type);
extern int totemmrp_ring_reenable (void);
diff --git a/exec/totemnet.c b/exec/totemnet.c
index 4c18788..fd7c76e 100644
--- a/exec/totemnet.c
+++ b/exec/totemnet.c
@@ -116,7 +116,8 @@ struct transport {
int (*crypto_set) (
void *transport_context,
- unsigned int type);
+ const char *cipher_type,
+ const char *hash_type);
int (*recv_mcast_empty) (
void *transport_context);
@@ -244,12 +245,14 @@ static void totemnet_instance_initialize (
int totemnet_crypto_set (
void *net_context,
- unsigned int type)
+ const char *cipher_type,
+ const char *hash_type)
{
struct totemnet_instance *instance = (struct totemnet_instance *)net_context;
int res = 0;
- res = instance->transport->crypto_set (instance->transport_context, type);
+ res = instance->transport->crypto_set (instance->transport_context,
+ cipher_type, hash_type);
return res;
}
diff --git a/exec/totemnet.h b/exec/totemnet.h
index 799091e..232c5cf 100644
--- a/exec/totemnet.h
+++ b/exec/totemnet.h
@@ -118,7 +118,8 @@ extern int totemnet_token_target_set (
extern int totemnet_crypto_set (
void *net_context,
- unsigned int type);
+ const char *cipher_type,
+ const char *hash_type);
extern int totemnet_recv_mcast_empty (
void *net_context);
diff --git a/exec/totempg.c b/exec/totempg.c
index 70dfba5..94f00cd 100644
--- a/exec/totempg.c
+++ b/exec/totempg.c
@@ -1384,12 +1384,12 @@ void* totempg_get_stats (void)
}
int totempg_crypto_set (
- unsigned int type)
+ const char *cipher_type,
+ const char *hash_type)
{
int res;
- res = totemmrp_crypto_set (
- type);
+ res = totemmrp_crypto_set (cipher_type, hash_type);
return (res);
}
diff --git a/exec/totemrrp.c b/exec/totemrrp.c
index 1a61341..25ea90b 100644
--- a/exec/totemrrp.c
+++ b/exec/totemrrp.c
@@ -2080,12 +2080,13 @@ int totemrrp_ifaces_get (
int totemrrp_crypto_set (
void *rrp_context,
- unsigned int type)
+ const char *cipher_type,
+ const char *hash_type)
{
struct totemrrp_instance *instance = (struct totemrrp_instance *)rrp_context;
int res;
- res = totemnet_crypto_set(instance->net_handles[0], type);
+ res = totemnet_crypto_set(instance->net_handles[0], cipher_type, hash_type);
return (res);
}
diff --git a/exec/totemrrp.h b/exec/totemrrp.h
index 4416eab..db32cda 100644
--- a/exec/totemrrp.h
+++ b/exec/totemrrp.h
@@ -130,7 +130,8 @@ extern int totemrrp_ifaces_get (
extern int totemrrp_crypto_set (
void *rrp_context,
- unsigned int type);
+ const char *cipher_type,
+ const char *hash_type);
extern int totemrrp_ring_reenable (
void *rrp_context,
diff --git a/exec/totemsrp.c b/exec/totemsrp.c
index 6a16db8..c262d98 100644
--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
@@ -1032,12 +1032,13 @@ finish:
int totemsrp_crypto_set (
void *srp_context,
- unsigned int type)
+ const char *cipher_type,
+ const char *hash_type)
{
struct totemsrp_instance *instance = (struct totemsrp_instance *)srp_context;
int res;
- res = totemrrp_crypto_set(instance->totemrrp_context, type);
+ res = totemrrp_crypto_set(instance->totemrrp_context, cipher_type, hash_type);
return (res);
}
diff --git a/exec/totemsrp.h b/exec/totemsrp.h
index 7162721..29fa127 100644
--- a/exec/totemsrp.h
+++ b/exec/totemsrp.h
@@ -114,7 +114,8 @@ extern int totemsrp_my_family_get (
extern int totemsrp_crypto_set (
void *srp_context,
- unsigned int type);
+ const char *cipher_type,
+ const char *hash_type);
extern int totemsrp_ring_reenable (
void *srp_context);
diff --git a/exec/totemudp.c b/exec/totemudp.c
index e265732..e40300a 100644
--- a/exec/totemudp.c
+++ b/exec/totemudp.c
@@ -238,7 +238,8 @@ do { \
int totemudp_crypto_set (
void *udp_context,
- unsigned int type)
+ const char *cipher_type,
+ const char *hash_type)
{
return (0);
diff --git a/exec/totemudp.h b/exec/totemudp.h
index 8acd853..ba22b4b 100644
--- a/exec/totemudp.h
+++ b/exec/totemudp.h
@@ -108,7 +108,8 @@ extern int totemudp_token_target_set (
extern int totemudp_crypto_set (
void *udp_context,
- unsigned int type);
+ const char *cipher_type,
+ const char *hash_type);
extern int totemudp_recv_mcast_empty (
void *udp_context);
diff --git a/exec/totemudpu.c b/exec/totemudpu.c
index 4a2f291..7b236cd 100644
--- a/exec/totemudpu.c
+++ b/exec/totemudpu.c
@@ -226,7 +226,8 @@ do { \
int totemudpu_crypto_set (
void *udpu_context,
- unsigned int type)
+ const char *cipher_type,
+ const char *hash_type)
{
return (0);
diff --git a/exec/totemudpu.h b/exec/totemudpu.h
index 1d1409a..136960c 100644
--- a/exec/totemudpu.h
+++ b/exec/totemudpu.h
@@ -108,7 +108,8 @@ extern int totemudpu_token_target_set (
extern int totemudpu_crypto_set (
void *udpu_context,
- unsigned int type);
+ const char *cipher_type,
+ const char *hash_type);
extern int totemudpu_recv_mcast_empty (
void *udpu_context);
diff --git a/include/corosync/cfg.h b/include/corosync/cfg.h
index 273c214..d26d5d1 100644
--- a/include/corosync/cfg.h
+++ b/include/corosync/cfg.h
@@ -157,11 +157,6 @@ corosync_cfg_local_get (
corosync_cfg_handle_t handle,
unsigned int *local_nodeid);
-cs_error_t
-corosync_cfg_crypto_set (
- corosync_cfg_handle_t handle,
- unsigned int type);
-
#ifdef __cplusplus
}
#endif
diff --git a/include/corosync/coroapi.h b/include/corosync/coroapi.h
index cbadeeb..ef22bd3 100644
--- a/include/corosync/coroapi.h
+++ b/include/corosync/coroapi.h
@@ -241,7 +241,7 @@ struct corosync_api_v1 {
const char *(*totem_ip_print) (const struct totem_ip_address *addr);
- int (*totem_crypto_set) (unsigned int type);
+ int (*totem_crypto_set) (const char *cipher_type, const char *hash_type);
int (*totem_callback_token_create) (
void **handle_out,
diff --git a/include/corosync/ipc_cfg.h b/include/corosync/ipc_cfg.h
index 4ddc039..1ff7e2f 100644
--- a/include/corosync/ipc_cfg.h
+++ b/include/corosync/ipc_cfg.h
@@ -141,15 +141,6 @@ struct res_lib_cfg_local_get {
mar_uint32_t local_nodeid __attribute__((aligned(8)));
};
-struct req_lib_cfg_crypto_set {
- struct qb_ipc_response_header header __attribute__((aligned(8)));
- mar_uint32_t type __attribute__((aligned(8)));
-};
-
-struct res_lib_cfg_crypto_set {
- struct qb_ipc_response_header header __attribute__((aligned(8)));
-};
-
typedef enum {
AIS_AMF_ADMINISTRATIVETARGET_SERVICEUNIT = 0,
AIS_AMF_ADMINISTRATIVETARGET_SERVICEGROUP = 1,
diff --git a/include/corosync/totem/totempg.h b/include/corosync/totem/totempg.h
index 98fed8f..8a94aec 100644
--- a/include/corosync/totem/totempg.h
+++ b/include/corosync/totem/totempg.h
@@ -153,7 +153,7 @@ extern unsigned int totempg_my_nodeid_get (void);
extern int totempg_my_family_get (void);
-extern int totempg_crypto_set (unsigned int type);
+extern int totempg_crypto_set (const char *cipher_type, const char *hash_type);
extern int totempg_ring_reenable (void);
--
1.7.1
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
