diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index ca19a2497..e474f5e97 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h @@ -39,10 +39,12 @@ enum syslog_levels { #include #endif +#define background udhcp_background +#define start_log_and_pid udhcp_start_log_and_pid + long uptime(void); void background(const char *pidfile); void start_log_and_pid(const char *client_server, const char *pidfile); -void background(const char *pidfile); void udhcp_logging(int level, const char *fmt, ...); #define LOG(level, str, args...) udhcp_logging(level, str, ## args) diff --git a/networking/udhcp/packet.h b/networking/udhcp/packet.h index f5859e824..b2be5d7f7 100644 --- a/networking/udhcp/packet.h +++ b/networking/udhcp/packet.h @@ -29,6 +29,12 @@ struct udp_dhcp_packet { struct dhcpMessage data; }; +#define init_header udhcp_init_header +#define get_packet udhcp_get_packet +#define checksum udhcp_checksum +#define raw_packet udhcp_raw_packet +#define kernel_packet udhcp_kernel_packet + void init_header(struct dhcpMessage *packet, char type); int get_packet(struct dhcpMessage *packet, int fd); uint16_t checksum(void *addr, int count); diff --git a/networking/udhcp/pidfile.h b/networking/udhcp/pidfile.h index ea97d1de5..b1292a816 100644 --- a/networking/udhcp/pidfile.h +++ b/networking/udhcp/pidfile.h @@ -20,6 +20,9 @@ */ +#define pidfile_acquire udhcp_pidfile_acquire +#define pidfile_write_release udhcp_pidfile_write_release + int pidfile_acquire(const char *pidfile); void pidfile_write_release(int pid_fd); diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c index 820fbb064..e08d765bb 100644 --- a/networking/udhcp/script.c +++ b/networking/udhcp/script.c @@ -33,6 +33,7 @@ #include "dhcpd.h" #include "dhcpc.h" #include "common.h" +#include "script.h" /* get a rough idea of how long an option will be (rounding up...) */ static const int max_option_length[] = { diff --git a/networking/udhcp/script.h b/networking/udhcp/script.h index 71003311c..ab2c9fba6 100644 --- a/networking/udhcp/script.h +++ b/networking/udhcp/script.h @@ -1,6 +1,7 @@ #ifndef _SCRIPT_H #define _SCRIPT_H +#define run_script udhcp_run_script extern void run_script(struct dhcpMessage *packet, const char *name); #endif