b628409b1
"Vladimir N. Oleynik"
2005-09-23
Subject
more make safe the exported namespace for udhcp. Move to bb-specific file for reduce change into udhcp-CVS
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/udhcp/common.h +0 -3networking/udhcp/dhcpc.c +1 -1networking/udhcp/dhcpc.h +2 -3networking/udhcp/libbb_udhcp.h +29 -0networking/udhcp/options.c +1 -1networking/udhcp/packet.h +0 -6networking/udhcp/pidfile.h +0 -3networking/udhcp/script.c +1 -1networking/udhcp/script.h +0 -1networking/udhcp/serverpacket.c +1 -1
networking/udhcp/common.h+0 -3
| @@ -39,9 +39,6 @@ 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); | |
networking/udhcp/dhcpc.c+1 -1
| @@ -34,6 +34,7 @@ | |
| #include <net/if.h> | |
| #include <errno.h> | |
| + | #include "common.h" |
| #include "dhcpd.h" | |
| #include "dhcpc.h" | |
| #include "options.h" | |
| @@ -41,7 +42,6 @@ | |
| #include "clientsocket.h" | |
| #include "script.h" | |
| #include "socket.h" | |
| - | #include "common.h" |
| #include "signalpipe.h" | |
| static int state; | |
networking/udhcp/dhcpc.h+2 -3
| @@ -2,10 +2,9 @@ | |
| #ifndef _DHCPC_H | |
| #define _DHCPC_H | |
| + | #ifndef DEFAULT_SCRIPT |
| #define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script" | |
| - | |
| - | /* allow libbb_udhcp.h to redefine DEFAULT_SCRIPT */ |
| - | #include "libbb_udhcp.h" |
| + | #endif |
| #define INIT_SELECTING 0 | |
| #define REQUESTING 1 | |
networking/udhcp/libbb_udhcp.h+29 -0
| @@ -27,6 +27,35 @@ | |
| #define xfopen bb_xfopen | |
| + | /* make safe the exported namespace */ |
| + | /* from common.h */ |
| + | #define background udhcp_background |
| + | #define start_log_and_pid udhcp_start_log_and_pid |
| + | /* from script.h */ |
| + | #define run_script udhcp_run_script |
| + | /* from packet.h */ |
| + | #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 |
| + | /* from pidfile.h */ |
| + | #define pidfile_acquire udhcp_pidfile_acquire |
| + | #define pidfile_write_release udhcp_pidfile_write_release |
| + | /* 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 |
| + | |
| #else /* ! BB_VER */ | |
| #include <stdlib.h> | |
networking/udhcp/options.c+1 -1
| @@ -6,10 +6,10 @@ | |
| #include <stdlib.h> | |
| #include <string.h> | |
| + | #include "common.h" |
| #include "dhcpd.h" | |
| #include "options.h" | |
| #include "files.h" | |
| - | #include "common.h" |
| /* supported options are easily added here */ | |
networking/udhcp/packet.h+0 -6
| @@ -29,12 +29,6 @@ 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); | |
networking/udhcp/pidfile.h+0 -3
| @@ -20,9 +20,6 @@ | |
| */ | |
| - | #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); | |
networking/udhcp/script.c+1 -1
| @@ -29,10 +29,10 @@ | |
| #include <sys/types.h> | |
| #include <sys/wait.h> | |
| + | #include "common.h" |
| #include "options.h" | |
| #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...) */ | |
networking/udhcp/script.h+0 -1
| @@ -1,7 +1,6 @@ | |
| #ifndef _SCRIPT_H | |
| #define _SCRIPT_H | |
| - | #define run_script udhcp_run_script |
| extern void run_script(struct dhcpMessage *packet, const char *name); | |
| #endif | |
networking/udhcp/serverpacket.c+1 -1
| @@ -25,10 +25,10 @@ | |
| #include <string.h> | |
| #include <time.h> | |
| + | #include "common.h" |
| #include "serverpacket.h" | |
| #include "dhcpd.h" | |
| #include "options.h" | |
| - | #include "common.h" |
| #include "static_leases.h" | |
| /* send a packet to giaddr using the kernel ip stack */ | |