Changeset a61fc251 in rtems


Ignore:
Timestamp:
05/22/12 13:35:14 (11 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
45ada30
Parents:
da0e045 (diff), 14811a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

Files:
16 added
3 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/libbsp/powerpc/acinclude.m4

    rda0e045 ra61fc251  
    3535  ss555 )
    3636    AC_CONFIG_SUBDIRS([ss555]);;
     37  t32mppc )
     38    AC_CONFIG_SUBDIRS([t32mppc]);;
    3739  tqm8xx )
    3840    AC_CONFIG_SUBDIRS([tqm8xx]);;

  • c/src/lib/libcpu/powerpc/configure.ac

    rda0e045 ra61fc251  
    2121
    2222AM_CONDITIONAL(shared, \
    23    test "$RTEMS_CPU_MODEL" = "mpc750" \
     23   test "$RTEMS_CPU_MODEL" = "" \
     24|| test "$RTEMS_CPU_MODEL" = "mpc750" \
    2425|| test "$RTEMS_CPU_MODEL" = "mpc7400" \
    2526|| test "$RTEMS_CPU_MODEL" = "mpc7455" \

  • cpukit/libnetworking/rtems/rtems_dhcp.c

    rda0e045 ra61fc251  
    206206                                                         DHCP_HOST,
    207207                                                         DHCP_DOMAIN_NAME };
     208#define NUM_NAMESERVERS \
     209  (sizeof rtems_bsdnet_config.name_server / sizeof rtems_bsdnet_config.name_server[0])
     210static struct in_addr rtems_dhcpd_nameserver[NUM_NAMESERVERS];
     211static int rtems_dhcpd_nameserver_count = 0;
     212
     213/*
     214 * Clean any DNS entries add by a DHCP request.
     215 */
     216static void
     217clean_dns_entries (void)
     218{
     219  int e;
     220  for (e = 0; e < rtems_dhcpd_nameserver_count; ++e)
     221  {
     222    int n;
     223    for (n = 0; n < rtems_bsdnet_nameserver_count; ++ n)
     224    {
     225      if (memcmp (&rtems_dhcpd_nameserver[e], &rtems_bsdnet_nameserver[n], 4) == 0)
     226      {
     227        if (n < (NUM_NAMESERVERS - 1))
     228          memmove (&rtems_bsdnet_nameserver[n],
     229                   &rtems_bsdnet_nameserver[n + 1],
     230                   (NUM_NAMESERVERS - n - 1) * 4);
     231        --rtems_bsdnet_nameserver_count;
     232      }
     233    }
     234  }
     235  rtems_dhcpd_nameserver_count = 0;
     236}
    208237
    209238/*
    … …  
    364393          int dlen = 0;
    365394          while ((dlen < len) &&
    366                  (rtems_bsdnet_nameserver_count <
    367                   sizeof rtems_bsdnet_config.name_server /
    368                   sizeof rtems_bsdnet_config.name_server[0]))
     395                 (rtems_dhcpd_nameserver_count < NUM_NAMESERVERS) &&
     396                 (rtems_bsdnet_nameserver_count < NUM_NAMESERVERS))
    369397          {
     398            memcpy (&rtems_dhcpd_nameserver
     399                    [rtems_dhcpd_nameserver_count], p + dlen, 4);
     400            rtems_dhcpd_nameserver_count++;
    370401            memcpy (&rtems_bsdnet_nameserver
    371402                    [rtems_bsdnet_nameserver_count], p + dlen, 4);
    … …  
    744775      }
    745776
     777      /*
     778       * We have an ack. Clear the DNS entries that have been assigned by a previous
     779       * DHCP request.
     780       */
     781      clean_dns_entries ();
     782
     783      /*
     784       * Process this requests options.
     785       */
    746786      process_options (&dhcp_req.vend[4], sizeof (dhcp_req.vend) - 4);
    747787
    … …  
    858898  struct proc          *procp = NULL;
    859899
     900  clean_dns_entries();
     901 
    860902  /*
    861903   * If we are to update the files create the root
Note: See TracChangeset for help on using the changeset viewer.