diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-04-06 04:43:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:51 -0500 |
| commit | a9044f92c9f6eb74c5f7cb56f43a6f8ea25ccb2a (patch) | |
| tree | 66051e9710511ad3a8bac9722696f9931539e947 /source4/cluster/ctdb/common/ctdb_call.c | |
| parent | 4685a42eaf28e0d4644bfa4cf18ef08abee329d3 (diff) | |
| download | samba-a9044f92c9f6eb74c5f7cb56f43a6f8ea25ccb2a.tar.gz samba-a9044f92c9f6eb74c5f7cb56f43a6f8ea25ccb2a.tar.bz2 samba-a9044f92c9f6eb74c5f7cb56f43a6f8ea25ccb2a.zip | |
r22098: merged from bzr tree
(This used to be commit a57af1ff8234ab590ebf28b3316953bec880005c)
Diffstat (limited to 'source4/cluster/ctdb/common/ctdb_call.c')
| -rw-r--r-- | source4/cluster/ctdb/common/ctdb_call.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source4/cluster/ctdb/common/ctdb_call.c b/source4/cluster/ctdb/common/ctdb_call.c index 0b4195140c..decdbe127f 100644 --- a/source4/cluster/ctdb/common/ctdb_call.c +++ b/source4/cluster/ctdb/common/ctdb_call.c @@ -125,6 +125,8 @@ static void ctdb_send_error(struct ctdb_context *ctdb, CTDB_NO_MEMORY_FATAL(ctdb, r); r->hdr.length = len + msglen; + r->hdr.ctdb_magic = CTDB_MAGIC; + r->hdr.ctdb_version = CTDB_VERSION; r->hdr.operation = CTDB_REPLY_ERROR; r->hdr.destnode = hdr->srcnode; r->hdr.srcnode = ctdb->vnn; @@ -153,6 +155,8 @@ static void ctdb_call_send_redirect(struct ctdb_context *ctdb, r = ctdb->methods->allocate_pkt(ctdb, sizeof(*r)); CTDB_NO_MEMORY_FATAL(ctdb, r); r->hdr.length = sizeof(*r); + r->hdr.ctdb_magic = CTDB_MAGIC; + r->hdr.ctdb_version = CTDB_VERSION; r->hdr.operation = CTDB_REPLY_REDIRECT; r->hdr.destnode = c->hdr.srcnode; r->hdr.srcnode = ctdb->vnn; @@ -184,6 +188,8 @@ static void ctdb_call_send_dmaster(struct ctdb_db_context *ctdb_db, r = ctdb->methods->allocate_pkt(ctdb, len); CTDB_NO_MEMORY_FATAL(ctdb, r); r->hdr.length = len; + r->hdr.ctdb_magic = CTDB_MAGIC; + r->hdr.ctdb_version = CTDB_VERSION; r->hdr.operation = CTDB_REQ_DMASTER; r->hdr.destnode = ctdb_lmaster(ctdb, key); r->hdr.srcnode = ctdb->vnn; @@ -264,6 +270,8 @@ void ctdb_request_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr r = ctdb->methods->allocate_pkt(ctdb, len); CTDB_NO_MEMORY_FATAL(ctdb, r); r->hdr.length = len; + r->hdr.ctdb_magic = CTDB_MAGIC; + r->hdr.ctdb_version = CTDB_VERSION; r->hdr.operation = CTDB_REPLY_DMASTER; r->hdr.destnode = c->dmaster; r->hdr.srcnode = ctdb->vnn; @@ -346,6 +354,8 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr) r = ctdb->methods->allocate_pkt(ctdb, len); CTDB_NO_MEMORY_FATAL(ctdb, r); r->hdr.length = len; + r->hdr.ctdb_magic = CTDB_MAGIC; + r->hdr.ctdb_version = CTDB_VERSION; r->hdr.operation = CTDB_REPLY_CALL; r->hdr.destnode = hdr->srcnode; r->hdr.srcnode = hdr->destnode; @@ -576,6 +586,8 @@ struct ctdb_call_state *ctdb_call_send(struct ctdb_db_context *ctdb_db, struct c CTDB_NO_MEMORY_NULL(ctdb, state->c); state->c->hdr.length = len; + state->c->hdr.ctdb_magic = CTDB_MAGIC; + state->c->hdr.ctdb_version = CTDB_VERSION; state->c->hdr.operation = CTDB_REQ_CALL; state->c->hdr.destnode = header.dmaster; state->c->hdr.srcnode = ctdb->vnn; |