diff options
author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-09-02 15:44:27 +0000 |
---|---|---|
committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-09-02 15:44:27 +0000 |
commit | b27ad92942089e2e05a4284d7f7a1c38eebcd2aa (patch) | |
tree | d991a4dff80b33dcf12aab14c10eef425f52af63 /sbin/dhclient/options.c | |
parent | ab7f97c0bcfa6b3f3ed6070afcbccad4c6f81f88 (diff) |
Kill 'ifi' global.
ok henning@, krw@
Diffstat (limited to 'sbin/dhclient/options.c')
-rw-r--r-- | sbin/dhclient/options.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c index c14630ea47c..2a85ea50126 100644 --- a/sbin/dhclient/options.c +++ b/sbin/dhclient/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.77 2016/08/31 12:57:31 mpi Exp $ */ +/* $OpenBSD: options.c,v 1.78 2016/09/02 15:44:26 mpi Exp $ */ /* DHCP options parsing and reassembly. */ @@ -653,7 +653,8 @@ do_packet(struct interface_info *ifi, unsigned int from_port, struct dhcp_packet *packet = &client->packet; struct option_data options[256]; struct reject_elem *ap; - void (*handler)(struct in_addr, struct option_data *, char *); + void (*handler)(struct interface_info *, struct in_addr, + struct option_data *, char *); char *type, *info; int i, rslt, options_valid = 1; @@ -752,7 +753,7 @@ do_packet(struct interface_info *ifi, unsigned int from_port, error("no memory for info string"); if (handler) - (*handler)(from, options, info); + (*handler)(ifi, from, options, info); free(info); |