RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org>

Browse Source 
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.
This commit is contained in:
Ralf Corsepius
2010-06-16 13:52:04 +00:00
parent 54cad054fd
commit 64b287e36d
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpukit/ChangeLog
View File

@@ -1,3 +1,11 @@
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.
2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/rfs/rtems-rfs-dir.c: Various 64bit compatibility fixes.

6
cpukit/libnetworking/nfs/bootp_subr.c
View File

@@ -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);
}

2
cpukit/libnetworking/rtems/mkrootfs.c
View File

@@ -255,7 +255,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)
{

2
cpukit/libnetworking/rtems/mkrootfs.h
View File

@@ -53,7 +53,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);

6
cpukit/libnetworking/rtems/rtems_dhcp.c
View File

@@ -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);
}