Merge branch 'lukeshu/misc'

1 files changed, 15 insertions, 15 deletions

diff --git a/libdhcp/dhcp_client.c b/libdhcp/dhcp_client.c
index 8ec3647..2d0ebe6 100644
--- a/libdhcp/dhcp_client.c
+++ b/libdhcp/dhcp_client.c
@@ -460,11 +460,11 @@ static bool dhcp_client_send(struct dhcp_client *client, uint8_t msgtyp, const c
 	/**********************************************************************\
 	 * Send                                                               *
 	\**********************************************************************/
-	debugf("state %s: sending DHCP %s", state_strs[client->state], dhcp_msgtyp_str(msgtyp));
+	log_debugf("state %s: sending DHCP %s", state_strs[client->state], dhcp_msgtyp_str(msgtyp));
 	ssize_t r = LO_CALL(client->sock, sendto, scratch_msg, DHCP_MSG_BASE_SIZE + optlen,
 	                  client_broadcasts ? net_ip4_addr_broadcast : client->lease_server_id, DHCP_PORT_SERVER);
 	if (r < 0) {
-		debugf("error: sendto: %zd", r);
+		log_debugf("error: sendto: %zd", r);
 		return true;
 	}
 	client->last_sent_msgtyp = msgtyp;
@@ -704,7 +704,7 @@ static ssize_t dhcp_client_recv(struct dhcp_client *client, struct dhcp_recv_msg
 static bool dhcp_check_conflict(lo_interface net_packet_conn sock, struct net_ip4_addr addr) {
 	assert(!LO_IS_NULL(sock));
 	ssize_t v = LO_CALL(sock, sendto, "CHECK_IP_CONFLICT", 17, addr, 5000);
-	debugf("check_ip_conflict => %zd", v);
+	log_debugf("check_ip_conflict => %zd", v);
 	return v != -NET_EARP_TIMEOUT;
 }
 
@@ -740,10 +740,10 @@ static void dhcp_client_take_lease(struct dhcp_client *client, struct dhcp_recv_
 	client->lease_time_ns_end = (dur_ns_end == DHCP_INFINITY * NS_PER_S) ? 0 : client->time_ns_init + dur_ns_end;
 
 	if (ifup) {
-		infof("applying configuration to "PRI_net_eth_addr, ARG_net_eth_addr(client->self_eth_addr));
-		infof(":: addr         = "PRI_net_ip4_addr, ARG_net_ip4_addr(client->lease_client_addr));
-		infof(":: gateway_addr = "PRI_net_ip4_addr, ARG_net_ip4_addr(client->lease_auxdata.gateway_addr));
-		infof(":: subnet_mask  = "PRI_net_ip4_addr, ARG_net_ip4_addr(client->lease_auxdata.subnet_mask));
+		log_infof("applying configuration to "PRI_net_eth_addr, ARG_net_eth_addr(client->self_eth_addr));
+		log_infof(":: addr         = "PRI_net_ip4_addr, ARG_net_ip4_addr(client->lease_client_addr));
+		log_infof(":: gateway_addr = "PRI_net_ip4_addr, ARG_net_ip4_addr(client->lease_auxdata.gateway_addr));
+		log_infof(":: subnet_mask  = "PRI_net_ip4_addr, ARG_net_ip4_addr(client->lease_auxdata.subnet_mask));
 		LO_CALL(client->iface, ifup, (struct net_iface_config){
 				.addr         = client->lease_client_addr,
 				.gateway_addr = client->lease_auxdata.gateway_addr,
@@ -767,7 +767,7 @@ static void dhcp_client_setstate(struct dhcp_client *client,
 
 	/* State transition diagram: https://datatracker.ietf.org/doc/html/rfc2131#page-35 */
 	for (;;) {
-		debugf("loop: state=%s", state_strs[client->state]);
+		log_debugf("loop: state=%s", state_strs[client->state]);
 		switch (client->state) {
 		case STATE_INIT:
 			client->xid = rand_uint63n(UINT32_MAX);
@@ -793,7 +793,7 @@ static void dhcp_client_setstate(struct dhcp_client *client,
 				break;
 			default:
 				assert(r < 0);
-				debugf("error: recvfrom: %d", r);
+				log_debugf("error: recvfrom: %d", r);
 			}
 			break;
 		case STATE_REQUESTING:
@@ -806,8 +806,8 @@ static void dhcp_client_setstate(struct dhcp_client *client,
 					break;
 				case DHCP_MSGTYP_ACK:
 					if (dhcp_check_conflict(client->sock, client->lease_client_addr)) {
-						debugf("IP "PRI_net_ip4_addr" is already in use",
-						       ARG_net_ip4_addr(client->lease_client_addr));
+						log_debugf("IP "PRI_net_ip4_addr" is already in use",
+						           ARG_net_ip4_addr(client->lease_client_addr));
 						dhcp_client_setstate(client, STATE_INIT, DHCP_MSGTYP_DECLINE, "IP is already in use", scratch_msg);
 					} else {
 						dhcp_client_take_lease(client, scratch_msg, true);
@@ -820,7 +820,7 @@ static void dhcp_client_setstate(struct dhcp_client *client,
 				break;
 			default:
 				assert(r < 0);
-				debugf("error: recvfrom: %d", r);
+				log_debugf("error: recvfrom: %d", r);
 			}
 			break;
 		case STATE_BOUND:
@@ -834,7 +834,7 @@ static void dhcp_client_setstate(struct dhcp_client *client,
 				break;
 			default:
 				assert(r < 0);
-				debugf("error: recvfrom: %d", r);
+				log_debugf("error: recvfrom: %d", r);
 			}
 			break;
 		case STATE_RENEWING:
@@ -863,7 +863,7 @@ static void dhcp_client_setstate(struct dhcp_client *client,
 				break;
 			default:
 				assert(r < 0);
-				debugf("error: recvfrom: %d", r);
+				log_debugf("error: recvfrom: %d", r);
 			}
 			break;
 		case STATE_REBINDING:
@@ -889,7 +889,7 @@ static void dhcp_client_setstate(struct dhcp_client *client,
 				break;
 			default:
 				assert(r < 0);
-				debugf("error: recvfrom: %d", r);
+				log_debugf("error: recvfrom: %d", r);
 			}
 			break;
 		case STATE_INIT_REBOOT: