Initial implementation of named exports

[nbd.git] / cliserv.h

diff --git a/cliserv.h b/cliserv.h
index 77310c3..67bac4b 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -35,21 +35,9 @@ typedef unsigned long long u64;
 #error I need at least some 64-bit type
 #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
-# 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 _LARGEFILE_SOURCE
@@ -57,6 +45,7 @@ typedef unsigned long long u64;
 #endif
 
 u64 cliserv_magic = 0x00420281861253LL;
+u64 opts_magic = 0x49484156454F5054LL;
 #define INIT_PASSWD "NBDMAGIC"
 
 #define INFO(a) do { } while(0)
@@ -87,9 +76,7 @@ void setmysockopt(int sock) {
 #endif
 #endif
 
-void err(const char *s) G_GNUC_NORETURN;
-
-void err(const char *s) {
+void err_nonfatal(const char *s) {
        const int maxlen = 150;
        char s1[maxlen], *s2;
 
@@ -114,7 +101,13 @@ void err(const char *s) {
        syslog(LOG_ERR, "Exiting.");
 #endif
        fprintf(stderr, "Error: %s\nExiting.\n", s1);
-       exit(1);
+}
+
+void err(const char *s) G_GNUC_NORETURN;
+
+void err(const char *s) {
+       err_nonfatal(s);
+       exit(EXIT_FAILURE);
 }
 
 void logging(void) {
@@ -143,3 +136,9 @@ u64 ntohll(u64 a) {
 /* 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 */
+
+#define NBD_DEFAULT_PORT       "12345" /* 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) */