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

Diff for /embedaddon/dnsmasq/src/dhcp.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2013/07/29 19:37:40 version 1.1.1.2, 2014/06/15 16:31:38
Line 1 Line 1
/* dnsmasq is Copyright (c) 2000-2013 Simon Kelley/* dnsmasq is Copyright (c) 2000-2014 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 20 Line 20
   
 struct iface_param {  struct iface_param {
   struct dhcp_context *current;    struct dhcp_context *current;
     struct dhcp_relay *relay;
     struct in_addr relay_local;
   int ind;    int ind;
 };  };
   
Line 28  struct match_param { Line 30  struct match_param {
   struct in_addr netmask, broadcast, addr;    struct in_addr netmask, broadcast, addr;
 };  };
   
static int complete_context(struct in_addr local, int if_index, static int complete_context(struct in_addr local, int if_index, char *label,
                             struct in_addr netmask, struct in_addr broadcast, void *vparam);                              struct in_addr netmask, struct in_addr broadcast, void *vparam);
static int check_listen_addrs(struct in_addr local, int if_index, static int check_listen_addrs(struct in_addr local, int if_index, char *label,
                               struct in_addr netmask, struct in_addr broadcast, void *vparam);                                struct in_addr netmask, struct in_addr broadcast, void *vparam);
   static int relay_upstream4(struct dhcp_relay *relay, struct dhcp_packet *mess, size_t sz, int iface_index);
   static struct dhcp_relay *relay_reply4(struct dhcp_packet *mess, char *arrival_interface);
   
 static int make_fd(int port)  static int make_fd(int port)
 {  {
Line 70  static int make_fd(int port) Line 74  static int make_fd(int port)
      support it. This handles the introduction of REUSEPORT on Linux. */       support it. This handles the introduction of REUSEPORT on Linux. */
   if (option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND))    if (option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND))
     {      {
      int rc = -1, porterr = 0;      int rc = 0;
   
 #ifdef SO_REUSEPORT  #ifdef SO_REUSEPORT
       if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &oneopt, sizeof(oneopt))) == -1 &&         if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &oneopt, sizeof(oneopt))) == -1 && 
          errno != ENOPROTOOPT)          errno == ENOPROTOOPT)
        porterr = 1;        rc = 0;
 #endif  #endif
               
      if (rc == -1 && !porterr)      if (rc != -1)
         rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &oneopt, sizeof(oneopt));          rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &oneopt, sizeof(oneopt));
               
       if (rc == -1)        if (rc == -1)
Line 132  void dhcp_packet(time_t now, int pxe_fd) Line 136  void dhcp_packet(time_t now, int pxe_fd)
   int fd = pxe_fd ? daemon->pxefd : daemon->dhcpfd;    int fd = pxe_fd ? daemon->pxefd : daemon->dhcpfd;
   struct dhcp_packet *mess;    struct dhcp_packet *mess;
   struct dhcp_context *context;    struct dhcp_context *context;
     struct dhcp_relay *relay;
     int is_relay_reply = 0;
   struct iname *tmp;    struct iname *tmp;
   struct ifreq ifr;    struct ifreq ifr;
   struct msghdr msg;    struct msghdr msg;
Line 250  void dhcp_packet(time_t now, int pxe_fd) Line 256  void dhcp_packet(time_t now, int pxe_fd)
     unicast_dest = 1;      unicast_dest = 1;
 #endif  #endif
       
  ifr.ifr_addr.sa_family = AF_INET;  if ((relay = relay_reply4((struct dhcp_packet *)daemon->dhcp_packet.iov_base, ifr.ifr_name)))
  if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 ) 
    iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr; 
  else 
     {      {
      my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);      /* Reply from server, using us as relay. */
      return;      iface_index = relay->iface_index;
       if (!indextoname(daemon->dhcpfd, iface_index, ifr.ifr_name))
         return;
       is_relay_reply = 1; 
       iov.iov_len = sz;
 #ifdef HAVE_LINUX_NETWORK
       strncpy(arp_req.arp_dev, ifr.ifr_name, 16);
 #endif 
     }      }
    else
  for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) 
    if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name)) 
      return; 
   
  /* unlinked contexts are marked by context->current == context */ 
  for (context = daemon->dhcp; context; context = context->next) 
    context->current = context; 
   
  parm.current = NULL; 
  parm.ind = iface_index; 
 
  if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name, NULL)) 
     {      {
      /* If we failed to match the primary address of the interface, see if we've got a --listen-address      ifr.ifr_addr.sa_family = AF_INET;
         for a secondary */      if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 )
      struct match_param match;        iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
       else
         {
           my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
           return;
         }
               
      match.matched = 0;      for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
      match.ind = iface_index;        if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
           return;
               
      if (!daemon->if_addrs ||      /* unlinked contexts/relays are marked by context->current == context */
          !iface_enumerate(AF_INET, &match, check_listen_addrs) ||      for (context = daemon->dhcp; context; context = context->next)
          !match.matched)        context->current = context;
       
       for (relay = daemon->relay4; relay; relay = relay->next)
         relay->current = relay;
       
       parm.current = NULL;
       parm.relay = NULL;
       parm.relay_local.s_addr = 0;
       parm.ind = iface_index;
       
       if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name, NULL))
         {
           /* If we failed to match the primary address of the interface, see if we've got a --listen-address
              for a secondary */
           struct match_param match;
           
           match.matched = 0;
           match.ind = iface_index;
           
           if (!daemon->if_addrs ||
               !iface_enumerate(AF_INET, &match, check_listen_addrs) ||
               !match.matched)
             return;
           
           iface_addr = match.addr;
           /* make sure secondary address gets priority in case
              there is more than one address on the interface in the same subnet */
           complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm);
         }    
       
       if (!iface_enumerate(AF_INET, &parm, complete_context))
         return;          return;
   
      iface_addr = match.addr;      /* We're relaying this request */
      /* make sure secondary address gets priority in case      if  (parm.relay_local.s_addr != 0 &&
         there is more than one address on the interface in the same subnet */           relay_upstream4(parm.relay, (struct dhcp_packet *)daemon->dhcp_packet.iov_base, (size_t)sz, iface_index))
      complete_context(match.addr, iface_index, match.netmask, match.broadcast, &parm);        return;
    }    
       /* May have configured relay, but not DHCP server */
       if (!daemon->dhcp)
         return;
 
       lease_prune(NULL, now); /* lose any expired leases */
       iov.iov_len = dhcp_reply(parm.current, ifr.ifr_name, iface_index, (size_t)sz, 
                                now, unicast_dest, &is_inform, pxe_fd, iface_addr);
       lease_update_file(now);
       lease_update_dns(0);
               
  if (!iface_enumerate(AF_INET, &parm, complete_context))      if (iov.iov_len == 0)
    return;        return;
     }
       
   lease_prune(NULL, now); /* lose any expired leases */  
   iov.iov_len = dhcp_reply(parm.current, ifr.ifr_name, iface_index, (size_t)sz,   
                            now, unicast_dest, &is_inform, pxe_fd, iface_addr);  
   lease_update_file(now);  
   lease_update_dns(0);  
       
   if (iov.iov_len == 0)  
     return;  
     
   msg.msg_name = &dest;    msg.msg_name = &dest;
   msg.msg_namelen = sizeof(dest);    msg.msg_namelen = sizeof(dest);
   msg.msg_control = NULL;    msg.msg_control = NULL;
Line 321  void dhcp_packet(time_t now, int pxe_fd) Line 356  void dhcp_packet(time_t now, int pxe_fd)
       if (mess->ciaddr.s_addr != 0)        if (mess->ciaddr.s_addr != 0)
         dest.sin_addr = mess->ciaddr;          dest.sin_addr = mess->ciaddr;
     }      }
  else if (mess->giaddr.s_addr)  else if (mess->giaddr.s_addr && !is_relay_reply)
     {      {
       /* Send to BOOTP relay  */        /* Send to BOOTP relay  */
       dest.sin_port = htons(daemon->dhcp_server_port);        dest.sin_port = htons(daemon->dhcp_server_port);
Line 334  void dhcp_packet(time_t now, int pxe_fd) Line 369  void dhcp_packet(time_t now, int pxe_fd)
          source port too, and send back to that.  If we're replying            source port too, and send back to that.  If we're replying 
          to a DHCPINFORM, trust the source address always. */           to a DHCPINFORM, trust the source address always. */
       if ((!is_inform && dest.sin_addr.s_addr != mess->ciaddr.s_addr) ||        if ((!is_inform && dest.sin_addr.s_addr != mess->ciaddr.s_addr) ||
          dest.sin_port == 0 || dest.sin_addr.s_addr == 0)          dest.sin_port == 0 || dest.sin_addr.s_addr == 0 || is_relay_reply)
         {          {
           dest.sin_port = htons(daemon->dhcp_client_port);             dest.sin_port = htons(daemon->dhcp_client_port); 
           dest.sin_addr = mess->ciaddr;            dest.sin_addr = mess->ciaddr;
Line 411  void dhcp_packet(time_t now, int pxe_fd) Line 446  void dhcp_packet(time_t now, int pxe_fd)
 }  }
     
 /* check against secondary interface addresses */  /* check against secondary interface addresses */
static int check_listen_addrs(struct in_addr local, int if_index, static int check_listen_addrs(struct in_addr local, int if_index, char *label,
                               struct in_addr netmask, struct in_addr broadcast, void *vparam)                                struct in_addr netmask, struct in_addr broadcast, void *vparam)
 {  {
   struct match_param *param = vparam;    struct match_param *param = vparam;
   struct iname *tmp;    struct iname *tmp;
   
     (void) label;
   
   if (if_index == param->ind)    if (if_index == param->ind)
     {      {
       for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)        for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)
Line 444  static int check_listen_addrs(struct in_addr local, in Line 481  static int check_listen_addrs(struct in_addr local, in
   
    Note that the current chain may be superceded later for configured hosts or those coming via gateways. */     Note that the current chain may be superceded later for configured hosts or those coming via gateways. */
   
static int complete_context(struct in_addr local, int if_index, static int complete_context(struct in_addr local, int if_index, char *label,
                             struct in_addr netmask, struct in_addr broadcast, void *vparam)                              struct in_addr netmask, struct in_addr broadcast, void *vparam)
 {  {
   struct dhcp_context *context;    struct dhcp_context *context;
     struct dhcp_relay *relay;
   struct iface_param *param = vparam;    struct iface_param *param = vparam;
   
     (void)label;
       
   for (context = daemon->dhcp; context; context = context->next)    for (context = daemon->dhcp; context; context = context->next)
     {      {
Line 491  static int complete_context(struct in_addr local, int  Line 531  static int complete_context(struct in_addr local, int 
         }                         }               
     }      }
   
     for (relay = daemon->relay4; relay; relay = relay->next)
       if (if_index == param->ind && relay->local.addr.addr4.s_addr == local.s_addr && relay->current == relay &&
           (param->relay_local.s_addr == 0 || param->relay_local.s_addr == local.s_addr))
         {
           relay->current = param->relay;
           param->relay = relay;
           param->relay_local = local;     
         }
   
   return 1;    return 1;
 }  }
                       
Line 700  int address_allocate(struct dhcp_context *context, Line 749  int address_allocate(struct dhcp_context *context,
   return 0;    return 0;
 }  }
   
 static int is_addr_in_context(struct dhcp_context *context, struct dhcp_config *config)  
 {  
   if (!context) /* called via find_config() from lease_update_from_configs() */  
     return 1;   
   if (!(config->flags & CONFIG_ADDR))  
     return 1;  
   for (; context; context = context->current)  
     if (is_same_net(config->addr, context->start, context->netmask))  
       return 1;  
     
   return 0;  
 }  
   
 int config_has_mac(struct dhcp_config *config, unsigned char *hwaddr, int len, int type)  
 {  
   struct hwaddr_config *conf_addr;  
     
   for (conf_addr = config->hwaddr; conf_addr; conf_addr = conf_addr->next)  
     if (conf_addr->wildcard_mask == 0 &&  
         conf_addr->hwaddr_len == len &&  
         (conf_addr->hwaddr_type == type || conf_addr->hwaddr_type == 0) &&  
         memcmp(conf_addr->hwaddr, hwaddr, len) == 0)  
       return 1;  
     
   return 0;  
 }  
   
 struct dhcp_config *find_config(struct dhcp_config *configs,  
                                 struct dhcp_context *context,  
                                 unsigned char *clid, int clid_len,  
                                 unsigned char *hwaddr, int hw_len,   
                                 int hw_type, char *hostname)  
 {  
   int count, new;  
   struct dhcp_config *config, *candidate;   
   struct hwaddr_config *conf_addr;  
   
   if (clid)  
     for (config = configs; config; config = config->next)  
       if (config->flags & CONFIG_CLID)  
         {  
           if (config->clid_len == clid_len &&   
               memcmp(config->clid, clid, clid_len) == 0 &&  
               is_addr_in_context(context, config))  
             return config;  
             
           /* dhcpcd prefixes ASCII client IDs by zero which is wrong, but we try and  
              cope with that here */  
           if (*clid == 0 && config->clid_len == clid_len-1  &&  
               memcmp(config->clid, clid+1, clid_len-1) == 0 &&  
               is_addr_in_context(context, config))  
             return config;  
         }  
     
   
   for (config = configs; config; config = config->next)  
     if (config_has_mac(config, hwaddr, hw_len, hw_type) &&  
         is_addr_in_context(context, config))  
       return config;  
     
   if (hostname && context)  
     for (config = configs; config; config = config->next)  
       if ((config->flags & CONFIG_NAME) &&   
           hostname_isequal(config->hostname, hostname) &&  
           is_addr_in_context(context, config))  
         return config;  
   
   /* use match with fewest wildcard octets */  
   for (candidate = NULL, count = 0, config = configs; config; config = config->next)  
     if (is_addr_in_context(context, config))  
       for (conf_addr = config->hwaddr; conf_addr; conf_addr = conf_addr->next)  
         if (conf_addr->wildcard_mask != 0 &&  
             conf_addr->hwaddr_len == hw_len &&    
             (conf_addr->hwaddr_type == hw_type || conf_addr->hwaddr_type == 0) &&  
             (new = memcmp_masked(conf_addr->hwaddr, hwaddr, hw_len, conf_addr->wildcard_mask)) > count)  
           {  
             count = new;  
             candidate = config;  
           }  
   
   return candidate;  
 }  
   
 void dhcp_read_ethers(void)  void dhcp_read_ethers(void)
 {  {
   FILE *f = fopen(ETHERSFILE, "r");    FILE *f = fopen(ETHERSFILE, "r");
Line 984  char *host_from_dns(struct in_addr addr) Line 950  char *host_from_dns(struct in_addr addr)
   return NULL;    return NULL;
 }  }
   
#endifstatic int  relay_upstream4(struct dhcp_relay *relay, struct dhcp_packet *mess, size_t sz, int iface_index)
 {
   /* ->local is same value for all relays on ->current chain */
   struct all_addr from;
   
   if (mess->op != BOOTREQUEST)
     return 0;
   
     /* source address == relay address */
     from.addr.addr4 = relay->local.addr.addr4;
     
     /* already gatewayed ? */
     if (mess->giaddr.s_addr)
       {
         /* if so check if by us, to stomp on loops. */
         if (mess->giaddr.s_addr == relay->local.addr.addr4.s_addr)
           return 1;
       }
     else
       {
         /* plug in our address */
         mess->giaddr.s_addr = relay->local.addr.addr4.s_addr;
       }
   
     if ((mess->hops++) > 20)
       return 1;
   
     for (; relay; relay = relay->current)
       {
         union mysockaddr to;
         
         to.sa.sa_family = AF_INET;
         to.in.sin_addr = relay->server.addr.addr4;
         to.in.sin_port = htons(daemon->dhcp_server_port);
         
         send_from(daemon->dhcpfd, 0, (char *)mess, sz, &to, &from, 0);
         
         if (option_bool(OPT_LOG_OPTS))
           {
             inet_ntop(AF_INET, &relay->local, daemon->addrbuff, ADDRSTRLEN);
             my_syslog(MS_DHCP | LOG_INFO, _("DHCP relay %s -> %s"), daemon->addrbuff, inet_ntoa(relay->server.addr.addr4));
           }
         
         /* Save this for replies */
         relay->iface_index = iface_index;
       }
     
     return 1;
   }
   
   
   static struct dhcp_relay *relay_reply4(struct dhcp_packet *mess, char *arrival_interface)
   {
     struct dhcp_relay *relay;
   
     if (mess->giaddr.s_addr == 0 || mess->op != BOOTREPLY)
       return NULL;
   
     for (relay = daemon->relay4; relay; relay = relay->next)
       {
         if (mess->giaddr.s_addr == relay->local.addr.addr4.s_addr)
           {
             if (!relay->interface || wildcard_match(relay->interface, arrival_interface))
               return relay->iface_index != 0 ? relay : NULL;
           }
       }
     
     return NULL;   
   }     
   
   #endif
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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