diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2014-06-03 21:33:23 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2014-06-03 21:33:23 +0400 |
| commit | 093c53e3e08abb609cae6e58b1b438616c57c17f (patch) | |
| tree | 10599557e5373498f773b57e0af84e7219875434 /accel-pppd/ctrl | |
| parent | b002a1bdc060bf26497ea65174bfb66468560abb (diff) | |
| download | accel-ppp-093c53e3e08abb609cae6e58b1b438616c57c17f.tar.gz accel-ppp-093c53e3e08abb609cae6e58b1b438616c57c17f.zip | |
make IPv4 address to string conversions endian friendly
Diffstat (limited to 'accel-pppd/ctrl')
| -rw-r--r-- | accel-pppd/ctrl/ipoe/dhcpv4.c | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/accel-pppd/ctrl/ipoe/dhcpv4.c b/accel-pppd/ctrl/ipoe/dhcpv4.c index 35fc4688..1d3033ff 100644 --- a/accel-pppd/ctrl/ipoe/dhcpv4.c +++ b/accel-pppd/ctrl/ipoe/dhcpv4.c @@ -241,34 +241,42 @@ void dhcpv4_print_packet(struct dhcpv4_packet *pack, int relay, void (*print)(co print("[DHCPv4 %s%s xid=%x ", relay ? "relay " : "", msg_name[pack->msg_type - 1], pack->hdr->xid); - if (pack->hdr->ciaddr) + if (pack->hdr->ciaddr) { + in_addr_t addr = ntohl(pack->hdr->ciaddr); print("ciaddr=%i.%i.%i.%i ", - pack->hdr->ciaddr & 0xff, - (pack->hdr->ciaddr >> 8) & 0xff, - (pack->hdr->ciaddr >> 16) & 0xff, - (pack->hdr->ciaddr >> 24) & 0xff); - - if (pack->hdr->yiaddr) + (addr >> 24) & 0xff, + (addr >> 16) & 0xff, + (addr >> 8) & 0xff, + addr & 0xff); + } + + if (pack->hdr->yiaddr) { + in_addr_t addr = ntohl(pack->hdr->yiaddr); print("yiaddr=%i.%i.%i.%i ", - pack->hdr->yiaddr & 0xff, - (pack->hdr->yiaddr >> 8) & 0xff, - (pack->hdr->yiaddr >> 16) & 0xff, - (pack->hdr->yiaddr >> 24) & 0xff); - - if (pack->hdr->siaddr) + (addr >> 24) & 0xff, + (addr >> 16) & 0xff, + (addr >> 8) & 0xff, + addr & 0xff); + } + + if (pack->hdr->siaddr) { + in_addr_t addr = ntohl(pack->hdr->siaddr); print("siaddr=%i.%i.%i.%i ", - pack->hdr->siaddr & 0xff, - (pack->hdr->siaddr >> 8) & 0xff, - (pack->hdr->siaddr >> 16) & 0xff, - (pack->hdr->siaddr >> 24) & 0xff); - - if (pack->hdr->giaddr) + (addr >> 24) & 0xff, + (addr >> 16) & 0xff, + (addr >> 8) & 0xff, + addr & 0xff); + } + + if (pack->hdr->giaddr) { + in_addr_t addr = ntohl(pack->hdr->giaddr); print("giaddr=%i.%i.%i.%i ", - pack->hdr->giaddr & 0xff, - (pack->hdr->giaddr >> 8) & 0xff, - (pack->hdr->giaddr >> 16) & 0xff, - (pack->hdr->giaddr >> 24) & 0xff); - + (addr >> 24) & 0xff, + (addr >> 16) & 0xff, + (addr >> 8) & 0xff, + addr & 0xff); + } + print("chaddr=%02x:%02x:%02x:%02x:%02x:%02x ", pack->hdr->chaddr[0], pack->hdr->chaddr[1], |