Permalink
Browse files

High: core: Internal tls api improvements for reuse with future LRMD …

…tls backend.
  • Loading branch information...
davidvossel committed Jan 5, 2013
1 parent df60384 commit 564f7cc2a51dcd2f28ab12a13394f31be5aa3c93
Showing with 939 additions and 460 deletions.
  1. +9 −4 cib/callbacks.c
  2. +5 −1 cib/callbacks.h
  3. +1 −1 cib/notify.c
  4. +205 −121 cib/remote.c
  5. +34 −2 include/crm_internal.h
  6. +139 −151 lib/cib/cib_remote.c
  7. +1 −0 lib/common/mainloop.c
  8. +544 −179 lib/common/remote.c
  9. +1 −1 tools/crm_mon.c
View
@@ -347,13 +347,18 @@ do_local_notify(xmlNode * notify_src, const char *client_id,
int rid = 0;
if(sync_reply) {
- CRM_LOG_ASSERT(client_obj->request_id);
+ if (client_obj->ipc) {
+ CRM_LOG_ASSERT(client_obj->request_id);
- rid = client_obj->request_id;
- client_obj->request_id = 0;
+ rid = client_obj->request_id;
+ client_obj->request_id = 0;
- crm_trace("Sending response %d to %s %s",
+ crm_trace("Sending response %d to %s %s",
rid, client_obj->name, from_peer?"(originator of delegated request)":"");
+ } else {
+ crm_trace("Sending response to %s %s",
+ client_obj->name, from_peer?"(originator of delegated request)":"");
+ }
} else {
crm_trace("Sending an event to %s %s",
View
@@ -41,25 +41,29 @@ typedef struct cib_client_s {
char *name;
char *callback_id;
char *user;
+ char *recv_buf;
int request_id;
qb_ipcs_connection_t *ipc;
#ifdef HAVE_GNUTLS_GNUTLS_H
gnutls_session *session;
+ gboolean handshake_complete;
#else
void *session;
#endif
gboolean encrypted;
+ gboolean remote_auth;
mainloop_io_t *remote;
-
+
unsigned long num_calls;
int pre_notify;
int post_notify;
int confirmations;
int replace;
int diffs;
+ int remote_auth_timeout;
GList *delegated_calls;
} cib_client_t;
View
@@ -83,7 +83,7 @@ cib_notify_client(gpointer key, gpointer value, gpointer user_data)
CRM_CHECK(client != NULL, return TRUE);
CRM_CHECK(update_msg != NULL, return TRUE);
- if (client->ipc == NULL) {
+ if (client->ipc == NULL && client->session == NULL) {
crm_warn("Skipping client with NULL channel");
return FALSE;
}
Oops, something went wrong.

0 comments on commit 564f7cc

Please sign in to comment.