diff options
| author | Shawn Routhier <sar@isc.org> | 2010-12-03 20:27:51 +0000 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2010-12-03 20:27:51 +0000 |
| commit | 391965129dec4c91beea436e6adf0e65277ca7db (patch) | |
| tree | 34baf6dd41aaa5a6f156e111ea3729f1a871099a | |
| parent | 3004babab17a9388f603963cdf1d0577536c7c1a (diff) | |
| download | isc-dhcp-391965129dec4c91beea436e6adf0e65277ca7db.tar.gz | |
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]
| -rw-r--r-- | RELNOTES | 5 | ||||
| -rw-r--r-- | dhcpctl/omshell.c | 6 | ||||
| -rw-r--r-- | includes/dhcpd.h | 1 |
3 files changed, 9 insertions, 3 deletions
@@ -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 diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c index c3e7ef63..4da7428e 100644 --- a/dhcpctl/omshell.c +++ b/dhcpctl/omshell.c @@ -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; diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 3df59b0b..a096f125 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -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) |