+2002-08-26 Conrad Scott <conrad.scott@dsl.pipex.com>
+
+ * fhandler_socket.cc (fhandler_socket::check_peer_secret_event):
+ Fix strace message.
+ (fhandler_socket::connect): Remove sigframe.
+ (fhandler_socket::accept): Ditto.
+ (fhandler_socket::getsockname): Ditto.
+ (fhandler_socket::getpeername): Ditto.
+ (fhandler_socket::recvfrom): Ditto.
+ (fhandler_socket::recvmsg): Ditto.
+ (fhandler_socket::sendto): Ditto.
+ (fhandler_socket::sendmsg): Ditto.
+ (fhandler_socket::close): Ditto.
+ (fhandler_socket::ioctl): Ditto.
+ * ioctl.cc (ioctl): Add sigframe.
+ *net.cc (cygwin_sendto): Ditto.
+ (cygwin_recvfrom): Ditto.
+ (cygwin_recvfrom): Ditto.
+ (cygwin_connect): Ditto.
+ (cygwin_shutdown): Ditto.
+ (cygwin_getpeername): Ditto.
+ (cygwin_accept): Ditto. Improve strace message.
+ (cygwin_getsockname): Ditto. Ditto.
+ (cygwin_recvmsg): Ditto. Ditto.
+ (cygwin_sendmsg): Fix strace message.
+
2002-08-27 Christopher Faylor <cgf@redhat.com>
* child_info.h: Add _PROC_WHOOPS enum value.
ev = CreateEvent (&sec_all_nih, FALSE, FALSE, buf);
if (!ev && GetLastError () == ERROR_ALREADY_EXISTS)
{
- debug_printf ("%s event already exist");
+ debug_printf ("event \"%s\" already exists", buf);
ev = OpenEvent (EVENT_ALL_ACCESS, FALSE, buf);
}
sockaddr_in sin;
int secret [4];
- sigframe thisframe (mainthread);
-
if (!get_inet_addr (name, namelen, &sin, &namelen, secret))
return -1;
BOOL secret_check_failed = FALSE;
BOOL in_progress = FALSE;
- sigframe thisframe (mainthread);
-
/* Allows NULL peer and len parameters. */
struct sockaddr_in peer_dummy;
int len_dummy;
{
int res = -1;
- sigframe thisframe (mainthread);
-
if (get_addr_family () == AF_LOCAL)
{
struct sockaddr_un *sun = (struct sockaddr_un *) name;
int
fhandler_socket::getpeername (struct sockaddr *name, int *namelen)
{
- sigframe thisframe (mainthread);
-
int res = ::getpeername (get_socket (), name, namelen);
if (res)
set_winsock_errno ();
wsock_event wsock_evt;
LPWSAOVERLAPPED ovr;
- sigframe thisframe (mainthread);
-
if (is_nonblocking () || !(ovr = wsock_evt.prepare ()))
{
debug_printf ("Fallback to winsock 1 recvfrom call");
char *buf, *p;
struct iovec *iov = msg->msg_iov;
- sigframe thisframe (mainthread);
-
if (get_addr_family () == AF_LOCAL)
{
/* On AF_LOCAL sockets the (fixed-size) name of the shared memory
LPWSAOVERLAPPED ovr;
sockaddr_in sin;
- sigframe thisframe (mainthread);
-
if (to && !get_inet_addr (to, tolen, &sin, &tolen))
return -1;
int
fhandler_socket::shutdown (int how)
{
- sigframe thisframe (mainthread);
-
int res = ::shutdown (get_socket (), how);
if (res)
{
int res = 0;
- sigframe thisframe (mainthread);
-
/* HACK to allow a graceful shutdown even if shutdown() hasn't been
called by the application. Note that this isn't the ultimate
solution but it helps in many cases. */
struct ifconf ifc, *ifcp;
struct ifreq *ifr, *ifrp;
- sigframe thisframe (mainthread);
-
switch (cmd)
{
case SIOCGIFCONF:
const struct sockaddr *to, int tolen)
{
int res;
+ sigframe thisframe (mainthread);
+
fhandler_socket *fh = get (fd);
if ((len && __check_invalid_read_ptr_errno (buf, (unsigned) len))
struct sockaddr *from, int *fromlen)
{
int res;
+ sigframe thisframe (mainthread);
+
fhandler_socket *fh = get (fd);
if ((len && __check_null_invalid_struct_errno (buf, (unsigned) len))
cygwin_connect (int fd, const struct sockaddr *name, int namelen)
{
int res;
+ sigframe thisframe (mainthread);
+
fhandler_socket *fh = get (fd);
if (__check_invalid_read_ptr_errno (name, namelen) || !fh)
cygwin_accept (int fd, struct sockaddr *peer, int *len)
{
int res;
+ sigframe thisframe (mainthread);
+
fhandler_socket *fh = get (fd);
if ((peer && (check_null_invalid_struct_errno (len)
else
res = fh->accept (peer, len);
- syscall_printf ("%d = accept (%d, %p, %d)", res, fd, peer, len);
+ syscall_printf ("%d = accept (%d, %p, %p)", res, fd, peer, len);
return res;
}
cygwin_getsockname (int fd, struct sockaddr *addr, int *namelen)
{
int res;
+ sigframe thisframe (mainthread);
+
fhandler_socket *fh = get (fd);
if (check_null_invalid_struct_errno (namelen)
else
res = fh->getsockname (addr, namelen);
- syscall_printf ("%d = getsockname (%d, %p, %d)", res, fd, addr, namelen);
+ syscall_printf ("%d = getsockname (%d, %p, %p)", res, fd, addr, namelen);
return res;
}
cygwin_shutdown (int fd, int how)
{
int res;
+ sigframe thisframe (mainthread);
+
fhandler_socket *fh = get (fd);
if (!fh)
cygwin_getpeername (int fd, struct sockaddr *name, int *len)
{
int res;
+ sigframe thisframe (mainthread);
+
fhandler_socket *fh = get (fd);
if (check_null_invalid_struct_errno (len)
cygwin_recvmsg (int fd, struct msghdr *msg, int flags)
{
int res;
+ sigframe thisframe (mainthread);
+
fhandler_socket *fh = get (fd);
if (check_null_invalid_struct_errno (msg)
else
res = fh->recvmsg (msg, flags);
- syscall_printf ("%d = recvmsg (%d, %p, %d)", res, fd, msg, flags);
+ syscall_printf ("%d = recvmsg (%d, %p, %x)", res, fd, msg, flags);
return res;
}
else
res = fh->sendmsg (msg, flags);
- syscall_printf ("%d = recvmsg (%d, %p, %d)", res, fd, msg, flags);
+ syscall_printf ("%d = sendmsg (%d, %p, %x)", res, fd, msg, flags);
return res;
}