--- trunk/mkinitrd-magellan/busybox/networking/udhcp/common.h 2010/04/29 20:38:48 983 +++ trunk/mkinitrd-magellan/busybox/networking/udhcp/common.h 2010/05/30 11:32:42 984 @@ -6,17 +6,14 @@ * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ - -#ifndef _COMMON_H -#define _COMMON_H +#ifndef UDHCP_COMMON_H +#define UDHCP_COMMON_H 1 #include "libbb.h" #include #include -#if __GNUC_PREREQ(4,1) -# pragma GCC visibility push(hidden) -#endif +PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN #define DEFAULT_SCRIPT CONFIG_UDHCPC_DEFAULT_SCRIPT @@ -26,7 +23,8 @@ #define DHCP_OPTIONS_BUFSIZE 308 -struct dhcpMessage { +//TODO: rename ciaddr/yiaddr/chaddr +struct dhcp_packet { uint8_t op; /* 1 = BOOTREQUEST, 2 = BOOTREPLY */ uint8_t htype; /* hardware address type. 1 = 10mb ethernet */ uint8_t hlen; /* hardware address length */ @@ -37,48 +35,48 @@ #define BROADCAST_FLAG 0x8000 /* "I need broadcast replies" */ uint32_t ciaddr; /* client IP (if client is in BOUND, RENEW or REBINDING state) */ uint32_t yiaddr; /* 'your' (client) IP address */ - uint32_t siaddr; /* IP address of next server to use in bootstrap, - * returned in DHCPOFFER, DHCPACK by server */ - uint32_t giaddr; /* relay agent IP address */ - uint8_t chaddr[16];/* link-layer client hardware address (MAC) */ - uint8_t sname[64]; /* server host name (ASCIZ) */ - uint8_t file[128]; /* boot file name (ASCIZ) */ - uint32_t cookie; /* fixed first four option bytes (99,130,83,99 dec) */ + /* IP address of next server to use in bootstrap, returned in DHCPOFFER, DHCPACK by server */ + uint32_t siaddr_nip; + uint32_t gateway_nip; /* relay agent IP address */ + uint8_t chaddr[16]; /* link-layer client hardware address (MAC) */ + uint8_t sname[64]; /* server host name (ASCIZ) */ + uint8_t file[128]; /* boot file name (ASCIZ) */ + uint32_t cookie; /* fixed first four option bytes (99,130,83,99 dec) */ uint8_t options[DHCP_OPTIONS_BUFSIZE + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS]; } PACKED; -struct udp_dhcp_packet { +struct ip_udp_dhcp_packet { struct iphdr ip; struct udphdr udp; - struct dhcpMessage data; + struct dhcp_packet data; } PACKED; /* Let's see whether compiler understood us right */ -struct BUG_bad_sizeof_struct_udp_dhcp_packet { - char BUG_bad_sizeof_struct_udp_dhcp_packet - [(sizeof(struct udp_dhcp_packet) != 576 + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS) ? -1 : 1]; +struct BUG_bad_sizeof_struct_ip_udp_dhcp_packet { + char BUG_bad_sizeof_struct_ip_udp_dhcp_packet + [(sizeof(struct ip_udp_dhcp_packet) != 576 + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS) ? -1 : 1]; }; uint16_t udhcp_checksum(void *addr, int count) FAST_FUNC; -void udhcp_init_header(struct dhcpMessage *packet, char type) FAST_FUNC; +void udhcp_init_header(struct dhcp_packet *packet, char type) FAST_FUNC; -/*int udhcp_recv_raw_packet(struct dhcpMessage *payload, int fd); - in dhcpc.h */ -int udhcp_recv_kernel_packet(struct dhcpMessage *packet, int fd) FAST_FUNC; +/*int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd); - in dhcpc.h */ +int udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd) FAST_FUNC; -int udhcp_send_raw_packet(struct dhcpMessage *payload, +int udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, uint32_t source_ip, int source_port, uint32_t dest_ip, int dest_port, const uint8_t *dest_arp, int ifindex) FAST_FUNC; -int udhcp_send_kernel_packet(struct dhcpMessage *payload, +int udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt, uint32_t source_ip, int source_port, uint32_t dest_ip, int dest_port) FAST_FUNC; /**/ -void udhcp_run_script(struct dhcpMessage *packet, const char *name) FAST_FUNC; +void udhcp_run_script(struct dhcp_packet *packet, const char *name) FAST_FUNC; // Still need to clean these up... @@ -91,20 +89,38 @@ void udhcp_sp_setup(void) FAST_FUNC; int udhcp_sp_fd_set(fd_set *rfds, int extra_fd) FAST_FUNC; int udhcp_sp_read(const fd_set *rfds) FAST_FUNC; -int udhcp_read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t *arp) FAST_FUNC; +int udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC; int udhcp_raw_socket(int ifindex) FAST_FUNC; int udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf) FAST_FUNC; /* Returns 1 if no reply received */ -int arpping(uint32_t test_ip, uint32_t from_ip, uint8_t *from_mac, const char *interface) FAST_FUNC; - -#if ENABLE_UDHCP_DEBUG -# define DEBUG(str, args...) bb_info_msg("### " str, ## args) +int arpping(uint32_t test_nip, + const uint8_t *safe_mac, + uint32_t from_ip, + uint8_t *from_mac, + const char *interface) FAST_FUNC; + +#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1 +extern unsigned dhcp_verbose; +# define log1(...) do { if (dhcp_verbose >= 1) bb_info_msg(__VA_ARGS__); } while (0) +# if CONFIG_UDHCP_DEBUG >= 2 +void udhcp_dump_packet(struct dhcp_packet *packet) FAST_FUNC; +# define log2(...) do { if (dhcp_verbose >= 2) bb_info_msg(__VA_ARGS__); } while (0) +# else +# define udhcp_dump_packet(...) ((void)0) +# define log2(...) ((void)0) +# endif +# if CONFIG_UDHCP_DEBUG >= 3 +# define log3(...) do { if (dhcp_verbose >= 3) bb_info_msg(__VA_ARGS__); } while (0) +# else +# define log3(...) ((void)0) +# endif #else -# define DEBUG(str, args...) do {;} while (0) +# define udhcp_dump_packet(...) ((void)0) +# define log1(...) ((void)0) +# define log2(...) ((void)0) +# define log3(...) ((void)0) #endif -#if __GNUC_PREREQ(4,1) -# pragma GCC visibility pop -#endif +POP_SAVED_FUNCTION_VISIBILITY #endif