diff options
| author | xebd <xeb@mail.ru> | 2017-12-05 12:46:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 12:46:33 +0300 |
| commit | b2ee19d80118f71afe966a938b9ad9e74d050f29 (patch) | |
| tree | b6f131613e1f47d4c8f7b4dd2f67ea9a61bbf8cc /accel-pppd/ipv6 | |
| parent | 477bae0d48927b41b308fbb16187c844c5c08b87 (diff) | |
| parent | d782673f9722e2287a209c308907ac824f3930f5 (diff) | |
| download | accel-ppp-b2ee19d80118f71afe966a938b9ad9e74d050f29.tar.gz accel-ppp-b2ee19d80118f71afe966a938b9ad9e74d050f29.zip | |
Merge pull request #21 from themiron/ipv6-dhcpv6-fixes
ipv6: dhcpv6: logging fixes
Diffstat (limited to 'accel-pppd/ipv6')
| -rw-r--r-- | accel-pppd/ipv6/dhcpv6.h | 2 | ||||
| -rw-r--r-- | accel-pppd/ipv6/dhcpv6_packet.c | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/accel-pppd/ipv6/dhcpv6.h b/accel-pppd/ipv6/dhcpv6.h index 1166445..1efbf72 100644 --- a/accel-pppd/ipv6/dhcpv6.h +++ b/accel-pppd/ipv6/dhcpv6.h @@ -46,7 +46,7 @@ #define D6_DECLINE 9 #define D6_RECONFIGURE 10 #define D6_INFORMATION_REQUEST 11 -#define D6_RELAY_FORM 12 +#define D6_RELAY_FORW 12 #define D6_RELAY_REPL 13 #define D6_STATUS_Success 0 diff --git a/accel-pppd/ipv6/dhcpv6_packet.c b/accel-pppd/ipv6/dhcpv6_packet.c index 16db5cb..fa18ac6 100644 --- a/accel-pppd/ipv6/dhcpv6_packet.c +++ b/accel-pppd/ipv6/dhcpv6_packet.c @@ -22,12 +22,12 @@ static void print_ia_na(struct dhcpv6_option *opt, void (*print)(const char *fmt static void print_ia_ta(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_ia_addr(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_oro(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); +static void print_hex_array(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_uint8(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_time(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_ipv6addr(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_ipv6addr_array(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_status(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); -static void print_uint64(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_reconf(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_dnssl(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); static void print_ia_prefix(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)); @@ -47,9 +47,9 @@ static struct dict_option known_options[] = { { D6_OPTION_STATUS_CODE, "Status", 0, 0, print_status }, { D6_OPTION_RAPID_COMMIT, "Rapid-Commit", 1, 0 }, { D6_OPTION_USER_CLASS, "User-Class", 1, 0 }, - { D6_OPTION_VENDOR_CLASS, "Vendor-Class", 1, 0, print_uint64 }, - { D6_OPTION_VENDOR_SPECIFIC, "Vendor-Specific", 1, 0, print_uint64 }, - { D6_OPTION_INTERFACE_ID, "Interface-ID", 1, 0, print_uint64 }, + { D6_OPTION_VENDOR_CLASS, "Vendor-Class", 1, 0, print_hex_array }, + { D6_OPTION_VENDOR_SPECIFIC, "Vendor-Specific", 1, 0, print_hex_array }, + { D6_OPTION_INTERFACE_ID, "Interface-ID", 1, 0, print_hex_array }, { D6_OPTION_RECONF_MSG, "Reconfigure", 0, 0, print_reconf }, { D6_OPTION_RECONF_ACCEPT, "Reconfigure-Accept", 1, 0 }, { D6_OPTION_DNS_SERVERS, "DNS", 1, 0, print_ipv6addr_array }, @@ -296,7 +296,7 @@ void dhcpv6_packet_print(struct dhcpv6_packet *pkt, void (*print)(const char *fm "Decline", "Reconfigure", "Information-Request", - "Relay-Form", + "Relay-Forward", "Relay-Reply" }; @@ -375,6 +375,15 @@ static void print_oro(struct dhcpv6_option *opt, void (*print)(const char *fmt, } } +static void print_hex_array(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)) +{ + int i; + + print(" "); + for (i = 0; i < ntohs(opt->hdr->len); i++) + print("%02x", opt->hdr->data[i]); +} + static void print_uint8(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)) { print(" %i", *(uint8_t *)opt->hdr->data); @@ -427,11 +436,6 @@ static void print_status(struct dhcpv6_option *opt, void (*print)(const char *fm print(" %s", status_name[ntohs(o->code)]); } -static void print_uint64(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)) -{ - print(" %llu", *(uint64_t *)opt->hdr->data); -} - static void print_reconf(struct dhcpv6_option *opt, void (*print)(const char *fmt, ...)) { |