diff options
Diffstat (limited to 'src/ccapi/server/win')
| -rw-r--r-- | src/ccapi/server/win/ccs_os_pipe.c | 5 | ||||
| -rw-r--r-- | src/ccapi/server/win/ccs_request_proc.c | 8 | ||||
| -rw-r--r-- | src/ccapi/server/win/ccs_win_pipe.c | 6 | ||||
| -rw-r--r-- | src/ccapi/server/win/ccs_win_pipe.h | 16 | ||||
| -rw-r--r-- | src/ccapi/server/win/workitem.h | 6 |
5 files changed, 20 insertions, 21 deletions
diff --git a/src/ccapi/server/win/ccs_os_pipe.c b/src/ccapi/server/win/ccs_os_pipe.c index 95af378e7..4573fa5e9 100644 --- a/src/ccapi/server/win/ccs_os_pipe.c +++ b/src/ccapi/server/win/ccs_os_pipe.c @@ -31,7 +31,7 @@ /* ------------------------------------------------------------------------ */ /* On Windows, a pipe is a struct. See ccs_win_pipe.h for details. */ - + /* ------------------------------------------------------------------------ */ @@ -43,7 +43,7 @@ cc_int32 ccs_os_pipe_valid (ccs_pipe_t in_pipe) { cc_int32 ccs_os_pipe_copy (ccs_pipe_t* out_pipe, ccs_pipe_t in_pipe) { return ccs_win_pipe_copy( - out_pipe, + out_pipe, in_pipe); } @@ -61,4 +61,3 @@ cc_int32 ccs_os_pipe_compare (ccs_pipe_t pipe_1, return ccs_win_pipe_compare(pipe_1, pipe_2, out_equal); } - diff --git a/src/ccapi/server/win/ccs_request_proc.c b/src/ccapi/server/win/ccs_request_proc.c index 8421b7224..00a8f032d 100644 --- a/src/ccapi/server/win/ccs_request_proc.c +++ b/src/ccapi/server/win/ccs_request_proc.c @@ -50,8 +50,8 @@ void ccs_rpc_request( cci_debug_printf("%s rpcmsg:%d; UUID:<%s> SST:<%s>", __FUNCTION__, rpcmsg, pszUUID, serverStartTime); #endif status = (rpcmsg != CCMSG_REQUEST) && (rpcmsg != CCMSG_PING); - - if (!status) { + + if (!status) { status = krb5int_ipc_stream_new (&stream); /* Create a stream for the request data */ } @@ -59,7 +59,7 @@ void ccs_rpc_request( status = krb5int_ipc_stream_write (stream, pbRequest, lenRequest); } - pipe = ccs_win_pipe_new(pszUUID, *p); + pipe = ccs_win_pipe_new(pszUUID, *p); worklist_add(rpcmsg, pipe, stream, serverStartTime); *return_status = status; } @@ -76,7 +76,7 @@ void ccs_rpc_connect( #if 0 cci_debug_printf("%s; rpcmsg:%d; UUID: <%s>", __FUNCTION__, rpcmsg, pszUUID); #endif - worklist_add( rpcmsg, + worklist_add( rpcmsg, pipe, NULL, /* No payload with connect request */ (const time_t)0 ); /* No server session number with connect request */ diff --git a/src/ccapi/server/win/ccs_win_pipe.c b/src/ccapi/server/win/ccs_win_pipe.c index 4ef807dd5..243f8f222 100644 --- a/src/ccapi/server/win/ccs_win_pipe.c +++ b/src/ccapi/server/win/ccs_win_pipe.c @@ -55,7 +55,7 @@ struct ccs_win_pipe_t* ccs_win_pipe_new (const char* uuid, const HANDLE h) { if (!uuidCopy) {err = cci_check_error(ccErrBadParam);} strcpy(uuidCopy, uuid); } - + if (!err) { out_pipe = (struct ccs_win_pipe_t*)malloc(sizeof(struct ccs_win_pipe_t)); if (!out_pipe) {err = cci_check_error(ccErrBadParam);} @@ -70,10 +70,10 @@ struct ccs_win_pipe_t* ccs_win_pipe_new (const char* uuid, const HANDLE h) { /* ------------------------------------------------------------------------ */ -cc_int32 ccs_win_pipe_copy (WIN_PIPE** out_pipe, +cc_int32 ccs_win_pipe_copy (WIN_PIPE** out_pipe, const WIN_PIPE* in_pipe) { - *out_pipe = + *out_pipe = ccs_win_pipe_new( ccs_win_pipe_getUuid (in_pipe), ccs_win_pipe_getHandle(in_pipe) ); diff --git a/src/ccapi/server/win/ccs_win_pipe.h b/src/ccapi/server/win/ccs_win_pipe.h index 3600d12af..c489aafd2 100644 --- a/src/ccapi/server/win/ccs_win_pipe.h +++ b/src/ccapi/server/win/ccs_win_pipe.h @@ -33,16 +33,16 @@ /* ------------------------------------------------------------------------ */ -/* On Windows, a pipe is a struct containing a UUID and a handle. Both the - UUID and handle are supplied by the client. - - The UUID is used to build the client's reply endpoint. - +/* On Windows, a pipe is a struct containing a UUID and a handle. Both the + UUID and handle are supplied by the client. + + The UUID is used to build the client's reply endpoint. + The handle is to the requesting client thread's thread local storage struct, so that the client's one and only reply handler can put reply data where the requesting thread will be able to see it. */ - + struct ccs_win_pipe_t { char* uuid; HANDLE clientHandle; @@ -58,7 +58,7 @@ cc_int32 ccs_win_pipe_compare (const WIN_PIPE* win_pipe_1, const WIN_PIPE* win_pipe_2, cc_uint32 *out_equal); -cc_int32 ccs_win_pipe_copy (WIN_PIPE** out_pipe, +cc_int32 ccs_win_pipe_copy (WIN_PIPE** out_pipe, const WIN_PIPE* in_pipe); cc_int32 ccs_win_pipe_valid (const WIN_PIPE* in_pipe); @@ -66,4 +66,4 @@ cc_int32 ccs_win_pipe_valid (const WIN_PIPE* in_pipe); char* ccs_win_pipe_getUuid (const WIN_PIPE* in_pipe); HANDLE ccs_win_pipe_getHandle (const WIN_PIPE* in_pipe); -#endif // _ccs_win_pipe_h_
\ No newline at end of file +#endif // _ccs_win_pipe_h_ diff --git a/src/ccapi/server/win/workitem.h b/src/ccapi/server/win/workitem.h index 9829f8500..1d3df155c 100644 --- a/src/ccapi/server/win/workitem.h +++ b/src/ccapi/server/win/workitem.h @@ -15,9 +15,9 @@ private: const long _rpcmsg; const long _sst; public: - WorkItem( k5_ipc_stream buf, - WIN_PIPE* pipe, - const long type, + WorkItem( k5_ipc_stream buf, + WIN_PIPE* pipe, + const long type, const long serverStartTime); WorkItem( const WorkItem&); WorkItem(); |