Re: Socket resets randomly

[James Hawkins]

On 9/8/06, Ryan Miller <rmiller(a)auctionpay.com> wrote:
> Index: ChangeLog
> ===================================================================
> RCS file: /home/wine/wine/ChangeLog,v
> retrieving revision 1.120
> diff -u -r1.120 ChangeLog
> --- ChangeLog   24 Aug 2006 14:43:25 -0000      1.120
> +++ ChangeLog   8 Sep 2006 22:49:55 -0000
> @@ -1,3 +1,8 @@
> [phone]  Ryan Miller <rmiller(a)auctionpay.com> & Zach Gorman <gormanjz(a)hotmail.com>
> +
> +       * dlls/ws2_32/socket.c, dlls/ws2_32/sock.c
> +       ws2_32: Fixed bug with sockets randomly reseting and tests.
> +
>  2006-08-24  Alexandre Julliard <julliard(a)winehq.org>
>
> * configure, configure.ac:
>
> Index: dlls/ws2_32/socket.c

As someone already said, no changes to Changelog.

===================================================================
> RCS file: /home/wine/wine/dlls/ws2_32/socket.c,v
> retrieving revision 1.4
> diff -u -r1.4 socket.c
> --- dlls/ws2_32/socket.c        8 Sep 2006 10:16:19 -0000       1.4
> +++ dlls/ws2_32/socket.c        8 Sep 2006 22:48:11 -0000
> @@ -2660,6 +2660,11 @@
>      TRACE("socket: %04x, level %d, name %d, ptr %p, len %d\n",
>            s, level, optname, optval, optlen);
>
> +    /* In Windows, if setsockopt succeeds, GetLastError() always returns zero.
> +       The native wininet.dll expects this behavior, and does not always
> +       check the return value of setsockopt() first.*/
> +    SetLastError(0);
> +

0 is ERROR_SUCCESS, and you need to use that define.
> /* SO_OPENTYPE does not require a valid socket handle. */
>      if (level == WS_SOL_SOCKET && optname == WS_SO_OPENTYPE)
>      {
>
> Index: dlls/ws2_32/tests/sock.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/ws2_32/tests/sock.c,v
> retrieving revision 1.2
> diff -u -r1.2 sock.c
> --- dlls/ws2_32/tests/sock.c    23 May 2006 12:49:01 -0000      1.2
> +++ dlls/ws2_32/tests/sock.c    8 Sep 2006 22:48:12 -0000
> @@ -1410,6 +1410,27 @@
>
> }
>
> +static void test_setsockopt_last_error() {
> +    SOCKET s;
> +    BOOL bKeepAlive=0;
> +    struct sockaddr_in addr;
> +    struct timeval select_timeout;
> +
> +    select_timeout.tv_sec=5;
> +    select_timeout.tv_usec=0;
> +    addr.sin_family = AF_INET;
> +    addr.sin_addr.s_addr = inet_addr(SERVERIP);
> +    addr.sin_port = htons(SERVERPORT);
> +
> +    s = socket(AF_INET, SOCK_STREAM, 0);
> +    do_bind(s, (struct sockaddr *)&addr, sizeof(addr));
> +
> +    SetLastError(1);
> +    setsockopt(s,SOL_SOCKET, SO_KEEPALIVE, (char *)&bKeepAlive, sizeof(bKeepAlive));
> +    ok( GetLastError()==0, "GetLastError() was not cleared by setsockopt\n");
> +    closesocket(s);
> +}
> +

You need to SetLastError to some value that you know will never be set
by windows, something like 0xdeadbeef.  The reasoning is that
theoretically it could alter the results of the test.
> /**************** Main program  ***************/
>
> START_TEST( sock )
> @@ -1438,6 +1459,8 @@
>      test_WSAStringToAddressW();
>
> test_select();
> -
> +
> +    test_setsockopt_last_error();
> +
>      Exit();
>  }

-- 
James Hawkins

Socket resets randomly

[Michael Stefaniuc]

James Hawkins wrote:
> On 9/8/06, Ryan Miller <rmiller(a)auctionpay.com> wrote:
> > +    /* In Windows, if setsockopt succeeds, GetLastError() always
> > returns zero.
> > +       The native wininet.dll expects this behavior, and does not always
> > +       check the return value of setsockopt() first.*/
> > +    SetLastError(0);
> > +
>
> 0 is ERROR_SUCCESS, and you need to use that define.

find -name '*.[ch]' | xargs grep 'SetLastError( *0 *)' | wc -l
117

Time for a new Janitorial mini task?

bye
	michael
-- 
Michael Stefaniuc               Tel.: [phone]
Sr. Network Engineer            Fax.: [phone]
Red Hat GmbH                    Email: mstefani(a)redhat.com
Hauptstaetterstr. 58            http://www.redhat.de/
D-70178 Stuttgart

Socket resets randomly

[Alexandre Julliard]

Michael Stefaniuc <mstefani(a)redhat.com> writes:
> find -name '*.[ch]' | xargs grep 'SetLastError( *0 *)' | wc -l
> 117
>
> Time for a new Janitorial mini task?

No, SetLastError(0) is fine.

-- 
Alexandre Julliard
julliard(a)winehq.org