From 282113ba894449ed17e85b296cf0760d5206ac8d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 19 Nov 2003 18:49:41 +0000 Subject: Don't use safe_new but new throughout. Fix copyright dates throughout. * Makefile.in: Accomodate all new files and name changes. Add a *.d dependency. (sbindir): Add. (etcdir): Drop in favor of more appropriate sysconfdir definition. (sysconfdir): Add. (CXXFLAGS): Add -MMD flag. Add SYSCONFDIR definition. (.SUFFIXES): Add. (install): Add action items. (libclean): New target. (fullclean): Ditto. * bsd_helper.cc: New file. * bsd_helper.h: Ditto. * bsd_log.cc: Ditto. * bsd_log.h: Ditto. * bsd_mutex.cc: Ditto. * bsd_mutex.h: Ditto. * client.cc: Rearrange to build as less as possible if __INSIDE_CYGWIN__. (client_request::handle_request): Add Message Queue and Semaphore handling. * cygserver.cc: Rearrange to build as less as possible if __INSIDE_CYGWIN__. Use new debug/log/panic logging functions. (DEF_CONFIG_FILE): New definition for configuration file. Use throughout. (getfunc): Remove. (__cygserver__printf): Remove. (client_request_attach_tty::serve): Return error if impersonation fails. (print_usage): Pump up help message. (print_version): Add output of default configuration file. (main): Accommodate new options. Allow overwrite of threading options from config file. Call several new initialization functions. Drop printing dots. Don't define SIGHANDLE inline. * cygserver.conf: New file. * cygserver_process.h: Rename to process.h. * cygserver_transport.h: Rename to transport.h. * cygserver_transport_pipes.h: Rename to transport_pipes.h. * cygserver_transport_sockets.h: Rename to transport_sockets.h. * msg.cc: Rewrite. * sem.cc: Rewrite. * shm.cc: Rewrite. * sysv_msg.cc: New file, derived from FreeBSD version 1.52. * sysv_sem.cc: New file, derived from FreeBSD version 1.66. * sysv_shm.cc: New file, derived from FreeBSD version 1.89. * threaded_queue.cc: Rearrange to build as less as possible if __INSIDE_CYGWIN__. * transport.cc (transport_layer_base::impersonate_client): Define bool. (transport_layer_base::revert_to_self): Ditto. * transport.h (transport_layer_base::impersonate_client): Declare bool. (transport_layer_base::revert_to_self): Ditto. * transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): Don't call init_security. (init_security): Remove. (transport_layer_pipes::accept): Use global sec_all_nih. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Define bool. (transport_layer_pipes::revert_to_self): Ditt. * transport_pipes.h (transport_layer_pipes::impersonate_client): Declare bool. (transport_layer_pipes::revert_to_self): Ditto. * woutsup.h: Include bsd compatibility headers. (SIGHANDLE): Add definition. (__cygserver__printf): Remove definition. (__noop_printf): Ditto. (debug_printf): Define using debug. (syscall_printf): Define using log. (system_printf): Ditto. Drop all other _printf definitions. --- winsup/cygserver/sem.cc | 107 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 23 deletions(-) (limited to 'winsup/cygserver/sem.cc') diff --git a/winsup/cygserver/sem.cc b/winsup/cygserver/sem.cc index 97d91a354..6a179b0b6 100644 --- a/winsup/cygserver/sem.cc +++ b/winsup/cygserver/sem.cc @@ -1,8 +1,6 @@ /* sem.cc: Single unix specification IPC interface for Cygwin. - Copyright 2002 Red Hat, Inc. - - Written by Conrad Scott . + Copyright 2003 Red Hat, Inc. This file is part of Cygwin. @@ -10,31 +8,94 @@ 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" +#ifdef __OUTSIDE_CYGWIN__ +#include "woutsup.h" -#include -#include +#include +#include +#include +#include +#include +#include +#include "cygserver.h" +#include "process.h" +#include "transport.h" -#include "cygerrno.h" +#include "cygserver_ipc.h" +#include "cygserver_sem.h" -extern "C" int -semctl (int semid, int semnum, int cmd, ...) -{ - set_errno (ENOSYS); - return -1; -} - -extern "C" int -semget (key_t key, int nsems, int semflg) -{ - set_errno (ENOSYS); - return -1; +client_request_sem::client_request_sem () + : client_request (CYGSERVER_REQUEST_SEM, + &_parameters, sizeof (_parameters)) +{ } -extern "C" int -semop (int semid, struct sembuf *sops, size_t nsops) +void +client_request_sem::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_semaphores == TUN_FALSE) + { + syscall_printf ("Semaphore support not started"); + error_code (ENOSYS); + _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)) + { + client->release (); + 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; + switch (_parameters.in.semop) + { + case SEMOP_semctl: + res = semctl (&td, &_parameters.in.ctlargs); + break; + case SEMOP_semget: + res = semget (&td, &_parameters.in.getargs); + break; + case SEMOP_semop: + res = semop (&td, &_parameters.in.opargs); + break; + } + /* Allocated by the call to adjust_identity_info(). */ + if (_parameters.in.ipcblk.gidlist) + free (_parameters.in.ipcblk.gidlist); + client->release (); + error_code (res); + _parameters.out.ret = td.td_retval[0]; + msglen (sizeof (_parameters.out)); } +#endif /* __OUTSIDE_CYGWIN__ */ -- cgit v1.2.3