summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-07-20 02:40:58 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-07-20 20:44:18 -0700
commit3e34ad9388e3cf2493f3d75a760e6943f59dc55c (patch)
tree327f91f93799c6eba2f89abd20dfcbb57e5277f7 /rpc
parent9e3b58a2abdee5c1cf748eb463042ca9ef6aac66 (diff)
add port as an optional argument to 'probe' command
* there will be just 'one' glusterd per machine, but in case if its run on different port, then this option is useful to probe. Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 1074 (port related issues in 'gluster probe' command) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1074
Diffstat (limited to 'rpc')
-rw-r--r--rpc/xdr/src/cli1-xdr.c6
-rw-r--r--rpc/xdr/src/cli1-xdr.h3
-rw-r--r--rpc/xdr/src/glusterd1-xdr.c14
-rw-r--r--rpc/xdr/src/glusterd1-xdr.h7
4 files changed, 30 insertions, 0 deletions
diff --git a/rpc/xdr/src/cli1-xdr.c b/rpc/xdr/src/cli1-xdr.c
index e5dd310f1..0ffdf5bfe 100644
--- a/rpc/xdr/src/cli1-xdr.c
+++ b/rpc/xdr/src/cli1-xdr.c
@@ -47,6 +47,8 @@ xdr_gf1_cli_probe_req (XDR *xdrs, gf1_cli_probe_req *objp)
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
return TRUE;
}
@@ -60,6 +62,8 @@ xdr_gf1_cli_probe_rsp (XDR *xdrs, gf1_cli_probe_rsp *objp)
return FALSE;
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
return TRUE;
}
@@ -69,6 +73,8 @@ xdr_gf1_cli_deprobe_req (XDR *xdrs, gf1_cli_deprobe_req *objp)
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
return TRUE;
}
diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h
index b2060e187..50a26760a 100644
--- a/rpc/xdr/src/cli1-xdr.h
+++ b/rpc/xdr/src/cli1-xdr.h
@@ -43,6 +43,7 @@ typedef enum gf1_cli_get_volume gf1_cli_get_volume;
struct gf1_cli_probe_req {
char *hostname;
+ int port;
};
typedef struct gf1_cli_probe_req gf1_cli_probe_req;
@@ -50,11 +51,13 @@ struct gf1_cli_probe_rsp {
int op_ret;
int op_errno;
char *hostname;
+ int port;
};
typedef struct gf1_cli_probe_rsp gf1_cli_probe_rsp;
struct gf1_cli_deprobe_req {
char *hostname;
+ int port;
};
typedef struct gf1_cli_deprobe_req gf1_cli_deprobe_req;
diff --git a/rpc/xdr/src/glusterd1-xdr.c b/rpc/xdr/src/glusterd1-xdr.c
index 3ad32d948..cbca582ee 100644
--- a/rpc/xdr/src/glusterd1-xdr.c
+++ b/rpc/xdr/src/glusterd1-xdr.c
@@ -23,6 +23,8 @@ xdr_gd1_mgmt_probe_req (XDR *xdrs, gd1_mgmt_probe_req *objp)
return FALSE;
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
return TRUE;
}
@@ -35,6 +37,8 @@ xdr_gd1_mgmt_probe_rsp (XDR *xdrs, gd1_mgmt_probe_rsp *objp)
return FALSE;
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
return TRUE;
}
@@ -47,6 +51,8 @@ xdr_gd1_mgmt_friend_req (XDR *xdrs, gd1_mgmt_friend_req *objp)
return FALSE;
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
return TRUE;
}
@@ -59,6 +65,8 @@ xdr_gd1_mgmt_friend_rsp (XDR *xdrs, gd1_mgmt_friend_rsp *objp)
return FALSE;
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -75,6 +83,8 @@ xdr_gd1_mgmt_unfriend_req (XDR *xdrs, gd1_mgmt_unfriend_req *objp)
return FALSE;
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
return TRUE;
}
@@ -87,6 +97,8 @@ xdr_gd1_mgmt_unfriend_rsp (XDR *xdrs, gd1_mgmt_unfriend_rsp *objp)
return FALSE;
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -214,5 +226,7 @@ xdr_gd1_mgmt_friend_update (XDR *xdrs, gd1_mgmt_friend_update *objp)
return FALSE;
if (!xdr_string (xdrs, &objp->hostname, ~0))
return FALSE;
+ if (!xdr_int (xdrs, &objp->port))
+ return FALSE;
return TRUE;
}
diff --git a/rpc/xdr/src/glusterd1-xdr.h b/rpc/xdr/src/glusterd1-xdr.h
index 2fab3fd3b..0fc186ed6 100644
--- a/rpc/xdr/src/glusterd1-xdr.h
+++ b/rpc/xdr/src/glusterd1-xdr.h
@@ -24,24 +24,28 @@ typedef enum glusterd_volume_status glusterd_volume_status;
struct gd1_mgmt_probe_req {
u_char uuid[16];
char *hostname;
+ int port;
};
typedef struct gd1_mgmt_probe_req gd1_mgmt_probe_req;
struct gd1_mgmt_probe_rsp {
u_char uuid[16];
char *hostname;
+ int port;
};
typedef struct gd1_mgmt_probe_rsp gd1_mgmt_probe_rsp;
struct gd1_mgmt_friend_req {
u_char uuid[16];
char *hostname;
+ int port;
};
typedef struct gd1_mgmt_friend_req gd1_mgmt_friend_req;
struct gd1_mgmt_friend_rsp {
u_char uuid[16];
char *hostname;
+ int port;
int op_ret;
int op_errno;
};
@@ -50,12 +54,14 @@ typedef struct gd1_mgmt_friend_rsp gd1_mgmt_friend_rsp;
struct gd1_mgmt_unfriend_req {
u_char uuid[16];
char *hostname;
+ int port;
};
typedef struct gd1_mgmt_unfriend_req gd1_mgmt_unfriend_req;
struct gd1_mgmt_unfriend_rsp {
u_char uuid[16];
char *hostname;
+ int port;
int op_ret;
int op_errno;
};
@@ -125,6 +131,7 @@ struct gd1_mgmt_friend_update {
u_char uuid[16];
u_char friend_uuid[16];
char *hostname;
+ int port;
};
typedef struct gd1_mgmt_friend_update gd1_mgmt_friend_update;