diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-04-17 11:30:19 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-04-17 11:30:19 +1000 |
| commit | 80ec427ec740bfb14a45eb1fd6e783e363781096 (patch) | |
| tree | 9412f83e79b639c2f765a738b65cba09c35aebb4 | |
| parent | 3c2ebff3cbfb398aef9d6d2cc8c82a5892f630c8 (diff) | |
| parent | ee9712620f171381bb0d10ad8be490853eb0dc4a (diff) | |
| download | samba-80ec427ec740bfb14a45eb1fd6e783e363781096.tar.gz samba-80ec427ec740bfb14a45eb1fd6e783e363781096.tar.xz samba-80ec427ec740bfb14a45eb1fd6e783e363781096.zip | |
merge from ronnie
(This used to be ctdb commit fcf3669c27691ddb383d1c585234622efa498d90)
| -rw-r--r-- | ctdb/common/ctdb_client.c | 8 | ||||
| -rw-r--r-- | ctdb/common/ctdb_daemon.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c index 3cb27a1165..5a335c0b94 100644 --- a/ctdb/common/ctdb_client.c +++ b/ctdb/common/ctdb_client.c @@ -114,23 +114,23 @@ static void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args) struct ctdb_req_header *hdr; if (cnt < sizeof(*hdr)) { - ctdb_set_error(ctdb, "Bad packet length %d\n", cnt); + ctdb_set_error(ctdb, "Bad packet length %d in client\n", cnt); return; } hdr = (struct ctdb_req_header *)data; if (cnt != hdr->length) { - ctdb_set_error(ctdb, "Bad header length %d expected %d\n", + ctdb_set_error(ctdb, "Bad header length %d expected %d in client\n", hdr->length, cnt); return; } if (hdr->ctdb_magic != CTDB_MAGIC) { - ctdb_set_error(ctdb, "Non CTDB packet rejected\n"); + ctdb_set_error(ctdb, "Non CTDB packet rejected in client\n"); return; } if (hdr->ctdb_version != CTDB_VERSION) { - ctdb_set_error(ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version); + ctdb_set_error(ctdb, "Bad CTDB version 0x%x rejected in client\n", hdr->ctdb_version); return; } diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c index aec988115a..bd83668b87 100644 --- a/ctdb/common/ctdb_daemon.c +++ b/ctdb/common/ctdb_daemon.c @@ -85,7 +85,7 @@ static void daemon_message_handler(struct ctdb_context *ctdb, uint32_t srvid, r->srvid = srvid; r->datalen = data.dsize; memcpy(&r->data[0], data.dptr, data.dsize); - + ctdb_queue_send(client->queue, (uint8_t *)&r->hdr, len); talloc_free(r); @@ -417,12 +417,12 @@ static void client_incoming_packet(struct ctdb_client *client, void *data, size_ struct ctdb_req_header *hdr = data; if (hdr->ctdb_magic != CTDB_MAGIC) { - ctdb_set_error(client->ctdb, "Non CTDB packet rejected\n"); + ctdb_set_error(client->ctdb, "Non CTDB packet rejected in daemon\n"); goto done; } if (hdr->ctdb_version != CTDB_VERSION) { - ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version); + ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected in daemon\n", hdr->ctdb_version); goto done; } @@ -468,12 +468,12 @@ static void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args) } if (cnt < sizeof(*hdr)) { - ctdb_set_error(client->ctdb, "Bad packet length %d\n", cnt); + ctdb_set_error(client->ctdb, "Bad packet length %d in daemon\n", cnt); return; } hdr = (struct ctdb_req_header *)data; if (cnt != hdr->length) { - ctdb_set_error(client->ctdb, "Bad header length %d expected %d\n", + ctdb_set_error(client->ctdb, "Bad header length %d expected %d\n in daemon", hdr->length, cnt); return; } @@ -484,7 +484,7 @@ static void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args) } if (hdr->ctdb_version != CTDB_VERSION) { - ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version); + ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected in daemon\n", hdr->ctdb_version); return; } |