-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* dbus-sysdeps.c Wrappers around system/libc features (internal to D-BUS implementation)
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2005 Novell, Inc.
* Copyright (C) 2006 Ralf Habacker <ralf.habacker@freenet.de>
- * Copyright (C) 2006 Peter Kümmel <syntheticpp@gmx.net>
+ * Copyright (C) 2006 Peter Kümmel <syntheticpp@gmx.net>
* Copyright (C) 2006 Christian Ehrlicher <ch.ehrlicher@gmx.de>
*
* Licensed under the Academic Free License version 2.1
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+
#undef open
#define STRSAFE_NO_DEPRECATE
#ifndef DBUS_WINCE
-#define _WIN32_WINNT 0x0500
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
#endif
#include "dbus-internals.h"
#include "dbus-protocol.h"
#include "dbus-hash.h"
#include "dbus-sockets-win.h"
-#include "dbus-userdb.h"
#include "dbus-list.h"
+#include "dbus-credentials.h"
#include <windows.h>
+#include <ws2tcpip.h>
#include <fcntl.h>
#include <process.h>
+#include <stdio.h>
+#include <io.h>
+
+#include <string.h>
+#include <errno.h>
#include <sys/stat.h>
#include <sys/types.h>
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-#ifndef HAVE_SOCKLEN_T
-#define socklen_t int
+#ifdef HAVE_WSPIAPI_H
+// needed for w2k compatibility (getaddrinfo/freeaddrinfo/getnameinfo)
+#ifdef __GNUC__
+#define _inline
+#include "wspiapi.h"
+#else
+#include <wspiapi.h>
#endif
+#endif // HAVE_WSPIAPI_H
-_DBUS_DEFINE_GLOBAL_LOCK (win_fds);
-_DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
-
-
-static
-void
-_dbus_lock_sockets()
-{
- _dbus_assert (win_fds!=0);
- _DBUS_LOCK (win_fds);
-}
-
-static
-void
-_dbus_unlock_sockets()
-{
- _dbus_assert (win_fds!=0);
- _DBUS_UNLOCK (win_fds);
-}
-
-#ifdef _DBUS_WIN_USE_RANDOMIZER
-static int win_encap_randomizer;
+#ifndef O_BINARY
+#define O_BINARY 0
#endif
-static DBusHashTable *sid_atom_cache = NULL;
-
-
-static DBusString dbusdir;
-static int working_dir_init = 0;
-
-int _dbus_init_working_dir(char *s)
-{
- /* change working directory to one level above
- of dbus-daemon executable path.
- This allows the usage of relative path in
- config files or command line parameters */
- DBusString daemon_path,bin_path;
-
- if (!_dbus_string_init (&daemon_path))
- return FALSE;
-
- if (!_dbus_string_init (&bin_path))
- return FALSE;
-
- if (!_dbus_string_init (&dbusdir))
- return FALSE;
-
- _dbus_string_append(&daemon_path,s);
- _dbus_string_get_dirname(&daemon_path,&bin_path);
- _dbus_string_get_dirname(&bin_path,&dbusdir);
- chdir(_dbus_string_get_const_data(&dbusdir));
- _dbus_verbose ("Change working path to %s\n",_dbus_string_get_const_data (&dbusdir));
- working_dir_init = 1;
- return TRUE;
-}
-DBusString *_dbus_get_working_dir(void)
-{
- if (!working_dir_init)
- return NULL;
-
- _dbus_verbose ("retrieving working path %s\n",_dbus_string_get_const_data (&dbusdir));
- return &dbusdir;
-}
+typedef int socklen_t;
/**
- * File interface
+ * write data to a pipe.
*
+ * @param pipe the pipe instance
+ * @param buffer the buffer to write data from
+ * @param start the first byte in the buffer to write
+ * @param len the number of bytes to try to write
+ * @param error error return
+ * @returns the number of bytes written or -1 on error
*/
-dbus_bool_t
-_dbus_open_file (DBusFile *file,
- const char *filename,
- int oflag,
- int pmode)
-{
- if (pmode!=-1)
- file->FDATA = _open (filename, oflag, pmode);
- else
- file->FDATA = _open (filename, oflag);
- if (file->FDATA >= 0)
- return TRUE;
- else
- {
- file->FDATA = -1;
- return FALSE;
- }
-}
-
-dbus_bool_t
-_dbus_close_file (DBusFile *file,
- DBusError *error)
+int
+_dbus_pipe_write (DBusPipe *pipe,
+ const DBusString *buffer,
+ int start,
+ int len,
+ DBusError *error)
{
- const int fd = file->FDATA;
-
- _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
- _dbus_assert (fd >= 0);
+ int written;
+ const char *buffer_c = _dbus_string_get_const_data (buffer);
- if (_close (fd) == -1)
+ written = _write (pipe->fd_or_handle, buffer_c + start, len);
+ if (written < 0)
{
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Could not close fd %d: %s", fd,
- _dbus_strerror (errno));
- return FALSE;
+ dbus_set_error (error, DBUS_ERROR_FAILED,
+ "Writing to pipe: %s\n",
+ strerror (errno));
}
-
- file->FDATA = -1;
- _dbus_verbose ("closed C file descriptor %d:\n",fd);
-
- return TRUE;
+ return written;
}
+/**
+ * close a pipe.
+ *
+ * @param pipe the pipe instance
+ * @param error return location for an error
+ * @returns #FALSE if error is set
+ */
int
-_dbus_read_file(DBusFile *file,
- DBusString *buffer,
- int count)
+_dbus_pipe_close (DBusPipe *pipe,
+ DBusError *error)
{
- const int fd = file->FDATA;
- int bytes_read;
- int start;
- char *data;
- _dbus_assert (count >= 0);
-
- start = _dbus_string_get_length (buffer);
-
- if (!_dbus_string_lengthen (buffer, count))
- {
- errno = ENOMEM;
- return -1;
- }
-
- data = _dbus_string_get_data_len (buffer, start, count);
-
- _dbus_assert (fd >= 0);
-
- _dbus_verbose ("read: count=%d fd=%d\n", count, fd);
- bytes_read = read (fd, data, count);
-
- if (bytes_read == -1)
- _dbus_verbose ("read: failed: %s\n", _dbus_strerror (errno));
- else
- _dbus_verbose ("read: = %d\n", bytes_read);
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
- if (bytes_read < 0)
+ if (_close (pipe->fd_or_handle) < 0)
{
- /* put length back (note that this doesn't actually realloc anything) */
- _dbus_string_set_length (buffer, start);
return -1;
}
else
{
- /* put length back (doesn't actually realloc) */
- _dbus_string_set_length (buffer, start + bytes_read);
-
-#if 0
-
- if (bytes_read > 0)
- _dbus_verbose_bytes_of_string (buffer, start, bytes_read);
-#endif
-
- return bytes_read;
+ _dbus_pipe_invalidate (pipe);
+ return 0;
}
}
-int
-_dbus_write_file (DBusFile *file,
- const DBusString *buffer,
- int start,
- int len)
-{
- const int fd = file->FDATA;
- const char *data;
- int bytes_written;
-
- data = _dbus_string_get_const_data_len (buffer, start, len);
-
- _dbus_assert (fd >= 0);
-
- _dbus_verbose ("write: len=%d fd=%d\n", len, fd);
- bytes_written = write (fd, data, len);
-
- if (bytes_written == -1)
- _dbus_verbose ("write: failed: %s\n", _dbus_strerror (errno));
- else
- _dbus_verbose ("write: = %d\n", bytes_written);
-
-#if 0
-
- if (bytes_written > 0)
- _dbus_verbose_bytes_of_string (buffer, start, bytes_written);
-#endif
-
- return bytes_written;
-}
-
-dbus_bool_t
-_dbus_is_valid_file (DBusFile* file)
-{
- return file->FDATA >= 0;
-}
-
-dbus_bool_t _dbus_fstat (DBusFile *file,
- struct stat *sb)
-{
- return fstat(file->FDATA, sb) >= 0;
-}
-
-int
-_dbus_write_pipe (DBusPipe pipe,
- const DBusString *buffer,
- int start,
- int len)
-{
- DBusFile file;
- file.FDATA = pipe;
- return _dbus_write_file(&file, buffer, start, len);
-}
-
-int
-_dbus_read_pipe(DBusPipe pipe,
- DBusString *buffer,
- int count)
-{
- DBusFile file;
- file.FDATA = pipe;
- return _dbus_read_file(&file, buffer, count);
-}
-
-#undef FDATA
-
/**
* Socket interface
*
*/
-static DBusSocket *win_fds = NULL;
-static int win_n_fds = 0; // is this the size? rename to win_fds_size? #
-
-#if 0
-#define TO_HANDLE(n) ((n)^win32_encap_randomizer)
-#define FROM_HANDLE(n) ((n)^win32_encap_randomizer)
-#else
-#define TO_HANDLE(n) ((n)+0x10000000)
-#define FROM_HANDLE(n) ((n)-0x10000000)
-#define IS_HANDLE(n) ((n)&0x10000000)
-#endif
-
-
-static
-void
-_dbus_win_deallocate_fd (int fd)
-{
- _DBUS_LOCK (win_fds);
- win_fds[FROM_HANDLE (fd)].is_used = 0;
- _DBUS_UNLOCK (win_fds);
-}
-
-static
-int
-_dbus_win_allocate_fd (void)
-{
- int i;
-
- _DBUS_LOCK (win_fds);
-
- if (win_fds == NULL)
- {
-#ifdef _DBUS_WIN_USE_RANDOMIZER
- DBusString random;
-#endif
-
- win_n_fds = 16;
- /* Use malloc to avoid memory leak failure in dbus-test */
- win_fds = malloc (win_n_fds * sizeof (*win_fds));
-
- _dbus_assert (win_fds != NULL);
-
- for (i = 0; i < win_n_fds; i++)
- win_fds[i].is_used = 0;
-
-#ifdef _DBUS_WIN_USE_RANDOMIZER
-
- _dbus_string_init (&random);
- _dbus_generate_random_bytes (&random, sizeof (int));
- memmove (&win_encap_randomizer, _dbus_string_get_const_data (&random), sizeof (int));
- win_encap_randomizer &= 0xFF;
- _dbus_string_free (&random);
-#endif
-
- }
-
- for (i = 0; i < win_n_fds && win_fds[i].is_used != 0; i++)
- ;
-
- if (i == win_n_fds)
- {
- int oldn = win_n_fds;
- int j;
-
- win_n_fds += 16;
- win_fds = realloc (win_fds, win_n_fds * sizeof (*win_fds));
-
- _dbus_assert (win_fds != NULL);
-
- for (j = oldn; j < win_n_fds; j++)
- win_fds[i].is_used = 0;
- }
-
- memset(&win_fds[i], 0, sizeof(win_fds[i]));
-
- win_fds[i].is_used = 1;
- win_fds[i].fd = -1;
- win_fds[i].port_file_fd = -1;
- win_fds[i].close_on_exec = FALSE;
- win_fds[i].non_blocking = FALSE;
-
- _DBUS_UNLOCK (win_fds);
-
- return i;
-}
-
-static
-int
-_dbus_create_handle_from_socket (int s)
-{
- int i;
- int handle = -1;
-
- // check: parameter must be a valid value
- _dbus_assert(s != -1);
- _dbus_assert(!IS_HANDLE(s));
-
- // get index of a new position in the map
- i = _dbus_win_allocate_fd ();
-
- // fill new posiiton in the map: value->index
- win_fds[i].fd = s;
- win_fds[i].is_used = 1;
-
- // create handle from the index: index->handle
- handle = TO_HANDLE (i);
-
- _dbus_verbose ("_dbus_create_handle_from_value, value: %d, handle: %d\n", s, handle);
-
- return handle;
-}
-
-int
-_dbus_socket_to_handle (DBusSocket *s)
-{
- int i;
- int handle = -1;
-
- // check: parameter must be a valid socket
- _dbus_assert(s != NULL);
- _dbus_assert(s->fd != -1);
- _dbus_assert(!IS_HANDLE(s->fd));
-
- _DBUS_LOCK (win_fds);
-
- // at the first call there is no win_fds
- // will be constructed _dbus_create_handle_from_socket
- // because handle = -1
- if (win_fds != NULL)
- {
- // search for the value in the map
- // find the index of the value: value->index
- for (i = 0; i < win_n_fds; i++)
- if (win_fds[i].is_used == 1 && win_fds[i].fd == s->fd)
- {
- // create handle from the index: index->handle
- handle = TO_HANDLE (i);
- break;
- }
- }
- _DBUS_UNLOCK (win_fds);
-
-
- if (handle == -1)
- {
- handle = _dbus_create_handle_from_socket(s->fd);
- }
-
- _dbus_assert(handle != -1);
-
- return handle;
-}
-
-static
-void
-_dbus_handle_to_socket_unlocked (int handle,
- DBusSocket **ptr)
-{
- int i;
-
- // check: parameter must be a valid handle
- _dbus_assert(handle != -1);
- _dbus_assert(IS_HANDLE(handle));
- _dbus_assert(ptr != NULL);
-
- // map from handle to index: handle->index
- i = FROM_HANDLE (handle);
-
- _dbus_assert (win_fds != NULL);
- _dbus_assert (i >= 0 && i < win_n_fds);
-
- // check for if fd is valid
- _dbus_assert (win_fds[i].is_used == 1);
-
- // get socket from index: index->socket
- *ptr = &win_fds[i];
-
- _dbus_verbose ("_dbus_socket_to_handle_unlocked: socket=%d, handle=%d, index=%d\n", (*ptr)->fd, handle, i);
-}
-
-void
-_dbus_handle_to_socket (int handle,
- DBusSocket **ptr)
-{
- _dbus_lock_sockets();
- _dbus_handle_to_socket_unlocked (handle, ptr);
- _dbus_unlock_sockets();
-}
-
-#undef TO_HANDLE
-#undef IS_HANDLE
-#undef FROM_HANDLE
-#define FROM_HANDLE(n) 1==DBUS_WIN_DONT_USE__FROM_HANDLE__DIRECTLY
-#define win_fds 1==DBUS_WIN_DONT_USE_win_fds_DIRECTLY
-
-
-
-
/**
* Thin wrapper around the read() system call that appends
* the data it reads to the DBusString buffer. It appends
* @returns the number of bytes read or -1
*/
int
-_dbus_read_socket (int handle,
+_dbus_read_socket (int fd,
DBusString *buffer,
int count)
{
- DBusSocket *s;
int bytes_read;
int start;
char *data;
data = _dbus_string_get_data_len (buffer, start, count);
- _dbus_handle_to_socket(handle, &s);
+ again:
+
+ _dbus_verbose ("recv: count=%d fd=%d\n", count, fd);
+ bytes_read = recv (fd, data, count, 0);
+
+ if (bytes_read == SOCKET_ERROR)
+ {
+ DBUS_SOCKET_SET_ERRNO();
+ _dbus_verbose ("recv: failed: %s\n", _dbus_strerror (errno));
+ bytes_read = -1;
+ }
+ else
+ _dbus_verbose ("recv: = %d\n", bytes_read);
- if(s->is_used)
+ if (bytes_read < 0)
{
- _dbus_verbose ("recv: count=%d socket=%d\n", count, s->fd);
- bytes_read = recv (s->fd, data, count, 0);
- if (bytes_read == SOCKET_ERROR)
+ if (errno == EINTR)
+ goto again;
+ else
{
- DBUS_SOCKET_SET_ERRNO();
- _dbus_verbose ("recv: failed: %s\n", _dbus_strerror (errno));
- bytes_read = -1;
+ /* put length back (note that this doesn't actually realloc anything) */
+ _dbus_string_set_length (buffer, start);
+ return -1;
}
- else
- _dbus_verbose ("recv: = %d\n", bytes_read);
- }
- else
- {
- _dbus_assert_not_reached ("no valid socket");
- }
-
- if (bytes_read < 0)
- {
- /* put length back (note that this doesn't actually realloc anything) */
- _dbus_string_set_length (buffer, start);
- return -1;
}
else
{
_dbus_string_set_length (buffer, start + bytes_read);
#if 0
-
if (bytes_read > 0)
_dbus_verbose_bytes_of_string (buffer, start, bytes_read);
#endif
* @returns the number of bytes written or -1 on error
*/
int
-_dbus_write_socket (int handle,
+_dbus_write_socket (int fd,
const DBusString *buffer,
int start,
int len)
{
- DBusSocket *s;
- int is_used;
const char *data;
int bytes_written;
data = _dbus_string_get_const_data_len (buffer, start, len);
- _dbus_handle_to_socket(handle, &s);
+ again:
- if (s->is_used)
- {
- _dbus_verbose ("send: len=%d socket=%d\n", len, s->fd);
- bytes_written = send (s->fd, data, len, 0);
- if (bytes_written == SOCKET_ERROR)
- {
- DBUS_SOCKET_SET_ERRNO();
- _dbus_verbose ("send: failed: %s\n", _dbus_strerror (errno));
- bytes_written = -1;
- }
- else
- _dbus_verbose ("send: = %d\n", bytes_written);
- }
- else
+ _dbus_verbose ("send: len=%d fd=%d\n", len, fd);
+ bytes_written = send (fd, data, len, 0);
+
+ if (bytes_written == SOCKET_ERROR)
{
- _dbus_assert_not_reached ("unhandled fd type");
+ DBUS_SOCKET_SET_ERRNO();
+ _dbus_verbose ("send: failed: %s\n", _dbus_strerror (errno));
+ bytes_written = -1;
}
+ else
+ _dbus_verbose ("send: = %d\n", bytes_written);
+ if (bytes_written < 0 && errno == EINTR)
+ goto again;
+
#if 0
if (bytes_written > 0)
_dbus_verbose_bytes_of_string (buffer, start, bytes_written);
* @returns #FALSE if error set
*/
dbus_bool_t
-_dbus_close_socket (int handle,
+_dbus_close_socket (int fd,
DBusError *error)
{
- DBusSocket *s;
-
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
- _dbus_lock_sockets();
-
- _dbus_handle_to_socket_unlocked (handle, &s);
-
-
- if (s->is_used)
- {
- if (s->port_file_fd >= 0)
- {
- _chsize (s->port_file_fd, 0);
- close (s->port_file_fd);
- s->port_file_fd = -1;
- unlink (_dbus_string_get_const_data (&s->port_file));
- free ((char *) _dbus_string_get_const_data (&s->port_file));
- }
-
- if (closesocket (s->fd) == SOCKET_ERROR)
- {
- DBUS_SOCKET_SET_ERRNO ();
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Could not close socket: socket=%d, handle=%d, %s",
- s->fd, handle, _dbus_strerror (errno));
- _dbus_unlock_sockets();
- return FALSE;
- }
- _dbus_verbose ("_dbus_close_socket: socket=%d, handle=%d\n",
- s->fd, handle);
- }
- else
+ again:
+ if (closesocket (fd) == SOCKET_ERROR)
{
- _dbus_assert_not_reached ("unhandled fd type");
+ DBUS_SOCKET_SET_ERRNO ();
+
+ if (errno == EINTR)
+ goto again;
+
+ dbus_set_error (error, _dbus_error_from_errno (errno),
+ "Could not close socket: socket=%d, , %s",
+ fd, _dbus_strerror (errno));
+ return FALSE;
}
-
- _dbus_unlock_sockets();
-
- _dbus_win_deallocate_fd (handle);
+ _dbus_verbose ("_dbus_close_socket: socket=%d, \n", fd);
return TRUE;
-
}
/**
void
_dbus_fd_set_close_on_exec (int handle)
{
+#ifdef ENABLE_DBUSSOCKET
DBusSocket *s;
if (handle < 0)
return;
s->close_on_exec = TRUE;
_dbus_unlock_sockets();
+#else
+ /* TODO unic code.
+ int val;
+
+ val = fcntl (fd, F_GETFD, 0);
+
+ if (val < 0)
+ return;
+
+ val |= FD_CLOEXEC;
+
+ fcntl (fd, F_SETFD, val);
+ */
+#endif
}
/**
_dbus_set_fd_nonblocking (int handle,
DBusError *error)
{
- DBusSocket *s;
u_long one = 1;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
- _dbus_lock_sockets();
-
- _dbus_handle_to_socket_unlocked(handle, &s);
-
- if (s->is_used)
+ if (ioctlsocket (handle, FIONBIO, &one) == SOCKET_ERROR)
{
- if (ioctlsocket (s->fd, FIONBIO, &one) == SOCKET_ERROR)
- {
- dbus_set_error (error, _dbus_error_from_errno (WSAGetLastError ()),
- "Failed to set socket %d:%d to nonblocking: %s", s->fd,
- _dbus_strerror (WSAGetLastError ()));
- _dbus_unlock_sockets();
- return FALSE;
- }
- }
- else
- {
- _dbus_assert_not_reached ("unhandled fd type");
+ dbus_set_error (error, _dbus_error_from_errno (WSAGetLastError ()),
+ "Failed to set socket %d:%d to nonblocking: %s", handle,
+ _dbus_strerror (WSAGetLastError ()));
+ return FALSE;
}
- _dbus_unlock_sockets();
-
return TRUE;
}
* @param buffer1 first buffer
* @param start1 first byte to write in first buffer
* @param len1 number of bytes to write from first buffer
- * @param buffer2 second buffer, or #NULL
- * @param start2 first byte to write in second buffer
- * @param len2 number of bytes to write in second buffer
- * @returns total bytes written from both buffers, or -1 on error
- */
-int
-_dbus_write_socket_two (int handle,
- const DBusString *buffer1,
- int start1,
- int len1,
- const DBusString *buffer2,
- int start2,
- int len2)
-{
- DBusSocket *s;
- WSABUF vectors[2];
- const char *data1;
- const char *data2;
- int rc;
- DWORD bytes_written;
- int ret1;
-
- _dbus_assert (buffer1 != NULL);
- _dbus_assert (start1 >= 0);
- _dbus_assert (start2 >= 0);
- _dbus_assert (len1 >= 0);
- _dbus_assert (len2 >= 0);
-
- _dbus_handle_to_socket(handle, &s);
-
- data1 = _dbus_string_get_const_data_len (buffer1, start1, len1);
-
- if (buffer2 != NULL)
- data2 = _dbus_string_get_const_data_len (buffer2, start2, len2);
- else
- {
- data2 = NULL;
- start2 = 0;
- len2 = 0;
- }
-
- if (s->is_used)
- {
- vectors[0].buf = (char*) data1;
- vectors[0].len = len1;
- vectors[1].buf = (char*) data2;
- vectors[1].len = len2;
-
- _dbus_verbose ("WSASend: len1+2=%d+%d socket=%d\n", len1, len2, s->fd);
- rc = WSASend (s->fd, vectors, data2 ? 2 : 1, &bytes_written,
- 0, NULL, NULL);
- if (rc < 0)
- {
- DBUS_SOCKET_SET_ERRNO ();
- _dbus_verbose ("WSASend: failed: %s\n", _dbus_strerror (errno));
- bytes_written = -1;
- }
- else
- _dbus_verbose ("WSASend: = %ld\n", bytes_written);
- return bytes_written;
- }
- else
- {
- _dbus_assert_not_reached ("unhandled fd type");
- }
- return 0;
-}
-
-/**
- * @def _DBUS_MAX_SUN_PATH_LENGTH
- *
- * Maximum length of the path to a UNIX domain socket,
- * sockaddr_un::sun_path member. POSIX requires that all systems
- * support at least 100 bytes here, including the nul termination.
- * We use 99 for the max value to allow for the nul.
- *
- * We could probably also do sizeof (addr.sun_path)
- * but this way we are the same on all platforms
- * which is probably a good idea.
- */
-
-/**
- * Creates a socket and connects it to the UNIX domain socket at the
- * given path. The connection fd is returned, and is set up as
- * nonblocking.
- *
- * On Windows there are no UNIX domain sockets. Instead, connects to a
- * localhost-bound TCP socket, whose port number is stored in a file
- * at the given path.
- *
- * Uses abstract sockets instead of filesystem-linked sockets if
- * requested (it's possible only on Linux; see "man 7 unix" on Linux).
- * On non-Linux abstract socket usage always fails.
- *
- * @param path the path to UNIX domain socket
- * @param abstract #TRUE to use abstract namespace
- * @param error return location for error code
- * @returns connection file descriptor or -1 on error
- */
-int
-_dbus_connect_unix_socket (const char *path,
- dbus_bool_t abstract,
- DBusError *error)
-{
-#ifdef DBUS_WINCE
- return -1;
-#else
- int fd, n, port;
- char buf[7];
-
- _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
- _dbus_verbose ("connecting to pseudo-unix socket at %s\n",
- path);
-
- if (abstract)
- {
- dbus_set_error (error, DBUS_ERROR_NOT_SUPPORTED,
- "Implementation does not support abstract socket namespace\n");
- return -1;
- }
-
- fd = _sopen (path, O_RDONLY, SH_DENYNO);
-
- if (fd == -1)
- {
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to open file %s: %s",
- path, _dbus_strerror (errno));
- return -1;
- }
-
- n = read (fd, buf, sizeof (buf) - 1);
- close (fd);
-
- if (n == 0)
- {
- dbus_set_error (error, DBUS_ERROR_FAILED,
- "Failed to read port number from file %s",
- path);
- return -1;
- }
-
- buf[n] = '\0';
- port = atoi (buf);
-
- if (port <= 0 || port > 0xFFFF)
- {
- dbus_set_error (error, DBUS_ERROR_FAILED,
- "Invalid port numer in file %s",
- path);
- return -1;
- }
-
- return _dbus_connect_tcp_socket (NULL, port, error);
-#endif //DBUS_WINCE
-
-}
-
-/**
- * Creates a socket and binds it to the given path,
- * then listens on the socket. The socket is
- * set to be nonblocking.
- *
- * Uses abstract sockets instead of filesystem-linked
- * sockets if requested (it's possible only on Linux;
- * see "man 7 unix" on Linux).
- * On non-Linux abstract socket usage always fails.
- *
- * @param path the socket name
- * @param abstract #TRUE to use abstract namespace
- * @param error return location for errors
- * @returns the listening file descriptor or -1 on error
- */
-int
-_dbus_listen_unix_socket (const char *path,
- dbus_bool_t abstract,
- DBusError *error)
-{
-#ifdef DBUS_WINCE
- return -1;
-#else
- DBusSocket *s;
- int listen_handle;
- struct sockaddr sa;
- int addr_len;
- int filefd;
- int n, l;
- DBusString portstr;
-
- _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
- _dbus_verbose ("listening on pseudo-unix socket at %s\n",
- path);
-
- if (abstract)
- {
- dbus_set_error (error, DBUS_ERROR_NOT_SUPPORTED,
- "Implementation does not support abstract socket namespace\n");
- return -1;
- }
-
- listen_handle = _dbus_listen_tcp_socket (NULL, 0, error);
-
- if (listen_handle == -1)
- return -1;
-
- _dbus_handle_to_socket(listen_handle, &s);
-
- addr_len = sizeof (sa);
- if (getsockname (s->fd, &sa, &addr_len) == SOCKET_ERROR)
- {
- DBUS_SOCKET_SET_ERRNO ();
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "getsockname failed: %s",
- _dbus_strerror (errno));
- _dbus_close_socket (listen_handle, NULL);
- return -1;
- }
-
- _dbus_assert (((struct sockaddr_in*) &sa)->sin_family == AF_INET);
-
- filefd = _sopen (path, O_CREAT|O_WRONLY|_O_SHORT_LIVED, SH_DENYWR, 0666);
-
- if (filefd == -1)
- {
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to create pseudo-unix socket port number file %s: %s",
- path, _dbus_strerror (errno));
- _dbus_close_socket (listen_handle, NULL);
- return -1;
- }
-
- _dbus_lock_sockets();
- _dbus_handle_to_socket_unlocked(listen_handle, &s);
- s->port_file_fd = filefd;
- _dbus_unlock_sockets();
-
- /* Use strdup() to avoid memory leak in dbus-test */
- path = strdup (path);
- if (!path)
- {
- _DBUS_SET_OOM (error);
- _dbus_close_socket (listen_handle, NULL);
- return -1;
- }
-
- _dbus_string_init_const (&s->port_file, path);
-
- if (!_dbus_string_init (&portstr))
- {
- _DBUS_SET_OOM (error);
- _dbus_close_socket (listen_handle, NULL);
- return -1;
- }
-
- if (!_dbus_string_append_int (&portstr, ntohs (((struct sockaddr_in*) &sa)->sin_port)))
- {
- _DBUS_SET_OOM (error);
- _dbus_close_socket (listen_handle, NULL);
- return -1;
- }
-
- l = _dbus_string_get_length (&portstr);
- n = write (filefd, _dbus_string_get_const_data (&portstr), l);
- _dbus_string_free (&portstr);
-
- if (n == -1)
- {
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to write port number to file %s: %s",
- path, _dbus_strerror (errno));
- _dbus_close_socket (listen_handle, NULL);
- return -1;
- }
- else if (n < l)
- {
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to write port number to file %s",
- path);
- _dbus_close_socket (listen_handle, NULL);
- return -1;
- }
-
- return listen_handle;
-#endif //DBUS_WINCE
-}
-
-#if 0
-
-/**
- * Opens the client side of a Windows named pipe. The connection D-BUS
- * file descriptor index is returned. It is set up as nonblocking.
- *
- * @param path the path to named pipe socket
- * @param error return location for error code
- * @returns connection D-BUS file descriptor or -1 on error
- */
-int
-_dbus_connect_named_pipe (const char *path,
- DBusError *error)
-{
- _dbus_assert_not_reached ("not implemented");
-}
-
-#endif
-
-
-dbus_bool_t
-_dbus_account_to_win_sid (const wchar_t *waccount,
- void **ppsid,
- DBusError *error)
-{
- dbus_bool_t retval = FALSE;
- DWORD sid_length, wdomain_length;
- SID_NAME_USE use;
- wchar_t *wdomain;
-
- *ppsid = NULL;
-
- sid_length = 0;
- wdomain_length = 0;
- if (!LookupAccountNameW (NULL, waccount, NULL, &sid_length,
- NULL, &wdomain_length, &use)
- && GetLastError () != ERROR_INSUFFICIENT_BUFFER)
- {
- _dbus_win_set_error_from_win_error (error, GetLastError ());
- return FALSE;
- }
-
- *ppsid = dbus_malloc (sid_length);
- if (!*ppsid)
- {
- _DBUS_SET_OOM (error);
- return FALSE;
- }
-
- wdomain = dbus_new (wchar_t, wdomain_length);
- if (!wdomain)
- {
- _DBUS_SET_OOM (error);
- goto out1;
- }
-
- if (!LookupAccountNameW (NULL, waccount, (PSID) *ppsid, &sid_length,
- wdomain, &wdomain_length, &use))
- {
- _dbus_win_set_error_from_win_error (error, GetLastError ());
- goto out2;
- }
-
- if (!IsValidSid ((PSID) *ppsid))
- {
- dbus_set_error_const (error, DBUS_ERROR_FAILED, "Invalid SID");
- goto out2;
- }
-
- retval = TRUE;
-
-out2:
- dbus_free (wdomain);
-out1:
- if (!retval)
- {
- dbus_free (*ppsid);
- *ppsid = NULL;
- }
-
- return retval;
-}
-
-
-dbus_bool_t
-fill_win_user_info_name_and_groups (wchar_t *wname,
- wchar_t *wdomain,
- DBusUserInfo *info,
- DBusError *error)
-{
-#ifdef DBUS_WINCE
- return TRUE;
-#else
- dbus_bool_t retval = FALSE;
- char *name, *domain;
- LPLOCALGROUP_USERS_INFO_0 local_groups = NULL;
- LPGROUP_USERS_INFO_0 global_groups = NULL;
- DWORD nread, ntotal;
-
- name = _dbus_win_utf16_to_utf8 (wname, error);
- if (!name)
- return FALSE;
-
- domain = _dbus_win_utf16_to_utf8 (wdomain, error);
- if (!domain)
- goto out0;
-
- info->username = dbus_malloc (strlen (domain) + 1 + strlen (name) + 1);
- if (!info->username)
- {
- _DBUS_SET_OOM (error);
- goto out1;
- }
-
- strcpy (info->username, domain);
- strcat (info->username, "\\");
- strcat (info->username, name);
-
- info->n_group_ids = 0;
- if (NetUserGetLocalGroups (NULL, wname, 0, LG_INCLUDE_INDIRECT,
- (LPBYTE *) &local_groups, MAX_PREFERRED_LENGTH,
- &nread, &ntotal) == NERR_Success)
- {
- DWORD i;
- int n;
-
- info->group_ids = dbus_new (dbus_gid_t, nread);
- if (!info->group_ids)
- {
- _DBUS_SET_OOM (error);
- goto out3;
- }
-
- for (i = n = 0; i < nread; i++)
- {
- PSID group_sid;
- if (_dbus_account_to_win_sid (local_groups[i].lgrui0_name,
- &group_sid, error))
- {
- info->group_ids[n++] = _dbus_win_sid_to_uid_t (group_sid);
- dbus_free (group_sid);
- }
- }
- info->n_group_ids = n;
- }
-
- if (NetUserGetGroups (NULL, wname, 0,
- (LPBYTE *) &global_groups, MAX_PREFERRED_LENGTH,
- &nread, &ntotal) == NERR_Success)
- {
- DWORD i;
- int n = info->n_group_ids;
-
- info->group_ids = dbus_realloc (info->group_ids, (n + nread) * sizeof (dbus_gid_t));
- if (!info->group_ids)
- {
- _DBUS_SET_OOM (error);
- goto out4;
- }
-
- for (i = 0; i < nread; i++)
- {
- PSID group_sid;
- if (_dbus_account_to_win_sid (global_groups[i].grui0_name,
- &group_sid, error))
- {
- info->group_ids[n++] = _dbus_win_sid_to_uid_t (group_sid);
- dbus_free (group_sid);
- }
- }
- info->n_group_ids = n;
- }
-
- if (info->n_group_ids > 0)
- {
- /* FIXME: find out actual primary group */
- info->primary_gid = info->group_ids[0];
- }
- else
- {
- info->group_ids = dbus_new (dbus_gid_t, 1);
- info->n_group_ids = 1;
- info->group_ids[0] = DBUS_GID_UNSET;
- info->primary_gid = DBUS_GID_UNSET;
- }
-
- retval = TRUE;
-
-out4:
- if (global_groups != NULL)
- NetApiBufferFree (global_groups);
-out3:
- if (local_groups != NULL)
- NetApiBufferFree (local_groups);
-out1:
- dbus_free (domain);
-out0:
- dbus_free (name);
-
- return retval;
-#endif //DBUS_WINCE
-}
-
-dbus_bool_t
-fill_win_user_info_homedir (wchar_t *wname,
- wchar_t *wdomain,
- DBusUserInfo *info,
- DBusError *error)
-{
-#ifdef DBUS_WINCE
- //TODO
- return TRUE;
-#else
- dbus_bool_t retval = FALSE;
- USER_INFO_1 *user_info = NULL;
- wchar_t wcomputername[MAX_COMPUTERNAME_LENGTH + 1];
- DWORD wcomputername_length = MAX_COMPUTERNAME_LENGTH + 1;
- dbus_bool_t local_computer;
- wchar_t *dc = NULL;
- NET_API_STATUS ret = 0;
-
- /* If the domain is this computer's name, assume it's a local user.
- * Otherwise look up a DC for the domain, and ask it.
- */
-
- GetComputerNameW (wcomputername, &wcomputername_length);
- local_computer = (wcsicmp (wcomputername, wdomain) == 0);
-
- if (!local_computer)
- {
- ret = NetGetAnyDCName (NULL, wdomain, (LPBYTE *) &dc);
- if (ret != NERR_Success)
- {
- info->homedir = _dbus_strdup ("\\");
- _dbus_warn("NetGetAnyDCName() failed with errorcode %d '%s'\n",ret,_dbus_lm_strerror(ret));
- return TRUE;
- }
- }
-
- /* No way to find out the profile of another user, let's try the
- * "home directory" from NetUserGetInfo's USER_INFO_1.
- */
- ret = NetUserGetInfo (dc, wname, 1, (LPBYTE *) &user_info);
- if (ret == NERR_Success )
- if(user_info->usri1_home_dir != NULL &&
- user_info->usri1_home_dir != (LPWSTR)0xfeeefeee && /* freed memory http://www.gamedev.net/community/forums/topic.asp?topic_id=158402 */
- user_info->usri1_home_dir[0] != '\0')
- {
- info->homedir = _dbus_win_utf16_to_utf8 (user_info->usri1_home_dir, error);
- if (!info->homedir)
- goto out1;
- }
- else
- {
- _dbus_verbose("NetUserGetInfo() returned no home dir entry\n");
- /* Not set, so use something random. */
- info->homedir = _dbus_strdup ("\\");
- }
- else
- {
- char *dc_string = _dbus_win_utf16_to_utf8(dc,error);
- char *user_name = _dbus_win_utf16_to_utf8(wname,error);
- _dbus_warn("NetUserGetInfo() for user '%s' failed with errorcode %d '%s', %s\n",user_name, ret,_dbus_lm_strerror(ret),dc_string);
- dbus_free(user_name);
- dbus_free(dc_string);
- /* Not set, so use something random. */
- info->homedir = _dbus_strdup ("\\");
- }
-
- retval = TRUE;
-
-out1:
- if (dc != NULL)
- NetApiBufferFree (dc);
- if (user_info != NULL)
- NetApiBufferFree (user_info);
-
- return retval;
-#endif //DBUS_WINCE
-}
-
-dbus_bool_t
-fill_win_user_info_from_name (wchar_t *wname,
- DBusUserInfo *info,
- DBusError *error)
-{
-#ifdef DBUS_WINCE
- return TRUE;
- //TODO
-#else
- dbus_bool_t retval = FALSE;
- PSID sid;
- wchar_t *wdomain;
- DWORD sid_length, wdomain_length;
- SID_NAME_USE use;
-
- sid_length = 0;
- wdomain_length = 0;
- if (!LookupAccountNameW (NULL, wname, NULL, &sid_length,
- NULL, &wdomain_length, &use) &&
- GetLastError () != ERROR_INSUFFICIENT_BUFFER)
- {
- _dbus_win_set_error_from_win_error (error, GetLastError ());
- return FALSE;
- }
-
- sid = dbus_malloc (sid_length);
- if (!sid)
- {
- _DBUS_SET_OOM (error);
- return FALSE;
- }
-
- wdomain = dbus_new (wchar_t, wdomain_length);
- if (!wdomain)
- {
- _DBUS_SET_OOM (error);
- goto out0;
- }
-
- if (!LookupAccountNameW (NULL, wname, sid, &sid_length,
- wdomain, &wdomain_length, &use))
- {
- _dbus_win_set_error_from_win_error (error, GetLastError ());
- goto out1;
- }
-
- if (!IsValidSid (sid))
- {
- dbus_set_error_const (error, DBUS_ERROR_FAILED, "Invalid SID");
- goto out1;
- }
-
- info->uid = _dbus_win_sid_to_uid_t (sid);
-
- if (!fill_win_user_info_name_and_groups (wname, wdomain, info, error))
- goto out1;
-
- if (!fill_win_user_info_homedir (wname, wdomain, info, error))
- goto out1;
-
- retval = TRUE;
-
-out1:
- dbus_free (wdomain);
-out0:
- dbus_free (sid);
-
- return retval;
-#endif //DBUS_WINCE
-}
-
-dbus_bool_t
-_dbus_win_sid_to_name_and_domain (dbus_uid_t uid,
- wchar_t **wname,
- wchar_t **wdomain,
- DBusError *error)
-{
-#ifdef DBUS_WINCE
- return TRUE;
- //TODO
-#else
- PSID sid;
- DWORD wname_length, wdomain_length;
- SID_NAME_USE use;
-
- if (!_dbus_uid_t_to_win_sid (uid, &sid))
- {
- _dbus_win_set_error_from_win_error (error, GetLastError ());
- return FALSE;
- }
-
- wname_length = 0;
- wdomain_length = 0;
- if (!LookupAccountSidW (NULL, sid, NULL, &wname_length,
- NULL, &wdomain_length, &use) &&
- GetLastError () != ERROR_INSUFFICIENT_BUFFER)
- {
- _dbus_win_set_error_from_win_error (error, GetLastError ());
- goto out0;
- }
-
- *wname = dbus_new (wchar_t, wname_length);
- if (!*wname)
- {
- _DBUS_SET_OOM (error);
- goto out0;
- }
-
- *wdomain = dbus_new (wchar_t, wdomain_length);
- if (!*wdomain)
- {
- _DBUS_SET_OOM (error);
- goto out1;
- }
-
- if (!LookupAccountSidW (NULL, sid, *wname, &wname_length,
- *wdomain, &wdomain_length, &use))
- {
- _dbus_win_set_error_from_win_error (error, GetLastError ());
- goto out2;
- }
-
- return TRUE;
-
-out2:
- dbus_free (*wdomain);
- *wdomain = NULL;
-out1:
- dbus_free (*wname);
- *wname = NULL;
-out0:
- LocalFree (sid);
-
- return FALSE;
-#endif //DBUS_WINCE
-}
-
-dbus_bool_t
-fill_win_user_info_from_uid (dbus_uid_t uid,
- DBusUserInfo *info,
- DBusError *error)
+ * @param buffer2 second buffer, or #NULL
+ * @param start2 first byte to write in second buffer
+ * @param len2 number of bytes to write in second buffer
+ * @returns total bytes written from both buffers, or -1 on error
+ */
+int
+_dbus_write_socket_two (int fd,
+ const DBusString *buffer1,
+ int start1,
+ int len1,
+ const DBusString *buffer2,
+ int start2,
+ int len2)
{
-#ifdef DBUS_WINCE
- return TRUE;
- //TODO
-#else
- PSID sid;
- dbus_bool_t retval = FALSE;
- wchar_t *wname, *wdomain;
+ WSABUF vectors[2];
+ const char *data1;
+ const char *data2;
+ int rc;
+ DWORD bytes_written;
+
+ _dbus_assert (buffer1 != NULL);
+ _dbus_assert (start1 >= 0);
+ _dbus_assert (start2 >= 0);
+ _dbus_assert (len1 >= 0);
+ _dbus_assert (len2 >= 0);
- info->uid = uid;
- if (!_dbus_win_sid_to_name_and_domain (uid, &wname, &wdomain, error))
- {
- _dbus_verbose("%s after _dbus_win_sid_to_name_and_domain\n",__FUNCTION__);
- return FALSE;
- }
+ data1 = _dbus_string_get_const_data_len (buffer1, start1, len1);
- if (!fill_win_user_info_name_and_groups (wname, wdomain, info, error))
+ if (buffer2 != NULL)
+ data2 = _dbus_string_get_const_data_len (buffer2, start2, len2);
+ else
{
- _dbus_verbose("%s after fill_win_user_info_name_and_groups\n",__FUNCTION__);
- goto out0;
+ data2 = NULL;
+ start2 = 0;
+ len2 = 0;
}
+ vectors[0].buf = (char*) data1;
+ vectors[0].len = len1;
+ vectors[1].buf = (char*) data2;
+ vectors[1].len = len2;
- if (!fill_win_user_info_homedir (wname, wdomain, info, error))
+ again:
+
+ _dbus_verbose ("WSASend: len1+2=%d+%d fd=%d\n", len1, len2, fd);
+ rc = WSASend (fd,
+ vectors,
+ data2 ? 2 : 1,
+ &bytes_written,
+ 0,
+ NULL,
+ NULL);
+
+ if (rc < 0)
{
- _dbus_verbose("%s after fill_win_user_info_homedir\n",__FUNCTION__);
- goto out0;
+ DBUS_SOCKET_SET_ERRNO ();
+ _dbus_verbose ("WSASend: failed: %s\n", _dbus_strerror (errno));
+ bytes_written = -1;
}
+ else
+ _dbus_verbose ("WSASend: = %ld\n", bytes_written);
+
+ if (bytes_written < 0 && errno == EINTR)
+ goto again;
+
+ return bytes_written;
+}
- retval = TRUE;
-
-out0:
- dbus_free (wdomain);
- dbus_free (wname);
+#if 0
- return retval;
-#endif //DBUS_WINCE
+/**
+ * Opens the client side of a Windows named pipe. The connection D-BUS
+ * file descriptor index is returned. It is set up as nonblocking.
+ *
+ * @param path the path to named pipe socket
+ * @param error return location for error code
+ * @returns connection D-BUS file descriptor or -1 on error
+ */
+int
+_dbus_connect_named_pipe (const char *path,
+ DBusError *error)
+{
+ _dbus_assert_not_reached ("not implemented");
}
+#endif
va_list args)
{
/* MSVCRT's vsnprintf semantics are a bit different */
- /* The C library source in the Platform SDK indicates that this
- * would work, but alas, it doesn't. At least not on Windows
- * 2000. Presumably those sources correspond to the C library on
- * some newer or even future Windows version.
- *
- len = _vsnprintf (NULL, _DBUS_INT_MAX, format, args);
- */
- char p[1024];
+ char buf[1024];
+ int bufsize;
int len;
- len = vsnprintf (p, sizeof(p)-1, format, args);
- if (len == -1) // try again
+
+ bufsize = sizeof (buf);
+ len = _vsnprintf (buf, bufsize - 1, format, args);
+
+ while (len == -1) /* try again */
{
char *p;
- p = malloc (strlen(format)*3);
- len = vsnprintf (p, sizeof(p)-1, format, args);
- free(p);
+
+ bufsize *= 2;
+
+ p = malloc (bufsize);
+ len = _vsnprintf (p, bufsize - 1, format, args);
+ free (p);
}
+
return len;
}
/************************************************************************
- uid ... <-> win sid functions
************************************************************************/
return retval;
}
-static void
-_sid_atom_cache_shutdown (void *unused)
-{
- DBusHashIter iter;
- _DBUS_LOCK (sid_atom_cache);
- _dbus_hash_iter_init (sid_atom_cache, &iter);
- while (_dbus_hash_iter_next (&iter))
- {
- ATOM atom;
- atom = (ATOM) _dbus_hash_iter_get_value (&iter);
- GlobalDeleteAtom(atom);
- _dbus_hash_iter_remove_entry(&iter);
- }
- _DBUS_UNLOCK (sid_atom_cache);
- _dbus_hash_table_unref (sid_atom_cache);
- sid_atom_cache = NULL;
-}
+/** @} end of sysdeps-win */
-/**
- * Returns the 2-way associated dbus_uid_t form a SID.
- *
- * @param psid pointer to the SID
+
+/** Gets our UID
+ * @returns process UID
*/
dbus_uid_t
-_dbus_win_sid_to_uid_t (PSID psid)
+_dbus_getuid (void)
{
- dbus_uid_t uid;
- dbus_uid_t olduid;
- char *string;
- ATOM atom;
-
- if (!IsValidSid (psid))
- {
- _dbus_verbose("%s invalid sid\n",__FUNCTION__);
- return DBUS_UID_UNSET;
- }
- if (!ConvertSidToStringSidA (psid, &string))
- {
- _dbus_verbose("%s invalid sid\n",__FUNCTION__);
- return DBUS_UID_UNSET;
- }
-
- atom = GlobalAddAtom(string);
-
- if (atom == 0)
- {
- _dbus_verbose("%s GlobalAddAtom failed\n",__FUNCTION__);
- LocalFree (string);
- return DBUS_UID_UNSET;
- }
-
- _DBUS_LOCK (sid_atom_cache);
-
- if (sid_atom_cache == NULL)
- {
- sid_atom_cache = _dbus_hash_table_new (DBUS_HASH_ULONG, NULL, NULL);
- _dbus_register_shutdown_func (_sid_atom_cache_shutdown, NULL);
- }
-
- uid = atom;
- olduid = (dbus_uid_t) _dbus_hash_table_lookup_ulong (sid_atom_cache, uid);
-
- if (olduid)
- {
- _dbus_verbose("%s sid with id %i found in cache\n",__FUNCTION__, olduid);
- uid = olduid;
- }
- else
- {
- _dbus_hash_table_insert_ulong (sid_atom_cache, uid, (void*) uid);
- _dbus_verbose("%s sid %s added with uid %i to cache\n",__FUNCTION__, string, uid);
- }
-
- _DBUS_UNLOCK (sid_atom_cache);
-
- return uid;
+ return DBUS_UID_UNSET;
}
-dbus_bool_t _dbus_uid_t_to_win_sid (dbus_uid_t uid, PSID *ppsid)
+/**
+ * The only reason this is separate from _dbus_getpid() is to allow it
+ * on Windows for logging but not for other purposes.
+ *
+ * @returns process ID to put in log messages
+ */
+unsigned long
+_dbus_pid_for_log (void)
{
- void* atom;
- char string[255];
-
- atom = _dbus_hash_table_lookup_ulong (sid_atom_cache, uid);
- if (atom == NULL)
- {
- _dbus_verbose("%s uid %i not found in cache\n",__FUNCTION__,uid);
- return FALSE;
- }
- memset( string, '.', sizeof(string) );
- if (!GlobalGetAtomNameA( (ATOM) atom, string, 255 ))
- {
- _dbus_verbose("%s uid %i not found in cache\n",__FUNCTION__, uid);
- return FALSE;
- }
- if (!ConvertStringSidToSidA(string, ppsid))
- {
- _dbus_verbose("%s could not convert %s into sid \n",__FUNCTION__, string);
- return FALSE;
- }
- _dbus_verbose("%s converted %s into sid \n",__FUNCTION__, string);
- return TRUE;
+ return _dbus_getpid ();
}
-
-/** @} end of sysdeps-win */
-
-
-/** Gets our UID
- * @returns process UID
+/** Gets our SID
+ * @param points to sid buffer, need to be freed with LocalFree()
+ * @returns process sid
*/
-dbus_uid_t
-_dbus_getuid(void)
+dbus_bool_t
+_dbus_getsid(char **sid)
{
- dbus_uid_t retval = DBUS_UID_UNSET;
HANDLE process_token = NULL;
TOKEN_USER *token_user = NULL;
DWORD n;
-
- if (!OpenProcessToken (GetCurrentProcess (), TOKEN_QUERY, &process_token))
- _dbus_win_warn_win_error ("OpenProcessToken failed", GetLastError ());
- else if ((!GetTokenInformation (process_token, TokenUser, NULL, 0, &n)
+ PSID psid;
+ int retval = FALSE;
+
+ if (!OpenProcessToken (GetCurrentProcess (), TOKEN_QUERY, &process_token))
+ {
+ _dbus_win_warn_win_error ("OpenProcessToken failed", GetLastError ());
+ goto failed;
+ }
+ if ((!GetTokenInformation (process_token, TokenUser, NULL, 0, &n)
&& GetLastError () != ERROR_INSUFFICIENT_BUFFER)
|| (token_user = alloca (n)) == NULL
|| !GetTokenInformation (process_token, TokenUser, token_user, n, &n))
- _dbus_win_warn_win_error ("GetTokenInformation failed", GetLastError ());
- else
- retval = _dbus_win_sid_to_uid_t (token_user->User.Sid);
+ {
+ _dbus_win_warn_win_error ("GetTokenInformation failed", GetLastError ());
+ goto failed;
+ }
+ psid = token_user->User.Sid;
+ if (!IsValidSid (psid))
+ {
+ _dbus_verbose("%s invalid sid\n",__FUNCTION__);
+ goto failed;
+ }
+ if (!ConvertSidToStringSidA (psid, sid))
+ {
+ _dbus_verbose("%s invalid sid\n",__FUNCTION__);
+ goto failed;
+ }
+//okay:
+ retval = TRUE;
+failed:
if (process_token != NULL)
CloseHandle (process_token);
- _dbus_verbose("_dbus_getuid() returns %d\n",retval);
+ _dbus_verbose("_dbus_getsid() returns %d\n",retval);
return retval;
}
+
#ifdef DBUS_BUILD_TESTS
/** Gets our GID
* @returns process GID
dbus_gid_t
_dbus_getgid (void)
{
- dbus_gid_t retval = DBUS_GID_UNSET;
- HANDLE process_token = NULL;
- TOKEN_PRIMARY_GROUP *token_primary_group = NULL;
- DWORD n;
-
- if (!OpenProcessToken (GetCurrentProcess (), TOKEN_QUERY, &process_token))
- _dbus_win_warn_win_error ("OpenProcessToken failed", GetLastError ());
- else if ((!GetTokenInformation (process_token, TokenPrimaryGroup,
- NULL, 0, &n) &&
- GetLastError () != ERROR_INSUFFICIENT_BUFFER) ||
- (token_primary_group = alloca (n)) == NULL ||
- !GetTokenInformation (process_token, TokenPrimaryGroup,
- token_primary_group, n, &n))
- _dbus_win_warn_win_error ("GetTokenInformation failed", GetLastError ());
- else
- retval = _dbus_win_sid_to_uid_t (token_primary_group->PrimaryGroup);
-
- if (process_token != NULL)
- CloseHandle (process_token);
-
- return retval;
+ return DBUS_GID_UNSET;
}
#if 0
u_long arg;
fd_set read_set, write_set;
struct timeval tv;
- DBusSocket sock;
-
_dbus_win_startup_winsock ();
if (connect (socket1, (struct sockaddr *)&saddr, len) != SOCKET_ERROR ||
WSAGetLastError () != WSAEWOULDBLOCK)
{
- dbus_set_error_const (error, DBUS_ERROR_FAILED,
- "_dbus_full_duplex_pipe socketpair() emulation failed");
+ DBUS_SOCKET_SET_ERRNO ();
goto out1;
}
}
}
- sock.fd = socket1;
- *fd1 = _dbus_socket_to_handle (&sock);
- sock.fd = socket2;
- *fd2 = _dbus_socket_to_handle (&sock);
+ *fd1 = socket1;
+ *fd2 = socket2;
_dbus_verbose ("full-duplex pipe %d:%d <-> %d:%d\n",
*fd1, socket1, *fd2, socket2);
else
pEvents = eventsOnStack;
- _dbus_lock_sockets();
#ifdef DBUS_ENABLE_VERBOSE_MODE
msgp = msg;
for (i = 0; i < n_fds; i++)
{
static dbus_bool_t warned = FALSE;
- DBusSocket *s;
DBusPollFD *fdp = &fds[i];
- _dbus_handle_to_socket_unlocked(fdp->fd, &s);
-
- if (s->is_used == 0)
- {
- _dbus_warn ("no valid socket");
- warned = TRUE;
- }
if (fdp->events & _DBUS_POLLIN)
- msgp += sprintf (msgp, "R:%d ", s->fd);
+ msgp += sprintf (msgp, "R:%d ", fdp->fd);
if (fdp->events & _DBUS_POLLOUT)
- msgp += sprintf (msgp, "W:%d ", s->fd);
+ msgp += sprintf (msgp, "W:%d ", fdp->fd);
- msgp += sprintf (msgp, "E:%d\n\t", s->fd);
+ msgp += sprintf (msgp, "E:%d\n\t", fdp->fd);
// FIXME: more robust code for long msg
// create on heap when msg[] becomes too small
#endif
for (i = 0; i < n_fds; i++)
{
- DBusSocket *s;
DBusPollFD *fdp = &fds[i];
WSAEVENT ev;
long lNetworkEvents = FD_OOB;
- _dbus_handle_to_socket_unlocked(fdp->fd, &s);
-
- if (s->is_used == 0)
- continue;
-
ev = WSACreateEvent();
if (fdp->events & _DBUS_POLLIN)
if (fdp->events & _DBUS_POLLOUT)
lNetworkEvents |= FD_WRITE | FD_CONNECT;
- WSAEventSelect(s->fd, ev, lNetworkEvents);
+ WSAEventSelect(fdp->fd, ev, lNetworkEvents);
pEvents[i] = ev;
}
- _dbus_unlock_sockets();
ready = WSAWaitForMultipleEvents (n_fds, pEvents, FALSE, timeout_milliseconds, FALSE);
{
DBUS_SOCKET_SET_ERRNO ();
if (errno != EWOULDBLOCK)
- _dbus_verbose ("WSAWaitForMultipleEvents: failed: %s\n", _dbus_strerror (errno));
+ _dbus_verbose ("WSAWaitForMultipleEvents: failed: %s\n", strerror (errno));
ret = -1;
}
else if (ready == WSA_WAIT_TIMEOUT)
msgp = msg;
msgp += sprintf (msgp, "WSAWaitForMultipleEvents: =%d\n\t", ready);
- _dbus_lock_sockets();
for (i = 0; i < n_fds; i++)
{
- DBusSocket *s;
DBusPollFD *fdp = &fds[i];
WSANETWORKEVENTS ne;
- _dbus_handle_to_socket_unlocked(fdp->fd, &s);
-
fdp->revents = 0;
- WSAEnumNetworkEvents(s->fd, pEvents[i], &ne);
+ WSAEnumNetworkEvents(fdp->fd, pEvents[i], &ne);
if (ne.lNetworkEvents & (FD_READ | FD_ACCEPT | FD_CLOSE))
fdp->revents |= _DBUS_POLLIN;
fdp->revents |= _DBUS_POLLERR;
if (ne.lNetworkEvents & (FD_READ | FD_ACCEPT | FD_CLOSE))
- msgp += sprintf (msgp, "R:%d ", s->fd);
+ msgp += sprintf (msgp, "R:%d ", fdp->fd);
if (ne.lNetworkEvents & (FD_WRITE | FD_CONNECT))
- msgp += sprintf (msgp, "W:%d ", s->fd);
+ msgp += sprintf (msgp, "W:%d ", fdp->fd);
if (ne.lNetworkEvents & (FD_OOB))
- msgp += sprintf (msgp, "E:%d ", s->fd);
+ msgp += sprintf (msgp, "E:%d ", fdp->fd);
msgp += sprintf (msgp, "lNetworkEvents:%d ", ne.lNetworkEvents);
if(ne.lNetworkEvents)
ret++;
- WSAEventSelect(s->fd, pEvents[i], 0);
+ WSAEventSelect(fdp->fd, pEvents[i], 0);
}
- _dbus_unlock_sockets();
msgp += sprintf (msgp, "\n");
_dbus_verbose ("%s",msg);
FD_ZERO (&write_set);
FD_ZERO (&err_set);
- _dbus_lock_sockets();
#ifdef DBUS_ENABLE_VERBOSE_MODE
msgp = msg;
for (i = 0; i < n_fds; i++)
{
static dbus_bool_t warned = FALSE;
- DBusSocket *s;
DBusPollFD *fdp = &fds[i];
- _dbus_handle_to_socket_unlocked(fdp->fd, &s);
-
- if (s->is_used == 0)
- {
- _dbus_warn ("no valid socket");
- warned = TRUE;
- }
if (fdp->events & _DBUS_POLLIN)
- msgp += sprintf (msgp, "R:%d ", s->fd);
+ msgp += sprintf (msgp, "R:%d ", fdp->fd);
if (fdp->events & _DBUS_POLLOUT)
- msgp += sprintf (msgp, "W:%d ", s->fd);
+ msgp += sprintf (msgp, "W:%d ", fdp->fd);
- msgp += sprintf (msgp, "E:%d\n\t", s->fd);
+ msgp += sprintf (msgp, "E:%d\n\t", fdp->fd);
// FIXME: more robust code for long msg
// create on heap when msg[] becomes too small
#endif
for (i = 0; i < n_fds; i++)
{
- DBusSocket *s;
- DBusPollFD *fdp = &fds[i];
-
- _dbus_handle_to_socket_unlocked(fdp->fd, &s);
-
- if (s->is_used != 1)
- continue;
+ DBusPollFD *fdp = &fds[i];
if (fdp->events & _DBUS_POLLIN)
- FD_SET (s->fd, &read_set);
+ FD_SET (fdp->fd, &read_set);
if (fdp->events & _DBUS_POLLOUT)
- FD_SET (s->fd, &write_set);
+ FD_SET (fdp->fd, &write_set);
- FD_SET (s->fd, &err_set);
+ FD_SET (fdp->fd, &err_set);
- max_fd = MAX (max_fd, s->fd);
+ max_fd = MAX (max_fd, fdp->fd);
}
- _dbus_unlock_sockets();
tv.tv_sec = timeout_milliseconds / 1000;
tv.tv_usec = (timeout_milliseconds % 1000) * 1000;
#ifdef DBUS_ENABLE_VERBOSE_MODE
msgp = msg;
msgp += sprintf (msgp, "select: = %d:\n\t", ready);
- _dbus_lock_sockets();
- for (i = 0; i < n_fds; i++)
- {
- DBusSocket *s;
- DBusPollFD *fdp = &fds[i];
-
- _dbus_handle_to_socket_unlocked(fdp->fd, &s);
-
- if (FD_ISSET (s->fd, &read_set))
- msgp += sprintf (msgp, "R:%d ", s->fd);
-
- if (FD_ISSET (s->fd, &write_set))
- msgp += sprintf (msgp, "W:%d ", s->fd);
-
- if (FD_ISSET (s->fd, &err_set))
- msgp += sprintf (msgp, "E:%d\n\t", s->fd);
- }
- msgp += sprintf (msgp, "\n");
- _dbus_verbose ("%s",msg);
-#endif
for (i = 0; i < n_fds; i++)
- {
- DBusSocket *s;
- DBusPollFD *fdp = &fds[i];
-
- _dbus_handle_to_socket_unlocked(fdp->fd, &s);
-
- fdp->revents = 0;
-
- if (FD_ISSET (s->fd, &read_set))
- fdp->revents |= _DBUS_POLLIN;
-
- if (FD_ISSET (s->fd, &write_set))
- fdp->revents |= _DBUS_POLLOUT;
-
- if (FD_ISSET (s->fd, &err_set))
- fdp->revents |= _DBUS_POLLERR;
- }
- _dbus_unlock_sockets();
- }
- return ready;
-}
-#endif // USE_CHRIS_IMPL
-
-
-/************************************************************************
-
- error handling
-
- ************************************************************************/
-
-
-/**
- * Assigns an error name and message corresponding to a Win32 error
- * code to a DBusError. Does nothing if error is #NULL.
- *
- * @param error the error.
- * @param code the Win32 error code
- */
-void
-_dbus_win_set_error_from_win_error (DBusError *error,
- int code)
-{
- char *msg;
-
- /* As we want the English message, use the A API */
- FormatMessageA (FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_IGNORE_INSERTS |
- FORMAT_MESSAGE_FROM_SYSTEM,
- NULL, code, MAKELANGID (LANG_ENGLISH, SUBLANG_ENGLISH_US),
- (LPTSTR) &msg, 0, NULL);
- if (msg)
- {
- char *msg_copy;
-
- msg_copy = dbus_malloc (strlen (msg));
- strcpy (msg_copy, msg);
- LocalFree (msg);
-
- dbus_set_error (error, "win32.error", "%s", msg_copy);
- }
- else
- dbus_set_error_const (error, "win32.error", "Unknown error code or FormatMessage failed");
-}
-
-void
-_dbus_win_warn_win_error (const char *message,
- int code)
-{
- DBusError error;
-
- dbus_error_init (&error);
- _dbus_win_set_error_from_win_error (&error, code);
- _dbus_warn ("%s: %s\n", message, error.message);
- dbus_error_free (&error);
-}
-
-/**
- * A wrapper around strerror() because some platforms
- * may be lame and not have strerror().
- *
- * @param error_number errno.
- * @returns error description.
- */
-const char*
-_dbus_strerror (int error_number)
-{
-#ifdef DBUS_WINCE
- // TODO
- return "unknown";
-#else
- const char *msg;
-
- switch (error_number)
- {
- case WSAEINTR:
- return "Interrupted function call";
- case WSAEACCES:
- return "Permission denied";
- case WSAEFAULT:
- return "Bad address";
- case WSAEINVAL:
- return "Invalid argument";
- case WSAEMFILE:
- return "Too many open files";
- case WSAEWOULDBLOCK:
- return "Resource temporarily unavailable";
- case WSAEINPROGRESS:
- return "Operation now in progress";
- case WSAEALREADY:
- return "Operation already in progress";
- case WSAENOTSOCK:
- return "Socket operation on nonsocket";
- case WSAEDESTADDRREQ:
- return "Destination address required";
- case WSAEMSGSIZE:
- return "Message too long";
- case WSAEPROTOTYPE:
- return "Protocol wrong type for socket";
- case WSAENOPROTOOPT:
- return "Bad protocol option";
- case WSAEPROTONOSUPPORT:
- return "Protocol not supported";
- case WSAESOCKTNOSUPPORT:
- return "Socket type not supported";
- case WSAEOPNOTSUPP:
- return "Operation not supported";
- case WSAEPFNOSUPPORT:
- return "Protocol family not supported";
- case WSAEAFNOSUPPORT:
- return "Address family not supported by protocol family";
- case WSAEADDRINUSE:
- return "Address already in use";
- case WSAEADDRNOTAVAIL:
- return "Cannot assign requested address";
- case WSAENETDOWN:
- return "Network is down";
- case WSAENETUNREACH:
- return "Network is unreachable";
- case WSAENETRESET:
- return "Network dropped connection on reset";
- case WSAECONNABORTED:
- return "Software caused connection abort";
- case WSAECONNRESET:
- return "Connection reset by peer";
- case WSAENOBUFS:
- return "No buffer space available";
- case WSAEISCONN:
- return "Socket is already connected";
- case WSAENOTCONN:
- return "Socket is not connected";
- case WSAESHUTDOWN:
- return "Cannot send after socket shutdown";
- case WSAETIMEDOUT:
- return "Connection timed out";
- case WSAECONNREFUSED:
- return "Connection refused";
- case WSAEHOSTDOWN:
- return "Host is down";
- case WSAEHOSTUNREACH:
- return "No route to host";
- case WSAEPROCLIM:
- return "Too many processes";
- case WSAEDISCON:
- return "Graceful shutdown in progress";
- case WSATYPE_NOT_FOUND:
- return "Class type not found";
- case WSAHOST_NOT_FOUND:
- return "Host not found";
- case WSATRY_AGAIN:
- return "Nonauthoritative host not found";
- case WSANO_RECOVERY:
- return "This is a nonrecoverable error";
- case WSANO_DATA:
- return "Valid name, no data record of requested type";
- case WSA_INVALID_HANDLE:
- return "Specified event object handle is invalid";
- case WSA_INVALID_PARAMETER:
- return "One or more parameters are invalid";
- case WSA_IO_INCOMPLETE:
- return "Overlapped I/O event object not in signaled state";
- case WSA_IO_PENDING:
- return "Overlapped operations will complete later";
- case WSA_NOT_ENOUGH_MEMORY:
- return "Insufficient memory available";
- case WSA_OPERATION_ABORTED:
- return "Overlapped operation aborted";
-#ifdef WSAINVALIDPROCTABLE
-
- case WSAINVALIDPROCTABLE:
- return "Invalid procedure table from service provider";
-#endif
-#ifdef WSAINVALIDPROVIDER
-
- case WSAINVALIDPROVIDER:
- return "Invalid service provider version number";
-#endif
-#ifdef WSAPROVIDERFAILEDINIT
-
- case WSAPROVIDERFAILEDINIT:
- return "Unable to initialize a service provider";
-#endif
-
- case WSASYSCALLFAILURE:
- return "System call failure";
- }
- msg = strerror (error_number);
- if (msg == NULL)
- msg = "unknown";
-
- return msg;
-#endif //DBUS_WINCE
-}
-
-
-
-/* lan manager error codes */
-const char*
-_dbus_lm_strerror(int error_number)
-{
-#ifdef DBUS_WINCE
- // TODO
- return "unknown";
-#else
- const char *msg;
- switch (error_number)
- {
- case NERR_NetNotStarted:
- return "The workstation driver is not installed.";
- case NERR_UnknownServer:
- return "The server could not be located.";
- case NERR_ShareMem:
- return "An internal error occurred. The network cannot access a shared memory segment.";
- case NERR_NoNetworkResource:
- return "A network resource shortage occurred.";
- case NERR_RemoteOnly:
- return "This operation is not supported on workstations.";
- case NERR_DevNotRedirected:
- return "The device is not connected.";
- case NERR_ServerNotStarted:
- return "The Server service is not started.";
- case NERR_ItemNotFound:
- return "The queue is empty.";
- case NERR_UnknownDevDir:
- return "The device or directory does not exist.";
- case NERR_RedirectedPath:
- return "The operation is invalid on a redirected resource.";
- case NERR_DuplicateShare:
- return "The name has already been shared.";
- case NERR_NoRoom:
- return "The server is currently out of the requested resource.";
- case NERR_TooManyItems:
- return "Requested addition of items exceeds the maximum allowed.";
- case NERR_InvalidMaxUsers:
- return "The Peer service supports only two simultaneous users.";
- case NERR_BufTooSmall:
- return "The API return buffer is too small.";
- case NERR_RemoteErr:
- return "A remote API error occurred.";
- case NERR_LanmanIniError:
- return "An error occurred when opening or reading the configuration file.";
- case NERR_NetworkError:
- return "A general network error occurred.";
- case NERR_WkstaInconsistentState:
- return "The Workstation service is in an inconsistent state. Restart the computer before restarting the Workstation service.";
- case NERR_WkstaNotStarted:
- return "The Workstation service has not been started.";
- case NERR_BrowserNotStarted:
- return "The requested information is not available.";
- case NERR_InternalError:
- return "An internal error occurred.";
- case NERR_BadTransactConfig:
- return "The server is not configured for transactions.";
- case NERR_InvalidAPI:
- return "The requested API is not supported on the remote server.";
- case NERR_BadEventName:
- return "The event name is invalid.";
- case NERR_DupNameReboot:
- return "The computer name already exists on the network. Change it and restart the computer.";
- case NERR_CfgCompNotFound:
- return "The specified component could not be found in the configuration information.";
- case NERR_CfgParamNotFound:
- return "The specified parameter could not be found in the configuration information.";
- case NERR_LineTooLong:
- return "A line in the configuration file is too long.";
- case NERR_QNotFound:
- return "The printer does not exist.";
- case NERR_JobNotFound:
- return "The print job does not exist.";
- case NERR_DestNotFound:
- return "The printer destination cannot be found.";
- case NERR_DestExists:
- return "The printer destination already exists.";
- case NERR_QExists:
- return "The printer queue already exists.";
- case NERR_QNoRoom:
- return "No more printers can be added.";
- case NERR_JobNoRoom:
- return "No more print jobs can be added.";
- case NERR_DestNoRoom:
- return "No more printer destinations can be added.";
- case NERR_DestIdle:
- return "This printer destination is idle and cannot accept control operations.";
- case NERR_DestInvalidOp:
- return "This printer destination request contains an invalid control function.";
- case NERR_ProcNoRespond:
- return "The print processor is not responding.";
- case NERR_SpoolerNotLoaded:
- return "The spooler is not running.";
- case NERR_DestInvalidState:
- return "This operation cannot be performed on the print destination in its current state.";
- case NERR_QInvalidState:
- return "This operation cannot be performed on the printer queue in its current state.";
- case NERR_JobInvalidState:
- return "This operation cannot be performed on the print job in its current state.";
- case NERR_SpoolNoMemory:
- return "A spooler memory allocation failure occurred.";
- case NERR_DriverNotFound:
- return "The device driver does not exist.";
- case NERR_DataTypeInvalid:
- return "The data type is not supported by the print processor.";
- case NERR_ProcNotFound:
- return "The print processor is not installed.";
- case NERR_ServiceTableLocked:
- return "The service database is locked.";
- case NERR_ServiceTableFull:
- return "The service table is full.";
- case NERR_ServiceInstalled:
- return "The requested service has already been started.";
- case NERR_ServiceEntryLocked:
- return "The service does not respond to control actions.";
- case NERR_ServiceNotInstalled:
- return "The service has not been started.";
- case NERR_BadServiceName:
- return "The service name is invalid.";
- case NERR_ServiceCtlTimeout:
- return "The service is not responding to the control function.";
- case NERR_ServiceCtlBusy:
- return "The service control is busy.";
- case NERR_BadServiceProgName:
- return "The configuration file contains an invalid service program name.";
- case NERR_ServiceNotCtrl:
- return "The service could not be controlled in its present state.";
- case NERR_ServiceKillProc:
- return "The service ended abnormally.";
- case NERR_ServiceCtlNotValid:
- return "The requested pause or stop is not valid for this service.";
- case NERR_NotInDispatchTbl:
- return "The service control dispatcher could not find the service name in the dispatch table.";
- case NERR_BadControlRecv:
- return "The service control dispatcher pipe read failed.";
- case NERR_ServiceNotStarting:
- return "A thread for the new service could not be created.";
- case NERR_AlreadyLoggedOn:
- return "This workstation is already logged on to the local-area network.";
- case NERR_NotLoggedOn:
- return "The workstation is not logged on to the local-area network.";
- case NERR_BadUsername:
- return "The user name or group name parameter is invalid.";
- case NERR_BadPassword:
- return "The password parameter is invalid.";
- case NERR_UnableToAddName_W:
- return "@W The logon processor did not add the message alias.";
- case NERR_UnableToAddName_F:
- return "The logon processor did not add the message alias.";
- case NERR_UnableToDelName_W:
- return "@W The logoff processor did not delete the message alias.";
- case NERR_UnableToDelName_F:
- return "The logoff processor did not delete the message alias.";
- case NERR_LogonsPaused:
- return "Network logons are paused.";
- case NERR_LogonServerConflict:
- return "A centralized logon-server conflict occurred.";
- case NERR_LogonNoUserPath:
- return "The server is configured without a valid user path.";
- case NERR_LogonScriptError:
- return "An error occurred while loading or running the logon script.";
- case NERR_StandaloneLogon:
- return "The logon server was not specified. Your computer will be logged on as STANDALONE.";
- case NERR_LogonServerNotFound:
- return "The logon server could not be found.";
- case NERR_LogonDomainExists:
- return "There is already a logon domain for this computer.";
- case NERR_NonValidatedLogon:
- return "The logon server could not validate the logon.";
- case NERR_ACFNotFound:
- return "The security database could not be found.";
- case NERR_GroupNotFound:
- return "The group name could not be found.";
- case NERR_UserNotFound:
- return "The user name could not be found.";
- case NERR_ResourceNotFound:
- return "The resource name could not be found.";
- case NERR_GroupExists:
- return "The group already exists.";
- case NERR_UserExists:
- return "The user account already exists.";
- case NERR_ResourceExists:
- return "The resource permission list already exists.";
- case NERR_NotPrimary:
- return "This operation is only allowed on the primary domain controller of the domain.";
- case NERR_ACFNotLoaded:
- return "The security database has not been started.";
- case NERR_ACFNoRoom:
- return "There are too many names in the user accounts database.";
- case NERR_ACFFileIOFail:
- return "A disk I/O failure occurred.";
- case NERR_ACFTooManyLists:
- return "The limit of 64 entries per resource was exceeded.";
- case NERR_UserLogon:
- return "Deleting a user with a session is not allowed.";
- case NERR_ACFNoParent:
- return "The parent directory could not be located.";
- case NERR_CanNotGrowSegment:
- return "Unable to add to the security database session cache segment.";
- case NERR_SpeGroupOp:
- return "This operation is not allowed on this special group.";
- case NERR_NotInCache:
- return "This user is not cached in user accounts database session cache.";
- case NERR_UserInGroup:
- return "The user already belongs to this group.";
- case NERR_UserNotInGroup:
- return "The user does not belong to this group.";
- case NERR_AccountUndefined:
- return "This user account is undefined.";
- case NERR_AccountExpired:
- return "This user account has expired.";
- case NERR_InvalidWorkstation:
- return "The user is not allowed to log on from this workstation.";
- case NERR_InvalidLogonHours:
- return "The user is not allowed to log on at this time.";
- case NERR_PasswordExpired:
- return "The password of this user has expired.";
- case NERR_PasswordCantChange:
- return "The password of this user cannot change.";
- case NERR_PasswordHistConflict:
- return "This password cannot be used now.";
- case NERR_PasswordTooShort:
- return "The password does not meet the password policy requirements. Check the minimum password length, password complexity and password history requirements.";
- case NERR_PasswordTooRecent:
- return "The password of this user is too recent to change.";
- case NERR_InvalidDatabase:
- return "The security database is corrupted.";
- case NERR_DatabaseUpToDate:
- return "No updates are necessary to this replicant network/local security database.";
- case NERR_SyncRequired:
- return "This replicant database is outdated; synchronization is required.";
- case NERR_UseNotFound:
- return "The network connection could not be found.";
- case NERR_BadAsgType:
- return "This asg_type is invalid.";
- case NERR_DeviceIsShared:
- return "This device is currently being shared.";
- case NERR_NoComputerName:
- return "The computer name could not be added as a message alias. The name may already exist on the network.";
- case NERR_MsgAlreadyStarted:
- return "The Messenger service is already started.";
- case NERR_MsgInitFailed:
- return "The Messenger service failed to start.";
- case NERR_NameNotFound:
- return "The message alias could not be found on the network.";
- case NERR_AlreadyForwarded:
- return "This message alias has already been forwarded.";
- case NERR_AddForwarded:
- return "This message alias has been added but is still forwarded.";
- case NERR_AlreadyExists:
- return "This message alias already exists locally.";
- case NERR_TooManyNames:
- return "The maximum number of added message aliases has been exceeded.";
- case NERR_DelComputerName:
- return "The computer name could not be deleted.";
- case NERR_LocalForward:
- return "Messages cannot be forwarded back to the same workstation.";
- case NERR_GrpMsgProcessor:
- return "An error occurred in the domain message processor.";
- case NERR_PausedRemote:
- return "The message was sent, but the recipient has paused the Messenger service.";
- case NERR_BadReceive:
- return "The message was sent but not received.";
- case NERR_NameInUse:
- return "The message alias is currently in use. Try again later.";
- case NERR_MsgNotStarted:
- return "The Messenger service has not been started.";
- case NERR_NotLocalName:
- return "The name is not on the local computer.";
- case NERR_NoForwardName:
- return "The forwarded message alias could not be found on the network.";
- case NERR_RemoteFull:
- return "The message alias table on the remote station is full.";
- case NERR_NameNotForwarded:
- return "Messages for this alias are not currently being forwarded.";
- case NERR_TruncatedBroadcast:
- return "The broadcast message was truncated.";
- case NERR_InvalidDevice:
- return "This is an invalid device name.";
- case NERR_WriteFault:
- return "A write fault occurred.";
- case NERR_DuplicateName:
- return "A duplicate message alias exists on the network.";
- case NERR_DeleteLater:
- return "@W This message alias will be deleted later.";
- case NERR_IncompleteDel:
- return "The message alias was not successfully deleted from all networks.";
- case NERR_MultipleNets:
- return "This operation is not supported on computers with multiple networks.";
- case NERR_NetNameNotFound:
- return "This shared resource does not exist.";
- case NERR_DeviceNotShared:
- return "This device is not shared.";
- case NERR_ClientNameNotFound:
- return "A session does not exist with that computer name.";
- case NERR_FileIdNotFound:
- return "There is not an open file with that identification number.";
- case NERR_ExecFailure:
- return "A failure occurred when executing a remote administration command.";
- case NERR_TmpFile:
- return "A failure occurred when opening a remote temporary file.";
- case NERR_TooMuchData:
- return "The data returned from a remote administration command has been truncated to 64K.";
- case NERR_DeviceShareConflict:
- return "This device cannot be shared as both a spooled and a non-spooled resource.";
- case NERR_BrowserTableIncomplete:
- return "The information in the list of servers may be incorrect.";
- case NERR_NotLocalDomain:
- return "The computer is not active in this domain.";
-#ifdef NERR_IsDfsShare
-
- case NERR_IsDfsShare:
- return "The share must be removed from the Distributed File System before it can be deleted.";
-#endif
+ {
+ DBusPollFD *fdp = &fds[i];
- case NERR_DevInvalidOpCode:
- return "The operation is invalid for this device.";
- case NERR_DevNotFound:
- return "This device cannot be shared.";
- case NERR_DevNotOpen:
- return "This device was not open.";
- case NERR_BadQueueDevString:
- return "This device name list is invalid.";
- case NERR_BadQueuePriority:
- return "The queue priority is invalid.";
- case NERR_NoCommDevs:
- return "There are no shared communication devices.";
- case NERR_QueueNotFound:
- return "The queue you specified does not exist.";
- case NERR_BadDevString:
- return "This list of devices is invalid.";
- case NERR_BadDev:
- return "The requested device is invalid.";
- case NERR_InUseBySpooler:
- return "This device is already in use by the spooler.";
- case NERR_CommDevInUse:
- return "This device is already in use as a communication device.";
- case NERR_InvalidComputer:
- return "This computer name is invalid.";
- case NERR_MaxLenExceeded:
- return "The string and prefix specified are too long.";
- case NERR_BadComponent:
- return "This path component is invalid.";
- case NERR_CantType:
- return "Could not determine the type of input.";
- case NERR_TooManyEntries:
- return "The buffer for types is not big enough.";
- case NERR_ProfileFileTooBig:
- return "Profile files cannot exceed 64K.";
- case NERR_ProfileOffset:
- return "The start offset is out of range.";
- case NERR_ProfileCleanup:
- return "The system cannot delete current connections to network resources.";
- case NERR_ProfileUnknownCmd:
- return "The system was unable to parse the command line in this file.";
- case NERR_ProfileLoadErr:
- return "An error occurred while loading the profile file.";
- case NERR_ProfileSaveErr:
- return "@W Errors occurred while saving the profile file. The profile was partially saved.";
- case NERR_LogOverflow:
- return "Log file %1 is full.";
- case NERR_LogFileChanged:
- return "This log file has changed between reads.";
- case NERR_LogFileCorrupt:
- return "Log file %1 is corrupt.";
- case NERR_SourceIsDir:
- return "The source path cannot be a directory.";
- case NERR_BadSource:
- return "The source path is illegal.";
- case NERR_BadDest:
- return "The destination path is illegal.";
- case NERR_DifferentServers:
- return "The source and destination paths are on different servers.";
- case NERR_RunSrvPaused:
- return "The Run server you requested is paused.";
- case NERR_ErrCommRunSrv:
- return "An error occurred when communicating with a Run server.";
- case NERR_ErrorExecingGhost:
- return "An error occurred when starting a background process.";
- case NERR_ShareNotFound:
- return "The shared resource you are connected to could not be found.";
- case NERR_InvalidLana:
- return "The LAN adapter number is invalid.";
- case NERR_OpenFiles:
- return "There are open files on the connection.";
- case NERR_ActiveConns:
- return "Active connections still exist.";
- case NERR_BadPasswordCore:
- return "This share name or password is invalid.";
- case NERR_DevInUse:
- return "The device is being accessed by an active process.";
- case NERR_LocalDrive:
- return "The drive letter is in use locally.";
- case NERR_AlertExists:
- return "The specified client is already registered for the specified event.";
- case NERR_TooManyAlerts:
- return "The alert table is full.";
- case NERR_NoSuchAlert:
- return "An invalid or nonexistent alert name was raised.";
- case NERR_BadRecipient:
- return "The alert recipient is invalid.";
- case NERR_AcctLimitExceeded:
- return "A user's session with this server has been deleted.";
- case NERR_InvalidLogSeek:
- return "The log file does not contain the requested record number.";
- case NERR_BadUasConfig:
- return "The user accounts database is not configured correctly.";
- case NERR_InvalidUASOp:
- return "This operation is not permitted when the Netlogon service is running.";
- case NERR_LastAdmin:
- return "This operation is not allowed on the last administrative account.";
- case NERR_DCNotFound:
- return "Could not find domain controller for this domain.";
- case NERR_LogonTrackingError:
- return "Could not set logon information for this user.";
- case NERR_NetlogonNotStarted:
- return "The Netlogon service has not been started.";
- case NERR_CanNotGrowUASFile:
- return "Unable to add to the user accounts database.";
- case NERR_TimeDiffAtDC:
- return "This server's clock is not synchronized with the primary domain controller's clock.";
- case NERR_PasswordMismatch:
- return "A password mismatch has been detected.";
- case NERR_NoSuchServer:
- return "The server identification does not specify a valid server.";
- case NERR_NoSuchSession:
- return "The session identification does not specify a valid session.";
- case NERR_NoSuchConnection:
- return "The connection identification does not specify a valid connection.";
- case NERR_TooManyServers:
- return "There is no space for another entry in the table of available servers.";
- case NERR_TooManySessions:
- return "The server has reached the maximum number of sessions it supports.";
- case NERR_TooManyConnections:
- return "The server has reached the maximum number of connections it supports.";
- case NERR_TooManyFiles:
- return "The server cannot open more files because it has reached its maximum number.";
- case NERR_NoAlternateServers:
- return "There are no alternate servers registered on this server.";
- case NERR_TryDownLevel:
- return "Try down-level (remote admin protocol) version of API instead.";
- case NERR_UPSDriverNotStarted:
- return "The UPS driver could not be accessed by the UPS service.";
- case NERR_UPSInvalidConfig:
- return "The UPS service is not configured correctly.";
- case NERR_UPSInvalidCommPort:
- return "The UPS service could not access the specified Comm Port.";
- case NERR_UPSSignalAsserted:
- return "The UPS indicated a line fail or low battery situation. Service not started.";
- case NERR_UPSShutdownFailed:
- return "The UPS service failed to perform a system shut down.";
- case NERR_BadDosRetCode:
- return "The program below returned an MS-DOS error code:";
- case NERR_ProgNeedsExtraMem:
- return "The program below needs more memory:";
- case NERR_BadDosFunction:
- return "The program below called an unsupported MS-DOS function:";
- case NERR_RemoteBootFailed:
- return "The workstation failed to boot.";
- case NERR_BadFileCheckSum:
- return "The file below is corrupt.";
- case NERR_NoRplBootSystem:
- return "No loader is specified in the boot-block definition file.";
- case NERR_RplLoadrNetBiosErr:
- return "NetBIOS returned an error: The NCB and SMB are dumped above.";
- case NERR_RplLoadrDiskErr:
- return "A disk I/O error occurred.";
- case NERR_ImageParamErr:
- return "Image parameter substitution failed.";
- case NERR_TooManyImageParams:
- return "Too many image parameters cross disk sector boundaries.";
- case NERR_NonDosFloppyUsed:
- return "The image was not generated from an MS-DOS diskette formatted with /S.";
- case NERR_RplBootRestart:
- return "Remote boot will be restarted later.";
- case NERR_RplSrvrCallFailed:
- return "The call to the Remoteboot server failed.";
- case NERR_CantConnectRplSrvr:
- return "Cannot connect to the Remoteboot server.";
- case NERR_CantOpenImageFile:
- return "Cannot open image file on the Remoteboot server.";
- case NERR_CallingRplSrvr:
- return "Connecting to the Remoteboot server...";
- case NERR_StartingRplBoot:
- return "Connecting to the Remoteboot server...";
- case NERR_RplBootServiceTerm:
- return "Remote boot service was stopped; check the error log for the cause of the problem.";
- case NERR_RplBootStartFailed:
- return "Remote boot startup failed; check the error log for the cause of the problem.";
- case NERR_RPL_CONNECTED:
- return "A second connection to a Remoteboot resource is not allowed.";
- case NERR_BrowserConfiguredToNotRun:
- return "The browser service was configured with MaintainServerList=No.";
- case NERR_RplNoAdaptersStarted:
- return "Service failed to start since none of the network adapters started with this service.";
- case NERR_RplBadRegistry:
- return "Service failed to start due to bad startup information in the registry.";
- case NERR_RplBadDatabase:
- return "Service failed to start because its database is absent or corrupt.";
- case NERR_RplRplfilesShare:
- return "Service failed to start because RPLFILES share is absent.";
- case NERR_RplNotRplServer:
- return "Service failed to start because RPLUSER group is absent.";
- case NERR_RplCannotEnum:
- return "Cannot enumerate service records.";
- case NERR_RplWkstaInfoCorrupted:
- return "Workstation record information has been corrupted.";
- case NERR_RplWkstaNotFound:
- return "Workstation record was not found.";
- case NERR_RplWkstaNameUnavailable:
- return "Workstation name is in use by some other workstation.";
- case NERR_RplProfileInfoCorrupted:
- return "Profile record information has been corrupted.";
- case NERR_RplProfileNotFound:
- return "Profile record was not found.";
- case NERR_RplProfileNameUnavailable:
- return "Profile name is in use by some other profile.";
- case NERR_RplProfileNotEmpty:
- return "There are workstations using this profile.";
- case NERR_RplConfigInfoCorrupted:
- return "Configuration record information has been corrupted.";
- case NERR_RplConfigNotFound:
- return "Configuration record was not found.";
- case NERR_RplAdapterInfoCorrupted:
- return "Adapter ID record information has been corrupted.";
- case NERR_RplInternal:
- return "An internal service error has occurred.";
- case NERR_RplVendorInfoCorrupted:
- return "Vendor ID record information has been corrupted.";
- case NERR_RplBootInfoCorrupted:
- return "Boot block record information has been corrupted.";
- case NERR_RplWkstaNeedsUserAcct:
- return "The user account for this workstation record is missing.";
- case NERR_RplNeedsRPLUSERAcct:
- return "The RPLUSER local group could not be found.";
- case NERR_RplBootNotFound:
- return "Boot block record was not found.";
- case NERR_RplIncompatibleProfile:
- return "Chosen profile is incompatible with this workstation.";
- case NERR_RplAdapterNameUnavailable:
- return "Chosen network adapter ID is in use by some other workstation.";
- case NERR_RplConfigNotEmpty:
- return "There are profiles using this configuration.";
- case NERR_RplBootInUse:
- return "There are workstations, profiles, or configurations using this boot block.";
- case NERR_RplBackupDatabase:
- return "Service failed to backup Remoteboot database.";
- case NERR_RplAdapterNotFound:
- return "Adapter record was not found.";
- case NERR_RplVendorNotFound:
- return "Vendor record was not found.";
- case NERR_RplVendorNameUnavailable:
- return "Vendor name is in use by some other vendor record.";
- case NERR_RplBootNameUnavailable:
- return "(boot name, vendor ID) is in use by some other boot block record.";
- case NERR_RplConfigNameUnavailable:
- return "Configuration name is in use by some other configuration.";
- case NERR_DfsInternalCorruption:
- return "The internal database maintained by the Dfs service is corrupt.";
- case NERR_DfsVolumeDataCorrupt:
- return "One of the records in the internal Dfs database is corrupt.";
- case NERR_DfsNoSuchVolume:
- return "There is no DFS name whose entry path matches the input Entry Path.";
- case NERR_DfsVolumeAlreadyExists:
- return "A root or link with the given name already exists.";
- case NERR_DfsAlreadyShared:
- return "The server share specified is already shared in the Dfs.";
- case NERR_DfsNoSuchShare:
- return "The indicated server share does not support the indicated DFS namespace.";
- case NERR_DfsNotALeafVolume:
- return "The operation is not valid on this portion of the namespace.";
- case NERR_DfsLeafVolume:
- return "The operation is not valid on this portion of the namespace.";
- case NERR_DfsVolumeHasMultipleServers:
- return "The operation is ambiguous because the link has multiple servers.";
- case NERR_DfsCantCreateJunctionPoint:
- return "Unable to create a link.";
- case NERR_DfsServerNotDfsAware:
- return "The server is not Dfs Aware.";
- case NERR_DfsBadRenamePath:
- return "The specified rename target path is invalid.";
- case NERR_DfsVolumeIsOffline:
- return "The specified DFS link is offline.";
- case NERR_DfsNoSuchServer:
- return "The specified server is not a server for this link.";
- case NERR_DfsCyclicalName:
- return "A cycle in the Dfs name was detected.";
- case NERR_DfsNotSupportedInServerDfs:
- return "The operation is not supported on a server-based Dfs.";
- case NERR_DfsDuplicateService:
- return "This link is already supported by the specified server-share.";
- case NERR_DfsCantRemoveLastServerShare:
- return "Can't remove the last server-share supporting this root or link.";
- case NERR_DfsVolumeIsInterDfs:
- return "The operation is not supported for an Inter-DFS link.";
- case NERR_DfsInconsistent:
- return "The internal state of the Dfs Service has become inconsistent.";
- case NERR_DfsServerUpgraded:
- return "The Dfs Service has been installed on the specified server.";
- case NERR_DfsDataIsIdentical:
- return "The Dfs data being reconciled is identical.";
- case NERR_DfsCantRemoveDfsRoot:
- return "The DFS root cannot be deleted. Uninstall DFS if required.";
- case NERR_DfsChildOrParentInDfs:
- return "A child or parent directory of the share is already in a Dfs.";
- case NERR_DfsInternalError:
- return "Dfs internal error.";
- /* the following are not defined in mingw */
-#if 0
+ if (FD_ISSET (fdp->fd, &read_set))
+ msgp += sprintf (msgp, "R:%d ", fdp->fd);
- case NERR_SetupAlreadyJoined:
- return "This machine is already joined to a domain.";
- case NERR_SetupNotJoined:
- return "This machine is not currently joined to a domain.";
- case NERR_SetupDomainController:
- return "This machine is a domain controller and cannot be unjoined from a domain.";
- case NERR_DefaultJoinRequired:
- return "The destination domain controller does not support creating machine accounts in OUs.";
- case NERR_InvalidWorkgroupName:
- return "The specified workgroup name is invalid.";
- case NERR_NameUsesIncompatibleCodePage:
- return "The specified computer name is incompatible with the default language used on the domain controller.";
- case NERR_ComputerAccountNotFound:
- return "The specified computer account could not be found.";
- case NERR_PersonalSku:
- return "This version of Windows cannot be joined to a domain.";
- case NERR_PasswordMustChange:
- return "The password must change at the next logon.";
- case NERR_AccountLockedOut:
- return "The account is locked out.";
- case NERR_PasswordTooLong:
- return "The password is too long.";
- case NERR_PasswordNotComplexEnough:
- return "The password does not meet the complexity policy.";
- case NERR_PasswordFilterError:
- return "The password does not meet the requirements of the password filter DLLs.";
-#endif
+ if (FD_ISSET (fdp->fd, &write_set))
+ msgp += sprintf (msgp, "W:%d ", fdp->fd);
- }
- msg = strerror (error_number);
- if (msg == NULL)
- msg = "unknown";
+ if (FD_ISSET (fdp->fd, &err_set))
+ msgp += sprintf (msgp, "E:%d\n\t", fdp->fd);
+ }
+ msgp += sprintf (msgp, "\n");
+ _dbus_verbose ("%s",msg);
+#endif
- return msg;
-#endif //DBUS_WINCE
-}
+ for (i = 0; i < n_fds; i++)
+ {
+ DBusPollFD *fdp = &fds[i];
+ fdp->revents = 0;
+ if (FD_ISSET (fdp->fd, &read_set))
+ fdp->revents |= _DBUS_POLLIN;
+ if (FD_ISSET (fdp->fd, &write_set))
+ fdp->revents |= _DBUS_POLLOUT;
+ if (FD_ISSET (fdp->fd, &err_set))
+ fdp->revents |= _DBUS_POLLERR;
+ }
+ }
+ return ready;
+}
+#endif // USE_CHRIS_IMPL
Original CVS version of dbus-sysdeps.c
******************************************************************************/
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* dbus-sysdeps.c Wrappers around system/libc features (internal to D-Bus implementation)
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
/**
- * @addtogroup DBusInternalsUtils
- * @{
- */
-
-int _dbus_mkdir (const char *path,
- mode_t mode)
-{
- return _mkdir(path);
-}
-
-/**
* Exit the process, returning the given value.
*
* @param code the exit code
* and port. The connection fd is returned, and is set up as
* nonblocking.
*
- * @param host the host name to connect to, NULL for loopback
- * @param port the prot to connect to
+ * @param host the host name to connect to
+ * @param port the port to connect to
+ * @param family the address family to listen on, NULL for all
* @param error return location for error code
* @returns connection file descriptor or -1 on error
*/
int
_dbus_connect_tcp_socket (const char *host,
- dbus_uint32_t port,
+ const char *port,
+ const char *family,
DBusError *error)
{
- DBusSocket s;
- int handle;
- struct sockaddr_in addr;
- struct hostent *he;
- struct in_addr *haddr;
- struct in_addr ina;
+ int fd = -1, res;
+ struct addrinfo hints;
+ struct addrinfo *ai, *tmp;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
_dbus_win_startup_winsock ();
- s.fd = socket (AF_INET, SOCK_STREAM, 0);
+ fd = socket (AF_INET, SOCK_STREAM, 0);
- if (DBUS_SOCKET_IS_INVALID (s.fd))
+ if (DBUS_SOCKET_IS_INVALID (fd))
{
DBUS_SOCKET_SET_ERRNO ();
dbus_set_error (error,
return -1;
}
- if (host == NULL)
+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
+
+ _DBUS_ZERO (hints);
+
+ if (!family)
+ hints.ai_family = AF_UNSPEC;
+ else if (!strcmp(family, "ipv4"))
+ hints.ai_family = AF_INET;
+ else if (!strcmp(family, "ipv6"))
+ hints.ai_family = AF_INET6;
+ else
{
- host = "localhost";
- ina.s_addr = htonl (INADDR_LOOPBACK);
- haddr = &ina;
+ dbus_set_error (error,
+ _dbus_error_from_errno (errno),
+ "Unknown address family %s", family);
+ return -1;
}
+ hints.ai_protocol = IPPROTO_TCP;
+ hints.ai_socktype = SOCK_STREAM;
+#ifdef AI_ADDRCONFIG
+ hints.ai_flags = AI_ADDRCONFIG;
+#else
+ hints.ai_flags = 0;
+#endif
- he = gethostbyname (host);
- if (he == NULL)
+ if ((res = getaddrinfo(host, port, &hints, &ai)) != 0)
{
- DBUS_SOCKET_SET_ERRNO ();
dbus_set_error (error,
_dbus_error_from_errno (errno),
- "Failed to lookup hostname: %s",
- host);
- DBUS_CLOSE_SOCKET (s.fd);
+ "Failed to lookup host/port: \"%s:%s\": %s (%d)",
+ host, port, gai_strerror(res), res);
+ closesocket (fd);
return -1;
}
- haddr = ((struct in_addr *) (he->h_addr_list)[0]);
-
- _DBUS_ZERO (addr);
- memcpy (&addr.sin_addr, haddr, sizeof(struct in_addr));
- addr.sin_family = AF_INET;
- addr.sin_port = htons (port);
-
- if (DBUS_SOCKET_API_RETURNS_ERROR
- (connect (s.fd, (struct sockaddr*) &addr, sizeof (addr)) < 0))
+ tmp = ai;
+ while (tmp)
{
- DBUS_SOCKET_SET_ERRNO ();
+ if ((fd = socket (tmp->ai_family, SOCK_STREAM, 0)) < 0)
+ {
+ freeaddrinfo(ai);
dbus_set_error (error,
_dbus_error_from_errno (errno),
- "Failed to connect to socket %s:%d %s",
- host, port, _dbus_strerror (errno));
+ "Failed to open socket: %s",
+ _dbus_strerror (errno));
+ return -1;
+ }
+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
+
+ if (connect (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0)
+ {
+ closesocket(fd);
+ fd = -1;
+ tmp = tmp->ai_next;
+ continue;
+ }
- DBUS_CLOSE_SOCKET (s.fd);
- s.fd = -1;
+ break;
+ }
+ freeaddrinfo(ai);
+ if (fd == -1)
+ {
+ dbus_set_error (error,
+ _dbus_error_from_errno (errno),
+ "Failed to connect to socket \"%s:%s\" %s",
+ host, port, _dbus_strerror(errno));
return -1;
}
- handle = _dbus_socket_to_handle (&s);
- if (!_dbus_set_fd_nonblocking (handle, error))
+ if (!_dbus_set_fd_nonblocking (fd, error))
{
- _dbus_close_socket (handle, NULL);
- handle = -1;
+ closesocket (fd);
+ fd = -1;
return -1;
}
- return handle;
+ return fd;
}
+
void
_dbus_daemon_init(const char *host, dbus_uint32_t port);
+
/**
- * Creates a socket and binds it to the given port,
- * then listens on the socket. The socket is
- * set to be nonblocking.
+ * Creates a socket and binds it to the given path, then listens on
+ * the socket. The socket is set to be nonblocking. In case of port=0
+ * a random free port is used and returned in the port parameter.
+ * If inaddr_any is specified, the hostname is ignored.
*
- * @param host the interface to listen on, NULL for loopback, empty for any
- * @param port the port to listen on, if zero a free port will be used
+ * @param host the host name to listen on
+ * @param port the port to listen on, if zero a free port will be used
+ * @param family the address family to listen on, NULL for all
+ * @param retport string to return the actual port listened on
+ * @param fds_p location to store returned file descriptors
* @param error return location for errors
- * @returns the listening file descriptor or -1 on error
+ * @returns the number of listening file descriptors or -1 on error
*/
int
_dbus_listen_tcp_socket (const char *host,
- dbus_uint32_t port,
+ const char *port,
+ const char *family,
+ DBusString *retport,
+ int **fds_p,
DBusError *error)
{
- DBusSocket slisten;
- int handle;
- struct sockaddr_in addr;
- struct hostent *he;
- struct in_addr *haddr;
- int len = sizeof (struct sockaddr);
- struct in_addr ina;
-
+ int nlisten_fd = 0, *listen_fd = NULL, res, i, port_num = -1;
+ struct addrinfo hints;
+ struct addrinfo *ai, *tmp;
+ *fds_p = NULL;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
_dbus_win_startup_winsock ();
- slisten.fd = socket (AF_INET, SOCK_STREAM, 0);
+ _DBUS_ZERO (hints);
- if (DBUS_SOCKET_IS_INVALID (slisten.fd))
+ if (!family)
+ hints.ai_family = AF_UNSPEC;
+ else if (!strcmp(family, "ipv4"))
+ hints.ai_family = AF_INET;
+ else if (!strcmp(family, "ipv6"))
+ hints.ai_family = AF_INET6;
+ else
{
- DBUS_SOCKET_SET_ERRNO ();
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to create socket \"%s:%d\": %s",
- host, port, _dbus_strerror (errno));
+ dbus_set_error (error,
+ _dbus_error_from_errno (errno),
+ "Unknown address family %s", family);
return -1;
}
- if (host == NULL)
- {
- host = "localhost";
- ina.s_addr = htonl (INADDR_LOOPBACK);
- haddr = &ina;
- }
- else if (!host[0])
+
+ hints.ai_protocol = IPPROTO_TCP;
+ hints.ai_socktype = SOCK_STREAM;
+#ifdef AI_ADDRCONFIG
+ hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
+#else
+ hints.ai_flags = AI_PASSIVE;
+#endif
+
+ redo_lookup_with_port:
+ if ((res = getaddrinfo(host, port, &hints, &ai)) != 0 || !ai)
{
- ina.s_addr = htonl (INADDR_ANY);
- haddr = &ina;
+ dbus_set_error (error,
+ _dbus_error_from_errno (errno),
+ "Failed to lookup host/port: \"%s:%s\": %s (%d)",
+ host ? host : "*", port, gai_strerror(res), res);
+ return -1;
}
- else
+
+ tmp = ai;
+ while (tmp)
{
- he = gethostbyname (host);
- if (he == NULL)
+ int fd = -1, *newlisten_fd;
+ if ((fd = socket (tmp->ai_family, SOCK_STREAM, 0)) < 0)
{
- DBUS_SOCKET_SET_ERRNO ();
dbus_set_error (error,
_dbus_error_from_errno (errno),
- "Failed to lookup hostname: %s",
- host);
- DBUS_CLOSE_SOCKET (slisten.fd);
- return -1;
+ "Failed to open socket: %s",
+ _dbus_strerror (errno));
+ goto failed;
}
+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
- haddr = ((struct in_addr *) (he->h_addr_list)[0]);
+ if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) == SOCKET_ERROR)
+ {
+ closesocket (fd);
+ dbus_set_error (error, _dbus_error_from_errno (errno),
+ "Failed to bind socket \"%s:%s\": %s",
+ host ? host : "*", port, _dbus_strerror (errno));
+ goto failed;
}
- _DBUS_ZERO (addr);
- memcpy (&addr.sin_addr, haddr, sizeof (struct in_addr));
- addr.sin_family = AF_INET;
- addr.sin_port = htons (port);
+ if (listen (fd, 30 /* backlog */) == SOCKET_ERROR)
+ {
+ closesocket (fd);
+ dbus_set_error (error, _dbus_error_from_errno (errno),
+ "Failed to listen on socket \"%s:%s\": %s",
+ host ? host : "*", port, _dbus_strerror (errno));
+ goto failed;
+ }
- if (bind (slisten.fd, (struct sockaddr*) &addr, sizeof (struct sockaddr)))
+ newlisten_fd = dbus_realloc(listen_fd, sizeof(int)*(nlisten_fd+1));
+ if (!newlisten_fd)
{
- DBUS_SOCKET_SET_ERRNO ();
+ closesocket (fd);
dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to bind socket \"%s:%d\": %s",
- host, port, _dbus_strerror (errno));
- DBUS_CLOSE_SOCKET (slisten.fd);
- return -1;
+ "Failed to allocate file handle array: %s",
+ _dbus_strerror (errno));
+ goto failed;
}
+ listen_fd = newlisten_fd;
+ listen_fd[nlisten_fd] = fd;
+ nlisten_fd++;
- if (DBUS_SOCKET_API_RETURNS_ERROR (listen (slisten.fd, 30 /* backlog */)))
+ if (!_dbus_string_get_length(retport))
+ {
+ /* If the user didn't specify a port, or used 0, then
+ the kernel chooses a port. After the first address
+ is bound to, we need to force all remaining addresses
+ to use the same port */
+ if (!port || !strcmp(port, "0"))
+ {
+ sockaddr_gen addr;
+ socklen_t addrlen = sizeof(addr);
+ char portbuf[10];
+
+ if ((res = getsockname(fd, &addr.Address, &addrlen)) != 0)
{
- DBUS_SOCKET_SET_ERRNO ();
dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to listen on socket \"%s:%d\": %s",
- host, port, _dbus_strerror (errno));
- DBUS_CLOSE_SOCKET (slisten.fd);
- return -1;
+ "Failed to resolve port \"%s:%s\": %s (%d)",
+ host ? host : "*", port, gai_strerror(res), res);
+ goto failed;
+ }
+ snprintf( portbuf, sizeof( portbuf ) - 1, "%d", addr.AddressIn.sin_port );
+ if (!_dbus_string_append(retport, portbuf))
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto failed;
+ }
+
+ /* Release current address list & redo lookup */
+ port = _dbus_string_get_const_data(retport);
+ freeaddrinfo(ai);
+ goto redo_lookup_with_port;
+ }
+ else
+ {
+ if (!_dbus_string_append(retport, port))
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto failed;
+ }
+ }
+ }
+
+ tmp = tmp->ai_next;
}
+ freeaddrinfo(ai);
+ ai = NULL;
+ if (!nlisten_fd)
+ {
+ errno = WSAEADDRINUSE;
+ dbus_set_error (error, _dbus_error_from_errno (errno),
+ "Failed to bind socket \"%s:%s\": %s",
+ host ? host : "*", port, _dbus_strerror (errno));
+ return -1;
+ }
- getsockname(slisten.fd, (struct sockaddr*) &addr, &len);
-
- _dbus_daemon_init(host, ntohs(addr.sin_port));
-
- handle = _dbus_socket_to_handle (&slisten);
+ sscanf(_dbus_string_get_const_data(retport), "%d", &port_num);
+ _dbus_daemon_init(host, port_num);
- if (!_dbus_set_fd_nonblocking (handle, error))
+ for (i = 0 ; i < nlisten_fd ; i++)
{
- _dbus_close_socket (handle, NULL);
- return -1;
+ if (!_dbus_set_fd_nonblocking (listen_fd[i], error))
+ {
+ goto failed;
+ }
}
- return handle;
+ *fds_p = listen_fd;
+
+ return nlisten_fd;
+
+ failed:
+ if (ai)
+ freeaddrinfo(ai);
+ for (i = 0 ; i < nlisten_fd ; i++)
+ closesocket (listen_fd[i]);
+ dbus_free(listen_fd);
+ return -1;
}
+
/**
* Accepts a connection on a listening socket.
* Handles EINTR for you.
* @returns the connection fd of the client, or -1 on error
*/
int
-_dbus_accept (int listen_handle)
+_dbus_accept (int listen_fd)
{
- DBusSocket *slisten;
- DBusSocket sclient;
- struct sockaddr addr;
- socklen_t addrlen;
-
- _dbus_handle_to_socket(listen_handle, &slisten);
+ int client_fd;
- addrlen = sizeof (addr);
+ retry:
+ client_fd = accept (listen_fd, NULL, NULL);
- //FIXME: why do we not try it again on Windows?
-#if !defined(DBUS_WIN) && !defined(DBUS_WINCE)
-retry:
-#endif
-
- sclient.fd = accept (slisten->fd, &addr, &addrlen);
-
- if (DBUS_SOCKET_IS_INVALID (sclient.fd))
+ if (DBUS_SOCKET_IS_INVALID (client_fd))
{
DBUS_SOCKET_SET_ERRNO ();
-#if !defined(DBUS_WIN) && !defined(DBUS_WINCE)
if (errno == EINTR)
goto retry;
-#else
- return -1;
-#endif
}
- return _dbus_socket_to_handle (&sclient);
+ _dbus_verbose ("client fd %d accepted\n", client_fd);
+
+ return client_fd;
}
+
dbus_bool_t
-write_credentials_byte (int server_fd,
+_dbus_send_credentials_socket (int handle,
DBusError *error)
{
- /* FIXME: for the session bus credentials shouldn't matter (?), but
- * for the system bus they are presumably essential. A rough outline
- * of a way to implement the credential transfer would be this:
- *
- * client waits to *read* a byte.
- *
- * server creates a named pipe with a random name, sends a byte
- * contining its length, and its name.
- *
- * client reads the name, connects to it (using Win32 API).
- *
- * server waits for connection to the named pipe, then calls
- * ImpersonateNamedPipeClient(), notes its now-current credentials,
- * calls RevertToSelf(), closes its handles to the named pipe, and
- * is done. (Maybe there is some other way to get the SID of a named
- * pipe client without having to use impersonation?)
- *
- * client closes its handles and is done.
- *
- */
+/* FIXME: for the session bus credentials shouldn't matter (?), but
+ * for the system bus they are presumably essential. A rough outline
+ * of a way to implement the credential transfer would be this:
+ *
+ * client waits to *read* a byte.
+ *
+ * server creates a named pipe with a random name, sends a byte
+ * contining its length, and its name.
+ *
+ * client reads the name, connects to it (using Win32 API).
+ *
+ * server waits for connection to the named pipe, then calls
+ * ImpersonateNamedPipeClient(), notes its now-current credentials,
+ * calls RevertToSelf(), closes its handles to the named pipe, and
+ * is done. (Maybe there is some other way to get the SID of a named
+ * pipe client without having to use impersonation?)
+ *
+ * client closes its handles and is done.
+ *
+ * Ralf: Why not sending credentials over the given this connection ?
+ * Using named pipes makes it impossible to be connected from a unix client.
+ *
+ */
+ int bytes_written;
+ DBusString buf;
+
+ _dbus_string_init_const_len (&buf, "\0", 1);
+again:
+ bytes_written = _dbus_write_socket (handle, &buf, 0, 1 );
+
+ if (bytes_written < 0 && errno == EINTR)
+ goto again;
+ if (bytes_written < 0)
+ {
+ dbus_set_error (error, _dbus_error_from_errno (errno),
+ "Failed to write credentials byte: %s",
+ _dbus_strerror (errno));
+ return FALSE;
+ }
+ else if (bytes_written == 0)
+ {
+ dbus_set_error (error, DBUS_ERROR_IO_ERROR,
+ "wrote zero bytes writing credentials byte");
+ return FALSE;
+ }
+ else
+ {
+ _dbus_assert (bytes_written == 1);
+ _dbus_verbose ("wrote 1 zero byte, credential sending isn't implemented yet\n");
+ return TRUE;
+ }
return TRUE;
}
* @returns #TRUE on success
*/
dbus_bool_t
-_dbus_read_credentials_unix_socket (int client_fd,
- DBusCredentials *credentials,
- DBusError *error)
+_dbus_read_credentials_socket (int handle,
+ DBusCredentials *credentials,
+ DBusError *error)
{
- /* FIXME bogus testing credentials */
- _dbus_credentials_from_current_process (credentials);
+ int bytes_read = 0;
+ DBusString buf;
+
+ // could fail due too OOM
+ if (_dbus_string_init(&buf))
+ {
+ bytes_read = _dbus_read_socket(handle, &buf, 1 );
+
+ if (bytes_read > 0)
+ _dbus_verbose("got one zero byte from server");
+
+ _dbus_string_free(&buf);
+ }
+
+ _dbus_credentials_add_from_current_process (credentials);
+ _dbus_verbose("FIXME: get faked credentials from current process");
return TRUE;
}
/**
- * Gets user info for the given user ID.
- *
- * @param info user info object to initialize
- * @param uid the user ID
- * @param error error return
- * @returns #TRUE on success
- */
-dbus_bool_t
-_dbus_user_info_fill_uid (DBusUserInfo *info,
- dbus_uid_t uid,
- DBusError *error)
-{
- return fill_user_info (info, uid,
- NULL, error);
-}
-
-/**
- * Gets user info for the given username.
- *
- * @param info user info object to initialize
- * @param username the username
- * @param error error return
- * @returns #TRUE on success
- */
-dbus_bool_t
-_dbus_user_info_fill (DBusUserInfo *info,
- const DBusString *username,
- DBusError *error)
-{
- return fill_user_info (info, DBUS_UID_UNSET,
- username, error);
-}
-
-
-dbus_bool_t
-fill_user_info (DBusUserInfo *info,
- dbus_uid_t uid,
- const DBusString *username,
- DBusError *error)
-{
- const char *username_c;
-
- /* exactly one of username/uid provided */
- _dbus_assert (username != NULL || uid != DBUS_UID_UNSET);
- _dbus_assert (username == NULL || uid == DBUS_UID_UNSET);
-
- info->uid = DBUS_UID_UNSET;
- info->primary_gid = DBUS_GID_UNSET;
- info->group_ids = NULL;
- info->n_group_ids = 0;
- info->username = NULL;
- info->homedir = NULL;
-
- if (username != NULL)
- username_c = _dbus_string_get_const_data (username);
- else
- username_c = NULL;
-
- if (uid != DBUS_UID_UNSET)
- {
- if (!fill_win_user_info_from_uid (uid, info, error))
- {
- _dbus_verbose("%s after fill_win_user_info_from_uid\n",__FUNCTION__);
- return FALSE;
- }
- }
- else
- {
- wchar_t *wname = _dbus_win_utf8_to_utf16 (username_c, error);
-
- if (!wname)
- return FALSE;
-
- if (!fill_win_user_info_from_name (wname, info, error))
- {
- dbus_free (wname);
- return FALSE;
- }
- dbus_free (wname);
- }
-
- return TRUE;
-}
-
-
-/**
* Appends the given filename to the given directory.
*
* @todo it might be cute to collapse multiple '/' such as "foo//"
_dbus_string_get_length (dir));
}
+/*---------------- DBusCredentials ----------------------------------
+
+/**
+ * Adds the credentials corresponding to the given username.
+ *
+ * @param credentials credentials to fill in
+ * @param username the username
+ * @returns #TRUE if the username existed and we got some credentials
+ */
+dbus_bool_t
+_dbus_credentials_add_from_user (DBusCredentials *credentials,
+ const DBusString *username)
+{
+ return _dbus_credentials_add_windows_sid (credentials,
+ _dbus_string_get_const_data(username));
+}
+
+/**
+ * Adds the credentials of the current process to the
+ * passed-in credentials object.
+ *
+ * @param credentials credentials to add to
+ * @returns #FALSE if no memory; does not properly roll back on failure, so only some credentials may have been added
+ */
+
+dbus_bool_t
+_dbus_credentials_add_from_current_process (DBusCredentials *credentials)
+{
+ dbus_bool_t retval = FALSE;
+ char *sid = NULL;
+
+ if (!_dbus_getsid(&sid))
+ goto failed;
+
+ if (!_dbus_credentials_add_unix_pid(credentials, _dbus_getpid()))
+ goto failed;
+
+ if (!_dbus_credentials_add_windows_sid (credentials,sid))
+ goto failed;
+
+ retval = TRUE;
+ goto end;
+failed:
+ retval = FALSE;
+end:
+ if (sid)
+ LocalFree(sid);
+
+ return retval;
+}
+
+/**
+ * Append to the string the identity we would like to have when we
+ * authenticate, on UNIX this is the current process UID and on
+ * Windows something else, probably a Windows SID string. No escaping
+ * is required, that is done in dbus-auth.c. The username here
+ * need not be anything human-readable, it can be the machine-readable
+ * form i.e. a user id.
+ *
+ * @param str the string to append to
+ * @returns #FALSE on no memory
+ * @todo to which class belongs this
+ */
+dbus_bool_t
+_dbus_append_user_from_current_process (DBusString *str)
+{
+ dbus_bool_t retval = FALSE;
+ char *sid = NULL;
+
+ if (!_dbus_getsid(&sid))
+ return FALSE;
+ retval = _dbus_string_append (str,sid);
+ LocalFree(sid);
+ return retval;
+}
/**
* Gets our process ID
*time64 -= DBUS_INT64_CONSTANT (116444736000000000);
*time64 /= 10;
- if (tv_sec)
- *tv_sec = *time64 / 1000000;
+ if (tv_sec)
+ *tv_sec = *time64 / 1000000;
+
+ if (tv_usec)
+ *tv_usec = *time64 % 1000000;
+}
+
+
+/**
+ * signal (SIGPIPE, SIG_IGN);
+ */
+void
+_dbus_disable_sigpipe (void)
+{
+}
+
+
+/* _dbus_read() is static on Windows, only used below in this file.
+ */
+static int
+_dbus_read (int fd,
+ DBusString *buffer,
+ int count)
+{
+ int bytes_read;
+ int start;
+ char *data;
+
+ _dbus_assert (count >= 0);
+
+ start = _dbus_string_get_length (buffer);
+
+ if (!_dbus_string_lengthen (buffer, count))
+ {
+ errno = ENOMEM;
+ return -1;
+ }
+
+ data = _dbus_string_get_data_len (buffer, start, count);
- if (tv_usec)
- *tv_usec = *time64 % 1000000;
-}
+ again:
+ bytes_read = _read (fd, data, count);
-/**
- * signal (SIGPIPE, SIG_IGN);
- */
-void
-_dbus_disable_sigpipe (void)
-{
- _dbus_verbose("FIXME: implement _dbus_disable_sigpipe (void)\n");
-}
+ if (bytes_read < 0)
+ {
+ if (errno == EINTR)
+ goto again;
+ else
+ {
+ /* put length back (note that this doesn't actually realloc anything) */
+ _dbus_string_set_length (buffer, start);
+ return -1;
+ }
+ }
+ else
+ {
+ /* put length back (doesn't actually realloc) */
+ _dbus_string_set_length (buffer, start + bytes_read);
-/**
- * Gets the credentials of the current process.
- *
- * @param credentials credentials to fill in.
- */
-void
-_dbus_credentials_from_current_process (DBusCredentials *credentials)
-{
- credentials->pid = _dbus_getpid ();
- credentials->uid = _dbus_getuid ();
- credentials->gid = _dbus_getgid ();
+#if 0
+ if (bytes_read > 0)
+ _dbus_verbose_bytes_of_string (buffer, start, bytes_read);
+#endif
+
+ return bytes_read;
+ }
}
/**
const DBusString *filename,
DBusError *error)
{
- DBusFile file;
- struct stat sb;
+ int fd;
+ struct _stati64 sb;
int orig_len;
int total;
const char *filename_c;
filename_c = _dbus_string_get_const_data (filename);
- /* O_BINARY useful on Cygwin and Win32 */
- if (!_dbus_open_file (&file, filename_c, O_RDONLY | O_BINARY, -1))
+ fd = _open (filename_c, O_RDONLY | O_BINARY);
+ if (fd < 0)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"Failed to open \"%s\": %s",
filename_c,
- _dbus_strerror (errno));
+ strerror (errno));
return FALSE;
}
- if (!_dbus_fstat (&file, &sb))
+ _dbus_verbose ("file %s fd %d opened\n", filename_c, fd);
+
+ if (_fstati64 (fd, &sb) < 0)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"Failed to stat \"%s\": %s",
filename_c,
- _dbus_strerror (errno));
+ strerror (errno));
_dbus_verbose ("fstat() failed: %s",
- _dbus_strerror (errno));
+ strerror (errno));
- _dbus_close_file (&file, NULL);
+ _close (fd);
return FALSE;
}
dbus_set_error (error, DBUS_ERROR_FAILED,
"File size %lu of \"%s\" is too large.",
(unsigned long) sb.st_size, filename_c);
- _dbus_close_file (&file, NULL);
+ _close (fd);
return FALSE;
}
while (total < (int) sb.st_size)
{
- bytes_read = _dbus_read_file (&file, str,
- sb.st_size - total);
+ bytes_read = _dbus_read (fd, str, sb.st_size - total);
if (bytes_read <= 0)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"Error reading \"%s\": %s",
filename_c,
- _dbus_strerror (errno));
+ strerror (errno));
_dbus_verbose ("read() failed: %s",
- _dbus_strerror (errno));
+ strerror (errno));
- _dbus_close_file (&file, NULL);
+ _close (fd);
_dbus_string_set_length (str, orig_len);
return FALSE;
}
total += bytes_read;
}
- _dbus_close_file (&file, NULL);
+ _close (fd);
return TRUE;
}
else if (sb.st_size != 0)
dbus_set_error (error, DBUS_ERROR_FAILED,
"\"%s\" is not a regular file",
filename_c);
- _dbus_close_file (&file, NULL);
+ _close (fd);
return FALSE;
}
else
{
- _dbus_close_file (&file, NULL);
+ _close (fd);
return TRUE;
}
}
const DBusString *filename,
DBusError *error)
{
- DBusFile file;
+ int fd;
int bytes_to_write;
const char *filename_c;
DBusString tmp_filename;
const char *tmp_filename_c;
int total;
+ const char *str_c;
dbus_bool_t need_unlink;
dbus_bool_t retval;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
+ fd = -1;
retval = FALSE;
need_unlink = FALSE;
filename_c = _dbus_string_get_const_data (filename);
tmp_filename_c = _dbus_string_get_const_data (&tmp_filename);
- if (!_dbus_open_file (&file, tmp_filename_c, O_WRONLY | O_BINARY | O_EXCL | O_CREAT,
- 0600))
+ fd = _open (tmp_filename_c, O_WRONLY | O_BINARY | O_EXCL | O_CREAT,
+ 0600);
+ if (fd < 0)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"Could not create %s: %s", tmp_filename_c,
- _dbus_strerror (errno));
+ strerror (errno));
goto out;
}
+ _dbus_verbose ("tmp file %s fd %d opened\n", tmp_filename_c, fd);
+
need_unlink = TRUE;
total = 0;
bytes_to_write = _dbus_string_get_length (str);
+ str_c = _dbus_string_get_const_data (str);
while (total < bytes_to_write)
{
int bytes_written;
- bytes_written = _dbus_write_file (&file, str, total,
- bytes_to_write - total);
+ bytes_written = _write (fd, str_c + total, bytes_to_write - total);
if (bytes_written <= 0)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"Could not write to %s: %s", tmp_filename_c,
- _dbus_strerror (errno));
-
+ strerror (errno));
goto out;
}
total += bytes_written;
}
- if (!_dbus_close_file (&file, NULL))
+ if (_close (fd) < 0)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"Could not close file %s: %s",
- tmp_filename_c, _dbus_strerror (errno));
+ tmp_filename_c, strerror (errno));
goto out;
}
+ fd = -1;
if ((unlink (filename_c) == -1 && errno != ENOENT) ||
rename (tmp_filename_c, filename_c) < 0)
retval = TRUE;
-out:
- /* close first, then unlink, to prevent ".nfs34234235" garbage
- * files
- */
+ out:
+ /* close first, then unlink */
- if (_dbus_is_valid_file(&file))
- _dbus_close_file (&file, NULL);
+ if (fd >= 0)
+ _close (fd);
- if (need_unlink && unlink (tmp_filename_c) < 0)
- _dbus_verbose ("Failed to unlink temp file %s: %s\n",
- tmp_filename_c, _dbus_strerror (errno));
+ if (need_unlink && _unlink (tmp_filename_c) < 0)
+ _dbus_verbose ("failed to unlink temp file %s: %s\n",
+ tmp_filename_c, strerror (errno));
_dbus_string_free (&tmp_filename);
_dbus_create_file_exclusively (const DBusString *filename,
DBusError *error)
{
- DBusFile file;
+ int fd;
const char *filename_c;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
filename_c = _dbus_string_get_const_data (filename);
- if (!_dbus_open_file (&file, filename_c, O_WRONLY | O_BINARY | O_EXCL | O_CREAT,
- 0600))
+ fd = _open (filename_c, O_WRONLY | O_BINARY | O_EXCL | O_CREAT,
+ 0600);
+ if (fd < 0)
{
dbus_set_error (error,
DBUS_ERROR_FAILED,
"Could not create file %s: %s\n",
filename_c,
- _dbus_strerror (errno));
+ strerror (errno));
return FALSE;
}
- if (!_dbus_close_file (&file, NULL))
+ _dbus_verbose ("exclusive file %s fd %d opened\n", filename_c, fd);
+
+ if (_close (fd) < 0)
{
dbus_set_error (error,
DBUS_ERROR_FAILED,
"Could not close file %s: %s\n",
filename_c,
- _dbus_strerror (errno));
+ strerror (errno));
return FALSE;
}
filename_c = _dbus_string_get_const_data (filename);
- if (_dbus_mkdir (filename_c, 0700) < 0)
+ if (!CreateDirectory (filename_c, NULL))
{
- if (errno == EEXIST)
+ if (GetLastError () == ERROR_ALREADY_EXISTS)
return TRUE;
dbus_set_error (error, DBUS_ERROR_FAILED,
"Failed to create directory %s: %s\n",
- filename_c, _dbus_strerror (errno));
+ filename_c, strerror (errno));
return FALSE;
}
else
filename_c = _dbus_string_get_const_data (filename);
- if (unlink (filename_c) < 0)
+ if (_unlink (filename_c) < 0)
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Failed to delete file %s: %s\n",
- filename_c, _dbus_strerror (errno));
+ filename_c, strerror (errno));
return FALSE;
}
else
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <winver.h>
DPRINTF("Backtrace:\n");
- memset(&context, 0, sizeof(context));
+ _DBUS_ZERO(context);
context.ContextFlags = CONTEXT_FULL;
SuspendThread(hThread);
return;
}
- memset(&sf, 0, sizeof(sf));
+ _DBUS_ZERO(sf);
#ifdef __i386__
sf.AddrFrame.Offset = context.Ebp;
}
#endif
-/**
- * Sends a single nul byte with our UNIX credentials as ancillary
- * data. Returns #TRUE if the data was successfully written. On
- * systems that don't support sending credentials, just writes a byte,
- * doesn't send any credentials. On some systems, such as Linux,
- * reading/writing the byte isn't actually required, but we do it
- * anyway just to avoid multiple codepaths.
- *
- * Fails if no byte can be written, so you must select() first.
- *
- * The point of the byte is that on some systems we have to
- * use sendmsg()/recvmsg() to transmit credentials.
- *
- * @param server_fd file descriptor for connection to server
- * @param error return location for error code
- * @returns #TRUE if the byte was sent
- */
-dbus_bool_t
-_dbus_send_credentials_unix_socket (int server_fd,
- DBusError *error)
-{
- _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
- if (write_credentials_byte (server_fd, error))
- return TRUE;
- else
- return FALSE;
-}
-
static dbus_uint32_t fromAscii(char ascii)
{
if(ascii >= '0' && ascii <= '9')
// mutex to determine if dbus-daemon is already started (per user)
static const char *cDBusDaemonMutex = "DBusDaemonMutex";
// named shm for dbus adress info (per user)
+#ifdef _DEBUG
+static const char *cDBusDaemonAddressInfo = "DBusDaemonAddressInfoDebug";
+#else
static const char *cDBusDaemonAddressInfo = "DBusDaemonAddressInfo";
+#endif
void
_dbus_daemon_init(const char *host, dbus_uint32_t port)
{
HANDLE lock;
- const char *adr = NULL;
+ char *adr = NULL;
char szUserName[64];
DWORD dwUserNameSize = sizeof(szUserName);
char szDBusDaemonMutex[128];
char szDBusDaemonAddressInfo[128];
char szAddress[128];
+ DWORD ret;
_dbus_assert(host);
_dbus_assert(port);
_snprintf(szAddress, sizeof(szAddress) - 1, "tcp:host=%s,port=%d", host, port);
-
- _dbus_assert( GetUserName(szUserName, &dwUserNameSize) != 0);
+ ret = GetUserName(szUserName, &dwUserNameSize);
+ _dbus_assert(ret != 0);
_snprintf(szDBusDaemonMutex, sizeof(szDBusDaemonMutex) - 1, "%s:%s",
cDBusDaemonMutex, szUserName);
_snprintf(szDBusDaemonAddressInfo, sizeof(szDBusDaemonAddressInfo) - 1, "%s:%s",
// before _dbus_global_lock to keep correct lock/release order
hDBusDaemonMutex = CreateMutex( NULL, FALSE, szDBusDaemonMutex );
-
- _dbus_assert(WaitForSingleObject( hDBusDaemonMutex, 1000 ) == WAIT_OBJECT_0);
+ ret = WaitForSingleObject( hDBusDaemonMutex, 1000 );
+ if ( ret != WAIT_OBJECT_0 ) {
+ _dbus_warn("Could not lock mutex %s (return code %d). daemon already running?\n", szDBusDaemonMutex, ret );
+ _dbus_assert( !"Could not lock mutex, daemon already running?" );
+ }
// sync _dbus_daemon_init, _dbus_daemon_uninit and _dbus_daemon_already_runs
lock = _dbus_global_lock( cUniqueDBusInitMutex );
_dbus_assert( adr );
- strcpy(adr, szAddress);
+ strcpy( adr, szAddress);
// cleanup
UnmapViewOfFile( adr );
_dbus_get_autolaunch_shm(DBusString *adress)
{
HANDLE sharedMem;
- const char *adr;
+ char *adr;
char szUserName[64];
DWORD dwUserNameSize = sizeof(szUserName);
char szDBusDaemonAddressInfo[128];
+ int i;
if( !GetUserName(szUserName, &dwUserNameSize) )
return FALSE;
cDBusDaemonAddressInfo, szUserName);
// read shm
- do {
+ for(i=0;i<20;++i) {
// we know that dbus-daemon is available, so we wait until shm is available
sharedMem = OpenFileMapping( FILE_MAP_READ, FALSE, szDBusDaemonAddressInfo );
if( sharedMem == 0 )
Sleep( 100 );
- } while( sharedMem == 0 );
+ if ( sharedMem != 0)
+ break;
+ }
if( sharedMem == 0 )
return FALSE;
LPSTR lpFile;
char dbus_exe_path[MAX_PATH];
char dbus_args[MAX_PATH * 2];
+#ifdef _DEBUG
+ const char * daemon_name = "dbus-daemond.exe";
+#else
+ const char * daemon_name = "dbus-daemon.exe";
+#endif
mutex = _dbus_global_lock ( cDBusAutolaunchMutex );
if (_dbus_daemon_already_runs(address))
{
- printf("dbus daemon already exists\n");
+ _dbus_verbose("found already running dbus daemon\n");
retval = TRUE;
goto out;
}
- if (!SearchPathA(NULL, "dbus-daemon.exe", NULL, sizeof(dbus_exe_path), dbus_exe_path, &lpFile))
+ if (!SearchPathA(NULL, daemon_name, NULL, sizeof(dbus_exe_path), dbus_exe_path, &lpFile))
{
- printf ("could not find dbus-daemon executable\n");
+ printf ("please add the path to %s to your PATH environment variable\n", daemon_name);
+ printf ("or start the daemon manually\n\n");
+ printf ("");
goto out;
}
_snprintf(dbus_args, sizeof(dbus_args) - 1, "\"%s\" %s", dbus_exe_path, " --session");
// argv[i] = "--config-file=bus\\session.conf";
- printf("create process \"%s\" %s\n", dbus_exe_path, dbus_args);
- if(CreateProcessA(dbus_exe_path, dbus_args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+// printf("create process \"%s\" %s\n", dbus_exe_path, dbus_args);
+ if(CreateProcessA(dbus_exe_path, dbus_args, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi))
{
- retval = TRUE;
-
- // Wait until started (see _dbus_get_autolaunch_shm())
- WaitForInputIdle(pi.hProcess, INFINITE);
retval = _dbus_get_autolaunch_shm( address );
- } else {
- retval = FALSE;
}
+ if (retval == FALSE)
+ dbus_set_error_const (error, DBUS_ERROR_FAILED, "Failed to launch dbus-daemon");
+
out:
if (retval)
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
#define DBUS_STANDARD_SESSION_SERVICEDIR "/dbus-1/services"
-
-// @TODO: this function is duplicated from dbus-sysdeps-unix.c
-// and differs only in the path separator, may be we should
-// use a dbus path separator variable
-
-#define _dbus_path_seperator ";"
-
-static dbus_bool_t
-split_paths_and_append (DBusString *dirs,
- const char *suffix,
- DBusList **dir_list)
-{
- int start;
- int i;
- int len;
- char *cpath;
- const DBusString file_suffix;
-
- start = 0;
- i = 0;
-
- _dbus_string_init_const (&file_suffix, suffix);
-
- len = _dbus_string_get_length (dirs);
-
- while (_dbus_string_find (dirs, start, _dbus_path_seperator, &i))
- {
- DBusString path;
-
- if (!_dbus_string_init (&path))
- goto oom;
-
- if (!_dbus_string_copy_len (dirs,
- start,
- i - start,
- &path,
- 0))
- {
- _dbus_string_free (&path);
- goto oom;
- }
-
- _dbus_string_chop_white (&path);
-
- /* check for an empty path */
- if (_dbus_string_get_length (&path) == 0)
- goto next;
-
- if (!_dbus_concat_dir_and_file (&path,
- &file_suffix))
- {
- _dbus_string_free (&path);
- goto oom;
- }
-
- if (!_dbus_string_copy_data(&path, &cpath))
- {
- _dbus_string_free (&path);
- goto oom;
- }
-
- if (!_dbus_list_append (dir_list, cpath))
- {
- _dbus_string_free (&path);
- dbus_free (cpath);
- goto oom;
- }
-
- next:
- _dbus_string_free (&path);
- start = i + 1;
- }
-
- if (start != len)
- {
- DBusString path;
-
- if (!_dbus_string_init (&path))
- goto oom;
-
- if (!_dbus_string_copy_len (dirs,
- start,
- len - start,
- &path,
- 0))
- {
- _dbus_string_free (&path);
- goto oom;
- }
-
- if (!_dbus_concat_dir_and_file (&path,
- &file_suffix))
- {
- _dbus_string_free (&path);
- goto oom;
- }
-
- if (!_dbus_string_copy_data(&path, &cpath))
- {
- _dbus_string_free (&path);
- goto oom;
- }
-
- if (!_dbus_list_append (dir_list, cpath))
- {
- _dbus_string_free (&path);
- dbus_free (cpath);
- goto oom;
- }
-
- _dbus_string_free (&path);
- }
-
- return TRUE;
-
- oom:
- _dbus_list_foreach (dir_list, (DBusForeachFunction)dbus_free, NULL);
- _dbus_list_clear (dir_list);
- return FALSE;
-}
+#define DBUS_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
/**
* Returns the standard directories for a session bus to look for service
if (!_dbus_string_init (&servicedir_path))
return FALSE;
- if (!_dbus_string_append (&servicedir_path, DBUS_DATADIR";"))
+ if (!_dbus_string_append (&servicedir_path, DBUS_DATADIR _DBUS_PATH_SEPARATOR))
goto oom;
common_progs = _dbus_getenv ("CommonProgramFiles");
if (!_dbus_string_append (&servicedir_path, common_progs))
goto oom;
- if (!_dbus_string_append (&servicedir_path, ";"))
+ if (!_dbus_string_append (&servicedir_path, _DBUS_PATH_SEPARATOR))
goto oom;
}
- if (!split_paths_and_append (&servicedir_path,
+ if (!_dbus_split_paths_and_append (&servicedir_path,
DBUS_STANDARD_SESSION_SERVICEDIR,
dirs))
goto oom;
return FALSE;
}
+/**
+ * Returns the standard directories for a system bus to look for service
+ * activation files
+ *
+ * On UNIX this should be the standard xdg freedesktop.org data directories:
+ *
+ * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share}
+ *
+ * and
+ *
+ * DBUS_DATADIR
+ *
+ * On Windows there is no system bus and this function can return nothing.
+ *
+ * @param dirs the directory list we are returning
+ * @returns #FALSE on OOM
+ */
+
+dbus_bool_t
+_dbus_get_standard_system_servicedirs (DBusList **dirs)
+{
+ *dirs = NULL;
+ return TRUE;
+}
+
_DBUS_DEFINE_GLOBAL_LOCK (atomic);
/**
_dbus_atomic_inc (DBusAtomic *atomic)
{
// +/- 1 is needed here!
+ // no volatile argument with mingw
return InterlockedIncrement (&atomic->value) - 1;
}
_dbus_atomic_dec (DBusAtomic *atomic)
{
// +/- 1 is needed here!
+ // no volatile argument with mingw
return InterlockedDecrement (&atomic->value) + 1;
}
#endif /* asserts or tests enabled */
-/** @} end of sysdeps-win */
+/**
+ * Called when the bus daemon is signaled to reload its configuration; any
+ * caches should be nuked. Of course any caches that need explicit reload
+ * are probably broken, but c'est la vie.
+ *
+ *
+ */
+void
+_dbus_flush_caches (void)
+{
+
+}
+
+dbus_bool_t _dbus_windows_user_is_process_owner (const char *windows_sid)
+{
+ return TRUE;
+}
+
+/**
+ * See if errno is EAGAIN or EWOULDBLOCK (this has to be done differently
+ * for Winsock so is abstracted)
+ *
+ * @returns #TRUE if errno == EAGAIN or errno == EWOULDBLOCK
+ */
+dbus_bool_t
+_dbus_get_is_errno_eagain_or_ewouldblock (void)
+{
+ return errno == EAGAIN || errno == EWOULDBLOCK;
+}
+
+/**
+ * return the absolute path of the dbus installation
+ *
+ * @param s buffer for installation path
+ * @param len length of buffer
+ * @returns #FALSE on failure
+ */
+dbus_bool_t
+_dbus_get_install_root(char *s, int len)
+{
+ char *p = NULL;
+ int ret = GetModuleFileName(NULL,s,len);
+ if ( ret == 0
+ || ret == len && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+ {
+ *s = '\0';
+ return FALSE;
+ }
+ else if ((p = strstr(s,"\\bin\\")))
+ {
+ *(p+1)= '\0';
+ return TRUE;
+ }
+ else
+ {
+ *s = '\0';
+ return FALSE;
+ }
+}
+
+/**
+ find config file either from installation or build root according to
+ the following path layout
+ install-root/
+ bin/dbus-daemon[d].exe
+ etc/<config-file>.conf
+
+ build-root/
+ bin/dbus-daemon[d].exe
+ bus/<config-file>.conf
+*/
+dbus_bool_t
+_dbus_get_config_file_name(DBusString *config_file, char *s)
+{
+ char path[MAX_PATH*2];
+ int path_size = sizeof(path);
+ int len = 4 + strlen(s);
+
+ if (!_dbus_get_install_root(path,path_size))
+ return FALSE;
+
+ if(len > sizeof(path)-2)
+ return FALSE;
+ strcat(path,"etc\\");
+ strcat(path,s);
+ if (_dbus_file_exists(path))
+ {
+ // find path from executable
+ if (!_dbus_string_append (config_file, path))
+ return FALSE;
+ }
+ else
+ {
+ if (!_dbus_get_install_root(path,path_size))
+ return FALSE;
+ if(len + strlen(path) > sizeof(path)-2)
+ return FALSE;
+ strcat(path,"bus\\");
+ strcat(path,s);
+
+ if (_dbus_file_exists(path))
+ {
+ if (!_dbus_string_append (config_file, path))
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+
+/**
+ * Append the absolute path of the system.conf file
+ * (there is no system bus on Windows so this can just
+ * return FALSE and print a warning or something)
+ *
+ * @param str the string to append to
+ * @returns #FALSE if no memory
+ */
+dbus_bool_t
+_dbus_append_system_config_file (DBusString *str)
+{
+ return _dbus_get_config_file_name(str, "system.conf");
+}
+
+/**
+ * Append the absolute path of the session.conf file.
+ *
+ * @param str the string to append to
+ * @returns #FALSE if no memory
+ */
+dbus_bool_t
+_dbus_append_session_config_file (DBusString *str)
+{
+ return _dbus_get_config_file_name(str, "session.conf");
+}
+
+/* See comment in dbus-sysdeps-unix.c */
+dbus_bool_t
+_dbus_lookup_session_address (dbus_bool_t *supported,
+ DBusString *address,
+ DBusError *error)
+{
+ /* Probably fill this in with something based on COM? */
+ *supported = FALSE;
+ return TRUE;
+}
+
+/**
+ * Appends the directory in which a keyring for the given credentials
+ * should be stored. The credentials should have either a Windows or
+ * UNIX user in them. The directory should be an absolute path.
+ *
+ * On UNIX the directory is ~/.dbus-keyrings while on Windows it should probably
+ * be something else, since the dotfile convention is not normal on Windows.
+ *
+ * @param directory string to append directory to
+ * @param credentials credentials the directory should be for
+ *
+ * @returns #FALSE on no memory
+ */
+dbus_bool_t
+_dbus_append_keyring_directory_for_credentials (DBusString *directory,
+ DBusCredentials *credentials)
+{
+ DBusString homedir;
+ DBusString dotdir;
+ dbus_uid_t uid;
+ const char *homepath;
+
+ _dbus_assert (credentials != NULL);
+ _dbus_assert (!_dbus_credentials_are_anonymous (credentials));
+
+ if (!_dbus_string_init (&homedir))
+ return FALSE;
+
+ homepath = _dbus_getenv("HOMEPATH");
+ if (homepath != NULL && *homepath != '\0')
+ {
+ _dbus_string_append(&homedir,homepath);
+ }
+
+#ifdef DBUS_BUILD_TESTS
+ {
+ const char *override;
+
+ override = _dbus_getenv ("DBUS_TEST_HOMEDIR");
+ if (override != NULL && *override != '\0')
+ {
+ _dbus_string_set_length (&homedir, 0);
+ if (!_dbus_string_append (&homedir, override))
+ goto failed;
+
+ _dbus_verbose ("Using fake homedir for testing: %s\n",
+ _dbus_string_get_const_data (&homedir));
+ }
+ else
+ {
+ static dbus_bool_t already_warned = FALSE;
+ if (!already_warned)
+ {
+ _dbus_warn ("Using your real home directory for testing, set DBUS_TEST_HOMEDIR to avoid\n");
+ already_warned = TRUE;
+ }
+ }
+ }
+#endif
+
+ _dbus_string_init_const (&dotdir, ".dbus-keyrings");
+ if (!_dbus_concat_dir_and_file (&homedir,
+ &dotdir))
+ goto failed;
+
+ if (!_dbus_string_copy (&homedir, 0,
+ directory, _dbus_string_get_length (directory))) {
+ goto failed;
+ }
+
+ _dbus_string_free (&homedir);
+ return TRUE;
+
+ failed:
+ _dbus_string_free (&homedir);
+ return FALSE;
+}
+/** @} end of sysdeps-win */
/* tests in dbus-sysdeps-util.c */
+
projects / platform / upstream / dbus.git / blobdiff