static int inet_sock;
static int forward_bcast;
static int forward_dhcp;
+static int parse_dhcp;
uint8_t local_addr[4];
int local_route_table;
fill_arp_packet(&pkt, rif, rif->src_ip, ipaddr);
pkt.arp.arp_op = htons(ARPOP_REQUEST);
- memcpy(pkt.arp.arp_spa, rif->src_ip, ETH_ALEN);
+ memcpy(pkt.arp.arp_spa, rif->src_ip, sizeof(pkt.arp.arp_spa));
memset(pkt.arp.arp_tha, 0, ETH_ALEN);
memset(pkt.eth.ether_dhost, 0xff, ETH_ALEN);
if (!forward_bcast && !forward_dhcp)
continue;
- if (relayd_handle_dhcp_packet(rif, pktbuf, pktlen, forward_dhcp))
+ if (relayd_handle_dhcp_packet(rif, pktbuf, pktlen, forward_dhcp, parse_dhcp))
continue;
if (forward_bcast)
if (strlen(ifname) >= IFNAMSIZ)
return NULL;
+ list_for_each_entry(rif, &interfaces, list) {
+ if (!strncmp(rif->ifname, ifname, IFNAMSIZ))
+ return rif;
+ }
+
rif = calloc(1, sizeof(*rif));
if (!rif)
return NULL;
* When we hit SIGTERM, clean up interfaces directly, so that we
* won't leave our routing in an invalid state.
*/
- cleanup_hosts();
- free_interfaces();
- exit(1);
+ uloop_end();
}
static int usage(const char *progname)
" -T <table> Set routing table number for automatically added routes\n"
" -B Enable broadcast forwarding\n"
" -D Enable DHCP forwarding\n"
+ " -P Disable DHCP options parsing\n"
" -L <ipaddr> Enable local access using <ipaddr> as source address\n"
"\n",
progname);
struct relayd_interface *rif = NULL;
struct in_addr addr, addr2;
bool local_addr_valid = false;
- bool managed;
+ bool managed = false;
int ifnum = 0;
char *s, *s2;
int mask;
host_ping_tries = 5;
forward_bcast = 0;
local_route_table = 0;
+ parse_dhcp = 1;
uloop_init();
- while ((ch = getopt(argc, argv, "I:i:t:p:BDdT:G:R:L:")) != -1) {
+ while ((ch = getopt(argc, argv, "I:i:t:p:BDPdT:G:R:L:")) != -1) {
switch(ch) {
case 'I':
managed = true;
case 'D':
forward_dhcp = 1;
break;
+ case 'P':
+ parse_dhcp = 0;
+ break;
case 'T':
route_table = atoi(optarg);
if (route_table <= 0)