summaryrefslogtreecommitdiffstats
path: root/src/server/net.c
diff options
context:
space:
mode:
authorSimon Rettberg2016-02-01 12:41:11 +0100
committerSimon Rettberg2016-02-01 12:41:11 +0100
commit81c9da3c9d55fab13ab9a912cade320015d01613 (patch)
tree03b8ab9263b72c3ce746d1827222a03696452a9d /src/server/net.c
parent[SERVER] Fix a lot of (mostly harmless) data races (diff)
downloaddnbd3-81c9da3c9d55fab13ab9a912cade320015d01613.tar.gz
dnbd3-81c9da3c9d55fab13ab9a912cade320015d01613.tar.xz
dnbd3-81c9da3c9d55fab13ab9a912cade320015d01613.zip
[SERVER] BREAKING: Get rid of pseudo case-insensitivityv2.1
This was a wrong decision made long time ago, and it's broken in certain scenarios (eg. two servers serving from same NFS mount). Also it's of limited use anyways since it only supportes ASCII and would ignore umlauts, so blöd and BLÖD would still be considered two different images. So if you relied on this "feature" in any way, be careful when updating.
Diffstat (limited to 'src/server/net.c')
-rw-r--r--src/server/net.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/net.c b/src/server/net.c
index 8929937..93145a5 100644
--- a/src/server/net.c
+++ b/src/server/net.c
@@ -228,7 +228,7 @@ void *net_client_handler(void *dnbd3_client)
image_file = image->readFd;
serializer_reset_write( &payload );
serializer_put_uint16( &payload, PROTOCOL_VERSION );
- serializer_put_string( &payload, image->lower_name );
+ serializer_put_string( &payload, image->name );
serializer_put_uint16( &payload, (uint16_t)image->rid );
serializer_put_uint64( &payload, image->virtualFilesize );
reply.cmd = CMD_SELECT_IMAGE;
@@ -331,7 +331,7 @@ void *net_client_handler(void *dnbd3_client)
if ( !isCached ) {
if ( !uplink_request( client, request.handle, request.offset, request.size ) ) {
logadd( LOG_DEBUG1, "Could not relay uncached request from %s to upstream proxy, disabling image %s:%d",
- client->hostName, image->lower_name, image->rid );
+ client->hostName, image->name, image->rid );
image->working = false;
goto exit_client_cleanup;
}
@@ -375,7 +375,7 @@ void *net_client_handler(void *dnbd3_client)
client->hostName, (int)done, (int)realBytes, err );
}
if ( err == EBADF || err == EFAULT || err == EINVAL || err == EIO ) {
- logadd( LOG_INFO, "Disabling %s:%d", image->lower_name, image->rid );
+ logadd( LOG_INFO, "Disabling %s:%d", image->name, image->rid );
image->working = false;
}
}