diff options
Diffstat (limited to 'networking/udhcp/socket.c')
-rw-r--r-- | networking/udhcp/socket.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c index 2d253c1f2..3f481c33c 100644 --- a/networking/udhcp/socket.c +++ b/networking/udhcp/socket.c | |||
@@ -60,33 +60,33 @@ int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp) | |||
60 | if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) { | 60 | if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) { |
61 | our_ip = (struct sockaddr_in *) &ifr.ifr_addr; | 61 | our_ip = (struct sockaddr_in *) &ifr.ifr_addr; |
62 | *addr = our_ip->sin_addr.s_addr; | 62 | *addr = our_ip->sin_addr.s_addr; |
63 | DEBUG(LOG_INFO, "%s (our ip) = %s", ifr.ifr_name, inet_ntoa(our_ip->sin_addr)); | 63 | DEBUG("%s (our ip) = %s", ifr.ifr_name, inet_ntoa(our_ip->sin_addr)); |
64 | } else { | 64 | } else { |
65 | LOG(LOG_ERR, "SIOCGIFADDR failed, is the interface up and configured?: %m"); | 65 | bb_perror_msg("SIOCGIFADDR failed, is the interface up and configured?"); |
66 | close(fd); | 66 | close(fd); |
67 | return -1; | 67 | return -1; |
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | if (ioctl(fd, SIOCGIFINDEX, &ifr) == 0) { | 71 | if (ioctl(fd, SIOCGIFINDEX, &ifr) == 0) { |
72 | DEBUG(LOG_INFO, "adapter index %d", ifr.ifr_ifindex); | 72 | DEBUG("adapter index %d", ifr.ifr_ifindex); |
73 | *ifindex = ifr.ifr_ifindex; | 73 | *ifindex = ifr.ifr_ifindex; |
74 | } else { | 74 | } else { |
75 | LOG(LOG_ERR, "SIOCGIFINDEX failed!: %m"); | 75 | bb_perror_msg("SIOCGIFINDEX failed"); |
76 | close(fd); | 76 | close(fd); |
77 | return -1; | 77 | return -1; |
78 | } | 78 | } |
79 | if (ioctl(fd, SIOCGIFHWADDR, &ifr) == 0) { | 79 | if (ioctl(fd, SIOCGIFHWADDR, &ifr) == 0) { |
80 | memcpy(arp, ifr.ifr_hwaddr.sa_data, 6); | 80 | memcpy(arp, ifr.ifr_hwaddr.sa_data, 6); |
81 | DEBUG(LOG_INFO, "adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x", | 81 | DEBUG("adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x", |
82 | arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]); | 82 | arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]); |
83 | } else { | 83 | } else { |
84 | LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %m"); | 84 | bb_perror_msg("SIOCGIFHWADDR failed"); |
85 | close(fd); | 85 | close(fd); |
86 | return -1; | 86 | return -1; |
87 | } | 87 | } |
88 | } else { | 88 | } else { |
89 | LOG(LOG_ERR, "socket failed!: %m"); | 89 | bb_perror_msg("socket failed"); |
90 | return -1; | 90 | return -1; |
91 | } | 91 | } |
92 | close(fd); | 92 | close(fd); |
@@ -101,9 +101,9 @@ int listen_socket(uint32_t ip, int port, char *inf) | |||
101 | struct sockaddr_in addr; | 101 | struct sockaddr_in addr; |
102 | int n = 1; | 102 | int n = 1; |
103 | 103 | ||
104 | DEBUG(LOG_INFO, "Opening listen socket on 0x%08x:%d %s", ip, port, inf); | 104 | DEBUG("Opening listen socket on 0x%08x:%d %s", ip, port, inf); |
105 | if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { | 105 | if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { |
106 | DEBUG(LOG_ERR, "socket call failed: %m"); | 106 | bb_perror_msg("socket"); |
107 | return -1; | 107 | return -1; |
108 | } | 108 | } |
109 | 109 | ||