* fhandler.h (fhandler_base::set_fd): New virtual method.
(fhandler_base::get_fd): Ditto.
(fhandler_socket::set_fd): Ditto.
(fhandler_socket::get_fd): Ditto.
* fhandler_socket.cc (fhandler_socket::read): Call cygwin_recv instead
of native Winsock recv.
(fhandler_socket::write): Call cygwin_send instead of native Winsock
send.
* net.cc (fdsock): Store fd in fhandler_socket.
+2002-02-08 Corinna Vinschen <corinna@vinschen.de>
+
+ * dtable.cc (dtable::dup2): Store fd for fhandler_socket.
+ * fhandler.h (fhandler_base::set_fd): New virtual method.
+ (fhandler_base::get_fd): Ditto.
+ (fhandler_socket::set_fd): Ditto.
+ (fhandler_socket::get_fd): Ditto.
+ * fhandler_socket.cc (fhandler_socket::read): Call cygwin_recv instead
+ of native Winsock recv.
+ (fhandler_socket::write): Call cygwin_send instead of native Winsock
+ send.
+ * net.cc (fdsock): Store fd in fhandler_socket.
+
2002-02-07 Corinna Vinschen <corinna@vinschen.de>
* net.cc (cygwin_getsockname): Fix handling of NULL sun_path.
if (!not_open (newfd))
_close (newfd);
fds[newfd] = newfh;
+ newfh->set_fd (newfd);
ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup");
MALLOC_CHECK;
virtual void seekdir (DIR *, off_t);
virtual void rewinddir (DIR *);
virtual int closedir (DIR *);
+
+ virtual void set_fd (int nfd) {}
+ virtual int get_fd () { return -1; }
};
class fhandler_socket: public fhandler_base
HANDLE secret_event;
struct _WSAPROTOCOL_INFOA *prot_info_ptr;
char *sun_path;
+ int fd;
public:
fhandler_socket ();
select_record *select_read (select_record *s);
select_record *select_write (select_record *s);
select_record *select_except (select_record *s);
- int get_addr_family () {return addr_family;}
+ void set_fd (int nfd) { fd = nfd; }
+ int get_fd () { return fd; }
void set_addr_family (int af) {addr_family = af;}
+ int get_addr_family () {return addr_family;}
void set_sun_path (const char *path);
char *get_sun_path () {return sun_path;}
void set_connect_secret ();
return fh.fstat (buf, pc);
}
+extern "C" int cygwin_recv (int, void *, int, unsigned int);
+
int __stdcall
fhandler_socket::read (void *ptr, size_t len)
{
sigframe thisframe (mainthread);
- int res = recv (get_socket (), (char *) ptr, len, 0);
+ int res = cygwin_recv (get_fd (), (char *) ptr, len, 0);
+#if 0
if (res == SOCKET_ERROR)
set_winsock_errno ();
+#endif
return res;
}
+extern "C" int cygwin_send (int, const void *, int, unsigned int);
+
int
fhandler_socket::write (const void *ptr, size_t len)
{
sigframe thisframe (mainthread);
- int res = send (get_socket (), (const char *) ptr, len, 0);
+ int res = cygwin_send (get_fd (), (const char *) ptr, len, 0);
+#if 0
if (res == SOCKET_ERROR)
{
set_winsock_errno ();
if (get_errno () == ECONNABORTED || get_errno () == ECONNRESET)
_raise (SIGPIPE);
}
+#endif
return res;
}
else
debug_printf ("not setting socket inheritance since winsock2_active %d", winsock2_active);
fhandler_socket *fh = (fhandler_socket *) cygheap->fdtab.build_fhandler (fd, FH_SOCKET, name);
+ fh->set_fd (fd);
fh->set_io_handle ((HANDLE) soc);
fh->set_flags (O_RDWR);
fh->set_name (name, name);