#endif
#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
-#include <linux/nbd.h>
+# ifdef HAVE_LINUX_TYPES_H
+# include <linux/types.h>
+# else
+# define __be32 u32
+# define __be64 u64
+# endif
+# include <linux/nbd.h>
#endif
#if NBD_LFS==1
#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)
#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;
s1[maxlen-1] = '\0';
#ifdef ISSERVER
syslog(LOG_ERR, "%s", s1);
-#else
- fprintf(stderr, "Error: %s\n", s1);
+ syslog(LOG_ERR, "Exiting.");
#endif
+ fprintf(stderr, "Error: %s\nExiting.\n", s1);
exit(1);
}
-void logging(void)
-{
+void logging(void) {
#ifdef ISSERVER
openlog(MY_NAME, LOG_PID, LOG_DAEMON);
#endif
}
#ifdef WORDS_BIGENDIAN
-u64 ntohll(u64 a)
-{
+u64 ntohll(u64 a) {
return a;
}
#else
-u64 ntohll(u64 a)
-{
+u64 ntohll(u64 a) {
u32 lo = a & 0xffffffff;
u32 hi = a >> 32U;
lo = ntohl(lo);
}
#endif
#define htonll ntohll
+
+/* 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 */