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

6 files changed, 29 insertions, 29 deletions

diff --git a/src/ccapi/server/win/WorkItem.cpp b/src/ccapi/server/win/WorkItem.cpp
index 7e6aeb1cb2..2e9ebcc931 100644
--- a/src/ccapi/server/win/WorkItem.cpp
+++ b/src/ccapi/server/win/WorkItem.cpp
@@ -47,28 +47,28 @@ void deleteBuffer(char** buf) {
 

 // WorkItem contains a CountedBuffer which must be deleted, 

 //  so each WorkItem must be deleted.

-WorkItem::WorkItem(cci_stream_t buf, WIN_PIPE* pipe, const long type, const long sst) 

+WorkItem::WorkItem(k5_ipc_stream buf, WIN_PIPE* pipe, const long type, const long sst) 

 : _buf(buf), _rpcmsg(type), _pipe(pipe), _sst(sst) { }

 

 WorkItem::WorkItem(const WorkItem& item) : _buf(NULL), _rpcmsg(0), _pipe(NULL), _sst(0) {

 

-    cci_stream_t    _buf = NULL;

-    cci_stream_new(&_buf);

-    cci_stream_write(_buf, 

-                     cci_stream_data(item.payload()),

-                     cci_stream_size(item.payload()) );

+    k5_ipc_stream    _buf = NULL;

+    k5_ipc_stream_new(&_buf);

+    k5_ipc_stream_write(_buf, 

+                     k5_ipc_stream_data(item.payload()),

+                     k5_ipc_stream_size(item.payload()) );

     WorkItem(_buf, item._pipe, item._rpcmsg, item._sst);

     }

 

 WorkItem::WorkItem() : _buf(NULL), _rpcmsg(CCMSG_INVALID), _pipe(NULL), _sst(0) { }

 

 WorkItem::~WorkItem() {

-    if (_buf)   cci_stream_release(_buf);

+    if (_buf)   k5_ipc_stream_release(_buf);

     if (_pipe)  ccs_win_pipe_release(_pipe);

     }

 

-const cci_stream_t WorkItem::take_payload() {

-    cci_stream_t  temp  = payload();

+const k5_ipc_stream WorkItem::take_payload() {

+    k5_ipc_stream temp  = payload();

     _buf                = NULL;

     return temp;

     }

diff --git a/src/ccapi/server/win/WorkQueue.cpp b/src/ccapi/server/win/WorkQueue.cpp
index 711ecc1732..f16ad117e4 100644
--- a/src/ccapi/server/win/WorkQueue.cpp
+++ b/src/ccapi/server/win/WorkQueue.cpp
@@ -39,14 +39,14 @@ EXTERN_C    bool worklist_isEmpty() {
 

 EXTERN_C    int worklist_add(   const long          rpcmsg, 

                                 const ccs_pipe_t    pipe, 

-                                const cci_stream_t  stream, 

+                                const k5_ipc_stream stream, 

                                 const time_t        serverStartTime) {

         return worklist.add(new WorkItem(stream, pipe, rpcmsg, serverStartTime) );

         }

 

 EXTERN_C    int  worklist_remove(long*              rpcmsg,

                                  ccs_pipe_t*        pipe,

-                                 cci_stream_t*      stream,

+                                 k5_ipc_stream*      stream,

                                  time_t*            sst) {

         WorkItem*   item    = NULL;

         cc_int32    err     = worklist.remove(&item);

diff --git a/src/ccapi/server/win/WorkQueue.h b/src/ccapi/server/win/WorkQueue.h
index eb46780196..42d0cf2072 100644
--- a/src/ccapi/server/win/WorkQueue.h
+++ b/src/ccapi/server/win/WorkQueue.h
@@ -35,12 +35,12 @@ EXTERN_C    BOOL worklist_isEmpty();
 
 EXTERN_C    void worklist_add(  const long          rpcmsg,
                                 const ccs_pipe_t    pipe,
-                                const cci_stream_t  stream,
+                                const k5_ipc_stream stream,
                                 const time_t        serverStartTime);
 
 EXTERN_C    int  worklist_remove(long*              rpcmsg,
                                  ccs_pipe_t*        pipe,
-                                 cci_stream_t*      stream,
+                                 k5_ipc_stream*      stream,
                                  time_t*            serverStartTime);
 
 #endif // _work_queue_h
\ No newline at end of file
diff --git a/src/ccapi/server/win/ccs_os_server.cpp b/src/ccapi/server/win/ccs_os_server.cpp
index a6725b4edf..99854d1139 100644
--- a/src/ccapi/server/win/ccs_os_server.cpp
+++ b/src/ccapi/server/win/ccs_os_server.cpp
@@ -231,12 +231,12 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) {
             SleepEx(1000, TRUE);

             }

         else if (TRUE) {      // Take next WorkItem from the queue:

-            cci_stream_t    buf             = NULL;

+            k5_ipc_stream    buf             = NULL;

             long            rpcmsg          = CCMSG_INVALID;

             time_t          serverStartTime = 0xDEADDEAD;

             RPC_STATUS      status          = 0;

             char*           uuid            = NULL;

-            cci_stream_t    stream          = NULL;

+            k5_ipc_stream    stream          = NULL;

             ccs_pipe_t     pipe             = NULL;

             ccs_pipe_t     pipe2            = NULL;

 

@@ -279,8 +279,8 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) {
                             break;

                         case CCMSG_PING:

                             cci_debug_printf("  Processing PING");

-                            err = cci_stream_new  (&stream);

-                            err = cci_stream_write(stream, "This is a test of the emergency broadcasting system", 52);

+                            err = k5_ipc_stream_new  (&stream);

+                            err = k5_ipc_stream_write(stream, "This is a test of the emergency broadcasting system", 52);

                             err = ccs_os_server_send_reply(pipe, stream);

                             break;

                         default:

@@ -288,7 +288,7 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) {
                                 rpcmsg, uuid);

                             break;

                         }

-                    if (buf)        cci_stream_release(buf);

+                    if (buf)        k5_ipc_stream_release(buf);

                     /* Don't free uuid, which was allocated here.  A pointer to it is in the 

                        rpcargs struct which was passed to connectionListener which will be

                        received by ccapi_listen when the client exits.  ccapi_listen needs 

@@ -311,10 +311,10 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) {
 /* ------------------------------------------------------------------------ */

 

 cc_int32 ccs_os_server_send_reply (ccs_pipe_t   in_pipe,

-                                   cci_stream_t in_reply_stream) {

+                                   k5_ipc_stream in_reply_stream) {

 

     /* ccs_pipe_t in_reply_pipe     is a char* reply endpoint.

-       cci_stream_t in_reply_stream is the data to be sent.

+       k5_ipc_stream in_reply_stream is the data to be sent.

      */

 

     cc_int32    err     = 0;

@@ -333,8 +333,8 @@ cc_int32 ccs_os_server_send_reply (ccs_pipe_t   in_pipe,
                 (unsigned char*)&h,                 /* client's tspdata* */

                 (unsigned char*)uuid,

                 getMySST(),

-                cci_stream_size(in_reply_stream),   /* Length of buffer */

-                (const unsigned char*)cci_stream_data(in_reply_stream),   /* Data buffer */

+                k5_ipc_stream_size(in_reply_stream),   /* Length of buffer */

+                (const unsigned char*)k5_ipc_stream_data(in_reply_stream),   /* Data buffer */

                 &status );                          /* Return code */

             }

         RpcExcept(1) {

diff --git a/src/ccapi/server/win/ccs_request_proc.c b/src/ccapi/server/win/ccs_request_proc.c
index e3c741bccb..8a0da03f4b 100644
--- a/src/ccapi/server/win/ccs_request_proc.c
+++ b/src/ccapi/server/win/ccs_request_proc.c
@@ -43,7 +43,7 @@ void ccs_rpc_request(
     long*       return_status ) {   /* Return code */
 
     cc_int32        status  = 0;
-    cci_stream_t    stream;
+    k5_ipc_stream    stream;
     DWORD*          p       = (DWORD*)(tspHandle);
     WIN_PIPE*       pipe    = NULL;
 #if 0
@@ -52,11 +52,11 @@ void ccs_rpc_request(
     status = (rpcmsg != CCMSG_REQUEST) && (rpcmsg != CCMSG_PING);
     
     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, pbRequest, lenRequest);
+        status = k5_ipc_stream_write (stream, pbRequest, lenRequest);
         }
 
     pipe = ccs_win_pipe_new(pszUUID, *p);    
diff --git a/src/ccapi/server/win/workitem.h b/src/ccapi/server/win/workitem.h
index df1d7794a4..105380669f 100644
--- a/src/ccapi/server/win/workitem.h
+++ b/src/ccapi/server/win/workitem.h
@@ -11,12 +11,12 @@ extern "C" {
 
 class WorkItem {
 private:
-          cci_stream_t    _buf;
+          k5_ipc_stream    _buf;
           WIN_PIPE*       _pipe;
     const long            _rpcmsg;
     const long            _sst;
 public:
-    WorkItem(   cci_stream_t  buf, 
+    WorkItem(   k5_ipc_stream buf, 
                 WIN_PIPE*     pipe, 
                 const long    type, 
                 const long    serverStartTime);
@@ -24,8 +24,8 @@ public:
     WorkItem();
     ~WorkItem();
 
-    const cci_stream_t  payload()       const   {return _buf;}
-    const cci_stream_t  take_payload();
+    const k5_ipc_stream payload()       const   {return _buf;}
+    const k5_ipc_stream take_payload();
           WIN_PIPE*     take_pipe();
           WIN_PIPE*     pipe()          const   {return _pipe;}
     const long          type()          const   {return _rpcmsg;}