diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-06 18:36:50 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-06 18:36:50 +0000 |
commit | 3538b9a8822421b7c8596a33a917dcf2f99c92b7 (patch) | |
tree | 768c23fe79bb81583de7376a4d744632d888d303 /networking/udhcp/serverpacket.c | |
parent | 5d725462d44268f9a86030daaa6f6396d32f796c (diff) | |
download | busybox-w32-3538b9a8822421b7c8596a33a917dcf2f99c92b7.tar.gz busybox-w32-3538b9a8822421b7c8596a33a917dcf2f99c92b7.tar.bz2 busybox-w32-3538b9a8822421b7c8596a33a917dcf2f99c92b7.zip |
Implement optional syslog logging using ordinary
bb_xx_msg calls, and convert networking/* to it.
The rest of bbox will be converted gradually.
Diffstat (limited to 'networking/udhcp/serverpacket.c')
-rw-r--r-- | networking/udhcp/serverpacket.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/networking/udhcp/serverpacket.c b/networking/udhcp/serverpacket.c index 8c7b1642a..cfead413c 100644 --- a/networking/udhcp/serverpacket.c +++ b/networking/udhcp/serverpacket.c | |||
@@ -35,7 +35,7 @@ | |||
35 | /* send a packet to giaddr using the kernel ip stack */ | 35 | /* send a packet to giaddr using the kernel ip stack */ |
36 | static int send_packet_to_relay(struct dhcpMessage *payload) | 36 | static int send_packet_to_relay(struct dhcpMessage *payload) |
37 | { | 37 | { |
38 | DEBUG(LOG_INFO, "Forwarding packet to relay"); | 38 | DEBUG("Forwarding packet to relay"); |
39 | 39 | ||
40 | return udhcp_kernel_packet(payload, server_config.server, SERVER_PORT, | 40 | return udhcp_kernel_packet(payload, server_config.server, SERVER_PORT, |
41 | payload->giaddr, SERVER_PORT); | 41 | payload->giaddr, SERVER_PORT); |
@@ -49,19 +49,19 @@ static int send_packet_to_client(struct dhcpMessage *payload, int force_broadcas | |||
49 | uint32_t ciaddr; | 49 | uint32_t ciaddr; |
50 | 50 | ||
51 | if (force_broadcast) { | 51 | if (force_broadcast) { |
52 | DEBUG(LOG_INFO, "broadcasting packet to client (NAK)"); | 52 | DEBUG("broadcasting packet to client (NAK)"); |
53 | ciaddr = INADDR_BROADCAST; | 53 | ciaddr = INADDR_BROADCAST; |
54 | chaddr = MAC_BCAST_ADDR; | 54 | chaddr = MAC_BCAST_ADDR; |
55 | } else if (payload->ciaddr) { | 55 | } else if (payload->ciaddr) { |
56 | DEBUG(LOG_INFO, "unicasting packet to client ciaddr"); | 56 | DEBUG("unicasting packet to client ciaddr"); |
57 | ciaddr = payload->ciaddr; | 57 | ciaddr = payload->ciaddr; |
58 | chaddr = payload->chaddr; | 58 | chaddr = payload->chaddr; |
59 | } else if (ntohs(payload->flags) & BROADCAST_FLAG) { | 59 | } else if (ntohs(payload->flags) & BROADCAST_FLAG) { |
60 | DEBUG(LOG_INFO, "broadcasting packet to client (requested)"); | 60 | DEBUG("broadcasting packet to client (requested)"); |
61 | ciaddr = INADDR_BROADCAST; | 61 | ciaddr = INADDR_BROADCAST; |
62 | chaddr = MAC_BCAST_ADDR; | 62 | chaddr = MAC_BCAST_ADDR; |
63 | } else { | 63 | } else { |
64 | DEBUG(LOG_INFO, "unicasting packet to client yiaddr"); | 64 | DEBUG("unicasting packet to client yiaddr"); |
65 | ciaddr = payload->yiaddr; | 65 | ciaddr = payload->yiaddr; |
66 | chaddr = payload->chaddr; | 66 | chaddr = payload->chaddr; |
67 | } | 67 | } |
@@ -158,12 +158,12 @@ int sendOffer(struct dhcpMessage *oldpacket) | |||
158 | } | 158 | } |
159 | 159 | ||
160 | if(!packet.yiaddr) { | 160 | if(!packet.yiaddr) { |
161 | LOG(LOG_WARNING, "no IP addresses to give -- OFFER abandoned"); | 161 | bb_error_msg("No IP addresses to give - OFFER abandoned"); |
162 | return -1; | 162 | return -1; |
163 | } | 163 | } |
164 | 164 | ||
165 | if (!add_lease(packet.chaddr, packet.yiaddr, server_config.offer_time)) { | 165 | if (!add_lease(packet.chaddr, packet.yiaddr, server_config.offer_time)) { |
166 | LOG(LOG_WARNING, "lease pool is full -- OFFER abandoned"); | 166 | bb_error_msg("Lease pool is full - OFFER abandoned"); |
167 | return -1; | 167 | return -1; |
168 | } | 168 | } |
169 | 169 | ||
@@ -197,7 +197,7 @@ int sendOffer(struct dhcpMessage *oldpacket) | |||
197 | add_bootp_options(&packet); | 197 | add_bootp_options(&packet); |
198 | 198 | ||
199 | addr.s_addr = packet.yiaddr; | 199 | addr.s_addr = packet.yiaddr; |
200 | LOG(LOG_INFO, "sending OFFER of %s", inet_ntoa(addr)); | 200 | bb_info_msg("Sending OFFER of %s", inet_ntoa(addr)); |
201 | return send_packet(&packet, 0); | 201 | return send_packet(&packet, 0); |
202 | } | 202 | } |
203 | 203 | ||
@@ -208,7 +208,7 @@ int sendNAK(struct dhcpMessage *oldpacket) | |||
208 | 208 | ||
209 | init_packet(&packet, oldpacket, DHCPNAK); | 209 | init_packet(&packet, oldpacket, DHCPNAK); |
210 | 210 | ||
211 | DEBUG(LOG_INFO, "sending NAK"); | 211 | DEBUG("Sending NAK"); |
212 | return send_packet(&packet, 1); | 212 | return send_packet(&packet, 1); |
213 | } | 213 | } |
214 | 214 | ||
@@ -245,7 +245,7 @@ int sendACK(struct dhcpMessage *oldpacket, uint32_t yiaddr) | |||
245 | add_bootp_options(&packet); | 245 | add_bootp_options(&packet); |
246 | 246 | ||
247 | addr.s_addr = packet.yiaddr; | 247 | addr.s_addr = packet.yiaddr; |
248 | LOG(LOG_INFO, "sending ACK to %s", inet_ntoa(addr)); | 248 | bb_info_msg("Sending ACK to %s", inet_ntoa(addr)); |
249 | 249 | ||
250 | if (send_packet(&packet, 0) < 0) | 250 | if (send_packet(&packet, 0) < 0) |
251 | return -1; | 251 | return -1; |