mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

make F_GETFL return file access mode for !CORE_LOCKING as well

Browse Source
This commit is contained in:
goldsimon 2017-03-29 20:54:24 +02:00
parent 172dab1289
commit 5b6c654dd1
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/api/sockets.c
View File

@ -3171,19 +3171,30 @@ lwip_fcntl(int s, int cmd, int val)
if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) { if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) {
#if LWIP_TCPIP_CORE_LOCKING #if LWIP_TCPIP_CORE_LOCKING
LOCK_TCPIP_CORE(); LOCK_TCPIP_CORE();
LWIP_ASSERT("sock->conn->pcb.tcp != NULL", sock->conn->pcb.tcp != NULL); #else
if(!(sock->conn->pcb.tcp->flags & TF_RXCLOSED)) { SYS_ARCH_DECL_PROTECT(lev);
op_mode |= O_RDONLY; /* the proper thing to do here would be to get into the tcpip_thread,
} but locking should be OK as well since we only *read* some flags */
if (!(sock->conn->pcb.tcp->flags & TF_FIN)) { SYS_ARCH_PROTECT(lev);
op_mode |= O_WRONLY; #endif
if (sock->conn && sock->conn->pcb.tcp) {
if(!(sock->conn->pcb.tcp->flags & TF_RXCLOSED)) {
op_mode |= O_RDONLY;
}
if (!(sock->conn->pcb.tcp->flags & TF_FIN)) {
op_mode |= O_WRONLY;
}
} }
#if LWIP_TCPIP_CORE_LOCKING
UNLOCK_TCPIP_CORE(); UNLOCK_TCPIP_CORE();
#endif /* !LWIP_TCPIP_CORE_LOCKING */ #else
SYS_ARCH_UNPROTECT(lev);
#endif
} else { } else {
op_mode |= O_RDWR; op_mode |= O_RDWR;
} }
/* ensure O_RDWR for (O_RDONLY|O_WRONLY) != O_RDWR cases */
ret |= (op_mode == (O_RDONLY|O_WRONLY)) ? O_RDWR : op_mode; ret |= (op_mode == (O_RDONLY|O_WRONLY)) ? O_RDWR : op_mode;
break; break;