Changeset: 05cfc518814c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05cfc518814c
Modified Files:
Branch: default
Log Message:
Merge heads.
diffs (50 lines):
diff --git a/tools/merovingian/client/monetdb.1.in
b/tools/merovingian/client/monetdb.1.in
--- a/tools/merovingian/client/monetdb.1.in
+++ b/tools/merovingian/client/monetdb.1.in
@@ -30,7 +30,7 @@ to connect to a remote
.BR monetdbd (1).
The use of this option requires \-P (see below).
.IP "\-p port"
-Connects to the given portnumber instead of the default (50001).
+Connects to the given portnumber instead of the default (50000).
Requires \-h to be given as option too.
.IP "\-P passphrase"
Specifies the passphrase necessary to login to a remote
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -1479,7 +1479,7 @@ main(int argc, char *argv[])
do {
/* first try the port given (or else its default) */
snprintf(buf, sizeof(buf), "%s/.s.merovingian.%d",
- mero_host, mero_port == -1 ? 50001 :
mero_port);
+ mero_host, mero_port == -1 ? 50000 :
mero_port);
if (control_ping(buf, -1, NULL) == 0) {
mero_host = buf;
break;
@@ -1523,7 +1523,7 @@ main(int argc, char *argv[])
}
/* for TCP connections */
if (mero_host != NULL && *mero_host != '/' && mero_port == -1)
- mero_port = 50001;
+ mero_port = 50000;
/* handle regular commands */
if (strcmp(argv[i], "create") == 0) {
diff --git a/tools/merovingian/utils/control.c
b/tools/merovingian/utils/control.c
--- a/tools/merovingian/utils/control.c
+++ b/tools/merovingian/utils/control.c
@@ -100,8 +100,12 @@ char* control_send(
return(strdup(sbuf));
}
+ /* try reading length */
+ len = recv(sock, sbuf, 2, 0);
+ if (len == 2)
+ len += recv(sock, sbuf + len, sizeof(sbuf) - len, 0);
/* perform login ritual */
- if ((len = recv(sock, sbuf, sizeof(sbuf), 0)) <= 0) {
+ if (len <= 0) {
snprintf(sbuf, sizeof(sbuf), "no response from
merovingian");
return(strdup(sbuf));
}
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
