X-Git-Url: http://git.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=interface.c;h=3904c8918125d786e7119f56c8dfdcb1d8cd608f;hp=cde184bec9b3cc25147c17db327e41f3665b3e79;hb=ff09d9a4f9885b8160577c79e6349bfee05452f8;hpb=e1bacef27d869234149951cc7f4c9d3e0d8f07ad

diff --git a/interface.c b/interface.c
index cde184b..3904c89 100644
--- a/interface.c
+++ b/interface.c
@@ -242,7 +242,7 @@ read_socket4(struct uloop_fd *u, unsigned int events)
 		fprintf(stderr, "RX ipv4: %s\n", iface->name);
 		fprintf(stderr, "  multicast: %d\n", iface->multicast);
 		inet_ntop(AF_INET, &from.sin_addr, buf, 256);
-		fprintf(stderr, "  src %s:%d\n", buf, from.sin_port);
+		fprintf(stderr, "  src %s:%d\n", buf, ntohs(from.sin_port));
 		inet_ntop(AF_INET, &inp->ipi_spec_dst, buf, 256);
 		fprintf(stderr, "  dst %s\n", buf);
 		inet_ntop(AF_INET, &inp->ipi_addr, buf, 256);
@@ -252,7 +252,7 @@ read_socket4(struct uloop_fd *u, unsigned int events)
 	if (inp->ipi_ifindex != iface->ifindex)
 		fprintf(stderr, "invalid iface index %d != %d\n", ifindex, iface->ifindex);
 	else if (!interface_valid_src((void *) &iface->v4_addr, (void *) &iface->v4_netmask, (void *) &from.sin_addr, 4))
-		dns_handle_packet(iface, (struct sockaddr *) &from, from.sin_port, buffer, len);
+		dns_handle_packet(iface, (struct sockaddr *) &from, ntohs(from.sin_port), buffer, len);
 }
 
 static void
@@ -319,7 +319,7 @@ read_socket6(struct uloop_fd *u, unsigned int events)
 		fprintf(stderr, "RX ipv6: %s\n", iface->name);
 		fprintf(stderr, "  multicast: %d\n", iface->multicast);
 		inet_ntop(AF_INET6, &from.sin6_addr, buf, 256);
-		fprintf(stderr, "  src %s:%d\n", buf, from.sin6_port);
+		fprintf(stderr, "  src %s:%d\n", buf, ntohs(from.sin6_port));
 		inet_ntop(AF_INET6, &inp->ipi6_addr, buf, 256);
 		fprintf(stderr, "  dst %s\n", buf);
 	}
@@ -327,7 +327,7 @@ read_socket6(struct uloop_fd *u, unsigned int events)
 	if (inp->ipi6_ifindex != iface->ifindex)
 		fprintf(stderr, "invalid iface index %d != %d\n", ifindex, iface->ifindex);
 	else if (!interface_valid_src((void *) &iface->v6_addr, (void *) &iface->v6_netmask, (void *) &from.sin6_addr, 16))
-		dns_handle_packet(iface, (struct sockaddr *) &from, from.sin6_port, buffer, len);
+		dns_handle_packet(iface, (struct sockaddr *) &from, ntohs(from.sin6_port), buffer, len);
 }
 
 static int
@@ -441,7 +441,7 @@ reconnect_socket4(struct uloop_timeout *timeout)
 
 	uloop_fd_add(&iface->fd, ULOOP_READ);
 	if (iface->multicast) {
-		dns_send_question(iface, "_services._dns-sd._udp.local", TYPE_PTR, 0);
+		dns_send_question(iface, NULL, C_DNS_SD, TYPE_PTR, 0);
 		announce_init(iface);
 	}
 
@@ -489,7 +489,7 @@ reconnect_socket6(struct uloop_timeout *timeout)
 	uloop_fd_add(&iface->fd, ULOOP_READ);
 
 	if (iface->multicast) {
-		dns_send_question(iface, "_services._dns-sd._udp.local", TYPE_PTR, 0);
+		dns_send_question(iface, NULL, C_DNS_SD, TYPE_PTR, 0);
 		announce_init(iface);
 	}