projects
/
nbd.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be explicit when we exit
[nbd.git]
/
cliserv.h
diff --git
a/cliserv.h
b/cliserv.h
index
4f7aa78
..
77310c3
100644
(file)
--- a/
cliserv.h
+++ b/
cliserv.h
@@
-9,10
+9,11
@@
Send 128 bytes of zeros (reserved for future use)
*/
Send 128 bytes of zeros (reserved for future use)
*/
-#include "config.h"
#include <errno.h>
#include <string.h>
#include <netdb.h>
#include <errno.h>
#include <string.h>
#include <netdb.h>
+#include <netinet/tcp.h>
+#include <stdlib.h>
#if SIZEOF_UNSIGNED_SHORT_INT==4
typedef unsigned short u32;
#if SIZEOF_UNSIGNED_SHORT_INT==4
typedef unsigned short u32;
@@
-24,7
+25,6
@@
typedef unsigned long u32;
#error I need at least some 32-bit type
#endif
#error I need at least some 32-bit type
#endif
-#ifndef FS_32BIT
#if SIZEOF_UNSIGNED_INT==8
typedef unsigned int u64;
#elif SIZEOF_UNSIGNED_LONG_INT==8
#if SIZEOF_UNSIGNED_INT==8
typedef unsigned int u64;
#elif SIZEOF_UNSIGNED_LONG_INT==8
@@
-34,21
+34,34
@@
typedef unsigned long long u64;
#else
#error I need at least some 64-bit type
#endif
#else
#error I need at least some 64-bit type
#endif
-#endif /* FS_32BIT */
-#include <linux/nbd.h>
+#ifdef NBD_H_LOCAL
+/* 2.6.18 and above use __be* rather than u* */
+#define __be32 u32
+#define __be64 u64
+#include "nbd.h"
+#endif
+#ifdef NBD_H_LINUX
+# ifdef HAVE_LINUX_TYPES_H
+# include <linux/types.h>
+# else
+# define __be32 u32
+# define __be64 u64
+# endif
+# include <linux/nbd.h>
+#endif
-#ifdef FS_32BIT
-struct { unsigned char m[8]; } cliserv_magic = { { 0x00, 0x00, 0x42, 0x02, 0x81, 0x86, 0x12, 0x53 } };
-#else
-u64 cliserv_magic = 0x00420281861253LL;
+#if NBD_LFS==1
+#define _LARGEFILE_SOURCE
+#define _FILE_OFFSET_BITS 64
#endif
#endif
+
+u64 cliserv_magic = 0x00420281861253LL;
#define INIT_PASSWD "NBDMAGIC"
#define INFO(a) do { } while(0)
#define INIT_PASSWD "NBDMAGIC"
#define INFO(a) do { } while(0)
-void setmysockopt(int sock)
-{
+void setmysockopt(int sock) {
int size = 1;
#if 0
if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &size, sizeof(int)) < 0)
int size = 1;
#if 0
if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &size, sizeof(int)) < 0)
@@
-66,21
+79,29
@@
void setmysockopt(int sock)
#endif
}
#endif
}
-void err(const char *s)
-{
+#ifndef G_GNUC_NORETURN
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define G_GNUC_NORETURN __attribute__((__noreturn__))
+#else
+#define G_GNUC_NORETURN
+#endif
+#endif
+
+void err(const char *s) G_GNUC_NORETURN;
+
+void err(const char *s) {
const int maxlen = 150;
char s1[maxlen], *s2;
const int maxlen = 150;
char s1[maxlen], *s2;
- int n = 0;
strncpy(s1, s, maxlen);
strncpy(s1, s, maxlen);
- if (s2 = strstr(s, "%m")) {
+ if ((s2 = strstr(s, "%m"))) {
strcpy(s1 + (s2 - s), strerror(errno));
s2 += 2;
strcpy(s1 + strlen(s1), s2);
}
#ifndef sun
/* Solaris doesn't have %h in syslog */
strcpy(s1 + (s2 - s), strerror(errno));
s2 += 2;
strcpy(s1 + strlen(s1), s2);
}
#ifndef sun
/* Solaris doesn't have %h in syslog */
- else if (s2 = strstr(s, "%h")) {
+ else if ((s2 = strstr(s, "%h"))) {
strcpy(s1 + (s2 - s), hstrerror(h_errno));
s2 += 2;
strcpy(s1 + strlen(s1), s2);
strcpy(s1 + (s2 - s), hstrerror(h_errno));
s2 += 2;
strcpy(s1 + strlen(s1), s2);
@@
-89,15
+110,14
@@
void err(const char *s)
s1[maxlen-1] = '\0';
#ifdef ISSERVER
s1[maxlen-1] = '\0';
#ifdef ISSERVER
- syslog(LOG_ERR, s1);
-#else
- fprintf(stderr, "Error: %s\n", s1);
+ syslog(LOG_ERR, "%s", s1);
+ syslog(LOG_ERR, "Exiting.");
#endif
#endif
+ fprintf(stderr, "Error: %s\nExiting.\n", s1);
exit(1);
}
exit(1);
}
-void logging(void)
-{
+void logging(void) {
#ifdef ISSERVER
openlog(MY_NAME, LOG_PID, LOG_DAEMON);
#endif
#ifdef ISSERVER
openlog(MY_NAME, LOG_PID, LOG_DAEMON);
#endif
@@
-105,15
+125,12
@@
void logging(void)
setvbuf(stderr, NULL, _IONBF, 0);
}
setvbuf(stderr, NULL, _IONBF, 0);
}
-#ifndef FS_32BIT
#ifdef WORDS_BIGENDIAN
#ifdef WORDS_BIGENDIAN
-u64 ntohll(u64 a)
-{
+u64 ntohll(u64 a) {
return a;
}
#else
return a;
}
#else
-u64 ntohll(u64 a)
-{
+u64 ntohll(u64 a) {
u32 lo = a & 0xffffffff;
u32 hi = a >> 32U;
lo = ntohl(lo);
u32 lo = a & 0xffffffff;
u32 hi = a >> 32U;
lo = ntohl(lo);
@@
-122,4
+139,7
@@
u64 ntohll(u64 a)
}
#endif
#define htonll ntohll
}
#endif
#define htonll ntohll
-#endif /* FS_32BIT */
+
+/* Flags used between the client and server */
+#define NBD_FLAG_HAS_FLAGS (1 << 0) /* Flags are there */
+#define NBD_FLAG_READ_ONLY (1 << 1) /* Device is read-only */