summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Vladimir N. Oleynik"2005-09-22 15:07:33 +0000
committer"Vladimir N. Oleynik"2005-09-22 15:07:33 +0000
commit2f9c30a2d567ba7bdb6351e0167eb0b59735b898 (patch)
treee811a2285654327b344c1fb242683acb2782f2b8
parentac9731704a03d08b061ee02853e7cebe36964aba (diff)
downloadbusybox-2f9c30a2d567ba7bdb6351e0167eb0b59735b898.zip
busybox-2f9c30a2d567ba7bdb6351e0167eb0b59735b898.tar.gz
safe exported namespace for udhcp. Not full, bore :-(
-rw-r--r--networking/udhcp/common.h4
-rw-r--r--networking/udhcp/packet.h6
-rw-r--r--networking/udhcp/pidfile.h3
-rw-r--r--networking/udhcp/script.c1
-rw-r--r--networking/udhcp/script.h1
5 files changed, 14 insertions, 1 deletions
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index ca19a24..e474f5e 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -39,10 +39,12 @@ enum syslog_levels {
#include <syslog.h>
#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 f5859e8..b2be5d7 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 ea97d1d..b1292a8 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 820fbb0..e08d765 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 7100331..ab2c9fb 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