Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/udhcp/common.h

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/udhcp/common.h (modified) (2 diffs)

branches/2.2.5/mindi-busybox/networking/udhcp/common.h

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /* common.h
  *
@@ -10 +11 @@
 #define _COMMON_H
 
-#include "libbb_udhcp.h"
+#include "libbb.h"
+
+#define DEFAULT_SCRIPT  "/usr/share/udhcpc/default.script"
+
+extern const uint8_t MAC_BCAST_ADDR[6]; /* six all-ones */
+
+/*** packet.h ***/
+
+#include <netinet/udp.h>
+#include <netinet/ip.h>
+
+struct dhcpMessage {
+    uint8_t op;
+    uint8_t htype;
+    uint8_t hlen;
+    uint8_t hops;
+    uint32_t xid;
+    uint16_t secs;
+    uint16_t flags;
+    uint32_t ciaddr;
+    uint32_t yiaddr;
+    uint32_t siaddr;
+    uint32_t giaddr;
+    uint8_t chaddr[16];
+    uint8_t sname[64];
+    uint8_t file[128];
+    uint32_t cookie;
+    uint8_t options[308]; /* 312 - cookie */
+};
+
+struct udp_dhcp_packet {
+    struct iphdr ip;
+    struct udphdr udp;
+    struct dhcpMessage data;
+};
+
+void udhcp_init_header(struct dhcpMessage *packet, char type);
+int udhcp_get_packet(struct dhcpMessage *packet, int fd);
+uint16_t udhcp_checksum(void *addr, int count);
+int udhcp_raw_packet(struct dhcpMessage *payload,
+        uint32_t source_ip, int source_port,
+        uint32_t dest_ip, int dest_port,
+        const uint8_t *dest_arp, int ifindex);
+int udhcp_kernel_packet(struct dhcpMessage *payload,
+        uint32_t source_ip, int source_port,
+        uint32_t dest_ip, int dest_port);
 
 
-enum syslog_levels {
-    LOG_EMERG = 0,
-    LOG_ALERT,
-    LOG_CRIT,
-    LOG_WARNING,
-    LOG_ERR,
-    LOG_INFO,
-    LOG_DEBUG
-};
-#include <syslog.h>
+/**/
 
-long uptime(void);
+void udhcp_run_script(struct dhcpMessage *packet, const char *name);
 
-#define LOG(level, str, args...) udhcp_logging(level, str, ## args)
+// Still need to clean these up...
+
+/* from options.h */
+#define get_option      udhcp_get_option
+#define end_option      udhcp_end_option
+#define add_option_string   udhcp_add_option_string
+#define add_simple_option   udhcp_add_simple_option
+#define option_lengths      udhcp_option_lengths
+/* from socket.h */
+#define listen_socket       udhcp_listen_socket
+#define read_interface      udhcp_read_interface
+/* from dhcpc.h */
+#define client_config       udhcp_client_config
+/* from dhcpd.h */
+#define server_config       udhcp_server_config
+
+void udhcp_sp_setup(void);
+int udhcp_sp_fd_set(fd_set *rfds, int extra_fd);
+int udhcp_sp_read(fd_set *rfds);
+int raw_socket(int ifindex);
+int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t *arp);
+int listen_socket(/*uint32_t ip,*/ int port, const char *inf);
+/* Returns 1 if no reply received */
+int arpping(uint32_t test_ip, uint32_t from_ip, uint8_t *from_mac, const char *interface);
 
 #if ENABLE_FEATURE_UDHCP_DEBUG
-# define DEBUG(level, str, args...) LOG(level, str, ## args)
+# define DEBUG(str, args...) bb_info_msg(str, ## args)
 #else
-# define DEBUG(level, str, args...) do {;} while(0)
+# define DEBUG(str, args...) do {;} while (0)
 #endif