mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-29 21:38:10 +00:00
Code Issues Releases Wiki Activity

Patch from Joost Mulders <dhcp@j-mulders.demon.nl> to make DLPI work better,

Browse Source 
especially on Solaris/x86.
This commit is contained in:
Ben Cottrell 2001-01-31 19:00:34 +00:00
parent c5b569f874
commit 00bb1cad79
1 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
common/dlpi.c
View File

@ -84,7 +84,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: dlpi.c,v 1.24 2001/01/25 21:54:25 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n"; "$Id: dlpi.c,v 1.25 2001/01/31 19:00:34 tamino Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@ -404,6 +404,8 @@ void if_register_receive (info)
{ {
#ifdef USE_DLPI_PFMOD #ifdef USE_DLPI_PFMOD
struct packetfilt pf; struct packetfilt pf;
struct ip iphdr;
u_short offset;
#endif #endif
/* Open a DLPI device and hang it on this interface... */ /* Open a DLPI device and hang it on this interface... */
@ -417,19 +419,19 @@ void if_register_receive (info)
pf.Pf_Priority = 0; pf.Pf_Priority = 0;
pf.Pf_FilterLen = 0; pf.Pf_FilterLen = 0;
#ifdef USE_DLPI_RAW #if defined (USE_DLPI_RAW)
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 6; # define ETHER_H_PREFIX (14) /* sizeof (ethernet_header) */
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_CAND; /*
* ethertype == ETHERTYPE_IP
*/
offset = 12;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + (offset / 2);
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT | ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = htons (ETHERTYPE_IP); pf.Pf_Filter [pf.Pf_FilterLen++] = htons (ETHERTYPE_IP);
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT;
pf.Pf_Filter [pf.Pf_FilterLen++] = htons (IPPROTO_UDP);
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 11;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSH00FF + ENF_AND;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_CAND;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 18;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_CAND;
pf.Pf_Filter [pf.Pf_FilterLen++] = htons (local_port);
# else # else
# define ETHER_H_PREFIX (0)
# endif / * USE_DLPI_RAW */
/* /*
* The packets that will be received on this file descriptor * The packets that will be received on this file descriptor
* will be IP packets (due to the SAP that was specified in * will be IP packets (due to the SAP that was specified in
@ -439,22 +441,39 @@ void if_register_receive (info)
* to the local port. All offsets are relative to the start * to the local port. All offsets are relative to the start
* of an IP packet. * of an IP packet.
*/ */
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT;
pf.Pf_Filter [pf.Pf_FilterLen++] = htons (IPPROTO_UDP); /*
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 4; * BOOTPS destination port
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSH00FF + ENF_AND; */
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_CAND; offset = ETHER_H_PREFIX + sizeof (iphdr) + sizeof (u_short);
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 11; pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + (offset / 2);
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_CAND; pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT | ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = htons (local_port); /* local_port is already in network byte order */
pf.Pf_Filter [pf.Pf_FilterLen++] = local_port;
# if defined (USE_DLPI_RAW)
/* AND this result with the result of ETHERTYPE_IP */
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_AND;
# endif # endif
/*
* protocol should be udp. this is a byte compare, test for
* endianess.
*/
offset = ETHER_H_PREFIX + ((u_char *)&(iphdr.ip_p) - (u_char *) &iphdr);
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + (offset / 2);
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT | ENF_AND;
pf.Pf_Filter [pf.Pf_FilterLen++] = htons (0x00FF);
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT | ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = htons (IPPROTO_UDP);
/* AND this result with the result of local_port */
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_AND;
/* Install the filter... */ /* Install the filter... */
if (strioctl (info -> rfdesc, PFIOCSETF, INFTIM, if (strioctl (info -> rfdesc, PFIOCSETF, INFTIM,
sizeof (pf), (char *)&pf) < 0) { sizeof (pf), (char *)&pf) < 0) {
log_fatal ("Can't set PFMOD receive filter on %s: %m", info -> name); log_fatal ("Can't set PFMOD receive filter on %s: %m", info -> name);
} }
#endif #endif /* USE_DLPI_PFMOD */
if (!quiet_interface_discovery) if (!quiet_interface_discovery)
log_info ("Listening on DLPI/%s/%s%s%s", log_info ("Listening on DLPI/%s/%s%s%s",
@ -529,8 +548,8 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
/* Assemble the headers... */ /* Assemble the headers... */
#ifdef USE_DLPI_RAW #ifdef USE_DLPI_RAW
assemble_hw_header (interface, (unsigned char *)hh, &dbuflen, hto); assemble_hw_header (interface, (unsigned char *)hh, &dbuflen, hto);
if (dbuflen > sizeof hh) if (dbuflen > sizeof hh) /* hh is too small! */
abort ("hh is too small!"); abort ();
fudge = dbuflen % 4; /* IP header must be word-aligned. */ fudge = dbuflen % 4; /* IP header must be word-aligned. */
memcpy (dbuf + fudge, (unsigned char *)hh, dbuflen); memcpy (dbuf + fudge, (unsigned char *)hh, dbuflen);
dbuflen += fudge; dbuflen += fudge;
@ -548,9 +567,21 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
#ifdef USE_DLPI_RAW #ifdef USE_DLPI_RAW
result = write (interface -> wfdesc, dbuf + fudge, dbuflen - fudge); result = write (interface -> wfdesc, dbuf + fudge, dbuflen - fudge);
#else #else
/* XXX: Assumes ethernet, with two byte SAP */ /*
sap [0] = 0x08; /* ETHERTYPE_IP, high byte */ * a bug on intel causes a sap type of 0x0800 to appear on the wire as 0x0000.
sap [1] = 0x0; /* ETHERTYPE_IP, low byte */ * a bug on intel causes a sap type of 0x0000 to appear on the wire as 0x0800.
* .uhhmmm..
*
* at least the elxl (3com) and iprb (intel) drivers `need' this hack on 2.8.
*/
#if defined (SOL_X86_DLPI_SAP_HACK)
sap [0] = 0x00;
sap [1] = 0x00;
#else /* sparc and others, as it should be. */
sap [0] = 0x08;
sap [1] = 0x00;
#endif
saplen = -2; /* -2 indicates a two byte SAP at the end saplen = -2; /* -2 indicates a two byte SAP at the end
of the address */ of the address */