diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2008-08-27 10:24:35 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2008-08-27 10:24:35 +1000 |
| commit | a35fa0aa8f72ce5ef473d2d1244b13e5eae88670 (patch) | |
| tree | df50b99f01dbdb8a004bce5c0e4cfa8e232b888b | |
| parent | 18b10d400dc9a18ed9a04c8d81fa5030a2bbdb54 (diff) | |
rename ctdb_tcp_client back to the original name ctdb_control_tcp
(This used to be ctdb commit 4d1c0418cfe6170bc081684dbe45908a5d285f0b)
| -rw-r--r-- | ctdb/include/ctdb_private.h | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_control.c | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_takeover.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 8834ec4d52..a25674c9b4 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -565,7 +565,7 @@ struct ctdb_control_set_call { struct for tcp_client control used by samba can not modify */ -struct ctdb_tcp_client { +struct ctdb_control_tcp { struct sockaddr_in src; // samba uses this struct sockaddr_in dest;// samba uses this }; diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c index 68635d6b43..4128797866 100644 --- a/ctdb/server/ctdb_control.c +++ b/ctdb/server/ctdb_control.c @@ -296,7 +296,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, return ctdb_control_get_public_ips(ctdb, c, outdata); case CTDB_CONTROL_TCP_CLIENT: - CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_tcp_client)); + CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_tcp)); return ctdb_control_tcp_client(ctdb, client_id, indata); case CTDB_CONTROL_STARTUP: diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index b33471ddaf..fb20ff1796 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/server/ctdb_takeover.c @@ -956,7 +956,7 @@ int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id, TDB_DATA indata) { struct ctdb_client *client = ctdb_reqid_find(ctdb, client_id, struct ctdb_client); - struct ctdb_tcp_client *p = (struct ctdb_tcp_client *)indata.dptr; + struct ctdb_control_tcp *p = (struct ctdb_control_tcp *)indata.dptr; struct ctdb_tcp_list *tcp; struct ctdb_control_tcp_vnn t; int ret; |