#error I need at least some 64-bit type
#endif
-#ifdef NBD_H_LOCAL
+#define __be32 u32
+#define __be64 u64
#include "nbd.h"
-#endif
-#ifdef NBD_H_LINUX
-#include <linux/nbd.h>
-#endif
#if NBD_LFS==1
+/* /usr/include/features.h (included from /usr/include/sys/types.h)
+ defines this when _GNU_SOURCE is defined
+ */
+#ifndef _LARGEFILE_SOURCE
#define _LARGEFILE_SOURCE
+#endif
#define _FILE_OFFSET_BITS 64
#endif
u64 cliserv_magic = 0x00420281861253LL;
+u64 opts_magic = 0x49484156454F5054LL;
#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)
#endif
}
-void err(const char *s)
-{
- const int maxlen = 150;
- char s1[maxlen], *s2;
- int n = 0;
+#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_nonfatal(const char *s) {
+ char s1[150], *s2;
- strncpy(s1, s, maxlen);
- if (s2 = strstr(s, "%m")) {
+ strncpy(s1, s, sizeof(s1));
+ 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 */
- 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);
}
#endif
- s1[maxlen-1] = '\0';
+ s1[sizeof(s1)-1] = '\0';
#ifdef ISSERVER
syslog(LOG_ERR, "%s", s1);
-#else
- fprintf(stderr, "Error: %s\n", s1);
+ syslog(LOG_ERR, "Exiting.");
#endif
- exit(1);
+ fprintf(stderr, "Error: %s\nExiting.\n", s1);
}
-void logging(void)
-{
+void err(const char *s) G_GNUC_NORETURN;
+
+void err(const char *s) {
+ err_nonfatal(s);
+ exit(EXIT_FAILURE);
+}
+
+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
+
+#define NBD_DEFAULT_PORT "10809" /* Port on which named exports are
+ * served */
+
+/* Options that the client can select to the server */
+#define NBD_OPT_EXPORT_NAME (1 << 0) /* Client wants to select a named export (is followed by length and name of export) */