[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patches applied except one for nbd (was: Re: Some 'type' bug found and p
From: |
Marcus Brinkmann |
Subject: |
Patches applied except one for nbd (was: Re: Some 'type' bug found and patched |
Date: |
Mon, 1 Oct 2001 18:35:29 +0200 |
User-agent: |
Mutt/1.3.22i |
Hi,
again thank you, I applied all patches except the following one,
which I can't decide on (this is something for Roland).
Thanks,
Marcus
*** nbd.c.orig Sat Sep 29 14:07:52 2001
--- nbd.c Mon Oct 1 07:57:02 2001
***************
*** 40,53 ****
#define NBD_INIT_MAGIC
"NBDMAGIC\x00\x00\x42\x02\x81\x86\x12\x53"
! #define NBD_REQUEST_MAGIC htonl(0x25609513)
! #define NBD_REPLY_MAGIC htonl(0x67446698)
struct nbd_startup
{
char magic[16]; /* NBD_INIT_MAGIC */
! uint32_t sizehi; /* size in bytes, 64 bits in net order */
! uint32_t sizelo;
char reserved[128]; /* zeros, we don't check it */
};
--- 40,52 ----
#define NBD_INIT_MAGIC
"NBDMAGIC\x00\x00\x42\x02\x81\x86\x12\x53"
! #define NBD_REQUEST_MAGIC (htonl (0x25609513))
! #define NBD_REPLY_MAGIC (htonl (0x67446698))
struct nbd_startup
{
char magic[16]; /* NBD_INIT_MAGIC */
! uint64_t size; /* size in bytes, 64 bits in net order */
char reserved[128]; /* zeros, we don't check it */
};
*************** nbdopen (const char *name, int *mod_flag
*** 303,309 ****
return EGRATUITOUS; /* ? */
}
! *size = ((uint64_t) ntohl (ns.sizehi) << 32) | ntohl (ns.sizelo);
*sockport = getdport (sock);
close (sock);
--- 302,308 ----
return EGRATUITOUS; /* ? */
}
! *size = ntohll (ns.size);
*sockport = getdport (sock);
close (sock);
--
`Rhubarb is no Egyptian god.' Debian http://www.debian.org brinkmd@debian.org
Marcus Brinkmann GNU http://www.gnu.org marcus@gnu.org
Marcus.Brinkmann@ruhr-uni-bochum.de
http://www.marcus-brinkmann.de