frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for the abstract socket namespace under Linux 

Based on same in Xtrans.

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Cristau 2008-09-09 04:42:36 +01:00 committed by Julien Danjou
parent f3f8738436
commit 25e59ccc0d
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -70,6 +70,12 @@ AC_HEADER_STDC
AC_SEARCH_LIBS(getaddrinfo, socket) AC_SEARCH_LIBS(getaddrinfo, socket)
AC_SEARCH_LIBS(connect, socket) AC_SEARCH_LIBS(connect, socket)
case $host_os in
linux*)
AC_DEFINE([HAVE_ABSTRACT_SOCKETS], 1, [Define if your platform supports abstract sockets])
;;
esac
dnl check for the sockaddr_un.sun_len member dnl check for the sockaddr_un.sun_len member
AC_CHECK_MEMBER([struct sockaddr_un.sun_len], AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
[AC_DEFINE(HAVE_SOCKADDR_SUN_LEN,1,[Have the sockaddr_un.sun_len member.])], [AC_DEFINE(HAVE_SOCKADDR_SUN_LEN,1,[Have the sockaddr_un.sun_len member.])],

40
src/xcb_util.c
View File

@ -38,6 +38,7 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
@ -123,6 +124,9 @@ static int _xcb_open_unix(char *protocol, const char *file);
#ifdef DNETCONN #ifdef DNETCONN
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port); static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port);
#endif #endif
#ifdef HAVE_ABSTRACT_SOCKETS
static int _xcb_open_abstract(char *protocol, const char *file);
#endif
static int _xcb_open(char *host, char *protocol, const int display) static int _xcb_open(char *host, char *protocol, const int display)
{ {
@ -156,10 +160,13 @@ static int _xcb_open(char *host, char *protocol, const int display)
/* display specifies Unix socket */ /* display specifies Unix socket */
snprintf(file, sizeof(file), "%s%d", base, display); snprintf(file, sizeof(file), "%s%d", base, display);
#ifdef HAVE_ABSTRACT_SOCKETS
fd = _xcb_open_abstract(protocol, file);
if (fd >= 0 || (errno != ENOENT && errno != ECONNREFUSED))
return fd;
#endif
return _xcb_open_unix(protocol, file); return _xcb_open_unix(protocol, file);
return fd;
} }
#ifdef DNETCONN #ifdef DNETCONN
@ -274,6 +281,33 @@ static int _xcb_open_unix(char *protocol, const char *file)
return fd; return fd;
} }
#ifdef HAVE_ABSTRACT_SOCKETS
static int _xcb_open_abstract(char *protocol, const char *file)
{
int fd;
struct sockaddr_un addr = {0};
socklen_t namelen;
if (protocol && strcmp("unix",protocol))
return -1;
strcpy(addr.sun_path + 1, file);
addr.sun_family = AF_UNIX;
namelen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(file);
#ifdef HAVE_SOCKADDR_SUN_LEN
addr.sun_len = 1 + strlen(file);
#endif
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd == -1)
return -1;
if (connect(fd, (struct sockaddr *) &addr, namelen) == -1) {
close(fd);
return -1;
}
return fd;
}
#endif
xcb_connection_t *xcb_connect(const char *displayname, int *screenp) xcb_connection_t *xcb_connect(const char *displayname, int *screenp)
{ {
int fd, display = 0; int fd, display = 0;