diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-05-20 21:35:40 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-05-20 21:35:40 +0000 |
commit | 26358a4c4a8ae0ca68f08054e367aa3687681445 (patch) | |
tree | 790e13824acaeb9598460afb371c8791726fcb91 /avahi-core/socket.c | |
parent | 4de3df3db7df43474176533d0b5fac851dd4a9b4 (diff) |
* add new server state AVAHI_SERVER_SLEEPING to avoid conflicts by own responses
* Honour TC bit in incoming packets by responding immediately to packets
* publish browse domain
* Fix a structure size issue in iface.c revealed by running avahi on Linux 2.4
* Don't depend on IFF_RUNNING
* Require a global IP addresses to consider an interface relevant
* Linux 2.4 compatiblity
* fix parsing of TTL from recvmsg()
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@79 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core/socket.c')
-rw-r--r-- | avahi-core/socket.c | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/avahi-core/socket.c b/avahi-core/socket.c index 86e2a6f..b9e1b71 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -420,7 +420,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa, AvahiDnsPacket *p= NULL; struct msghdr msg; struct iovec io; - uint8_t aux[64]; + uint8_t aux[1024]; ssize_t l; struct cmsghdr *cmsg; gboolean found_ttl = FALSE, found_iface = FALSE; @@ -444,25 +444,42 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa, msg.msg_controllen = sizeof(aux); msg.msg_flags = 0; - if ((l = recvmsg(fd, &msg, 0)) < 0) + if ((l = recvmsg(fd, &msg, 0)) < 0) { + g_warning("recvmsg(): %s\n", strerror(errno)); goto fail; + } + if (ret_sa->sin_addr.s_addr == INADDR_ANY) { + /* Linux 2.4 behaves very strangely sometimes! */ + goto fail; + } + + g_assert(!(msg.msg_flags & MSG_CTRUNC)); + g_assert(!(msg.msg_flags & MSG_TRUNC)); p->size = (size_t) l; *ret_ttl = 0; + +/* avahi_hexdump(msg.msg_control, msg.msg_controllen); */ - for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg,cmsg)) { - if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_TTL) { - *ret_ttl = *(uint8_t *) CMSG_DATA(cmsg); - found_ttl = TRUE; - } + for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { + +/* avahi_hexdump(CMSG_DATA(cmsg), cmsg->cmsg_len - sizeof(struct cmsghdr)); */ + + if (cmsg->cmsg_level == SOL_IP) { - if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_PKTINFO) { - *ret_iface = ((struct in_pktinfo*) CMSG_DATA(cmsg))->ipi_ifindex; - found_iface = TRUE; + if (cmsg->cmsg_type == IP_TTL) { + *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg)); + found_ttl = TRUE; + } else if (cmsg->cmsg_type == IP_PKTINFO) { + *ret_iface = (gint) ((struct in_pktinfo*) CMSG_DATA(cmsg))->ipi_ifindex; + found_iface = TRUE; + } } } +/* g_message("ttl=%u iface=%i", *ret_ttl, *ret_iface); */ + g_assert(found_iface); g_assert(found_ttl); @@ -512,7 +529,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6 *ret_sa, for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { if (cmsg->cmsg_level == SOL_IPV6 && cmsg->cmsg_type == IPV6_HOPLIMIT) { - *ret_ttl = *(uint8_t *) CMSG_DATA(cmsg); + *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg)); found_ttl = TRUE; } |