mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-03 07:45:20 +00:00
Code Issues Releases Wiki Activity

update interface configure banner; add from addr to send_packet; don't filter on incoming IP address (doesn't work well if interface has aliases)

Browse Source
This commit is contained in:
Ted Lemon
1996-05-22 07:34:28 +00:00
parent 65bf41da72
commit cf9a3ddd74
2 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/nit.c
View File

@@ -137,7 +137,7 @@ void if_register_send (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
piaddr (info -> address)); info -> shared_network -> name);
} }
#endif /* USE_NIT_SEND */ #endif /* USE_NIT_SEND */
@@ -210,21 +210,6 @@ void if_register_receive (info, interface)
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 18; 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++] = ENF_PUSHLIT + ENF_CAND;
pf.Pf_Filter [pf.Pf_FilterLen++] = server_port; pf.Pf_Filter [pf.Pf_FilterLen++] = server_port;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 15;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = 0xffff;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 16;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = 0xffff;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_AND;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 15;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = addr [0];
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 16;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = addr [1];
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_AND;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_OR;
/* Install the filter... */ /* Install the filter... */
sio.ic_cmd = NIOCSETF; sio.ic_cmd = NIOCSETF;
@@ -237,16 +222,17 @@ void if_register_receive (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
piaddr (info -> address)); info -> shared_network -> name);
} }
#endif /* USE_NIT_RECEIVE */ #endif /* USE_NIT_RECEIVE */
#ifdef USE_NIT_SEND #ifdef USE_NIT_SEND
size_t send_packet (interface, packet, raw, len, to, hto) size_t send_packet (interface, packet, raw, len, from, to, hto)
struct interface_info *interface; struct interface_info *interface;
struct packet *packet; struct packet *packet;
struct dhcp_packet *raw; struct dhcp_packet *raw;
size_t len; size_t len;
struct in_addr from;
struct sockaddr_in *to; struct sockaddr_in *to;
struct hardware *hto; struct hardware *hto;
{ {
@@ -264,7 +250,7 @@ size_t send_packet (interface, packet, raw, len, to, hto)
/* Assemble the headers... */ /* Assemble the headers... */
assemble_hw_header (interface, buf, &bufp, hto); assemble_hw_header (interface, buf, &bufp, hto);
hw_end = bufp; hw_end = bufp;
assemble_udp_ip_header (interface, buf, &bufp, assemble_udp_ip_header (interface, buf, &bufp, from.s_addr,
to -> sin_addr.s_addr, to -> sin_port, to -> sin_addr.s_addr, to -> sin_port,
raw, len); raw, len);

24
nit.c
View File

@@ -137,7 +137,7 @@ void if_register_send (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
piaddr (info -> address)); info -> shared_network -> name);
} }
#endif /* USE_NIT_SEND */ #endif /* USE_NIT_SEND */
@@ -210,21 +210,6 @@ void if_register_receive (info, interface)
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 18; 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++] = ENF_PUSHLIT + ENF_CAND;
pf.Pf_Filter [pf.Pf_FilterLen++] = server_port; pf.Pf_Filter [pf.Pf_FilterLen++] = server_port;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 15;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = 0xffff;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 16;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = 0xffff;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_AND;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 15;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = addr [0];
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHWORD + 16;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_PUSHLIT + ENF_EQ;
pf.Pf_Filter [pf.Pf_FilterLen++] = addr [1];
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_AND;
pf.Pf_Filter [pf.Pf_FilterLen++] = ENF_OR;
/* Install the filter... */ /* Install the filter... */
sio.ic_cmd = NIOCSETF; sio.ic_cmd = NIOCSETF;
@@ -237,16 +222,17 @@ void if_register_receive (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
piaddr (info -> address)); info -> shared_network -> name);
} }
#endif /* USE_NIT_RECEIVE */ #endif /* USE_NIT_RECEIVE */
#ifdef USE_NIT_SEND #ifdef USE_NIT_SEND
size_t send_packet (interface, packet, raw, len, to, hto) size_t send_packet (interface, packet, raw, len, from, to, hto)
struct interface_info *interface; struct interface_info *interface;
struct packet *packet; struct packet *packet;
struct dhcp_packet *raw; struct dhcp_packet *raw;
size_t len; size_t len;
struct in_addr from;
struct sockaddr_in *to; struct sockaddr_in *to;
struct hardware *hto; struct hardware *hto;
{ {
@@ -264,7 +250,7 @@ size_t send_packet (interface, packet, raw, len, to, hto)
/* Assemble the headers... */ /* Assemble the headers... */
assemble_hw_header (interface, buf, &bufp, hto); assemble_hw_header (interface, buf, &bufp, hto);
hw_end = bufp; hw_end = bufp;
assemble_udp_ip_header (interface, buf, &bufp, assemble_udp_ip_header (interface, buf, &bufp, from.s_addr,
to -> sin_addr.s_addr, to -> sin_port, to -> sin_addr.s_addr, to -> sin_port,
raw, len); raw, len);