diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/dhcpd/dhcp-options.5 | 14 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/tables.c | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/usr.sbin/dhcpd/dhcp-options.5 b/usr.sbin/dhcpd/dhcp-options.5 index 6093a488912..9f13c5793e4 100644 --- a/usr.sbin/dhcpd/dhcp-options.5 +++ b/usr.sbin/dhcpd/dhcp-options.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhcp-options.5,v 1.9 2007/05/31 19:20:23 jmc Exp $ +.\" $OpenBSD: dhcp-options.5,v 1.10 2009/01/13 21:11:57 sthen Exp $ .\" .\" Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. .\" All rights reserved. @@ -36,7 +36,7 @@ .\" see ``http://www.isc.org/isc''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: January 13 2009 $ .Dt DHCP-OPTIONS 5 .Os .Sh NAME @@ -570,6 +570,16 @@ Servers should be listed in order of preference. The StreetTalk Directory Assistance (STDA) server option specifies a list of STDA servers available to the client. Servers should be listed in order of preference. +.It Xo +.Ic option voip-configuration-server Ar ip-address +.Oo , Ar ip-address ... Oc ; +.Xc +The +.Ic voip-configuration-server +option specifies a list of (normally TFTP) servers that VoIP clients +may download their configuration information and software images +from. +Servers should be listed in order of preference. .El .Sh SEE ALSO .Xr dhclient.conf 5 , diff --git a/usr.sbin/dhcpd/tables.c b/usr.sbin/dhcpd/tables.c index d90896d321d..b6e2ffb3897 100644 --- a/usr.sbin/dhcpd/tables.c +++ b/usr.sbin/dhcpd/tables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tables.c,v 1.7 2008/04/04 22:44:21 dlg Exp $ */ +/* $OpenBSD: tables.c,v 1.8 2009/01/13 21:11:57 sthen Exp $ */ /* Tables of information... */ @@ -212,7 +212,7 @@ struct option dhcp_options[256] = { { "option-147", "X", &dhcp_universe, 147 }, { "option-148", "X", &dhcp_universe, 148 }, { "option-149", "X", &dhcp_universe, 149 }, - { "option-150", "X", &dhcp_universe, 150 }, + { "voip-configuration-server", "IA", &dhcp_universe, 150 }, { "option-151", "X", &dhcp_universe, 151 }, { "option-152", "X", &dhcp_universe, 152 }, { "option-153", "X", &dhcp_universe, 153 }, |