diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-10-23 20:21:39 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-10-23 20:21:39 +0000 |
| commit | e865e3dba3c6ee5de5581dbfbafc025aa5c9947e (patch) | |
| tree | 7630d4d1b2f9982d1c5df4dad767ea7511ad33ee /avahi-core/socket.c | |
| parent | 0d0c9486e3fe26fdd67624ee57961ba2d5846ebb (diff) | |
* correctly handle empty domain names (i.e. the root zone)
* fix memory initialization error in wide-area.c
* make server_add_xx() functions atomic, i.e. clean up half-created entries on failure
* add some more validity checking macros and change everything to make use of them
* clean up avahi_server_add_address()
* change some functions from domain.[ch] to work on a stack buffer instead of malloced memory
* update avahi-test.c a little
* replace avahi_reverse_lookup_name_{ipv4,ipv6}() with a single function avahi_reverse_lookup_name()
* remove avahi_server_add_dns_server_name() from public API
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@845 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core/socket.c')
| -rw-r--r-- | avahi-core/socket.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/avahi-core/socket.c b/avahi-core/socket.c index 9be9ece..1360110 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -451,17 +451,17 @@ int avahi_send_dns_packet_ipv4(int fd, int interface, AvahiDnsPacket *p, const A #ifdef IP_PKTINFO if (interface >= 0) { + struct in_pktinfo *pkti; + memset(cmsg_data, 0, sizeof(cmsg_data)); cmsg = (struct cmsghdr*) cmsg_data; cmsg->cmsg_len = sizeof(cmsg_data); cmsg->cmsg_level = IPPROTO_IP; - { - struct in_pktinfo *pkti; + cmsg->cmsg_type = IP_PKTINFO; + + pkti = (struct in_pktinfo*) (cmsg_data + sizeof(struct cmsghdr)); + pkti->ipi_ifindex = interface; - cmsg->cmsg_type = IP_PKTINFO; - pkti = (struct in_pktinfo*) (cmsg_data + sizeof(struct cmsghdr)); - pkti->ipi_ifindex = interface; - } msg.msg_control = cmsg_data; msg.msg_controllen = sizeof(cmsg_data); } else { |