bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Call srand() to make sure request handles are properly randomised

Browse Source
This commit is contained in:
Alex Young
2014-02-24 12:20:50 +00:00
parent 5185be39c9
commit 8cf92af900
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/mirror.c
View File

@@ -694,7 +694,7 @@ void mirror_limit_cb( struct ev_loop *loop, ev_timer *w, int revents )
* if it has, start migrating. If it's not finished, then enabling the bitset
* stream does not go well for us.
*/
void mirror_begin_cb( struct ev_loop *loop, ev_timer *w, int revents )
static void mirror_begin_cb( struct ev_loop *loop, ev_timer *w, int revents )
{
struct mirror_ctrl* ctrl = (struct mirror_ctrl*) w->data;
NULLCHECK( ctrl );
@@ -750,7 +750,8 @@ void mirror_run( struct server *serve )
ctrl.ev_loop = EV_DEFAULT;
/* gcc warns on -O2. clang is fine. Seems to be the fault of ev.h */
/* gcc warns with -Wstrict-aliasing on -O2. clang doesn't
* implement this warning. Seems to be the fault of ev.h */
ev_init( &ctrl.begin_watcher, mirror_begin_cb );
ctrl.begin_watcher.repeat = 1.0; // We check bps every second. seems sane.
ctrl.begin_watcher.data = (void*) &ctrl;

7
src/common/readwrite.c
View File

@@ -103,10 +103,13 @@ int socket_nbd_write_hello(int fd, off64_t out_size)
void fill_request(struct nbd_request *request, int type, off64_t from, int len)
{
int32_t handle_i[2];
handle_i[0] = rand();
handle_i[1] = rand();
request->magic = htobe32(REQUEST_MAGIC);
request->type = htobe32(type);
((int*) request->handle)[0] = rand();
((int*) request->handle)[1] = rand();
memcpy( request->handle, handle_i, sizeof(request->handle) );
request->from = htobe64(from);
request->len = htobe32(len);
}