Reinstate accidentally disabled reply function and remove %m formats.

This commit is contained in:
df
2020-07-24 10:13:16 +01:00
parent 8f15f5873b
commit c9a1e4cf0d

10
mdnsd.c
View File

@@ -1186,7 +1186,7 @@ static void main_loop(struct mdnsd *svr) {
svr->sendmsg_requested = 1; svr->sendmsg_requested = 1;
// flush the notify_pipe // flush the notify_pipe
if (read_pipe(svr->notify_pipe[0], (char *)&notify_buf, 1) == -1) if (read_pipe(svr->notify_pipe[0], (char *)&notify_buf, 1) == -1)
log_message(LOG_ERR, "read_pipe() failed; %m\n"); log_message(LOG_ERR, "read_pipe() failed; %s\n", strerror(errno));
} else if (FD_ISSET(svr->sockfd, &sockfd_set)) { } else if (FD_ISSET(svr->sockfd, &sockfd_set)) {
struct sockaddr_in fromaddr; struct sockaddr_in fromaddr;
socklen_t sockaddr_size = sizeof(struct sockaddr_in); socklen_t sockaddr_size = sizeof(struct sockaddr_in);
@@ -1232,10 +1232,10 @@ static void main_loop(struct mdnsd *svr) {
struct mdns_pkt *mdns = mdns_parse_pkt(pkt_buffer, recvsize); struct mdns_pkt *mdns = mdns_parse_pkt(pkt_buffer, recvsize);
if (mdns != NULL) { if (mdns != NULL) {
if (process_mdns_pkt(svr, mdns, mdns_packet)) { if (process_mdns_pkt(svr, mdns, mdns_packet)) {
#ifdef MDNS_NO_RESPONDER_SUPPORT #ifndef MDNS_NO_RESPONDER_SUPPORT
size_t replylen = mdns_encode_pkt(mdns_packet, pkt_buffer, PACKET_SIZE); size_t replylen = mdns_encode_pkt(mdns_packet, pkt_buffer, PACKET_SIZE);
if (send_packet(svr->sockfd, pkt_buffer, replylen, svr->domain) == -1) if (send_packet(svr->sockfd, pkt_buffer, replylen, svr->domain) == -1)
log_message(LOG_ERR, "send_packet() failed; %m\n"); log_message(LOG_ERR, "send_packet() failed; %s\n", strerror(errno));
#endif #endif
} else if (mdns->num_qn == 0) { } else if (mdns->num_qn == 0) {
DEBUG_PRINTF("(no questions in packet)\n\n"); DEBUG_PRINTF("(no questions in packet)\n\n");
@@ -1244,7 +1244,7 @@ static void main_loop(struct mdnsd *svr) {
} }
} }
} else { } else {
log_message(LOG_ERR, "select() failed (ret: %d); %m\n", ret); log_message(LOG_ERR, "select() failed (ret: %d); %s\n", ret, strerror(errno));
continue; continue;
} }
@@ -1283,7 +1283,7 @@ static void main_loop(struct mdnsd *svr) {
DEBUG_PRINTF("sending query for probe : (num of qn = %d)\n", mdns_packet->num_qn); DEBUG_PRINTF("sending query for probe : (num of qn = %d)\n", mdns_packet->num_qn);
size_t replylen = mdns_encode_pkt(mdns_packet, pkt_buffer, PACKET_SIZE); size_t replylen = mdns_encode_pkt(mdns_packet, pkt_buffer, PACKET_SIZE);
if (send_packet(svr->sockfd, pkt_buffer, replylen, svr->domain) == -1) { if (send_packet(svr->sockfd, pkt_buffer, replylen, svr->domain) == -1) {
log_message(LOG_ERR, "send_packet() failed; %m\n"); log_message(LOG_ERR, "send_packet() failed; %s\n", strerror(errno));
} }
if (mdns_packet->rr_qn) { if (mdns_packet->rr_qn) {