Conditionally enable TFTP block rollover hack

[oweals/nmrpflash.git] / nmrpd.h

diff --git a/nmrpd.h b/nmrpd.h
index 0f9e6ac949ffb5ab481606cd1a6de478b6710ec3..0773777c5e255e894b3f90950a7255fa97c40eb0 100644 (file)
--- a/nmrpd.h
+++ b/nmrpd.h
@@ -1,42 +1,56 @@
 /**
- * nmrp-flash - Netgear Unbrick Utility
+ * nmrpflash - Netgear Unbrick Utility
  * Copyright (C) 2016 Joseph Lehner <joseph.c.lehner@gmail.com>
  *
- * nmrp-flash is free software: you can redistribute it and/or modify
+ * nmrpflash is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * nmrp-flash is distributed in the hope that it will be useful,
+ * nmrpflash is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with nmrp-flash.  If not, see <http://www.gnu.org/licenses/>.
+ * along with nmrpflash.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 #ifndef NMRPD_H
 #define NMRPD_H
 #include <stdint.h>
+#include <signal.h>
 #include <stdbool.h>
 
 #if defined(_WIN32) || defined(_WIN64)
-#define NMRPFLASH_WINDOWS
-#elif defined(__linux__)
-#define NMRPFLASH_LINUX
+#      define NMRPFLASH_WINDOWS
 #elif defined(__APPLE__) && defined(__MACH__)
-#define NMRPFLASH_OSX
-#elif defined(__unix__)
-#define NMRPFLASH_UNIX
-#warning "nmrp-flash is not fully supported on your operating system"
+#      define NMRPFLASH_UNIX
+#      define NMRPFLASH_OSX
+#      define NMRPFLASH_BSD
+#elif defined (__unix__)
+#      define NMRPFLASH_UNIX
+#      if defined(__linux__)
+#              define NMRPFLASH_LINUX
+#      elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+#                      define NMRPFLASH_BSD
+#      else
+#              warning "nmrpflash is not fully supported on this platform"
+#      endif
+#else
+#      warning "nmrpflash is not supported on this platform"
 #endif
 
 #ifndef NMRPFLASH_WINDOWS
 #include <arpa/inet.h>
+#include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <net/if.h>
+#ifndef NMRPFLASH_LINUX
+#include <net/if_dl.h>
+#endif
 #else
 #include <winsock2.h>
 #include <iphlpapi.h>
@@ -44,7 +58,21 @@
 #include <windows.h>
 #endif
 
-#define NMRPD_VERSION "0.9"
+#ifndef MIN
+#define MIN(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];
+       uint16_t ether_type;
+} PACKED;
 
 enum nmrp_op {
        NMRP_UPLOAD_FW = 0,
@@ -56,17 +84,22 @@ struct nmrpd_args {
        unsigned rx_timeout;
        unsigned ul_timeout;
        const char *tftpcmd;
-       const char *filename;
+       const char *file_local;
+       const char *file_remote;
+       const char *ipaddr_intf;
        const char *ipaddr;
        const char *ipmask;
        const char *intf;
        const char *mac;
        enum nmrp_op op;
        uint16_t port;
-       int force_root;
+       const char *region;
 };
 
+const char *leafname(const char *path);
 int tftp_put(struct nmrpd_args *args);
+bool tftp_is_valid_filename(const char *filename);
+
 int nmrp_do(struct nmrpd_args *args);
 
 int select_fd(int fd, unsigned timeout);
@@ -76,12 +109,14 @@ const char *mac_to_str(uint8_t *mac);
 void win_perror2(const char *msg, DWORD err);
 void sock_perror(const char *msg);
 #else
-#define sock_perror(x) perror(x)
+#define sock_perror(x) xperror(x)
 #endif
 
 extern int verbosity;
 
 struct ethsock;
+struct ethsock_arp_undo;
+struct ethsock_ip_undo;
 
 struct ethsock *ethsock_create(const char *intf, uint16_t protocol);
 int ethsock_close(struct ethsock *sock);
@@ -89,6 +124,29 @@ int ethsock_send(struct ethsock *sock, void *buf, size_t len);
 ssize_t ethsock_recv(struct ethsock *sock, void *buf, size_t len);
 int ethsock_set_timeout(struct ethsock *sock, unsigned msec);
 uint8_t *ethsock_get_hwaddr(struct ethsock *sock);
+int ethsock_arp_add(struct ethsock *sock, uint8_t *hwaddr, uint32_t ipaddr, struct ethsock_arp_undo **undo);
+int ethsock_arp_del(struct ethsock *sock, struct ethsock_arp_undo **undo);
 int ethsock_list_all(void);
 
+struct ethsock_ip_callback_args
+{
+       struct in_addr *ipaddr;
+       struct in_addr *ipmask;
+       void *arg;
+};
+
+typedef int (*ethsock_ip_callback_t)(struct ethsock_ip_callback_args *args);
+int ethsock_for_each_ip(struct ethsock *sock, ethsock_ip_callback_t callback,
+               void *arg);
+
+int ethsock_ip_add(struct ethsock *sock, uint32_t ipaddr, uint32_t ipmask, struct ethsock_ip_undo **undo);
+int ethsock_ip_del(struct ethsock *sock, struct ethsock_ip_undo **undo);
+
+time_t time_monotonic();
+char *lltostr(long long ll, int base);
+uint32_t bitcount(uint32_t n);
+uint32_t netmask(uint32_t count);
+void xperror(const char *msg);
+
+extern volatile sig_atomic_t g_interrupted;
 #endif