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

Restore printing of values in omshell to the style pre 21518. For

Browse Source 
21518 we changed the print routines to always display time values
as a hex list.  This had a side effect of printing all data strings
as a hex list.  We shall investigate other ways of displaying time
values more usefully.  [ISC-Bugs #22626]
This commit is contained in:
Shawn Routhier
2010-12-03 20:27:51 +00:00
parent 3004babab1
commit 391965129d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RELNOTES
View File

@@ -144,6 +144,11 @@ work on other platforms. Please report any problems and suggested fixes to
a setsockopt() call. The signal is already being ignored as part
of the ISC library. [ISC-Bugs #22269]
- Restore printing of values in omshell to the style pre 21518. For
21518 we changed the print routines to always display time values
as a hex list. This had a side effect of printing all data strings
as a hex list. We shall investigate other ways of displaying time
values more usefully. [ISC-Bugs #22626]
Changes since 4.2.0b2

6
dhcpctl/omshell.c
View File

@@ -161,9 +161,9 @@ main(int argc, char **argv) {
break;
case omapi_datatype_data:
print_hex_only(v->value->u.buffer.len,
v->value->u.buffer.value,
sizeof(hex_buf), hex_buf);
print_hex_or_string(v->value->u.buffer.len,
v->value->u.buffer.value,
sizeof(hex_buf), hex_buf);
printf("%s\n", hex_buf);
break;

1
includes/dhcpd.h
View File

@@ -2304,6 +2304,7 @@ void dump_packet PROTO ((struct packet *));
void hash_dump PROTO ((struct hash_table *));
char *print_hex PROTO ((unsigned, const u_int8_t *, unsigned, unsigned));
void print_hex_only PROTO ((unsigned, const u_int8_t *, unsigned, char *));
void print_hex_or_string PROTO ((unsigned, const u_int8_t *, unsigned, char *));
#define print_hex_1(len, data, limit) print_hex(len, data, limit, 0)
#define print_hex_2(len, data, limit) print_hex(len, data, limit, 1)
#define print_hex_3(len, data, limit) print_hex(len, data, limit, 2)