mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 22:05:23 +00:00
Code Issues Releases Wiki Activity

Options whose format is X now print as colon-seperated hex, so that pretty_print output can be parsed. do_packet() moved here from dispatch.c

Browse Source
This commit is contained in:
Ted Lemon
1997-03-06 06:55:06 +00:00
parent 9d33ed7272
commit 17f4dab73c
1 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
common/options.c
View File

@@ -42,7 +42,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: options.c,v 1.22 1997/02/22 08:32:04 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; "$Id: options.c,v 1.23 1997/03/06 06:55:06 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#define DHCP_OPTION_DATA #define DHCP_OPTION_DATA
@@ -413,7 +413,13 @@ char *pretty_print_option (code, data, len, emit_commas)
char *op = optbuf; char *op = optbuf;
unsigned char *dp = data; unsigned char *dp = data;
struct in_addr foo; struct in_addr foo;
char comma;
if (emit_commas)
comma = ',';
else
comma = ' ';
/* Figure out the size of the data. */ /* Figure out the size of the data. */
for (i = 0; dhcp_options [code].format [i]; i++) { for (i = 0; dhcp_options [code].format [i]; i++) {
if (!numhunk) { if (!numhunk) {
@@ -430,6 +436,13 @@ char *pretty_print_option (code, data, len, emit_commas)
fmtbuf [i] = 0; fmtbuf [i] = 0;
numhunk = 0; numhunk = 0;
break; break;
case 'X':
fmtbuf [i] = 'x';
fmtbuf [i + 1] = 0;
hunksize++;
numhunk = 0;
comma = ':';
break;
case 't': case 't':
fmtbuf [i] = 't'; fmtbuf [i] = 't';
fmtbuf [i + 1] = 0; fmtbuf [i + 1] = 0;
@@ -524,6 +537,9 @@ char *pretty_print_option (code, data, len, emit_commas)
case 'B': case 'B':
sprintf (op, "%d", *dp++); sprintf (op, "%d", *dp++);
break; break;
case 'x':
sprintf (op, "%x", *dp++);
break;
case 'f': case 'f':
strcpy (op, *dp++ ? "true" : "false"); strcpy (op, *dp++ ? "true" : "false");
break; break;
@@ -531,15 +547,45 @@ char *pretty_print_option (code, data, len, emit_commas)
warn ("Unexpected format code %c", fmtbuf [j]); warn ("Unexpected format code %c", fmtbuf [j]);
} }
op += strlen (op); op += strlen (op);
if (j + 1 < numelem) if (j + 1 < numelem && comma != ':')
*op++ = ' '; *op++ = ' ';
} }
if (i + 1 < numhunk) { if (i + 1 < numhunk) {
if (emit_commas) *op++ = comma;
*op++ = ',';
*op++ = ' ';
} }
} }
return optbuf; return optbuf;
} }
void do_packet (interface, packbuf, len, from_port, from, hfrom)
struct interface_info *interface;
unsigned char *packbuf;
int len;
unsigned short from_port;
struct iaddr from;
struct hardware *hfrom;
{
struct packet tp;
struct dhcp_packet tdp;
memcpy (&tdp, packbuf, len);
memset (&tp, 0, sizeof tp);
tp.raw = &tdp;
tp.packet_length = len;
tp.client_port = from_port;
tp.client_addr = from;
tp.interface = interface;
tp.haddr = hfrom;
parse_options (&tp);
if (tp.options_valid &&
tp.options [DHO_DHCP_MESSAGE_TYPE].data)
tp.packet_type =
tp.options [DHO_DHCP_MESSAGE_TYPE].data [0];
if (tp.packet_type)
dhcp (&tp);
else if (tdp.op == BOOTREQUEST)
bootp (&tp);
}