sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

messages_dgm: Pass receiving "ev" to recv_cb

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2016-09-23 18:36:15 -07:00 committed by Jeremy Allison
parent 88cdb233d3
commit fc0b35b41c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/lib/messages_dgm.c
View File

@ -78,7 +78,8 @@ struct messaging_dgm_context {
struct tevent_fd *read_fde;
struct messaging_dgm_in_msg *in_msgs;
void (*recv_cb)(const uint8_t *msg,
void (*recv_cb)(struct tevent_context *ev,
const uint8_t *msg,
size_t msg_len,
int *fds,
size_t num_fds,
@ -823,7 +824,8 @@ int messaging_dgm_init(struct tevent_context *ev,
uint64_t *punique,
const char *socket_dir,
const char *lockfile_dir,
void (*recv_cb)(const uint8_t *msg,
void (*recv_cb)(struct tevent_context *ev,
const uint8_t *msg,
size_t msg_len,
int *fds,
size_t num_fds,
@ -1079,7 +1081,7 @@ static void messaging_dgm_recv(struct messaging_dgm_context *ctx,
buflen -= sizeof(cookie);
if (cookie == 0) {
ctx->recv_cb(buf, buflen, fds, num_fds,
ctx->recv_cb(ev, buf, buflen, fds, num_fds,
ctx->recv_cb_private_data);
return;
}
@ -1142,7 +1144,7 @@ static void messaging_dgm_recv(struct messaging_dgm_context *ctx,
DLIST_REMOVE(ctx->in_msgs, msg);
talloc_set_destructor(msg, NULL);
ctx->recv_cb(msg->buf, msg->msglen, fds, num_fds,
ctx->recv_cb(ev, msg->buf, msg->msglen, fds, num_fds,
ctx->recv_cb_private_data);
TALLOC_FREE(msg);

3
source3/lib/messages_dgm.h
View File

@ -28,7 +28,8 @@ int messaging_dgm_init(struct tevent_context *ev,
uint64_t *unique,
const char *socket_dir,
const char *lockfile_dir,
void (*recv_cb)(const uint8_t *msg,
void (*recv_cb)(struct tevent_context *ev,
const uint8_t *msg,
size_t msg_len,
int *fds,
size_t num_fds,

6
source3/lib/messages_dgm_ref.c
View File

@ -36,7 +36,8 @@ static pid_t dgm_pid = 0;
static struct msg_dgm_ref *refs = NULL;
static int msg_dgm_ref_destructor(struct msg_dgm_ref *r);
static void msg_dgm_ref_recv(const uint8_t *msg, size_t msg_len,
static void msg_dgm_ref_recv(struct tevent_context *ev,
const uint8_t *msg, size_t msg_len,
int *fds, size_t num_fds, void *private_data);
void *messaging_dgm_ref(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
@ -114,7 +115,8 @@ void *messaging_dgm_ref(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
return result;
}
static void msg_dgm_ref_recv(const uint8_t *msg, size_t msg_len,
static void msg_dgm_ref_recv(struct tevent_context *ev,
const uint8_t *msg, size_t msg_len,
int *fds, size_t num_fds, void *private_data)
{
struct msg_dgm_ref *r, *next;