diff options
-rw-r--r-- | networking/udhcp/d6_dhcpc.c | 14 | ||||
-rw-r--r-- | networking/udhcp/dhcpc.c | 6 | ||||
-rw-r--r-- | networking/udhcp/dhcpd.c | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c index fbdaa99bd..76b087b92 100644 --- a/networking/udhcp/d6_dhcpc.c +++ b/networking/udhcp/d6_dhcpc.c | |||
@@ -1589,8 +1589,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) | |||
1589 | } | 1589 | } |
1590 | 1590 | ||
1591 | if ((packet.d6_xid32 & htonl(0x00ffffff)) != xid) { | 1591 | if ((packet.d6_xid32 & htonl(0x00ffffff)) != xid) { |
1592 | log1("xid %x (our is %x), ignoring packet", | 1592 | log1("xid %x (our is %x)%s", |
1593 | (unsigned)(packet.d6_xid32 & htonl(0x00ffffff)), (unsigned)xid); | 1593 | (unsigned)(packet.d6_xid32 & htonl(0x00ffffff)), (unsigned)xid, |
1594 | ", ignoring packet" | ||
1595 | ); | ||
1594 | continue; | 1596 | continue; |
1595 | } | 1597 | } |
1596 | 1598 | ||
@@ -1743,7 +1745,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) | |||
1743 | free(client6_data.ia_na); | 1745 | free(client6_data.ia_na); |
1744 | client6_data.ia_na = d6_copy_option(packet.d6_options, packet_end, D6_OPT_IA_NA); | 1746 | client6_data.ia_na = d6_copy_option(packet.d6_options, packet_end, D6_OPT_IA_NA); |
1745 | if (!client6_data.ia_na) { | 1747 | if (!client6_data.ia_na) { |
1746 | bb_info_msg("no %s option, ignoring packet", "IA_NA"); | 1748 | bb_info_msg("no %s option%s", "IA_NA", ", ignoring packet"); |
1747 | continue; | 1749 | continue; |
1748 | } | 1750 | } |
1749 | if (client6_data.ia_na->len < (4 + 4 + 4) + (2 + 2 + 16 + 4 + 4)) { | 1751 | if (client6_data.ia_na->len < (4 + 4 + 4) + (2 + 2 + 16 + 4 + 4)) { |
@@ -1756,7 +1758,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) | |||
1756 | D6_OPT_IAADDR | 1758 | D6_OPT_IAADDR |
1757 | ); | 1759 | ); |
1758 | if (!iaaddr) { | 1760 | if (!iaaddr) { |
1759 | bb_info_msg("no %s option, ignoring packet", "IAADDR"); | 1761 | bb_info_msg("no %s option%s", "IAADDR", ", ignoring packet"); |
1760 | continue; | 1762 | continue; |
1761 | } | 1763 | } |
1762 | if (iaaddr->len < (16 + 4 + 4)) { | 1764 | if (iaaddr->len < (16 + 4 + 4)) { |
@@ -1781,7 +1783,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) | |||
1781 | free(client6_data.ia_pd); | 1783 | free(client6_data.ia_pd); |
1782 | client6_data.ia_pd = d6_copy_option(packet.d6_options, packet_end, D6_OPT_IA_PD); | 1784 | client6_data.ia_pd = d6_copy_option(packet.d6_options, packet_end, D6_OPT_IA_PD); |
1783 | if (!client6_data.ia_pd) { | 1785 | if (!client6_data.ia_pd) { |
1784 | bb_info_msg("no %s option, ignoring packet", "IA_PD"); | 1786 | bb_info_msg("no %s option%s", "IA_PD", ", ignoring packet"); |
1785 | continue; | 1787 | continue; |
1786 | } | 1788 | } |
1787 | if (client6_data.ia_pd->len < (4 + 4 + 4) + (2 + 2 + 4 + 4 + 1 + 16)) { | 1789 | if (client6_data.ia_pd->len < (4 + 4 + 4) + (2 + 2 + 4 + 4 + 1 + 16)) { |
@@ -1794,7 +1796,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) | |||
1794 | D6_OPT_IAPREFIX | 1796 | D6_OPT_IAPREFIX |
1795 | ); | 1797 | ); |
1796 | if (!iaprefix) { | 1798 | if (!iaprefix) { |
1797 | bb_info_msg("no %s option, ignoring packet", "IAPREFIX"); | 1799 | bb_info_msg("no %s option%s", "IAPREFIX", ", ignoring packet"); |
1798 | continue; | 1800 | continue; |
1799 | } | 1801 | } |
1800 | if (iaprefix->len < (4 + 4 + 1 + 16)) { | 1802 | if (iaprefix->len < (4 + 4 + 1 + 16)) { |
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index f1f6720f3..bbcbd1fca 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c | |||
@@ -1655,8 +1655,10 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | |||
1655 | } | 1655 | } |
1656 | 1656 | ||
1657 | if (packet.xid != xid) { | 1657 | if (packet.xid != xid) { |
1658 | log1("xid %x (our is %x), ignoring packet", | 1658 | log1("xid %x (our is %x)%s", |
1659 | (unsigned)packet.xid, (unsigned)xid); | 1659 | (unsigned)packet.xid, (unsigned)xid, |
1660 | ", ignoring packet" | ||
1661 | ); | ||
1660 | continue; | 1662 | continue; |
1661 | } | 1663 | } |
1662 | 1664 | ||
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index cd32cb437..260130507 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c | |||
@@ -1048,7 +1048,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) | |||
1048 | move_from_unaligned32(server_id_network_order, server_id_opt); | 1048 | move_from_unaligned32(server_id_network_order, server_id_opt); |
1049 | if (server_id_network_order != server_data.server_nip) { | 1049 | if (server_id_network_order != server_data.server_nip) { |
1050 | /* client talks to somebody else */ | 1050 | /* client talks to somebody else */ |
1051 | log1("server ID doesn't match%s", ", ignoring"); | 1051 | log1("server ID doesn't match%s", ", ignoring packet"); |
1052 | continue; | 1052 | continue; |
1053 | } | 1053 | } |
1054 | } | 1054 | } |
@@ -1171,7 +1171,7 @@ o DHCPREQUEST generated during REBINDING state: | |||
1171 | if (!requested_ip_opt) { | 1171 | if (!requested_ip_opt) { |
1172 | requested_nip = packet.ciaddr; | 1172 | requested_nip = packet.ciaddr; |
1173 | if (requested_nip == 0) { | 1173 | if (requested_nip == 0) { |
1174 | log1("no requested IP and no ciaddr%s", ", ignoring"); | 1174 | log1("no requested IP and no ciaddr%s", ", ignoring packet"); |
1175 | break; | 1175 | break; |
1176 | } | 1176 | } |
1177 | } | 1177 | } |