avoid possible use of uninitialized intf_addr in nmrp_do()

[oweals/nmrpflash.git] / nmrpd.h

diff --git a/nmrpd.h b/nmrpd.h
index 8d2c73074713d8aab97ce7857b2708393b048518..d65c8116003c339e8f614e835deb3dc5bb191248 100644 (file)
--- a/nmrpd.h
+++ b/nmrpd.h
@@ -25,13 +25,14 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 #      define NMRPFLASH_WINDOWS
+#elif defined(__APPLE__) && defined(__MACH__)
+#      define NMRPFLASH_UNIX
+#      define NMRPFLASH_OSX
+#      define NMRPFLASH_BSD
 #elif defined (__unix__)
 #      define NMRPFLASH_UNIX
 #      if defined(__linux__)
 #              define NMRPFLASH_LINUX
-#      elif defined(__APPLE__) && defined(__MACH__)
-#              define NMRPFLASH_OSX
-#              define NMRPFLASH_BSD
 #      elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
 #                      define NMRPFLASH_BSD
 #      else
@@ -61,10 +62,16 @@
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #endif
 
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
 #ifndef PACKED
 #define PACKED __attribute__((packed))
 #endif
 
+#define NMRPFLASH_SET_REGION
+
 struct eth_hdr {
        uint8_t ether_dhost[6];
        uint8_t ether_shost[6];
@@ -89,6 +96,7 @@ struct nmrpd_args {
        const char *intf;
        const char *mac;
        enum nmrp_op op;
+       bool blind;
        uint16_t port;
        const char *region;
 };