diff options
| author |   krw <krw@openbsd.org> | 2014-01-19 04:36:04 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2014-01-19 04:36:04 +0000 |
| commit | 595e6798dc82b3ecf4207d8c3bbb262d29689261 (patch) | |
| tree | 054fe05741414f2f474662af951e78c5e1c3d513 | |
| parent | Cast socklen_t when comparing to size_t and use socklen_t to iterate over (diff) | |
| download | wireguard-openbsd-595e6798dc82b3ecf4207d8c3bbb262d29689261.tar.xz wireguard-openbsd-595e6798dc82b3ecf4207d8c3bbb262d29689261.zip | |
Rename parse_hardware_param() to parse_ethernet() to reflect what
it actually does.
| -rw-r--r-- | sbin/dhclient/clparse.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 4 | ||||
| -rw-r--r-- | sbin/dhclient/parse.c | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index 57b605a3786..5fcba8f2380 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.75 2014/01/18 01:19:01 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.76 2014/01/19 04:36:04 krw Exp $ */ /* Parser for dhclient config and lease files. */ @@ -190,7 +190,7 @@ parse_client_statement(FILE *cfile) config->default_actions[code] = ACTION_PREPEND; break; case TOK_HARDWARE: - parse_hardware_param(cfile, &ifi->hw_address); + parse_ethernet(cfile, &ifi->hw_address); break; case TOK_REQUEST: count = parse_option_list(cfile, optlist, sizeof(optlist)); diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 38a7b2f2f57..ed31b63cfcf 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.130 2014/01/13 02:38:52 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.131 2014/01/19 04:36:04 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -235,7 +235,7 @@ void skip_to_semi(FILE *); int parse_semi(FILE *); char *parse_string(FILE *); int parse_ip_addr(FILE *, struct in_addr *); -void parse_hardware_param(FILE *, struct ether_addr *); +void parse_ethernet(FILE *, struct ether_addr *); void parse_lease_time(FILE *, time_t *); void convert_num(unsigned char *, char *, int, int); time_t parse_date(FILE *); diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c index 302d98bf825..6d7d2626d70 100644 --- a/sbin/dhclient/parse.c +++ b/sbin/dhclient/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.33 2014/01/18 01:03:56 krw Exp $ */ +/* $OpenBSD: parse.c,v 1.34 2014/01/19 04:36:04 krw Exp $ */ /* Common parser code for dhcpd and dhclient. */ @@ -143,11 +143,10 @@ parse_ip_addr(FILE *cfile, struct in_addr *addr) } /* - * hardware-parameter :== HARDWARE ETHERNET csns SEMI - * csns :== NUMBER | csns COLON NUMBER + * ETHERNET :== 'ethernet' NUMBER:NUMBER:NUMBER:NUMBER:NUMBER:NUMBER */ void -parse_hardware_param(FILE *cfile, struct ether_addr *hardware) +parse_ethernet(FILE *cfile, struct ether_addr *hardware) { int token; |