svn commit: trunk/busybox/networking/udhcp

[vodz at busybox.net]

Author: vodz
Date: 2005-09-22 08:07:33 -0700 (Thu, 22 Sep 2005)
New Revision: 11581

Log:
safe exported namespace for udhcp. Not full, bore :-(

Modified:
   trunk/busybox/networking/udhcp/common.h
   trunk/busybox/networking/udhcp/packet.h
   trunk/busybox/networking/udhcp/pidfile.h
   trunk/busybox/networking/udhcp/script.c
   trunk/busybox/networking/udhcp/script.h


Changeset:
Modified: trunk/busybox/networking/udhcp/common.h
===================================================================
--- trunk/busybox/networking/udhcp/common.h	2005-09-22 14:38:17 UTC (rev 11580)
+++ trunk/busybox/networking/udhcp/common.h	2005-09-22 15:07:33 UTC (rev 11581)
@@ -39,10 +39,12 @@
 #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)

Modified: trunk/busybox/networking/udhcp/packet.h
===================================================================
--- trunk/busybox/networking/udhcp/packet.h	2005-09-22 14:38:17 UTC (rev 11580)
+++ trunk/busybox/networking/udhcp/packet.h	2005-09-22 15:07:33 UTC (rev 11581)
@@ -29,6 +29,12 @@
 	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);

Modified: trunk/busybox/networking/udhcp/pidfile.h
===================================================================
--- trunk/busybox/networking/udhcp/pidfile.h	2005-09-22 14:38:17 UTC (rev 11580)
+++ trunk/busybox/networking/udhcp/pidfile.h	2005-09-22 15:07:33 UTC (rev 11581)
@@ -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);
 

Modified: trunk/busybox/networking/udhcp/script.c
===================================================================
--- trunk/busybox/networking/udhcp/script.c	2005-09-22 14:38:17 UTC (rev 11580)
+++ trunk/busybox/networking/udhcp/script.c	2005-09-22 15:07:33 UTC (rev 11581)
@@ -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[] = {

Modified: trunk/busybox/networking/udhcp/script.h
===================================================================
--- trunk/busybox/networking/udhcp/script.h	2005-09-22 14:38:17 UTC (rev 11580)
+++ trunk/busybox/networking/udhcp/script.h	2005-09-22 15:07:33 UTC (rev 11581)
@@ -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