#include <arpa/inet.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <errno.h>
#include "options.h"
#include "dhcpd.h"
#include "dhcpc.h"
-#include "packet.h"
#include "options.h"
-#include "debug.h"
-
-#include "config.h"
+#include "common.h"
/* get a rough idea of how long an option will be (rounding up...) */
-static int max_option_length[] = {
+static const int max_option_length[] = {
[OPTION_IP] = sizeof("255.255.255.255 "),
[OPTION_IP_PAIR] = sizeof("255.255.255.255 ") * 2,
[OPTION_STRING] = 1,
};
-static int upper_length(int length, struct dhcp_option *option)
+static inline int upper_length(int length, int opt_index)
{
- return max_option_length[option->flags & TYPE_MASK] *
- (length / option_lengths[option->flags & TYPE_MASK]);
+ return max_option_length[opt_index] *
+ (length / option_lengths[opt_index]);
}
-static int sprintip(char *dest, char *pre, unsigned char *ip) {
- return sprintf(dest, "%s%d.%d.%d.%d ", pre, ip[0], ip[1], ip[2], ip[3]);
+static int sprintip(char *dest, unsigned char *ip)
+{
+ return sprintf(dest, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
}
-#ifdef CONFIG_FEATURE_UDHCPC_IP
-/* convert a netmask (255.255.255.0) into the length (24) */
-static int inet_ntom (const char *src, short *dst)
+static void asprintip(char **dest, char *pre, unsigned char *ip)
{
- in_addr_t mask, num;
-
- mask = ntohl(*(unsigned int *)src);
-
- for (num = mask; num & 1; num >>= 1);
-
- if (num != 0 && mask != 0)
- {
- for (num = ~mask; num & 1; num >>= 1);
- if (num)
- return 0;
- }
-
- for (num = 0; mask; mask <<= 1)
- num++;
+ asprintf(dest, "%s%d.%d.%d.%d", pre, ip[0], ip[1], ip[2], ip[3]);
+}
- *dst = num;
- return 1;
+/* really simple implementation, just count the bits */
+static int mton(struct in_addr *mask)
+{
+ int i;
+ unsigned long bits = ntohl(mask->s_addr);
+ /* too bad one can't check the carry bit, etc in c bit
+ * shifting */
+ for (i = 0; i < 32 && !((bits >> i) & 1); i++);
+ return 32 - i;
}
-static int sprintprefix(char *dest, char *pre, unsigned char *ip) {
- short sdest = 0;
- inet_ntom(ip, &sdest);
- return sprintf(dest, "%s%hd ", pre, sdest);
-}
-#endif
/* Fill dest with the text of option 'option'. */
static void fill_options(char *dest, unsigned char *option, struct dhcp_option *type_p)
for(;;) {
switch (type) {
case OPTION_IP_PAIR:
- dest += sprintip(dest, "", option);
+ dest += sprintip(dest, option);
*(dest++) = '/';
option += 4;
optlen = 4;
-#ifndef CONFIG_FEATURE_UDHCPC_IP
case OPTION_IP: /* Works regardless of host byte order. */
-#endif
- dest += sprintip(dest, "", option);
+ dest += sprintip(dest, option);
break;
-#ifdef CONFIG_FEATURE_UDHCPC_IP
- case OPTION_IP: /* Works regardless of host byte order. */
- if (type_p->flags & OPTION_PREFIX) {
- dest += sprintprefix(dest, "", option);
- } else {
- dest += sprintip(dest, "", option);
- }
- break;
-#endif
case OPTION_BOOLEAN:
- dest += sprintf(dest, *option ? "yes " : "no ");
+ dest += sprintf(dest, *option ? "yes" : "no");
break;
case OPTION_U8:
- dest += sprintf(dest, "%u ", *option);
+ dest += sprintf(dest, "%u", *option);
break;
case OPTION_U16:
memcpy(&val_u16, option, 2);
- dest += sprintf(dest, "%u ", ntohs(val_u16));
+ dest += sprintf(dest, "%u", ntohs(val_u16));
break;
case OPTION_S16:
memcpy(&val_s16, option, 2);
- dest += sprintf(dest, "%d ", ntohs(val_s16));
+ dest += sprintf(dest, "%d", ntohs(val_s16));
break;
case OPTION_U32:
memcpy(&val_u32, option, 4);
- dest += sprintf(dest, "%lu ", (unsigned long) ntohl(val_u32));
+ dest += sprintf(dest, "%lu", (unsigned long) ntohl(val_u32));
break;
case OPTION_S32:
memcpy(&val_s32, option, 4);
- dest += sprintf(dest, "%ld ", (long) ntohl(val_s32));
+ dest += sprintf(dest, "%ld", (long) ntohl(val_s32));
break;
case OPTION_STRING:
memcpy(dest, option, len);
option += optlen;
len -= optlen;
if (len <= 0) break;
+ dest += sprintf(dest, " ");
}
}
static char *find_env(const char *prefix, char *defaultstr)
{
- extern char **environ;
- char **ptr;
- const int len = strlen(prefix);
+ char *ptr;
- for (ptr = environ; *ptr != NULL; ptr++) {
- if (strncmp(prefix, *ptr, len) == 0)
- return *ptr;
- }
- return defaultstr;
+ ptr = getenv(prefix);
+ return ptr ? ptr : defaultstr;
}
int i, j;
char **envp;
unsigned char *temp;
+ struct in_addr subnet;
char over = 0;
if (packet == NULL)
}
envp = xmalloc((num_options + 5) * sizeof(char *));
- envp[0] = xmalloc(sizeof("interface=") + strlen(client_config.interface));
- sprintf(envp[0], "interface=%s", client_config.interface);
- envp[1] = find_env("PATH", "PATH=/bin:/usr/bin:/sbin:/usr/sbin");
- envp[2] = find_env("HOME", "HOME=/");
+ j = 0;
+ asprintf(&envp[j++], "interface=%s", client_config.interface);
+ envp[j++] = find_env("PATH", "PATH=/bin:/usr/bin:/sbin:/usr/sbin");
+ envp[j++] = find_env("HOME", "HOME=/");
if (packet == NULL) {
- envp[3] = NULL;
+ envp[j++] = NULL;
return envp;
}
- envp[3] = xmalloc(sizeof("ip=255.255.255.255"));
- sprintip(envp[3], "ip=", (unsigned char *) &packet->yiaddr);
- for (i = 0, j = 4; options[i].code; i++) {
- if ((temp = get_option(packet, options[i].code))) {
- envp[j] = xmalloc(upper_length(temp[OPT_LEN - 2], &options[i]) + strlen(options[i].name) + 2);
- fill_options(envp[j], temp, &options[i]);
- j++;
+ asprintip(&envp[j++], "ip=", (unsigned char *) &packet->yiaddr);
+
+
+ for (i = 0; options[i].code; i++) {
+ if (!(temp = get_option(packet, options[i].code)))
+ continue;
+ envp[j] = xmalloc(upper_length(temp[OPT_LEN - 2], options[i].flags & TYPE_MASK) + strlen(options[i].name) + 2);
+ fill_options(envp[j++], temp, &options[i]);
+
+ /* Fill in a subnet bits option for things like /24 */
+ if (options[i].code == DHCP_SUBNET) {
+ memcpy(&subnet, temp, 4);
+ asprintf(&envp[j++], "mask=%d", mton(&subnet));
}
}
if (packet->siaddr) {
- envp[j] = xmalloc(sizeof("siaddr=255.255.255.255"));
- sprintip(envp[j++], "siaddr=", (unsigned char *) &packet->siaddr);
+ asprintip(&envp[j++], "siaddr=", (unsigned char *) &packet->siaddr);
}
if (!(over & FILE_FIELD) && packet->file[0]) {
/* watch out for invalid packets */
packet->file[sizeof(packet->file) - 1] = '\0';
- envp[j] = xmalloc(sizeof("boot_file=") + strlen(packet->file));
- sprintf(envp[j++], "boot_file=%s", packet->file);
+ asprintf(&envp[j++], "boot_file=%s", packet->file);
}
if (!(over & SNAME_FIELD) && packet->sname[0]) {
/* watch out for invalid packets */
packet->sname[sizeof(packet->sname) - 1] = '\0';
- envp[j] = xmalloc(sizeof("sname=") + strlen(packet->sname));
- sprintf(envp[j++], "sname=%s", packet->sname);
+ asprintf(&envp[j++], "sname=%s", packet->sname);
}
envp[j] = NULL;
return envp;
DEBUG(LOG_INFO, "execle'ing %s", client_config.script);
execle(client_config.script, client_config.script,
name, NULL, envp);
- LOG(LOG_ERR, "script %s failed: %s",
- client_config.script, strerror(errno));
+ LOG(LOG_ERR, "script %s failed: %m", client_config.script);
exit(1);
}
}