[BACK]Return to lease.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / dnsmasq / src

Diff for /embedaddon/dnsmasq/src/lease.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2014/06/15 16:31:38 version 1.1.1.3, 2016/11/02 09:57:01
Line 1 Line 1
/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley/* dnsmasq is Copyright (c) 2000-2016 Simon Kelley
   
    This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
Line 352  static int find_interface_v4(struct in_addr local, int Line 352  static int find_interface_v4(struct in_addr local, int
                              struct in_addr netmask, struct in_addr broadcast, void *vparam)                               struct in_addr netmask, struct in_addr broadcast, void *vparam)
 {  {
   struct dhcp_lease *lease;    struct dhcp_lease *lease;
    int prefix = netmask_length(netmask);
 
   (void) label;    (void) label;
   (void) broadcast;    (void) broadcast;
   (void) vparam;    (void) vparam;
   
   for (lease = leases; lease; lease = lease->next)    for (lease = leases; lease; lease = lease->next)
    if (!(lease->flags & (LEASE_TA | LEASE_NA)))    if (!(lease->flags & (LEASE_TA | LEASE_NA)) &&
      if (is_same_net(local, lease->addr, netmask))        is_same_net(local, lease->addr, netmask) && 
        lease_set_interface(lease, if_index, *((time_t *)vparam));        prefix > lease->new_prefixlen) 
        {
         lease->new_interface = if_index;
         lease->new_prefixlen = prefix;
       }
 
   return 1;    return 1;
 }  }
   
Line 371  static int find_interface_v6(struct in6_addr *local,   Line 376  static int find_interface_v6(struct in6_addr *local,  
                              int preferred, int valid, void *vparam)                               int preferred, int valid, void *vparam)
 {  {
   struct dhcp_lease *lease;    struct dhcp_lease *lease;
  
   (void)scope;    (void)scope;
   (void)flags;    (void)flags;
   (void)preferred;    (void)preferred;
   (void)valid;    (void)valid;
     (void)vparam;
   
   for (lease = leases; lease; lease = lease->next)    for (lease = leases; lease; lease = lease->next)
     if ((lease->flags & (LEASE_TA | LEASE_NA)))      if ((lease->flags & (LEASE_TA | LEASE_NA)))
      if (is_same_net6(local, &lease->addr6, prefix))      if (is_same_net6(local, &lease->addr6, prefix) && prefix > lease->new_prefixlen) {
        lease_set_interface(lease, if_index, *((time_t *)vparam));        /* save prefix length for comparison, as we might get shorter matching
           * prefix in upcoming netlink GETADDR responses
          * */
         lease->new_interface = if_index;
         lease->new_prefixlen = prefix;
       }
 
   return 1;    return 1;
 }  }
   
Line 414  void lease_update_slaac(time_t now) Line 425  void lease_update_slaac(time_t now)
    start-time. */     start-time. */
 void lease_find_interfaces(time_t now)  void lease_find_interfaces(time_t now)
 {  {
     struct dhcp_lease *lease;
     
     for (lease = leases; lease; lease = lease->next)
       lease->new_prefixlen = lease->new_interface = 0;
   
   iface_enumerate(AF_INET, &now, find_interface_v4);    iface_enumerate(AF_INET, &now, find_interface_v4);
 #ifdef HAVE_DHCP6  #ifdef HAVE_DHCP6
   iface_enumerate(AF_INET6, &now, find_interface_v6);    iface_enumerate(AF_INET6, &now, find_interface_v6);
 #endif  #endif
   
     for (lease = leases; lease; lease = lease->next)
       if (lease->new_interface != 0) 
         lease_set_interface(lease, lease->new_interface, now);
 }  }
   
 #ifdef HAVE_DHCP6  #ifdef HAVE_DHCP6
Line 793  void lease_set_iaid(struct dhcp_lease *lease, int iaid Line 813  void lease_set_iaid(struct dhcp_lease *lease, int iaid
 }  }
 #endif  #endif
   
void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,void lease_set_hwaddr(struct dhcp_lease *lease, const unsigned char *hwaddr,
                      unsigned char *clid, int hw_len, int hw_type, int clid_len,                       const unsigned char *clid, int hw_len, int hw_type,
                      time_t now, int force)                      int clid_len, time_t now, int force)
 {  {
 #ifdef HAVE_DHCP6  #ifdef HAVE_DHCP6
   int change = force;    int change = force;
Line 877  static void kill_name(struct dhcp_lease *lease) Line 897  static void kill_name(struct dhcp_lease *lease)
   lease->hostname = lease->fqdn = NULL;    lease->hostname = lease->fqdn = NULL;
 }  }
   
void lease_set_hostname(struct dhcp_lease *lease, char *name, int auth, char *domain, char *config_domain)void lease_set_hostname(struct dhcp_lease *lease, const char *name, int auth, char *domain, char *config_domain)
 {  {
   struct dhcp_lease *lease_tmp;    struct dhcp_lease *lease_tmp;
   char *new_name = NULL, *new_fqdn = NULL;    char *new_name = NULL, *new_fqdn = NULL;
Line 1090  int do_script_run(time_t now) Line 1110  int do_script_run(time_t now)
 }  }
   
 #ifdef HAVE_SCRIPT  #ifdef HAVE_SCRIPT
   /* delim == -1 -> delim = 0, but embeded 0s, creating extra records, are OK. */
 void lease_add_extradata(struct dhcp_lease *lease, unsigned char *data, unsigned int len, int delim)  void lease_add_extradata(struct dhcp_lease *lease, unsigned char *data, unsigned int len, int delim)
 {  {
   unsigned int i;    unsigned int i;
       
  /* check for embeded NULLs */  if (delim == -1)
  for (i = 0; i < len; i++)    delim = 0;
    if (data[i] == 0)  else
      {    /* check for embeded NULLs */
        len = i;    for (i = 0; i < len; i++)
        break;      if (data[i] == 0)
      }        {
          len = i;
           break;
         }
   
   if ((lease->extradata_size - lease->extradata_len) < (len + 1))    if ((lease->extradata_size - lease->extradata_len) < (len + 1))
     {      {
       size_t newsz = lease->extradata_len + len + 100;        size_t newsz = lease->extradata_len + len + 100;
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>