This is the mail archive of the cygwin-patches mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Return the correct value for getsockopt(SO_REUSEADDR) after setting setsockopt(SO_REUSEADDR, 1).


On Mon, Jan 9, 2017 at 5:58 PM, Corinna Vinschen
<corinna-cygwin@cygwin.com> wrote:
> On Jan  9 17:36, Erik Bray wrote:
>> ---
>>  winsup/cygwin/net.cc | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
>> index e4805d3..b02f9e3 100644
>> --- a/winsup/cygwin/net.cc
>> +++ b/winsup/cygwin/net.cc
>> @@ -925,6 +925,14 @@ cygwin_getsockopt (int fd, int level, int optname, void *optval,
>>         res = fh->getpeereid (&cred->pid, &cred->uid, &cred->gid);
>>         __leave;
>>       }
>> +      else if (optname == SO_REUSEADDR && level == SOL_SOCKET)
>> +    {
>> +      unsigned int *reuseaddr = (unsigned int *) optval;
>> +      *reuseaddr = fh->saw_reuseaddr();
>> +      *optlen = sizeof(*reuseaddr);
>                         ^^^
>                         space missing
>
>> +      res = 0;
>> +      __leave;
>> +    }
>
> Indentation of this block is wrong.
>
> Still, good catch.  I fixed the above manually and applied the patch
> as obvious (otherwise we're still needing your BSD sign-off).

Great, thanks!

I'll get back to you on the BSD sign-off and your comments on my other
patches tomorrow.

Thanks,
Erik


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]