Changeset: 897606fc5e4e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=897606fc5e4e
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/mnc.c
clients/mapilib/mapi.c
common/stream/stream.c
common/stream/stream_socket.h
monetdb5/modules/mal/mal_mapi.c
tools/merovingian/daemon/client.c
tools/merovingian/daemon/proxy.c
tools/merovingian/utils/control.c
Branch: default
Log Message:
Sockets aren't "text" streams (no CRLF<->LF translation).
diffs (169 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2780,9 +2780,7 @@ stream *open_rstream(const char *filenam
stream *open_urlstream(const char *url);
stream *open_wastream(const char *filename);
stream *open_wstream(const char *filename);
-stream *socket_rastream(SOCKET socket, const char *name);
stream *socket_rstream(SOCKET socket, const char *name);
-stream *socket_wastream(SOCKET socket, const char *name);
stream *socket_wstream(SOCKET socket, const char *name);
stream *stream_blackhole_create(void);
stream *stream_fwf_create(stream *restrict s, size_t num_fields, size_t
*restrict widths, char filler);
diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -277,8 +277,8 @@ main(int argc, char **argv)
#endif
}
- out = socket_wastream(s, "ascii write stream");
- in = socket_rastream(s, "ascii read stream");
+ out = socket_wstream(s, "write stream");
+ in = socket_rstream(s, "read stream");
if (block) {
out = block_stream(out);
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -2510,9 +2510,9 @@ mapi_reconnect(Mapi mid)
#endif
}
- mid->to = socket_wastream(s, "Mapi client write");
+ mid->to = socket_wstream(s, "Mapi client write");
mapi_log_record(mid, "Mapi client write");
- mid->from = socket_rastream(s, "Mapi client read");
+ mid->from = socket_rstream(s, "Mapi client read");
mapi_log_record(mid, "Mapi client read");
check_stream(mid, mid->to, "Cannot open socket for writing",
"mapi_reconnect", mid->error);
check_stream(mid, mid->from, "Cannot open socket for reading",
"mapi_reconnect", mid->error);
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -2722,30 +2722,30 @@ socket_open(SOCKET sock, const char *nam
}
stream *
-socket_rastream(SOCKET sock, const char *name)
+socket_rstream(SOCKET sock, const char *name)
{
stream *s = NULL;
#ifdef STREAM_DEBUG
- fprintf(stderr, "socket_rastream %zd %s\n", (ssize_t) sock, name);
+ fprintf(stderr, "socket_rstream %zd %s\n", (ssize_t) sock, name);
#endif
if ((s = socket_open(sock, name)) != NULL)
- s->binary = false;
+ s->binary = true;
return s;
}
stream *
-socket_wastream(SOCKET sock, const char *name)
+socket_wstream(SOCKET sock, const char *name)
{
stream *s;
#ifdef STREAM_DEBUG
- fprintf(stderr, "socket_wastream %zd %s\n", (ssize_t) sock, name);
+ fprintf(stderr, "socket_wstream %zd %s\n", (ssize_t) sock, name);
#endif
if ((s = socket_open(sock, name)) == NULL)
return NULL;
s->readonly = false;
- s->binary = false;
+ s->binary = true;
return s;
}
diff --git a/common/stream/stream_socket.h b/common/stream/stream_socket.h
--- a/common/stream/stream_socket.h
+++ b/common/stream/stream_socket.h
@@ -28,7 +28,5 @@
stream_export stream *socket_rstream(SOCKET socket, const char *name);
stream_export stream *socket_wstream(SOCKET socket, const char *name);
-stream_export stream *socket_rastream(SOCKET socket, const char *name);
-stream_export stream *socket_wastream(SOCKET socket, const char *name);
#endif /* _STREAM_SOCKET_H_ */
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -456,8 +456,8 @@ SERVERlistenThread(SOCKET *Sock)
showException(GDKstdout, MAL, "initClient",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
continue;
}
- data->in = socket_rastream(msgsock, "Server read");
- data->out = socket_wastream(msgsock, "Server write");
+ data->in = socket_rstream(msgsock, "Server read");
+ data->out = socket_wstream(msgsock, "Server write");
if (data->in == NULL || data->out == NULL) {
stream_alloc_fail:
mnstr_destroy(data->in);
diff --git a/tools/merovingian/daemon/client.c
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -77,14 +77,14 @@ handleClient(void *data)
isusock = ((struct clientdata *) data)->isusock;
self = ((struct clientdata *) data)->self;
free(data);
- fdin = socket_rastream(sock, "merovingian<-client (read)");
+ fdin = socket_rstream(sock, "merovingian<-client (read)");
if (fdin == 0) {
self->dead = 1;
return(newErr("merovingian-client inputstream problems"));
}
fdin = block_stream(fdin);
- fout = socket_wastream(sock, "merovingian->client (write)");
+ fout = socket_wstream(sock, "merovingian->client (write)");
if (fout == 0) {
close_stream(fdin);
self->dead = 1;
diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c
--- a/tools/merovingian/daemon/proxy.c
+++ b/tools/merovingian/daemon/proxy.c
@@ -230,8 +230,8 @@ startProxy(int psock, stream *cfdin, str
}
}
- sfdin = block_stream(socket_rastream(ssock, "merovingian<-server (proxy
read)"));
- sfout = block_stream(socket_wastream(ssock, "merovingian->server (proxy
write)"));
+ sfdin = block_stream(socket_rstream(ssock, "merovingian<-server (proxy
read)"));
+ sfout = block_stream(socket_wstream(ssock, "merovingian->server (proxy
write)"));
if (sfdin == 0 || sfout == 0) {
close_stream(sfout);
@@ -299,11 +299,11 @@ handleMySQLClient(int sock)
str p;
int len;
- fdin = socket_rastream(sock, "merovingian<-mysqlclient (read)");
+ fdin = socket_rstream(sock, "merovingian<-mysqlclient (read)");
if (fdin == 0)
return(newErr("merovingian-mysqlclient inputstream problems"));
- fout = socket_wastream(sock, "merovingian->mysqlclient (write)");
+ fout = socket_wstream(sock, "merovingian->mysqlclient (write)");
if (fout == 0) {
close_stream(fdin);
return(newErr("merovingian-mysqlclient outputstream problems"));
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
@@ -133,8 +133,8 @@ char* control_send(
buf = rbuf + 2;
ver = 9;
- fdin = block_stream(socket_rastream(sock, "client in"));
- fdout = block_stream(socket_wastream(sock, "client
out"));
+ fdin = block_stream(socket_rstream(sock, "client in"));
+ fdout = block_stream(socket_wstream(sock, "client
out"));
} else {
if (len > 2 &&
(strstr(rbuf + 2, ":BIG:") != NULL ||
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
