Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/udhcp/dhcprelay.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/udhcp/dhcprelay.c (modified) (2 diffs)

branches/3.3/mindi-busybox/networking/udhcp/dhcprelay.c

@@ -34 +34 @@
 } FIX_ALIASING;
 
-#define dhcprelay_xid_list (*(struct xid_item*)&bb_common_bufsiz1)
+#define dhcprelay_xid_list (*(struct xid_item*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static struct xid_item *xid_add(uint32_t xid, struct sockaddr_in *ip, int client)
@@ -257 +258 @@
     int num_sockets, max_socket;
     uint32_t our_nip;
+
+    INIT_G();
 
     server_addr.sin_family = AF_INET;