Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

decode DHCPv4 T1, T2 and lease-time options better.

Browse Source
This commit is contained in:
Simon Kelley
2012-03-12 21:44:14 +00:00
parent 8643ec7fea
commit d0e2c6c9ab
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/option.c
View File

@@ -375,6 +375,7 @@ static struct {
#define OT_INTERNAL 0x2000 #define OT_INTERNAL 0x2000
#define OT_NAME 0x1000 #define OT_NAME 0x1000
#define OT_CSTRING 0x0800 #define OT_CSTRING 0x0800
#define OT_DEC 0x0400 /* OT_INTERNAL only */
static const struct opttab_t { static const struct opttab_t {
char *name; char *name;
@@ -419,15 +420,15 @@ static const struct opttab_t {
{ "x-windows-fs", 48, OT_ADDR_LIST }, { "x-windows-fs", 48, OT_ADDR_LIST },
{ "x-windows-dm", 49, OT_ADDR_LIST }, { "x-windows-dm", 49, OT_ADDR_LIST },
{ "requested-address", 50, OT_INTERNAL | OT_ADDR_LIST }, { "requested-address", 50, OT_INTERNAL | OT_ADDR_LIST },
{ "lease-time", 51, OT_INTERNAL }, { "lease-time", 51, OT_INTERNAL | OT_DEC },
{ "option-overload", 52, OT_INTERNAL }, { "option-overload", 52, OT_INTERNAL },
{ "message-type", 53, OT_INTERNAL, }, { "message-type", 53, OT_INTERNAL, },
{ "server-identifier", 54, OT_INTERNAL | OT_ADDR_LIST }, { "server-identifier", 54, OT_INTERNAL | OT_ADDR_LIST },
{ "parameter-request", 55, OT_INTERNAL }, { "parameter-request", 55, OT_INTERNAL },
{ "message", 56, OT_INTERNAL }, { "message", 56, OT_INTERNAL },
{ "max-message-size", 57, OT_INTERNAL }, { "max-message-size", 57, OT_INTERNAL },
{ "T1", 58, OT_INTERNAL }, { "T1", 58, OT_INTERNAL | OT_DEC},
{ "T2", 59, OT_INTERNAL }, { "T2", 59, OT_INTERNAL | OT_DEC},
{ "vendor-class", 60, 0 }, { "vendor-class", 60, 0 },
{ "client-id", 61, OT_INTERNAL }, { "client-id", 61, OT_INTERNAL },
{ "nis+-domain", 64, OT_NAME }, { "nis+-domain", 64, OT_NAME },
@@ -574,7 +575,16 @@ char *option_string(int prot, unsigned int opt, unsigned char *val, int opt_len,
} }
} }
#endif #endif
else else if ((ot[o].size & OT_DEC) && opt_len != 0)
{
unsigned int dec = 0;
for (i = 0; i < opt_len; i++)
dec = (dec << 8) | val[i];
sprintf(buf, "%u", dec);
}
else
nodecode = 1; nodecode = 1;
} }
break; break;