diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-06-16 13:50:23 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-06-16 13:50:23 +0000 |
| commit | c428ec09795b81d4af2207ded1835e9cdb9ea05a (patch) | |
| tree | c0f0fc66b13da3ea62cfca8b42762a754f7b7585 /cpukit/libnetworking | |
| parent | 2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-c428ec09795b81d4af2207ded1835e9cdb9ea05a.tar.bz2 | |
2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org>
PR 1566/filesystem
* libnetworking/rtems/mkrootfs.c, libnetworking/rtems/mkrootfs.h:
Let rtems_rootfs_append_host_rec take an in_addr_t as first arg.
* libnetworking/rtems/rtems_dhcp.c, libnetworking/nfs/bootp_subr.c:
Reflect changes above.
Diffstat (limited to 'cpukit/libnetworking')
| -rw-r--r-- | cpukit/libnetworking/nfs/bootp_subr.c | 6 | ||||
| -rw-r--r-- | cpukit/libnetworking/rtems/mkrootfs.c | 2 | ||||
| -rw-r--r-- | cpukit/libnetworking/rtems/mkrootfs.h | 2 | ||||
| -rw-r--r-- | cpukit/libnetworking/rtems/rtems_dhcp.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/cpukit/libnetworking/nfs/bootp_subr.c b/cpukit/libnetworking/nfs/bootp_subr.c index cdac406cdc..e976227d4d 100644 --- a/cpukit/libnetworking/nfs/bootp_subr.c +++ b/cpukit/libnetworking/nfs/bootp_subr.c @@ -1153,7 +1153,7 @@ bootpc_init(bool update_files, bool forever) dn = "mydomain"; if (!hn) hn = "me"; - rtems_rootfs_append_host_rec(*((unsigned long*) &myaddr.sin_addr), hn, dn); + rtems_rootfs_append_host_rec(myaddr.sin_addr.s_addr, hn, dn); /* * Should the given domainname be used here ? @@ -1163,12 +1163,12 @@ bootpc_init(bool update_files, bool forever) hn = rtems_bsdnet_bootp_server_name; else hn = "bootps"; - rtems_rootfs_append_host_rec(*((unsigned long *) &rtems_bsdnet_bootp_server_address), + rtems_rootfs_append_host_rec(rtems_bsdnet_bootp_server_address.s_addr, hn, dn); } if (dhcp_gotlogserver) { - rtems_rootfs_append_host_rec(*((unsigned long *) &rtems_bsdnet_log_host_address), + rtems_rootfs_append_host_rec(rtems_bsdnet_log_host_address.s_addr, "logs", dn); } diff --git a/cpukit/libnetworking/rtems/mkrootfs.c b/cpukit/libnetworking/rtems/mkrootfs.c index d5a230df33..63d67e26b3 100644 --- a/cpukit/libnetworking/rtems/mkrootfs.c +++ b/cpukit/libnetworking/rtems/mkrootfs.c @@ -166,7 +166,7 @@ rtems_rootfs_file_append (const char *file, */ int -rtems_rootfs_append_host_rec (unsigned long cip, +rtems_rootfs_append_host_rec (in_addr_t cip, const char *cname, const char *dname) { diff --git a/cpukit/libnetworking/rtems/mkrootfs.h b/cpukit/libnetworking/rtems/mkrootfs.h index bfd25389c1..857b633264 100644 --- a/cpukit/libnetworking/rtems/mkrootfs.h +++ b/cpukit/libnetworking/rtems/mkrootfs.h @@ -46,7 +46,7 @@ rtems_rootfs_file_append (const char *file, */ int -rtems_rootfs_append_host_rec (unsigned long cip, +rtems_rootfs_append_host_rec (in_addr_t cip, const char *cname, const char *dname); diff --git a/cpukit/libnetworking/rtems/rtems_dhcp.c b/cpukit/libnetworking/rtems/rtems_dhcp.c index df1acca710..82f8fd9c5b 100644 --- a/cpukit/libnetworking/rtems/rtems_dhcp.c +++ b/cpukit/libnetworking/rtems/rtems_dhcp.c @@ -1048,7 +1048,7 @@ dhcp_init (int update_files) hn = "me"; sethostname (hn, strlen (hn)); } - rtems_rootfs_append_host_rec(*((unsigned long*) &myaddr.sin_addr), hn, dn); + rtems_rootfs_append_host_rec(myaddr.sin_addr.s_addr, hn, dn); /* * Should the given domainname be used here ? @@ -1058,12 +1058,12 @@ dhcp_init (int update_files) hn = rtems_bsdnet_bootp_server_name; else hn = "bootps"; - rtems_rootfs_append_host_rec(*((unsigned long *) &rtems_bsdnet_bootp_server_address), + rtems_rootfs_append_host_rec(rtems_bsdnet_bootp_server_address.s_addr, hn, dn); } if (dhcp_gotlogserver) { - rtems_rootfs_append_host_rec(*((unsigned long *) &rtems_bsdnet_log_host_address), + rtems_rootfs_append_host_rec(rtems_bsdnet_log_host_address.s_addr, "logs", dn); } |