Nmap Development mailing list archives
Re: [nmap-svn] r33463 - nmap/nsock/tests
From: Daniel Miller <bonsaiviking () gmail com>
Date: Sun, 10 Aug 2014 16:30:24 -0500
I can confirm that this now passes on FreeBSD. Thanks, Henri! Dan On Sun, Aug 10, 2014 at 1:31 PM, <commit-mailer () nmap org> wrote:
Author: henri Date: Sun Aug 10 18:31:00 2014 New Revision: 33463 Log: Try to trigger connection failure in a more portable way. The former one was hackish and didn't behave consistently between operating systems. Passing in a zero addrlen should reliably make connect(2) fail. Modified: nmap/nsock/tests/connect.c Modified: nmap/nsock/tests/connect.c ============================================================================== --- nmap/nsock/tests/connect.c (original) +++ nmap/nsock/tests/connect.c Sun Aug 10 18:31:00 2014 @@ -86,13 +86,15 @@ memset(&peer, 0, sizeof(peer)); peer.sin_family = AF_INET; - inet_aton("0.0.0.1", &peer.sin_addr); /* IANA reserved */ + inet_aton("127.0.0.1", &peer.sin_addr); + /* pass in addrlen == 0 to force connect(2) to fail */ nsock_connect_tcp(ctd->nsp, ctd->nsi, connect_handler, 4000, NULL, - (struct sockaddr *)&peer, sizeof(peer), PORT_TCP); + (struct sockaddr *)&peer, 0, PORT_TCP); nsock_loop(ctd->nsp, 4000); - return ctd->connect_result == -EINVAL ? 0 : ctd->connect_result; + AssertEqual(ctd->connect_result, EINVAL); + return 0; } _______________________________________________ Sent through the svn mailing list http://nmap.org/mailman/listinfo/svn
_______________________________________________ Sent through the dev mailing list http://nmap.org/mailman/listinfo/dev Archived at http://seclists.org/nmap-dev/
Current thread:
- Re: [nmap-svn] r33463 - nmap/nsock/tests Daniel Miller (Aug 10)