rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-15 20:21:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed rtems_bsdnet_makeFdForSocket to work with file system change.

Browse Source
This commit is contained in:
Jennifer Averett
2012-07-18 11:42:04 -05:00
parent 21cc0aa57a
commit e4f2591430
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtemsbsd/src/rtems-bsd-syscalls.c
View File

@@ -94,11 +94,7 @@ struct socket *rtems_bsdnet_fdToSocket(
/* /*
* Create an RTEMS file descriptor for a socket * Create an RTEMS file descriptor for a socket
*/ */
static int rtems_bsdnet_makeFdForSocket (void *so)
int rtems_bsdnet_makeFdForSocket(
void *so,
const rtems_filesystem_file_handlers_r *h
)
{ {
rtems_libio_t *iop; rtems_libio_t *iop;
int fd; int fd;
@@ -111,8 +107,9 @@ int rtems_bsdnet_makeFdForSocket(
iop->flags |= LIBIO_FLAGS_WRITE | LIBIO_FLAGS_READ; iop->flags |= LIBIO_FLAGS_WRITE | LIBIO_FLAGS_READ;
iop->data0 = fd; iop->data0 = fd;
iop->data1 = so; iop->data1 = so;
iop->pathinfo.handlers = h; iop->pathinfo.handlers = &socket_handlers;
iop->pathinfo.mt_entry->ops = &rtems_filesystem_operations_default; iop->pathinfo.mt_entry = &rtems_filesystem_null_mt_entry;
rtems_filesystem_location_add_to_mt_entry(&iop->pathinfo);
return fd; return fd;
} }
@@ -214,7 +211,7 @@ socket (int domain, int type, int protocol)
/* An extra reference on `fp' has been held for us by falloc(). */ /* An extra reference on `fp' has been held for us by falloc(). */
error = socreate(domain, &so, type, protocol, td->td_ucred, td); error = socreate(domain, &so, type, protocol, td->td_ucred, td);
if (error == 0) { if (error == 0) {
fd = rtems_bsdnet_makeFdForSocket (so, &socket_handlers); fd = rtems_bsdnet_makeFdForSocket (so);
if (fd < 0) if (fd < 0)
{ {
soclose (so); soclose (so);
@@ -461,7 +458,7 @@ kern_accept(struct thread *td, int s, struct sockaddr **name, socklen_t *namelen
TAILQ_REMOVE(&head->so_comp, so, so_list); TAILQ_REMOVE(&head->so_comp, so, so_list);
head->so_qlen--; head->so_qlen--;
fd = rtems_bsdnet_makeFdForSocket (so, &socket_handlers); fd = rtems_bsdnet_makeFdForSocket (so);
if (fd < 0) { if (fd < 0) {
TAILQ_INSERT_HEAD(&head->so_comp, so, so_list); TAILQ_INSERT_HEAD(&head->so_comp, so, so_list);
head->so_qlen++; head->so_qlen++;