[PATCH 3/8] net: dhcp: add support of tftp server ip or Etherboot file (option 150)

[Jean-Christophe PLAGNIOL-VILLARD]

On 11:21 Fri 30 Mar     , Sascha Hauer wrote:
> On Fri, Mar 30, 2012 at 06:31:48AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > if tftp server ip
> > 	Use the tftp server name only if this option is not set.
> > 	Export it also via env tftp_server_ip.
> > else
> > 	Export it via end etherboot_file
> > 
> > E.g. the ISC dhcp server can be configured with
> > 
> >   | option option-150 code 150 = ip-address;
> >   | option option-150-etherboot-file code 150 = string;
> >   |
> >   | class "at91sam9x5ek" {
> >   |         match if substring (option vendor-class-identifier,0,20) = "barebox-at91sam9x5ek";
> >   |
> >   |         filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage";
> >   |         option tftp-server-name "192.168.200.98";
> >   |         option option-150 192.168.200.98;
> >   |         next-server 192.168.200.98;
> >   |         option root-path "192.168.200.98:/opt/work/buildroot/build/sam9x5/target";
> >   |         if substring (option dhcp-client-identifier,0,7) = "ser2net" {
> >   |                 filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage-ser2net";
> >   |                 ption option-150-etherboot-file "/tftpboot/test.sh";
> >   |         }
> >   | }
> > 
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> > ---
> >  net/dhcp.c |   21 ++++++++++++++++++++-
> >  1 files changed, 20 insertions(+), 1 deletions(-)
> > 
> > diff --git a/net/dhcp.c b/net/dhcp.c
> > index 6728717..adfb4a0 100644
> > --- a/net/dhcp.c
> > +++ b/net/dhcp.c
> > @@ -195,6 +195,8 @@ static int dhcp_extended (u8 *e, int message_type, IPaddr_t ServerID,
> >  	*cnt += 1;
> >  	*e++  = 66;		/* TFTP server name */
> >  	*cnt += 1;
> > +	*e++  = 150;		/* TFTP server ip */
> > +	*cnt += 1;
> >  	*e++  = 255;		/* End of the list */
> >  
> >  	/* Pad to minimal length */
> > @@ -255,6 +257,7 @@ static void dhcp_options_process(unsigned char *popt, struct bootp *bp)
> >  	IPaddr_t ip;
> >  	char str[256];
> >  	char tftpname[256];
> > +	bool is_tftpserverip = false;
> >  
> >  	while (popt < end && *popt != 0xff) {
> >  		oplen = *(popt + 1);
> > @@ -327,6 +330,18 @@ static void dhcp_options_process(unsigned char *popt, struct bootp *bp)
> >  					setenv("bootfile", str);
> >  			}
> >  			break;
> > +		case 150:	/* TFTP server ip or Etherboot*/
> > +			if (oplen == sizeof(IPaddr_t)) {
> > +				is_tftpserverip = true;
> > +				ip = net_read_ip(popt + 2);
> > +				net_set_serverip(ip);
> > +				setenv_ip("tftp_server_ip", ip);
> > +			} else {
> > +				memcpy(str, popt + 2, oplen);
> > +				str[oplen] = 0;
> > +				setenv("etherboot_file", str);
> > +			}
> 
> This seems fragile. What if the etherboot filename has a length of 4?
agree but this is really unlikely and I did want to add an option in the
client to ask a file name

And we can not detect it via the DHCP RFC

btw IPaddr_t need to be fix on 64bit

Best Regards,
J.