Skip Menu |
 

History Show all quoted text — Show full headers
# Mon Jul 21 17:07:02 2008 jaltman (Jeffrey Altman) - Ticket created
Subject: WIN32 SOCKET != int in gss lib
Download (untitled) / with headers
text/plain 333B
A WIN32 SOCKET is a HANDLE type and is not equivalent in size to an
'int'. Windows SOCKET values frequently exceed MAX_INT and become
truncated.

convert all references to SOCKET and use closesocket() to release the
them instead of the C Runtime Library close() which only applies to file
descriptors.

Proposed patch attached.
Download gss-win32-socket-1.patch
application/octet-stream 6.4KiB

Message body not shown because it is not plain text.

# Mon Jul 21 17:07:45 2008 jaltman (Jeffrey Altman) - Subject changed from 'WIN32 SOCKET != int in gss lib' to 'WIN32 SOCKET != int in gss and rpc libs'
# Mon Jul 21 17:07:45 2008 jaltman (Jeffrey Altman) - Component krb5-libs added
# Mon Jul 21 18:40:28 2008 raeburn (Ken Raeburn) - Correspondence added
Download (untitled) / with headers
text/plain 187B
Proposed patch approved, with discussed changes to use SOCKET/closesocket unconditionally,
anywhere but in the installed headers. (Don't forget to make sure port-sockets.h is included.)
# Tue Jul 22 18:28:36 2008 jaltman (Jeffrey Altman) - Correspondence added
RT-Send-CC: raeburn@mit.edu
Download (untitled) / with headers
text/plain 335B
[raeburn - Mon Jul 21 18:40:28 2008]:

Show quoted text
> Proposed patch approved, with discussed changes to use
> SOCKET/closesocket unconditionally,
> anywhere but in the installed headers. (Don't forget to make sure
> port-sockets.h is included.)

When you get an opportunity please try the attached patch,
rt6041-gssrpc-socket-2.patch

Thank you.
Download rt6041-gssrpc-socket-2.patch
application/octet-stream 7.1KiB

Message body not shown because it is not plain text.

# Wed Jul 23 13:18:34 2008 raeburn (Ken Raeburn) - Correspondence added
From: Ken Raeburn <raeburn@MIT.EDU>
To: rt@krbdev.mit.edu
Subject: Re: [krbdev.mit.edu #6041] WIN32 SOCKET != int in gss and rpc libs
Date: Wed, 23 Jul 2008 13:18:22 -0400
RT-Send-Cc:
Download (untitled) / with headers
text/plain 207B
closesocket returns an int as close does. If we're intentionally
ignoring the return values, please keep the (void) casts, at least for
now.

Why do you need to define INVALID_SOCKET in svc_udp.c?

Ken
# Wed Jul 23 13:25:28 2008 jaltman (Jeffrey Altman) - Correspondence added
Date: Wed, 23 Jul 2008 13:27:06 -0400
From: Jeffrey Altman <jaltman@mit.edu>
To: rt@krbdev.mit.edu
Subject: Re: [krbdev.mit.edu #6041] WIN32 SOCKET != int in gss and rpc libs
RT-Send-Cc:
Download (untitled) / with headers
text/plain 465B
Ken Raeburn via RT wrote:
Show quoted text
> closesocket returns an int as close does. If we're intentionally
> ignoring the return values, please keep the (void) casts, at least for
> now.

sure although I don't understand why ignoring that return value should
be treated specially.

Show quoted text
> Why do you need to define INVALID_SOCKET in svc_udp.c?

INVALID_SOCKET is a special value on Windows which is architecture
dependent. Is INVALID_SOCKET defined somewhere else for Unix?
# Wed Jul 23 14:40:11 2008 jaltman (Jeffrey Altman) - Correspondence added
Download (untitled) / with headers
text/plain 106B
Take three.

(void) casting re-applied

INVALID_SOCKET defined in port-sockets.h and removed from .c file
Download rt6041-gssrpc-socket-3.patch
application/octet-stream 7.1KiB

Message body not shown because it is not plain text.

# Wed Jul 23 16:37:02 2008 raeburn (Ken Raeburn) - Correspondence added
From: Ken Raeburn <raeburn@MIT.EDU>
To: rt@krbdev.mit.edu
Subject: Re: [krbdev.mit.edu #6041] WIN32 SOCKET != int in gss and rpc libs
Date: Wed, 23 Jul 2008 16:36:51 -0400
RT-Send-Cc:
Download (untitled) / with headers
text/plain 722B
On Jul 23, 2008, at 13:25, Jeffrey Altman via RT wrote:
Show quoted text
> sure although I don't understand why ignoring that return value should
> be treated specially.

It's not that there's anything special about close/closesocket, I just
don't want to make removing such casts a part of this otherwise fairly
specific change, in the absence of a specific coding style guideline
regarding ignored return values.

Show quoted text
>> Why do you need to define INVALID_SOCKET in svc_udp.c?
>
> INVALID_SOCKET is a special value on Windows which is architecture
> dependent. Is INVALID_SOCKET defined somewhere else for Unix?

Yes, port-sockets.h already has a definition for the UNIX case.

The revised patch looks good, please check it in...

Ken
# Wed Jul 23 16:56:01 2008 jaltman (Jeffrey Altman) - Status changed from 'open' to 'review'
# Wed Jul 23 16:56:02 2008 jaltman (Jeffrey Altman) - Tags pullup added
# Wed Jul 23 16:56:02 2008 jaltman (Jeffrey Altman) - Correspondence added
From: jaltman@mit.edu
Subject: SVN Commit
Download (untitled) / with headers
text/plain 582B

In the gss rpc package, replace the type used for a
socket on Windows with SOCKET (instead of int) and
replace all calls to close() that are used to close
sockets with closesocket().

src/include/port-sockets.h includes the definitions
of SOCKET and closesocket() for non-Windows systems.


Commit By: jaltman



Revision: 20578
Changed Files:
U trunk/src/include/gssrpc/svc.h
U trunk/src/lib/rpc/clnt_simple.c
U trunk/src/lib/rpc/clnt_tcp.c
U trunk/src/lib/rpc/clnt_udp.c
U trunk/src/lib/rpc/pmap_rmt.c
U trunk/src/lib/rpc/svc_tcp.c
U trunk/src/lib/rpc/svc_udp.c
# Wed Jul 23 19:20:02 2008 raeburn (Ken Raeburn) - Status changed from 'review' to 'resolved'
# Fri Jul 25 18:04:33 2008 raeburn (Ken Raeburn) - Status changed from 'resolved' to 'open'
# Fri Jul 25 18:04:34 2008 raeburn (Ken Raeburn) - Correspondence added
Download (untitled) / with headers
text/plain 397B
Tom caught a problem I overlooked: clnttcp_create is a public interface. You updated the
function definition to take SOCKET*, but the declaration still says int*. Please update the header
(and since it gets installed, you can only use SOCKET for Windows environments, it has to stay
with int for UNIX).

You might also want to look into why compile-time warnings didn't catch this for you....
# Wed Jan 01 02:18:12 2014 tlyu (Taylor Yu) - CustomField pullup deleted