diff options
| -rw-r--r-- | cpukit/ChangeLog | 16 | ||||
| -rw-r--r-- | cpukit/libnetworking/rtems/rtems_bsdnet.h | 2 | ||||
| -rw-r--r-- | cpukit/libnetworking/rtems/rtems_bsdnet_internal.h | 9 | ||||
| -rw-r--r-- | cpukit/libnetworking/rtems/rtems_glue.c | 6 |
4 files changed, 21 insertions, 12 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 8d0d8a6c2c..d213a8e373 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,19 @@ +2005-02-03 Ralf Corsepius <ralf.corsepius@rtems.org> + + PR 755/rtems + * libnetworking/rtems_glue.c: + Rename rtems_bsdnet_nameservers to _rtems_bsdnet_nameservers. + Rename rtems_bsdnet_ntpservers to _rtems_bsdnet_ntpservers. + Add new rtems_bsdnet_nameservers, rtems_bsdnet_ntpservers as + pointers to _rtems_bsdnet_*servers arrays. + * libnetworking/rtems/rtems_bsdnet_internal.h: Remove + rtems_bsdnet_nameserver, rtems_bsdnet_nameserver_count. + * libnetworking/rtems/rtems_bsdnet.h: Remove + rtems_bsdnet_ntpserver, rtems_bsdnet_ntp_count. + * libnetworking/rtems/bsdnet/servers.h: New. + * libnetworking/opt_ipsec.h: New (BSD compatibility). + * libnetworking/Makefile.am: Reflect changes above. + 2005-02-02 Ralf Corsepius <ralf.corsepius@rtems.org> * libnetworking/rtems/ftpfs.h, libnetworking/rtems/mkrootfs.h, diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet.h b/cpukit/libnetworking/rtems/rtems_bsdnet.h index eeab800168..1a483cb060 100644 --- a/cpukit/libnetworking/rtems/rtems_bsdnet.h +++ b/cpukit/libnetworking/rtems/rtems_bsdnet.h @@ -40,8 +40,6 @@ extern struct in_addr rtems_bsdnet_bootp_server_address; extern char *rtems_bsdnet_bootp_server_name; extern char *rtems_bsdnet_bootp_boot_file_name; extern char *rtems_bsdnet_bootp_cmdline; -extern struct in_addr rtems_bsdnet_ntpserver[]; -extern int rtems_bsdnet_ntpserver_count; extern long rtems_bsdnet_timeoffset; /* diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h index a43154a1f5..11395edb49 100644 --- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h +++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h @@ -29,12 +29,7 @@ typedef unsigned int vm_size_t; #include <rtems/cdefs.h> #include <sys/time.h> -/* -struct itimerval { - struct timeval it_interval; - struct timeval it_value; -}; -*/ + struct mdproc { int md_flags; int *md_regs; @@ -162,8 +157,6 @@ extern int rtems_bsdnet_ticks_per_second; extern int rtems_bsdnet_microseconds_per_tick; extern struct in_addr rtems_bsdnet_log_host_address; extern char *rtems_bsdnet_domain_name; -extern struct in_addr rtems_bsdnet_nameserver[]; -extern int rtems_bsdnet_nameserver_count; /* * Internal IOCTL command diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c index c97af906ea..dc9fa4bd68 100644 --- a/cpukit/libnetworking/rtems/rtems_glue.c +++ b/cpukit/libnetworking/rtems/rtems_glue.c @@ -89,11 +89,13 @@ char *rtems_bsdnet_bootp_boot_file_name = 0; char *rtems_bsdnet_bootp_server_name = 0; char *rtems_bsdnet_domain_name = 0; char *rtems_bsdnet_bootp_cmdline = 0; -struct in_addr rtems_bsdnet_nameserver[sizeof rtems_bsdnet_config.name_server / +static struct in_addr _rtems_bsdnet_nameserver[sizeof rtems_bsdnet_config.name_server / sizeof rtems_bsdnet_config.name_server[0]]; +struct in_addr *rtems_bsdnet_nameserver = _rtems_bsdnet_nameserver; int rtems_bsdnet_nameserver_count = 0; -struct in_addr rtems_bsdnet_ntpserver[sizeof rtems_bsdnet_config.ntp_server / +static struct in_addr _rtems_bsdnet_ntpserver[sizeof rtems_bsdnet_config.ntp_server / sizeof rtems_bsdnet_config.ntp_server[0]]; +struct in_addr *rtems_bsdnet_ntpserver = _rtems_bsdnet_ntpserver; int rtems_bsdnet_ntpserver_count = 0; long rtems_bsdnet_timeoffset = 0; |