sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

dbwrap_watch: Use messaging_read_send/recv

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2013-12-30 21:35:03 +01:00
parent 5f3ccfc16b
commit 017609767f
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/lib/dbwrap/dbwrap_watch.c
View File

@ -230,7 +230,6 @@ struct dbwrap_record_watch_state {
struct db_context *db; struct db_context *db;
struct tevent_req *req; struct tevent_req *req;
struct messaging_context *msg; struct messaging_context *msg;
struct msg_channel *channel;
TDB_DATA key; TDB_DATA key;
TDB_DATA w_key; TDB_DATA w_key;
}; };
@ -248,7 +247,6 @@ struct tevent_req *dbwrap_record_watch_send(TALLOC_CTX *mem_ctx,
struct dbwrap_record_watch_state *state; struct dbwrap_record_watch_state *state;
struct db_context *watchers_db; struct db_context *watchers_db;
NTSTATUS status; NTSTATUS status;
int ret;
req = tevent_req_create(mem_ctx, &state, req = tevent_req_create(mem_ctx, &state,
struct dbwrap_record_watch_state); struct dbwrap_record_watch_state);
@ -272,12 +270,12 @@ struct tevent_req *dbwrap_record_watch_send(TALLOC_CTX *mem_ctx,
return tevent_req_post(req, ev); return tevent_req_post(req, ev);
} }
ret = msg_channel_init(state, state->msg, MSG_DBWRAP_MODIFIED, subreq = messaging_read_send(state, ev, state->msg,
&state->channel); MSG_DBWRAP_MODIFIED);
if (ret != 0) { if (tevent_req_nomem(subreq, req)) {
tevent_req_nterror(req, map_nt_error_from_unix(ret));
return tevent_req_post(req, ev); return tevent_req_post(req, ev);
} }
tevent_req_set_callback(subreq, dbwrap_record_watch_done, req);
status = dbwrap_record_add_watcher( status = dbwrap_record_add_watcher(
state->w_key, messaging_server_id(state->msg)); state->w_key, messaging_server_id(state->msg));
@ -286,11 +284,6 @@ struct tevent_req *dbwrap_record_watch_send(TALLOC_CTX *mem_ctx,
} }
talloc_set_destructor(state, dbwrap_record_watch_state_destructor); talloc_set_destructor(state, dbwrap_record_watch_state_destructor);
subreq = msg_read_send(state, state->ev, state->channel);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, dbwrap_record_watch_done, req);
return req; return req;
} }
@ -365,7 +358,7 @@ static void dbwrap_record_watch_done(struct tevent_req *subreq)
struct messaging_rec *rec; struct messaging_rec *rec;
int ret; int ret;
ret = msg_read_recv(subreq, talloc_tos(), &rec); ret = messaging_read_recv(subreq, talloc_tos(), &rec);
TALLOC_FREE(subreq); TALLOC_FREE(subreq);
if (ret != 0) { if (ret != 0) {
tevent_req_nterror(req, map_nt_error_from_unix(ret)); tevent_req_nterror(req, map_nt_error_from_unix(ret));
@ -381,7 +374,8 @@ static void dbwrap_record_watch_done(struct tevent_req *subreq)
/* /*
* Not our record, wait for the next one * Not our record, wait for the next one
*/ */
subreq = msg_read_send(state, state->ev, state->channel); subreq = messaging_read_send(state, state->ev, state->msg,
MSG_DBWRAP_MODIFIED);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }