projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udhcpc: fix wrong options in decline and release packets
[oweals/busybox.git]
/
networking
/
udhcp
/
dhcprelay.c
diff --git
a/networking/udhcp/dhcprelay.c
b/networking/udhcp/dhcprelay.c
index 052739400a734975fd87d8b1b7aa5c065b7b13ce..a6483fc1f3cc3804b94c97c46c1baa03b06f8aee 100644
(file)
--- a/
networking/udhcp/dhcprelay.c
+++ b/
networking/udhcp/dhcprelay.c
@@
-11,26
+11,24
@@
*/
#include "common.h"
*/
#include "common.h"
-#include "dhcpd.h"
#include "options.h"
/* constants */
#include "options.h"
/* constants */
-#define SELECT_TIMEOUT 5 /* select timeout in sec. */
-#define MAX_LIFETIME 2*60 /* lifetime of an xid entry in sec. */
-#define MAX_INTERFACES 9
-
+#define SELECT_TIMEOUT 5 /* select timeout in sec. */
+#define MAX_LIFETIME 2*60 /* lifetime of an xid entry in sec. */
/* This list holds information about clients. The xid_* functions manipulate this list. */
/* This list holds information about clients. The xid_* functions manipulate this list. */
-static struct xid_item {
- u_int32_t xid;
- struct sockaddr_in ip;
+struct xid_item {
+ unsigned timestamp;
int client;
int client;
- time_t timestamp;
+ uint32_t xid;
+ struct sockaddr_in ip;
struct xid_item *next;
struct xid_item *next;
-}
dhcprelay_xid_list = {0, {0}, 0, 0, NULL}
;
+};
+#define dhcprelay_xid_list (*(struct xid_item*)&bb_common_bufsiz1)
-static struct xid_item *
xid_add(u_
int32_t xid, struct sockaddr_in *ip, int client)
+static struct xid_item *
xid_add(u
int32_t xid, struct sockaddr_in *ip, int client)
{
struct xid_item *item;
{
struct xid_item *item;
@@
-41,22
+39,21
@@
static struct xid_item * xid_add(u_int32_t xid, struct sockaddr_in *ip, int clie
item->ip = *ip;
item->xid = xid;
item->client = client;
item->ip = *ip;
item->xid = xid;
item->client = client;
- item->timestamp =
time(NULL
);
+ item->timestamp =
monotonic_sec(
);
item->next = dhcprelay_xid_list.next;
dhcprelay_xid_list.next = item;
return item;
}
item->next = dhcprelay_xid_list.next;
dhcprelay_xid_list.next = item;
return item;
}
-
static void xid_expire(void)
{
struct xid_item *item = dhcprelay_xid_list.next;
struct xid_item *last = &dhcprelay_xid_list;
static void xid_expire(void)
{
struct xid_item *item = dhcprelay_xid_list.next;
struct xid_item *last = &dhcprelay_xid_list;
-
time_t current_time = time(NULL
);
+
unsigned current_time = monotonic_sec(
);
while (item != NULL) {
while (item != NULL) {
- if ((current_time
-
item->timestamp) > MAX_LIFETIME) {
+ if ((current_time
-
item->timestamp) > MAX_LIFETIME) {
last->next = item->next;
free(item);
item = last->next;
last->next = item->next;
free(item);
item = last->next;
@@
-67,7
+64,7
@@
static void xid_expire(void)
}
}
}
}
-static struct xid_item *
xid_find(u_
int32_t xid)
+static struct xid_item *
xid_find(u
int32_t xid)
{
struct xid_item *item = dhcprelay_xid_list.next;
while (item != NULL) {
{
struct xid_item *item = dhcprelay_xid_list.next;
while (item != NULL) {
@@
-79,7
+76,7
@@
static struct xid_item * xid_find(u_int32_t xid)
return NULL;
}
return NULL;
}
-static void xid_del(u
_
int32_t xid)
+static void xid_del(uint32_t xid)
{
struct xid_item *item = dhcprelay_xid_list.next;
struct xid_item *last = &dhcprelay_xid_list;
{
struct xid_item *item = dhcprelay_xid_list.next;
struct xid_item *last = &dhcprelay_xid_list;
@@
-95,7
+92,6
@@
static void xid_del(u_int32_t xid)
}
}
}
}
-
/**
* get_dhcp_packet_type - gets the message type of a dhcp packet
* p - pointer to the dhcp packet
/**
* get_dhcp_packet_type - gets the message type of a dhcp packet
* p - pointer to the dhcp packet
@@
-103,7
+99,7
@@
static void xid_del(u_int32_t xid)
*/
static int get_dhcp_packet_type(struct dhcpMessage *p)
{
*/
static int get_dhcp_packet_type(struct dhcpMessage *p)
{
- u
_char
*op;
+ u
int8_t
*op;
/* it must be either a BOOTREQUEST or a BOOTREPLY */
if (p->op != BOOTREQUEST && p->op != BOOTREPLY)
/* it must be either a BOOTREQUEST or a BOOTREPLY */
if (p->op != BOOTREQUEST && p->op != BOOTREPLY)
@@
-115,72
+111,60
@@
static int get_dhcp_packet_type(struct dhcpMessage *p)
return -1;
}
return -1;
}
-/**
- * signal_handler - handles signals ;-)
- * sig - sent signal
- */
-static int dhcprelay_stopflag;
-static void dhcprelay_signal_handler(int sig)
-{
- dhcprelay_stopflag = 1;
-}
-
/**
* get_client_devices - parses the devices list
* dev_list - comma separated list of devices
* returns array
*/
/**
* get_client_devices - parses the devices list
* dev_list - comma separated list of devices
* returns array
*/
-static char **
get_client_devices(char *dev_list, int *client_number)
+static char **get_client_devices(char *dev_list, int *client_number)
{
{
- char *s, *
list, *
*client_dev;
+ char *s, **client_dev;
int i, cn;
/* copy list */
int i, cn;
/* copy list */
- list = xstrdup(dev_list);
- if (list == NULL) return NULL;
-
- /* get number of items */
- for (s = dev_list, cn = 1; *s; s++)
- if (*s == ',')
+ dev_list = xstrdup(dev_list);
+
+ /* get number of items, replace ',' with NULs */
+ s = dev_list;
+ cn = 1;
+ while (*s) {
+ if (*s == ',') {
+ *s = '\0';
cn++;
cn++;
+ }
+ s++;
+ }
+ *client_number = cn;
+ /* create vector of pointers */
client_dev = xzalloc(cn * sizeof(*client_dev));
client_dev = xzalloc(cn * sizeof(*client_dev));
-
- /* parse list */
- s = strtok(list, ",");
- i = 0;
- while (s != NULL) {
- client_dev[i++] = xstrdup(s);
- s = strtok(NULL, ",");
+ client_dev[0] = dev_list;
+ i = 1;
+ while (i != cn) {
+ client_dev[i] = client_dev[i - 1] + strlen(client_dev[i - 1]) + 1;
+ i++;
}
}
-
- /* free copy and exit */
- free(list);
- *client_number = cn;
return client_dev;
}
return client_dev;
}
-/* Creates listen sockets (in fds) and returns
the number allocate
d. */
+/* Creates listen sockets (in fds) and returns
numerically max f
d. */
static int init_sockets(char **client, int num_clients,
static int init_sockets(char **client, int num_clients,
- char *server, int *fds
, int *max_socket
)
+ char *server, int *fds)
{
{
- int i;
+ int i
, n
;
/* talk to real server on bootps */
/* talk to real server on bootps */
- fds[0] = listen_socket(htonl(INADDR_ANY), 67, server);
- *max_socket = fds[0];
-
- /* array starts at 1 since server is 0 */
- num_clients++;
+ fds[0] = listen_socket(/*INADDR_ANY,*/ 67, server);
+ n = fds[0];
- for (i
=
1; i < num_clients; i++) {
+ for (i
=
1; i < num_clients; i++) {
/* listen for clients on bootps */
/* listen for clients on bootps */
- fds[i] = listen_socket(htonl(INADDR_ANY), 67, client[i-1]);
- if (fds[i] > *max_socket) *max_socket = fds[i];
+ fds[i] = listen_socket(/*INADDR_ANY,*/ 67, client[i-1]);
+ if (fds[i] > n)
+ n = fds[i];
}
}
-
- return i;
+ return n;
}
}
@@
-239,8
+223,6
@@
static void pass_back(struct dhcpMessage *p, int packet_len, int *fds)
if (item->ip.sin_addr.s_addr == htonl(INADDR_ANY))
item->ip.sin_addr.s_addr = htonl(INADDR_BROADCAST);
if (item->ip.sin_addr.s_addr == htonl(INADDR_ANY))
item->ip.sin_addr.s_addr = htonl(INADDR_BROADCAST);
- if (item->client > MAX_INTERFACES)
- return;
res = sendto(fds[item->client], p, packet_len, 0, (struct sockaddr*)(&item->ip),
sizeof(item->ip));
if (res != packet_len) {
res = sendto(fds[item->client], p, packet_len, 0, (struct sockaddr*)(&item->ip),
sizeof(item->ip));
if (res != packet_len) {
@@
-252,17
+234,20
@@
static void pass_back(struct dhcpMessage *p, int packet_len, int *fds)
xid_del(p->xid);
}
xid_del(p->xid);
}
+static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **clients,
+ struct sockaddr_in *server_addr, uint32_t gw_ip) ATTRIBUTE_NORETURN;
static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **clients,
struct sockaddr_in *server_addr, uint32_t gw_ip)
{
struct dhcpMessage dhcp_msg;
fd_set rfds;
static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **clients,
struct sockaddr_in *server_addr, uint32_t gw_ip)
{
struct dhcpMessage dhcp_msg;
fd_set rfds;
- size_t packlen, addr_size;
+ size_t packlen;
+ socklen_t addr_size;
struct sockaddr_in client_addr;
struct timeval tv;
int i;
struct sockaddr_in client_addr;
struct timeval tv;
int i;
- while (
!dhcprelay_stopflag
) {
+ while (
1
) {
FD_ZERO(&rfds);
for (i = 0; i < num_sockets; i++)
FD_SET(fds[i], &rfds);
FD_ZERO(&rfds);
for (i = 0; i < num_sockets; i++)
FD_SET(fds[i], &rfds);
@@
-271,7
+256,7
@@
static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **cli
if (select(max_socket + 1, &rfds, NULL, NULL, &tv) > 0) {
/* server */
if (FD_ISSET(fds[0], &rfds)) {
if (select(max_socket + 1, &rfds, NULL, NULL, &tv) > 0) {
/* server */
if (FD_ISSET(fds[0], &rfds)) {
- packlen = udhcp_
get
_packet(&dhcp_msg, fds[0]);
+ packlen = udhcp_
recv
_packet(&dhcp_msg, fds[0]);
if (packlen > 0) {
pass_back(&dhcp_msg, packlen, fds);
}
if (packlen > 0) {
pass_back(&dhcp_msg, packlen, fds);
}
@@
-285,7
+270,7
@@
static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **cli
(struct sockaddr *)(&client_addr), &addr_size);
if (packlen <= 0)
continue;
(struct sockaddr *)(&client_addr), &addr_size);
if (packlen <= 0)
continue;
- if (read_interface(clients[i-1], NULL, &dhcp_msg.giaddr, NULL)
< 0
)
+ if (read_interface(clients[i-1], NULL, &dhcp_msg.giaddr, NULL))
dhcp_msg.giaddr = gw_ip;
pass_on(&dhcp_msg, packlen, i, fds, &client_addr, server_addr);
}
dhcp_msg.giaddr = gw_ip;
pass_on(&dhcp_msg, packlen, i, fds, &client_addr, server_addr);
}
@@
-294,9
+279,11
@@
static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **cli
}
}
}
}
+int dhcprelay_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int dhcprelay_main(int argc, char **argv)
{
int dhcprelay_main(int argc, char **argv)
{
- int i, num_sockets, max_socket, fds[MAX_INTERFACES];
+ int num_sockets, max_socket;
+ int *fds;
uint32_t gw_ip;
char **clients;
struct sockaddr_in server_addr;
uint32_t gw_ip;
char **clients;
struct sockaddr_in server_addr;
@@
-311,26
+298,16
@@
int dhcprelay_main(int argc, char **argv)
} else {
bb_show_usage();
}
} else {
bb_show_usage();
}
- clients = get_client_devices(argv[1], &num_sockets);
- if (!clients) return 0;
-
- signal(SIGTERM, dhcprelay_signal_handler);
- signal(SIGQUIT, dhcprelay_signal_handler);
- signal(SIGINT, dhcprelay_signal_handler);
- num_sockets = init_sockets(clients, num_sockets, argv[2], fds, &max_socket);
+ clients = get_client_devices(argv[1], &num_sockets);
+ num_sockets++; /* for server socket at fds[0] */
+ fds = xmalloc(num_sockets * sizeof(fds[0]));
+ max_socket = init_sockets(clients, num_sockets, argv[2], fds);
- if (read_interface(argv[2], NULL, &gw_ip, NULL)
== -1
)
+ if (read_interface(argv[2], NULL, &gw_ip, NULL))
return 1;
return 1;
+ /* doesn't return */
dhcprelay_loop(fds, num_sockets, max_socket, clients, &server_addr, gw_ip);
dhcprelay_loop(fds, num_sockets, max_socket, clients, &server_addr, gw_ip);
-
- if (ENABLE_FEATURE_CLEAN_UP) {
- for (i = 0; i < num_sockets; i++) {
- close(fds[i]);
- free(clients[i]);
- }
- }
-
- return 0;
+ /* return 0; - not reached */
}
}