b3434696b3
* assuan/assuan-socket.c (_assuan_close): Always use close(). * assuan/assuan.h (_gpgme_io_close): New prototype. (close): New macro, define as _gpgme_io_close. gpgme/ 2007-07-16 Marcus Brinkmann <marcus@g10code.de> * w32-io.c (struct reader_context_s, struct writer_context_s): New members REFCOUNT. (create_reader, create_writer): Initialize C->refcount to 1. (destroy_reader, destroy_writer): Only destroy if C->refcount drops to 0. (find_reader, find_writer, kill_reader, kill_writer): Beautify. * priv-io.h (_gpgme_io_dup): New prototype. * posix-io.c (_gpgme_io_dup): New function. * w32-io.c (_gpgme_io_dup): Likewise. * w32-glib-io.c (_gpgme_io_dup): Likewise. * engine-gpgsm.c (start): Reverting to version 2007-07-10.
149 lines
3.6 KiB
C
149 lines
3.6 KiB
C
/* assuan-socket.c
|
|
* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of Assuan.
|
|
*
|
|
* Assuan is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU Lesser General Public License as
|
|
* published by the Free Software Foundation; either version 2.1 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* Assuan is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
|
* USA.
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#ifdef HAVE_W32_SYSTEM
|
|
#include <windows.h>
|
|
#include <io.h>
|
|
#else
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#endif
|
|
#include "assuan-defs.h"
|
|
|
|
/* Hacks for Slowaris. */
|
|
#ifndef PF_LOCAL
|
|
# ifdef PF_UNIX
|
|
# define PF_LOCAL PF_UNIX
|
|
# else
|
|
# define PF_LOCAL AF_UNIX
|
|
# endif
|
|
#endif
|
|
#ifndef AF_LOCAL
|
|
# define AF_LOCAL AF_UNIX
|
|
#endif
|
|
|
|
int
|
|
_assuan_close (int fd)
|
|
{
|
|
#if defined (HAVE_W32_SYSTEM) && !defined(_ASSUAN_IN_GPGME_BUILD_ASSUAN)
|
|
int rc = closesocket (fd);
|
|
if (rc && WSAGetLastError () == WSAENOTSOCK)
|
|
rc = CloseHandle (fd);
|
|
return rc;
|
|
#else
|
|
return close (fd);
|
|
#endif
|
|
}
|
|
|
|
|
|
int
|
|
_assuan_sock_new (int domain, int type, int proto)
|
|
{
|
|
#ifndef HAVE_W32_SYSTEM
|
|
return socket (domain, type, proto);
|
|
#else
|
|
if (domain == AF_UNIX || domain == AF_LOCAL)
|
|
domain = AF_INET;
|
|
return socket (domain, type, proto);
|
|
#endif
|
|
}
|
|
|
|
|
|
int
|
|
_assuan_sock_connect (int sockfd, struct sockaddr * addr, int addrlen)
|
|
{
|
|
#ifndef HAVE_W32_SYSTEM
|
|
return connect (sockfd, addr, addrlen);
|
|
#else
|
|
struct sockaddr_in myaddr;
|
|
struct sockaddr_un * unaddr;
|
|
FILE * fp;
|
|
int port = 0;
|
|
|
|
unaddr = (struct sockaddr_un *)addr;
|
|
fp = fopen (unaddr->sun_path, "rb");
|
|
if (!fp)
|
|
return -1;
|
|
fscanf (fp, "%d", &port);
|
|
fclose (fp);
|
|
/* XXX: set errno in this case */
|
|
if (port < 0 || port > 65535)
|
|
return -1;
|
|
|
|
myaddr.sin_family = AF_INET;
|
|
myaddr.sin_port = port;
|
|
myaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
|
|
|
|
/* we need this later. */
|
|
unaddr->sun_family = myaddr.sin_family;
|
|
unaddr->sun_port = myaddr.sin_port;
|
|
unaddr->sun_addr.s_addr = myaddr.sin_addr.s_addr;
|
|
|
|
return connect (sockfd, (struct sockaddr *)&myaddr, sizeof myaddr);
|
|
#endif
|
|
}
|
|
|
|
|
|
int
|
|
_assuan_sock_bind (int sockfd, struct sockaddr * addr, int addrlen)
|
|
{
|
|
#ifndef HAVE_W32_SYSTEM
|
|
return bind (sockfd, addr, addrlen);
|
|
#else
|
|
if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX)
|
|
{
|
|
struct sockaddr_in myaddr;
|
|
struct sockaddr_un * unaddr;
|
|
FILE * fp;
|
|
int len = sizeof myaddr;
|
|
int rc;
|
|
|
|
myaddr.sin_port = 0;
|
|
myaddr.sin_family = AF_INET;
|
|
myaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
|
|
|
|
rc = bind (sockfd, (struct sockaddr *)&myaddr, len);
|
|
if (rc)
|
|
return rc;
|
|
rc = getsockname (sockfd, (struct sockaddr *)&myaddr, &len);
|
|
if (rc)
|
|
return rc;
|
|
unaddr = (struct sockaddr_un *)addr;
|
|
fp = fopen (unaddr->sun_path, "wb");
|
|
if (!fp)
|
|
return -1;
|
|
fprintf (fp, "%d", myaddr.sin_port);
|
|
fclose (fp);
|
|
|
|
/* we need this later. */
|
|
unaddr->sun_family = myaddr.sin_family;
|
|
unaddr->sun_port = myaddr.sin_port;
|
|
unaddr->sun_addr.s_addr = myaddr.sin_addr.s_addr;
|
|
|
|
return 0;
|
|
}
|
|
return bind (sockfd, addr, addrlen);
|
|
#endif
|
|
}
|
|
|