src/patches/dnsmasq/011-Dont_reset_packet_length_on_transmission_in_case_of_retransmission.patch

   1 From 6b1c464d6de3d7d2afc9b53afe78cda6d6e3316f Mon Sep 17 00:00:00 2001
   2 From: Simon Kelley <simon@thekelleys.org.uk>
   3 Date: Fri, 22 Jul 2016 20:59:16 +0100
   4 Subject: [PATCH] Don't reset packet length on transmission, in case of
   5  retransmission.
   6
   7 ---
   8  src/radv.c    |    2 +-
   9  src/rfc3315.c |    2 +-
  10  src/slaac.c   |    2 +-
  11  3 files changed, 3 insertions(+), 3 deletions(-)
  12
  13 diff --git a/src/radv.c b/src/radv.c
  14 index 39c9217..ffc37f2 100644
  15 --- a/src/radv.c
  16 +++ b/src/radv.c
  17 @@ -528,7 +528,7 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad
  18      }
  19
  20    while (retry_send(sendto(daemon->icmp6fd, daemon->outpacket.iov_base,
  21 -                          save_counter(0), 0, (struct sockaddr *)&addr,
  22 +                          save_counter(-1), 0, (struct sockaddr *)&addr,
  23                            sizeof(addr))));
  24
  25  }
  26 diff --git a/src/rfc3315.c b/src/rfc3315.c
  27 index e1271a1..c7bf46f 100644
  28 --- a/src/rfc3315.c
  29 +++ b/src/rfc3315.c
  30 @@ -2127,7 +2127,7 @@ void relay_upstream6(struct dhcp_relay *relay, ssize_t sz,
  31                 my_syslog(MS_DHCP | LOG_ERR, _("Cannot multicast to DHCPv6 server without correct interface"));
  32             }
  33
  34 -         send_from(daemon->dhcp6fd, 0, daemon->outpacket.iov_base, save_counter(0), &to, &from, 0);
  35 +         send_from(daemon->dhcp6fd, 0, daemon->outpacket.iov_base, save_counter(-1), &to, &from, 0);
  36
  37           if (option_bool(OPT_LOG_OPTS))
  38             {
  39 diff --git a/src/slaac.c b/src/slaac.c
  40 index bd6c9b4..7ecf127 100644
  41 --- a/src/slaac.c
  42 +++ b/src/slaac.c
  43 @@ -164,7 +164,7 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases)
  44             addr.sin6_port = htons(IPPROTO_ICMPV6);
  45             addr.sin6_addr = slaac->addr;
  46
  47 -           if (sendto(daemon->icmp6fd, daemon->outpacket.iov_base, save_counter(0), 0,
  48 +           if (sendto(daemon->icmp6fd, daemon->outpacket.iov_base, save_counter(-1), 0,
  49                        (struct sockaddr *)&addr,  sizeof(addr)) == -1 &&
  50                 errno == EHOSTUNREACH)
  51               slaac->ping_time = 0; /* Give up */
  52 --
  53 1.7.10.4
  54