1 files changed, 93 insertions, 30 deletions
diff --git a/winsup/cygserver/msg.cc b/winsup/cygserver/msg.cc
index fecaa068a..713a5866a 100644
--- a/winsup/cygserver/msg.cc
+++ b/winsup/cygserver/msg.cc
@@ -1,8 +1,6 @@
 /* msg.cc: Single unix specification IPC interface for Cygwin.
 
-   Copyright 2002 Red Hat, Inc.
-
-   Written by Conrad Scott <conrad.scott@dsl.pipex.com>.
+   Copyright 2003 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -10,38 +8,103 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
-#include "winsup.h"
-
-#include <sys/types.h>
-#include <cygwin/msg.h>
+#ifdef __OUTSIDE_CYGWIN__
+#include "woutsup.h"
 
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
-#include "cygerrno.h"
-
-extern "C" int
-msgctl (int msqid, int cmd, struct msqid_ds *buf)
-{
-  set_errno (ENOSYS);
-  return -1;
-}
+#include "cygserver.h"
+#include "process.h"
+#include "transport.h"
 
-extern "C" int
-msgget (key_t key, int msgflg)
-{
-  set_errno (ENOSYS);
-  return -1;
-}
+#include "cygserver_ipc.h"
+#include "cygserver_msg.h"
 
-extern "C" ssize_t
-msgrcv (int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg)
-{
-  set_errno (ENOSYS);
-  return -1;
+client_request_msg::client_request_msg ()
+  : client_request (CYGSERVER_REQUEST_MSG,
+		    &_parameters, sizeof (_parameters))
+{ 
 }
 
-extern "C" int
-msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg)
+void
+client_request_msg::serve (transport_layer_base *const conn,
+                           process_cache *const cache)
 {
-  set_errno (ENOSYS);
-  return -1;
+  if (msglen () != sizeof (_parameters.in))
+    {
+      syscall_printf ("bad request body length: expecting %lu bytes, got %lu",
+		      sizeof (_parameters), msglen ());
+      error_code (EINVAL);
+      msglen (0);
+      return;
+    }
+  if (support_msgqueues == TUN_FALSE)
+    {
+      syscall_printf ("Message queue support not started");
+      error_code (ENOSYS);
+      if (_parameters.in.msgop == MSGOP_msgrcv)
+	_parameters.out.rcv = -1;
+      else
+	_parameters.out.ret = -1;
+      msglen (sizeof (_parameters.out));
+      return;
+    }
+  process *const client = cache->process (_parameters.in.ipcblk.cygpid,
+					  _parameters.in.ipcblk.winpid);
+  if (!client)
+    {
+      error_code (EAGAIN);
+      msglen (0);
+      return;
+    }
+  if (!conn->impersonate_client ())
+    {
+      client->release ();
+      error_code (EACCES);
+      msglen (0);
+      return;
+    }
+  if (!adjust_identity_info (&_parameters.in.ipcblk))
+    {
+      conn->revert_to_self ();
+      error_code (EACCES);
+      msglen (0);
+      return;
+    }
+  /* Early revert_to_self since IPC code runs in kernel mode. */
+  conn->revert_to_self ();
+  thread td = { client, &_parameters.in.ipcblk, {-1, -1} };
+  int res;
+  msgop_t msgop = _parameters.in.msgop; /* Get's overwritten otherwise. */
+  switch (msgop)
+    {
+      case MSGOP_msgctl:
+	res = msgctl (&td, &_parameters.in.ctlargs);
+        break;
+      case MSGOP_msgget:
+	res = msgget (&td, &_parameters.in.getargs);
+        break;
+      case MSGOP_msgrcv:
+	res = msgrcv (&td, &_parameters.in.rcvargs);
+        break;
+      case MSGOP_msgsnd:
+	res = msgsnd (&td, &_parameters.in.sndargs);
+        break;
+    }
+  /* Allocated by the call to adjust_identity_info(). */
+  if (_parameters.in.ipcblk.gidlist)
+    free (_parameters.in.ipcblk.gidlist);
+  client->release ();
+  error_code (res);
+  if (msgop == MSGOP_msgrcv)
+    _parameters.out.rcv = td.td_retval[0];
+  else
+    _parameters.out.ret = td.td_retval[0];
+  msglen (sizeof (_parameters.out));
 }
+#endif /* __OUTSIDE_CYGWIN__ */