diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2008-09-30 21:23:17 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2008-09-30 21:23:17 +0000 |
| commit | 89db2820d03f280d0bf0e217d520e89c2bb8acd2 (patch) | |
| tree | baf4c5e5930974bf928509aea9d511d947b623f2 /src/ccapi/lib/win | |
| parent | 6b6d24e1ae0aadffb9062ac94ae8e600e09dbef0 (diff) | |
| download | krb5-89db2820d03f280d0bf0e217d520e89c2bb8acd2.tar.gz krb5-89db2820d03f280d0bf0e217d520e89c2bb8acd2.tar.xz krb5-89db2820d03f280d0bf0e217d520e89c2bb8acd2.zip | |
CCAPI should use common ipc and stream code
KIM and CCAPI should share the same IPC and stream object types.
Modified CCAPI to use code in src/util (stream) and src/util/mac (ipc)
ticket: new
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20787 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/ccapi/lib/win')
| -rw-r--r-- | src/ccapi/lib/win/ccapi_os_ipc.cxx | 16 | ||||
| -rw-r--r-- | src/ccapi/lib/win/ccs_reply_proc.c | 6 | ||||
| -rw-r--r-- | src/ccapi/lib/win/debug.exports | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/ccapi/lib/win/ccapi_os_ipc.cxx b/src/ccapi/lib/win/ccapi_os_ipc.cxx index 4b00e2de3..6ccd59b9a 100644 --- a/src/ccapi/lib/win/ccapi_os_ipc.cxx +++ b/src/ccapi/lib/win/ccapi_os_ipc.cxx @@ -68,9 +68,9 @@ static DWORD handle_exception(DWORD code); extern "C" { cc_int32 cci_os_ipc_msg( cc_int32 in_launch_server, - cci_stream_t in_request_stream, + k5_ipc_stream in_request_stream, cc_int32 in_msg, - cci_stream_t* out_reply_stream); + k5_ipc_stream* out_reply_stream); } /* ------------------------------------------------------------------------ */ @@ -128,8 +128,8 @@ void cci_os_ipc_thread_fini (void) /* ------------------------------------------------------------------------ */ cc_int32 cci_os_ipc (cc_int32 in_launch_server, - cci_stream_t in_request_stream, - cci_stream_t* out_reply_stream) { + k5_ipc_stream in_request_stream, + k5_ipc_stream* out_reply_stream) { return cci_os_ipc_msg( in_launch_server, in_request_stream, CCMSG_REQUEST, @@ -137,9 +137,9 @@ cc_int32 cci_os_ipc (cc_int32 in_launch_server, } extern "C" cc_int32 cci_os_ipc_msg( cc_int32 in_launch_server, - cci_stream_t in_request_stream, + k5_ipc_stream in_request_stream, cc_int32 in_msg, - cci_stream_t* out_reply_stream) { + k5_ipc_stream* out_reply_stream) { cc_int32 err = ccNoError; cc_int32 done = FALSE; @@ -207,8 +207,8 @@ extern "C" cc_int32 cci_os_ipc_msg( cc_int32 in_launch_server, in_msg, /* Message type */ (unsigned char*)&ptspdata, /* Our tspdata* will be sent back to the reply proc. */ (unsigned char*)uuid, - cci_stream_size(in_request_stream), - (unsigned char*)cci_stream_data(in_request_stream), /* Data buffer */ + k5_ipc_stream_size(in_request_stream), + (unsigned char*)k5_ipc_stream_data(in_request_stream), /* Data buffer */ sst, /* session start time */ (long*)(&err) ); /* Return code */ } diff --git a/src/ccapi/lib/win/ccs_reply_proc.c b/src/ccapi/lib/win/ccs_reply_proc.c index 79f45e4c8..8eb340836 100644 --- a/src/ccapi/lib/win/ccs_reply_proc.c +++ b/src/ccapi/lib/win/ccs_reply_proc.c @@ -47,17 +47,17 @@ void ccs_rpc_request_reply( HANDLE hEvent = openThreadEvent(uuid, REPLY_SUFFIX); DWORD* p = (DWORD*)(tspHandle); struct tspdata* tsp = (struct tspdata*)*p; - cci_stream_t stream; + k5_ipc_stream stream; long status = 0; #if 0 cci_debug_printf("%s! msg#:%d SST:%ld uuid:%s", __FUNCTION__, rpcmsg, srvStartTime, uuid); #endif if (!status) { - status = cci_stream_new (&stream); /* Create a stream for the request data */ + status = k5_ipc_stream_new (&stream); /* Create a stream for the request data */ } if (!status) { /* Put the data into the stream */ - status = cci_stream_write (stream, chIn, cbIn); + status = k5_ipc_stream_write (stream, chIn, cbIn); } if (!status) { /* Put the data into the stream */ diff --git a/src/ccapi/lib/win/debug.exports b/src/ccapi/lib/win/debug.exports index 0c3765325..d7fbcc152 100644 --- a/src/ccapi/lib/win/debug.exports +++ b/src/ccapi/lib/win/debug.exports @@ -3,9 +3,9 @@ cci_os_ipc
cci_os_ipc_msg
cci_os_ipc_thread_init
- cci_stream_data
- cci_stream_write
- cci_stream_new
+ k5_ipc_stream_data
+ k5_ipc_stream_write
+ k5_ipc_stream_new
ccs_authenticate
|