udhcpc[6]: make log2 messages for chaddr field indented like the rest

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-09-29 18:02:01 +02:00
parent a6a3ad3273
commit f625836e60
3 changed files with 10 additions and 5 deletions

View File

@ -18,7 +18,7 @@ void FAST_FUNC d6_dump_packet(struct d6_packet *packet)
return; return;
bb_error_msg( bb_error_msg(
"xid %x" " xid %x"
, packet->d6_xid32 , packet->d6_xid32
); );
//*bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0'; //*bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0';

View File

@ -1534,6 +1534,13 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
*/ */
if (send_renew(xid, server_addr, requested_ip) >= 0) { if (send_renew(xid, server_addr, requested_ip) >= 0) {
timeout >>= 1; timeout >>= 1;
//TODO: the timeout to receive an answer for our renew should not be selected
//with "timeout = lease_seconds / 2; ...; timeout = timeout / 2": it is often huge.
//Waiting e.g. 4*3600 seconds for a reply does not make sense
//(if reply isn't coming, we keep an open socket for hours),
//it should be something like 10 seconds.
//Also, it's probably best to try sending renew in kernel mode a few (3-5) times
//and fall back to raw mode if it does not work.
continue; continue;
} }
/* else: error sending. /* else: error sending.

View File

@ -41,7 +41,7 @@ void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
return; return;
bb_error_msg( bb_error_msg(
//"op %x" //" op %x"
//" htype %x" //" htype %x"
" hlen %x" " hlen %x"
//" hops %x" //" hops %x"
@ -52,7 +52,6 @@ void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
" yiaddr %x" " yiaddr %x"
" siaddr %x" " siaddr %x"
" giaddr %x" " giaddr %x"
//" chaddr %s"
//" sname %s" //" sname %s"
//" file %s" //" file %s"
//" cookie %x" //" cookie %x"
@ -68,14 +67,13 @@ void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
, packet->yiaddr , packet->yiaddr
, packet->siaddr_nip , packet->siaddr_nip
, packet->gateway_nip , packet->gateway_nip
//, packet->chaddr[16]
//, packet->sname[64] //, packet->sname[64]
//, packet->file[128] //, packet->file[128]
//, packet->cookie //, packet->cookie
//, packet->options[] //, packet->options[]
); );
*bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0'; *bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0';
bb_error_msg("chaddr %s", buf); bb_error_msg(" chaddr %s", buf);
} }
#endif #endif