Update to libICE 1.0.5.
Main change: ansification. Bumped major since some symbols which were not part of the public API have been changed to 'static'.
This commit is contained in:
matthieu
parent
c8fe3e6a3b
commit
6a4a9fe60e
@ -1,3 +1,128 @@
|
||||
commit ab9dff549534c6d7b33f440bff7a841d60c1206c
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Mon Dec 8 18:45:44 2008 +0100
|
||||
|
||||
bump to 1.0.5
|
||||
|
||||
commit 71695c4bf7ae07228605683f6cdeca0457c8495a
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Mon Dec 8 18:44:26 2008 +0100
|
||||
|
||||
remove ChangeLog from EXTRA_DIST and CLEANFILES
|
||||
|
||||
commit 653f659fe65ae8c2a9fe5b1fdbfc78da43f2cf90
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Mon Dec 8 18:41:34 2008 +0100
|
||||
|
||||
use memcmp instead of binaryEqual
|
||||
|
||||
suggested by Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
http://lists.freedesktop.org/archives/xorg/2008-December/041222.html
|
||||
|
||||
commit bf138553afe6eecd0e6c218dc6ae4f63065e4196
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Tue Dec 2 22:06:15 2008 +0100
|
||||
|
||||
Use NULL, not zero, for pointers
|
||||
|
||||
From Magnus Kessler <Magnus.Kessler@gmx.net>
|
||||
http://lists.freedesktop.org/archives/xorg/2008-October/039799.html
|
||||
http://lists.freedesktop.org/archives/xorg/attachments/20081030/b2ea5b1c/attachment-0001.bin
|
||||
|
||||
commit b01e82ce1deedb36c9696d4d27a3b9a5d5a52d08
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Thu Oct 30 12:01:06 2008 +0100
|
||||
|
||||
ANSI C
|
||||
|
||||
convert all old style function declarations
|
||||
|
||||
see also: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
http://bugs.freedesktop.org/show_bug.cgi?id=14683
|
||||
http://bugs.freedesktop.org/attachment.cgi?id=14582
|
||||
|
||||
see also: Magnus Kessler <Magnus.Kessler@gmx.net>
|
||||
http://lists.freedesktop.org/archives/xorg/2008-October/039799.html
|
||||
http://lists.freedesktop.org/archives/xorg/attachments/20081030/b2ea5b1c/attachment-0001.bin
|
||||
|
||||
commit 2aba1bc0583aeb3ee6e26e3bfacd123abef744d9
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Mon Dec 1 23:06:22 2008 +0100
|
||||
|
||||
towards ANSI C
|
||||
|
||||
make _IceProcessCoreMessage and default error handlers static
|
||||
|
||||
commit 69a1b4b6d34291738dfbc3aa19d0ce3f2842ec8f
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Mon Dec 1 22:22:12 2008 +0100
|
||||
|
||||
Activate CWARNFLAGS with lots of gcc warnings
|
||||
|
||||
commit 898ed95cad1133940a83dcf428865c5d3fb2c939
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Mon Dec 1 22:18:45 2008 +0100
|
||||
|
||||
use xorg-macros-1.2.1
|
||||
|
||||
Use XORG_CHANGELOG for rule to generate ChangeLog from git log
|
||||
Use XORG_CWARNFLAGS for compiler warning flags, leave CFLAGS to user
|
||||
|
||||
commit a99fbad09ab850e65ddd57e4d4488e4726295e14
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Tue Oct 7 13:21:48 2008 -0700
|
||||
|
||||
Constify some arguments in libICE to clear warnings in libSM
|
||||
|
||||
This patch avoids the gcc (3.4.6) warnings:
|
||||
../../libSM-1.0.3/src/sm_client.c:104: warning: passing arg 7 of `IceRegisterForProtocolSetup' from incompatible pointer type
|
||||
../../libSM-1.0.3/src/sm_manager.c:168: warning: passing arg 7 of `IceRegisterForProtocolReply' from incompatible pointer type
|
||||
when compiling libSM
|
||||
|
||||
commit 3bceaeb3192ca75a14854d614e1621d28fb82274
|
||||
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
Date: Tue Oct 7 11:25:42 2008 -0700
|
||||
|
||||
define macros to 1 in icetrans.c to avoid redefined macro warnings
|
||||
|
||||
X.Org Bug #17947 <http://bugs.freedesktop.org/show_bug.cgi?id=17947>
|
||||
Patch #19444 <http://bugs.freedesktop.org/attachment.cgi?id=19444>
|
||||
|
||||
Define as 1 (one) as done by autoconf and the command line
|
||||
option, e.g. -DICE_t, not as empty.
|
||||
|
||||
This avoids the gcc (3.4.6) warnings:
|
||||
../../libICE-1.0.4/src/icetrans.c:29:1: warning: "ICE_t" redefined
|
||||
../config.h:38:1: warning: this is the location of the previous definition
|
||||
../../libICE-1.0.4/src/icetrans.c:30:1: warning: "TRANS_CLIENT" redefined
|
||||
<command line>:6:1: warning: this is the location of the previous definition
|
||||
../../libICE-1.0.4/src/icetrans.c:31:1: warning: "TRANS_SERVER" redefined
|
||||
<command line>:7:1: warning: this is the location of the previous definition
|
||||
|
||||
commit b707104f4dba0963ab17c1d6a29c1e3a848ea408
|
||||
Author: Alan Hourihane <alanh@tungstengraphics.com>
|
||||
Date: Tue Apr 29 00:41:40 2008 +0100
|
||||
|
||||
silence warning
|
||||
|
||||
commit e6b525aefc05b5203391699b00053ad52243cc6b
|
||||
Author: Colin Harrison <colin.harrison-at-virgin.net>
|
||||
Date: Tue Apr 29 00:40:48 2008 +0100
|
||||
|
||||
include for sleep()
|
||||
|
||||
commit ef58f37724b841ef2246757be27111775aa86559
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sun Mar 9 09:02:40 2008 +0100
|
||||
|
||||
nuke RCS Ids
|
||||
|
||||
commit 47d86e8343d3d0201166c4d75da2ec9c12638cc1
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Dec 6 15:51:13 2007 -0500
|
||||
|
||||
Add missing PHONY line for automatic ChangeLog generation
|
||||
|
||||
commit f415da71dd26f128df7d550ecd7631f8888eb1d2
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Mon Aug 20 13:21:07 2007 -0700
|
||||
|
||||
@ -3,11 +3,12 @@ SUBDIRS = src
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = ice.pc
|
||||
|
||||
EXTRA_DIST=ice.pc.in ChangeLog
|
||||
CLEANFILES = ChangeLog
|
||||
EXTRA_DIST=ice.pc.in
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/26 12:07:34 matthieu Exp $
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2009/04/09 20:29:45 matthieu Exp $
|
||||
|
||||
SHARED_LIBS= ICE 8.1
|
||||
SHARED_LIBS= ICE 9.0
|
||||
|
||||
.include <bsd.xorg.mk>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT([libICE],
|
||||
1.0.4,
|
||||
1.0.5,
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
libICE)
|
||||
|
||||
@ -36,17 +36,19 @@ AC_DEFINE(ICE_t, 1, [Xtrans transport type])
|
||||
# Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
|
||||
# Require xorg-macros at least 1.2.1
|
||||
XORG_MACROS_VERSION([1.2.1])
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])])
|
||||
|
||||
dnl Allow checking code with lint, sparse, etc.
|
||||
XORG_WITH_LINT
|
||||
XORG_LINT_LIBRARY([ICE])
|
||||
LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}"
|
||||
|
||||
if test "x$GCC" = "xyes"; then
|
||||
GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
|
||||
-Wmissing-prototypes -Wmissing-declarations \
|
||||
-Wnested-externs -fno-strict-aliasing"
|
||||
CFLAGS="$GCC_WARNINGS $CFLAGS"
|
||||
fi
|
||||
XORG_CHANGELOG
|
||||
|
||||
XORG_CWARNFLAGS
|
||||
|
||||
XORG_RELEASE_VERSION
|
||||
|
||||
|
||||
@ -214,7 +214,7 @@ extern int IceRegisterForProtocolSetup (
|
||||
int /* versionCount */,
|
||||
IcePoVersionRec * /* versionRecs */,
|
||||
int /* authCount */,
|
||||
char ** /* authNames */,
|
||||
const char ** /* authNames */,
|
||||
IcePoAuthProc * /* authProcs */,
|
||||
IceIOErrorProc /* IOErrorProc */
|
||||
);
|
||||
@ -226,7 +226,7 @@ extern int IceRegisterForProtocolReply (
|
||||
int /* versionCount */,
|
||||
IcePaVersionRec * /* versionRecs */,
|
||||
int /* authCount */,
|
||||
char ** /* authNames */,
|
||||
const char ** /* authNames */,
|
||||
IcePaAuthProc * /* authProcs */,
|
||||
IceHostBasedAuthProc /* hostBasedAuthProc */,
|
||||
IceProtocolSetupProc /* protocolSetupProc */,
|
||||
|
||||
@ -89,6 +89,29 @@ extern void _IceErrorBadValue (
|
||||
IcePointer /* value */
|
||||
);
|
||||
|
||||
extern IcePoAuthStatus _IcePoMagicCookie1Proc (
|
||||
IceConn /* iceConn */,
|
||||
IcePointer * /* authStatePtr */,
|
||||
Bool /* cleanUp */,
|
||||
Bool /* swap */,
|
||||
int /* authDataLen */,
|
||||
IcePointer /* authData */,
|
||||
int * /* replyDataLenRet */,
|
||||
IcePointer * /* replyDataRet */,
|
||||
char ** /* errorStringRet */
|
||||
);
|
||||
|
||||
extern IcePaAuthStatus _IcePaMagicCookie1Proc (
|
||||
IceConn /* iceConn */,
|
||||
IcePointer * /* authStatePtr */,
|
||||
Bool /* swap */,
|
||||
int /* authDataLen */,
|
||||
IcePointer /* authData */,
|
||||
int * /* replyDataLenRet */,
|
||||
IcePointer * /* replyDataRet */,
|
||||
char ** /* errorStringRet */
|
||||
);
|
||||
|
||||
|
||||
/*
|
||||
* Macro to check if IO operations are valid on an ICE connection.
|
||||
|
||||
@ -37,6 +37,9 @@ Author: Ralph Mor, X Consortium
|
||||
#include <X11/ICE/ICEproto.h>
|
||||
#include <X11/ICE/ICEconn.h>
|
||||
#include <X11/ICE/ICEmsg.h>
|
||||
#ifdef WIN32
|
||||
#include <X11/Xwindows.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
lib_LTLIBRARIES=libICE.la
|
||||
|
||||
AM_CFLAGS= -I${top_srcdir}/include $(ICE_CFLAGS) $(XTRANS_CFLAGS) \
|
||||
-DICE_t -DTRANS_CLIENT -DTRANS_SERVER
|
||||
-DICE_t -DTRANS_CLIENT -DTRANS_SERVER $(CWARNFLAGS)
|
||||
|
||||
libICE_la_LDFLAGS = -version-number 6:3:0 -no-undefined
|
||||
|
||||
|
||||
@ -36,11 +36,10 @@ Author: Ralph Mor, X Consortium
|
||||
|
||||
|
||||
IceConn
|
||||
IceAcceptConnection (listenObj, statusRet)
|
||||
|
||||
IceListenObj listenObj;
|
||||
IceAcceptStatus *statusRet;
|
||||
|
||||
IceAcceptConnection (
|
||||
IceListenObj listenObj,
|
||||
IceAcceptStatus *statusRet
|
||||
)
|
||||
{
|
||||
IceConn iceConn;
|
||||
XtransConnInfo newconn;
|
||||
@ -51,7 +50,7 @@ IceAcceptStatus *statusRet;
|
||||
* Accept the connection.
|
||||
*/
|
||||
|
||||
if ((newconn = _IceTransAccept (listenObj->trans_conn, &status)) == 0)
|
||||
if ((newconn = _IceTransAccept (listenObj->trans_conn, &status)) == NULL)
|
||||
{
|
||||
if (status == TRANS_ACCEPT_BAD_MALLOC)
|
||||
*statusRet = IceAcceptBadMalloc;
|
||||
|
||||
@ -72,7 +72,6 @@ static Status write_counted_string (FILE *file, unsigned short count, char *stri
|
||||
|
||||
char *
|
||||
IceAuthFileName (void)
|
||||
|
||||
{
|
||||
static char slashDotICEauthority[] = "/.ICEauthority";
|
||||
char *name;
|
||||
@ -101,7 +100,7 @@ IceAuthFileName (void)
|
||||
if ((ptr1 = getenv("HOMEDRIVE")) && (ptr2 = getenv("HOMEDIR"))) {
|
||||
len1 = strlen (ptr1);
|
||||
len2 = strlen (ptr2);
|
||||
} else if (ptr2 = getenv("USERNAME")) {
|
||||
} else if ((ptr2 = getenv("USERNAME"))) {
|
||||
len1 = strlen (ptr1 = "/users/");
|
||||
len2 = strlen (ptr2);
|
||||
}
|
||||
@ -140,13 +139,12 @@ IceAuthFileName (void)
|
||||
|
||||
|
||||
int
|
||||
IceLockAuthFile (file_name, retries, timeout, dead)
|
||||
|
||||
char *file_name;
|
||||
int retries;
|
||||
int timeout;
|
||||
long dead;
|
||||
|
||||
IceLockAuthFile (
|
||||
char *file_name,
|
||||
int retries,
|
||||
int timeout,
|
||||
long dead
|
||||
)
|
||||
{
|
||||
char creat_name[1025], link_name[1025];
|
||||
struct stat statb;
|
||||
@ -217,10 +215,9 @@ long dead;
|
||||
|
||||
|
||||
void
|
||||
IceUnlockAuthFile (file_name)
|
||||
|
||||
char *file_name;
|
||||
|
||||
IceUnlockAuthFile (
|
||||
char *file_name
|
||||
)
|
||||
{
|
||||
#ifndef WIN32
|
||||
char creat_name[1025];
|
||||
@ -246,10 +243,9 @@ char *file_name;
|
||||
|
||||
|
||||
IceAuthFileEntry *
|
||||
IceReadAuthFileEntry (auth_file)
|
||||
|
||||
FILE *auth_file;
|
||||
|
||||
IceReadAuthFileEntry (
|
||||
FILE *auth_file
|
||||
)
|
||||
{
|
||||
IceAuthFileEntry local;
|
||||
IceAuthFileEntry *ret;
|
||||
@ -298,10 +294,9 @@ FILE *auth_file;
|
||||
|
||||
|
||||
void
|
||||
IceFreeAuthFileEntry (auth)
|
||||
|
||||
IceAuthFileEntry *auth;
|
||||
|
||||
IceFreeAuthFileEntry (
|
||||
IceAuthFileEntry *auth
|
||||
)
|
||||
{
|
||||
if (auth)
|
||||
{
|
||||
@ -317,11 +312,10 @@ IceAuthFileEntry *auth;
|
||||
|
||||
|
||||
Status
|
||||
IceWriteAuthFileEntry (auth_file, auth)
|
||||
|
||||
FILE *auth_file;
|
||||
IceAuthFileEntry *auth;
|
||||
|
||||
IceWriteAuthFileEntry (
|
||||
FILE *auth_file,
|
||||
IceAuthFileEntry *auth
|
||||
)
|
||||
{
|
||||
if (!write_string (auth_file, auth->protocol_name))
|
||||
return (0);
|
||||
@ -346,12 +340,11 @@ IceAuthFileEntry *auth;
|
||||
|
||||
|
||||
IceAuthFileEntry *
|
||||
IceGetAuthFileEntry (protocol_name, network_id, auth_name)
|
||||
|
||||
char *protocol_name;
|
||||
char *network_id;
|
||||
char *auth_name;
|
||||
|
||||
IceGetAuthFileEntry (
|
||||
char *protocol_name,
|
||||
char *network_id,
|
||||
char *auth_name
|
||||
)
|
||||
{
|
||||
FILE *auth_file;
|
||||
char *filename;
|
||||
@ -448,7 +441,7 @@ read_counted_string (FILE *file, unsigned short *countp, char **stringp)
|
||||
|
||||
if (len == 0)
|
||||
{
|
||||
data = 0;
|
||||
data = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -42,16 +42,14 @@ static XtransConnInfo ConnectToPeer(char *networkIdsList,
|
||||
#define Strstr strstr
|
||||
|
||||
IceConn
|
||||
IceOpenConnection (networkIdsList, context, mustAuthenticate, majorOpcodeCheck,
|
||||
errorLength, errorStringRet)
|
||||
|
||||
char *networkIdsList;
|
||||
IcePointer context;
|
||||
Bool mustAuthenticate;
|
||||
int majorOpcodeCheck;
|
||||
int errorLength;
|
||||
char *errorStringRet;
|
||||
|
||||
IceOpenConnection (
|
||||
char *networkIdsList,
|
||||
IcePointer context,
|
||||
Bool mustAuthenticate,
|
||||
int majorOpcodeCheck,
|
||||
int errorLength,
|
||||
char *errorStringRet
|
||||
)
|
||||
{
|
||||
IceConn iceConn;
|
||||
int extra, i, j;
|
||||
@ -432,10 +430,9 @@ char *errorStringRet;
|
||||
|
||||
|
||||
IcePointer
|
||||
IceGetConnectionContext (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceGetConnectionContext (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (iceConn->context);
|
||||
}
|
||||
|
||||
@ -40,13 +40,12 @@ Author: Ralph Mor, X Consortium
|
||||
|
||||
|
||||
void
|
||||
_IceErrorBadMinor (iceConn, majorOpcode, offendingMinor, severity)
|
||||
|
||||
IceConn iceConn;
|
||||
int majorOpcode;
|
||||
int offendingMinor;
|
||||
int severity;
|
||||
|
||||
_IceErrorBadMinor (
|
||||
IceConn iceConn,
|
||||
int majorOpcode,
|
||||
int offendingMinor,
|
||||
int severity
|
||||
)
|
||||
{
|
||||
IceErrorHeader (iceConn,
|
||||
majorOpcode, offendingMinor,
|
||||
@ -60,13 +59,12 @@ int severity;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorBadState (iceConn, majorOpcode, offendingMinor, severity)
|
||||
|
||||
IceConn iceConn;
|
||||
int majorOpcode;
|
||||
int offendingMinor;
|
||||
int severity;
|
||||
|
||||
_IceErrorBadState (
|
||||
IceConn iceConn,
|
||||
int majorOpcode,
|
||||
int offendingMinor,
|
||||
int severity
|
||||
)
|
||||
{
|
||||
IceErrorHeader (iceConn,
|
||||
majorOpcode, offendingMinor,
|
||||
@ -80,13 +78,12 @@ int severity;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorBadLength (iceConn, majorOpcode, offendingMinor, severity)
|
||||
|
||||
IceConn iceConn;
|
||||
int majorOpcode;
|
||||
int offendingMinor;
|
||||
int severity;
|
||||
|
||||
_IceErrorBadLength (
|
||||
IceConn iceConn,
|
||||
int majorOpcode,
|
||||
int offendingMinor,
|
||||
int severity
|
||||
)
|
||||
{
|
||||
IceErrorHeader (iceConn,
|
||||
majorOpcode, offendingMinor,
|
||||
@ -100,15 +97,14 @@ int severity;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorBadValue (iceConn, majorOpcode, offendingMinor, offset, length, value)
|
||||
|
||||
IceConn iceConn;
|
||||
int majorOpcode;
|
||||
int offendingMinor;
|
||||
int offset;
|
||||
int length; /* in bytes */
|
||||
IcePointer value;
|
||||
|
||||
_IceErrorBadValue (
|
||||
IceConn iceConn,
|
||||
int majorOpcode,
|
||||
int offendingMinor,
|
||||
int offset,
|
||||
int length, /* in bytes */
|
||||
IcePointer value
|
||||
)
|
||||
{
|
||||
IceErrorHeader (iceConn,
|
||||
majorOpcode, offendingMinor,
|
||||
@ -129,11 +125,10 @@ IcePointer value;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorNoAuthentication (iceConn, offendingMinor)
|
||||
|
||||
IceConn iceConn;
|
||||
int offendingMinor;
|
||||
|
||||
_IceErrorNoAuthentication (
|
||||
IceConn iceConn,
|
||||
int offendingMinor
|
||||
)
|
||||
{
|
||||
int severity = (offendingMinor == ICE_ConnectionSetup) ?
|
||||
IceFatalToConnection : IceFatalToProtocol;
|
||||
@ -150,11 +145,10 @@ int offendingMinor;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorNoVersion (iceConn, offendingMinor)
|
||||
|
||||
IceConn iceConn;
|
||||
int offendingMinor;
|
||||
|
||||
_IceErrorNoVersion (
|
||||
IceConn iceConn,
|
||||
int offendingMinor
|
||||
)
|
||||
{
|
||||
int severity = (offendingMinor == ICE_ConnectionSetup) ?
|
||||
IceFatalToConnection : IceFatalToProtocol;
|
||||
@ -171,12 +165,11 @@ int offendingMinor;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorSetupFailed (iceConn, offendingMinor, reason)
|
||||
|
||||
IceConn iceConn;
|
||||
int offendingMinor;
|
||||
char *reason;
|
||||
|
||||
_IceErrorSetupFailed (
|
||||
IceConn iceConn,
|
||||
int offendingMinor,
|
||||
char *reason
|
||||
)
|
||||
{
|
||||
char *pBuf, *pStart;
|
||||
int bytes;
|
||||
@ -203,12 +196,11 @@ char *reason;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorAuthenticationRejected (iceConn, offendingMinor, reason)
|
||||
|
||||
IceConn iceConn;
|
||||
int offendingMinor;
|
||||
char *reason;
|
||||
|
||||
_IceErrorAuthenticationRejected (
|
||||
IceConn iceConn,
|
||||
int offendingMinor,
|
||||
char *reason
|
||||
)
|
||||
{
|
||||
char *pBuf, *pStart;
|
||||
int bytes;
|
||||
@ -233,12 +225,11 @@ char *reason;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorAuthenticationFailed (iceConn, offendingMinor, reason)
|
||||
|
||||
IceConn iceConn;
|
||||
int offendingMinor;
|
||||
char *reason;
|
||||
|
||||
_IceErrorAuthenticationFailed (
|
||||
IceConn iceConn,
|
||||
int offendingMinor,
|
||||
char *reason
|
||||
)
|
||||
{
|
||||
char *pBuf, *pStart;
|
||||
int bytes;
|
||||
@ -263,11 +254,10 @@ char *reason;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorProtocolDuplicate (iceConn, protocolName)
|
||||
|
||||
IceConn iceConn;
|
||||
char *protocolName;
|
||||
|
||||
_IceErrorProtocolDuplicate (
|
||||
IceConn iceConn,
|
||||
char *protocolName
|
||||
)
|
||||
{
|
||||
char *pBuf, *pStart;
|
||||
int bytes;
|
||||
@ -292,11 +282,10 @@ char *protocolName;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorMajorOpcodeDuplicate (iceConn, majorOpcode)
|
||||
|
||||
IceConn iceConn;
|
||||
int majorOpcode;
|
||||
|
||||
_IceErrorMajorOpcodeDuplicate (
|
||||
IceConn iceConn,
|
||||
int majorOpcode
|
||||
)
|
||||
{
|
||||
char mOp = (char) majorOpcode;
|
||||
|
||||
@ -313,11 +302,10 @@ int majorOpcode;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorUnknownProtocol (iceConn, protocolName)
|
||||
|
||||
IceConn iceConn;
|
||||
char *protocolName;
|
||||
|
||||
_IceErrorUnknownProtocol (
|
||||
IceConn iceConn,
|
||||
char *protocolName
|
||||
)
|
||||
{
|
||||
char *pBuf, *pStart;
|
||||
int bytes;
|
||||
@ -342,13 +330,12 @@ char *protocolName;
|
||||
|
||||
|
||||
void
|
||||
_IceErrorBadMajor (iceConn, offendingMajor, offendingMinor, severity)
|
||||
|
||||
IceConn iceConn;
|
||||
int offendingMajor;
|
||||
int offendingMinor;
|
||||
int severity;
|
||||
|
||||
_IceErrorBadMajor (
|
||||
IceConn iceConn,
|
||||
int offendingMajor,
|
||||
int offendingMinor,
|
||||
int severity
|
||||
)
|
||||
{
|
||||
char maj = (char) offendingMajor;
|
||||
|
||||
@ -369,18 +356,16 @@ int severity;
|
||||
* Default error handler.
|
||||
*/
|
||||
|
||||
void
|
||||
_IceDefaultErrorHandler (iceConn, swap,
|
||||
offendingMinorOpcode, offendingSequence, errorClass, severity, values)
|
||||
|
||||
IceConn iceConn;
|
||||
Bool swap;
|
||||
int offendingMinorOpcode;
|
||||
unsigned long offendingSequence;
|
||||
int errorClass;
|
||||
int severity;
|
||||
IcePointer values;
|
||||
|
||||
static void
|
||||
_IceDefaultErrorHandler (
|
||||
IceConn iceConn,
|
||||
Bool swap,
|
||||
int offendingMinorOpcode,
|
||||
unsigned long offendingSequence,
|
||||
int errorClass,
|
||||
int severity,
|
||||
IcePointer values
|
||||
)
|
||||
{
|
||||
char *str;
|
||||
char *pData = (char *) values;
|
||||
@ -578,6 +563,7 @@ IcePointer values;
|
||||
exit (1);
|
||||
}
|
||||
|
||||
IceErrorHandler _IceErrorHandler = _IceDefaultErrorHandler;
|
||||
|
||||
|
||||
/*
|
||||
@ -587,10 +573,9 @@ IcePointer values;
|
||||
*/
|
||||
|
||||
IceErrorHandler
|
||||
IceSetErrorHandler (handler)
|
||||
|
||||
IceErrorHandler handler;
|
||||
|
||||
IceSetErrorHandler (
|
||||
IceErrorHandler handler
|
||||
)
|
||||
{
|
||||
IceErrorHandler oldHandler = _IceErrorHandler;
|
||||
|
||||
@ -608,11 +593,10 @@ IceErrorHandler handler;
|
||||
* Default IO error handler.
|
||||
*/
|
||||
|
||||
void
|
||||
_IceDefaultIOErrorHandler (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
static void
|
||||
_IceDefaultIOErrorHandler (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
fprintf (stderr,
|
||||
"ICE default IO error handler doing an exit(), pid = %ld, errno = %d\n",
|
||||
@ -621,6 +605,7 @@ IceConn iceConn;
|
||||
exit (1);
|
||||
}
|
||||
|
||||
IceIOErrorHandler _IceIOErrorHandler = _IceDefaultIOErrorHandler;
|
||||
|
||||
|
||||
/*
|
||||
@ -631,10 +616,9 @@ IceConn iceConn;
|
||||
*/
|
||||
|
||||
IceIOErrorHandler
|
||||
IceSetIOErrorHandler (handler)
|
||||
|
||||
IceIOErrorHandler handler;
|
||||
|
||||
IceSetIOErrorHandler (
|
||||
IceIOErrorHandler handler
|
||||
)
|
||||
{
|
||||
IceIOErrorHandler oldHandler = _IceIOErrorHandler;
|
||||
|
||||
|
||||
@ -60,15 +60,13 @@ extern IceAuthDataEntry _IcePaAuthDataEntries[];
|
||||
*/
|
||||
|
||||
void
|
||||
_IceGetPoAuthData (protocolName, networkId, authName,
|
||||
authDataLenRet, authDataRet)
|
||||
|
||||
char *protocolName;
|
||||
char *networkId;
|
||||
char *authName;
|
||||
unsigned short *authDataLenRet;
|
||||
char **authDataRet;
|
||||
|
||||
_IceGetPoAuthData (
|
||||
char *protocolName,
|
||||
char *networkId,
|
||||
char *authName,
|
||||
unsigned short *authDataLenRet,
|
||||
char **authDataRet
|
||||
)
|
||||
{
|
||||
IceAuthFileEntry *entry;
|
||||
|
||||
@ -93,15 +91,13 @@ char **authDataRet;
|
||||
|
||||
|
||||
void
|
||||
_IceGetPaAuthData (protocolName, networkId, authName,
|
||||
authDataLenRet, authDataRet)
|
||||
|
||||
char *protocolName;
|
||||
char *networkId;
|
||||
char *authName;
|
||||
unsigned short *authDataLenRet;
|
||||
char **authDataRet;
|
||||
|
||||
_IceGetPaAuthData (
|
||||
char *protocolName,
|
||||
char *networkId,
|
||||
char *authName,
|
||||
unsigned short *authDataLenRet,
|
||||
char **authDataRet
|
||||
)
|
||||
{
|
||||
IceAuthDataEntry *entry = NULL;
|
||||
int found = 0;
|
||||
@ -134,16 +130,14 @@ char **authDataRet;
|
||||
|
||||
|
||||
void
|
||||
_IceGetPoValidAuthIndices (protocol_name, network_id,
|
||||
num_auth_names, auth_names, num_indices_ret, indices_ret)
|
||||
|
||||
char *protocol_name;
|
||||
char *network_id;
|
||||
int num_auth_names;
|
||||
char **auth_names;
|
||||
int *num_indices_ret;
|
||||
int *indices_ret; /* in/out arg */
|
||||
|
||||
_IceGetPoValidAuthIndices (
|
||||
char *protocol_name,
|
||||
char *network_id,
|
||||
int num_auth_names,
|
||||
char **auth_names,
|
||||
int *num_indices_ret,
|
||||
int *indices_ret /* in/out arg */
|
||||
)
|
||||
{
|
||||
FILE *auth_file;
|
||||
char *filename;
|
||||
@ -195,16 +189,14 @@ int *indices_ret; /* in/out arg */
|
||||
|
||||
|
||||
void
|
||||
_IceGetPaValidAuthIndices (protocol_name, network_id,
|
||||
num_auth_names, auth_names, num_indices_ret, indices_ret)
|
||||
|
||||
char *protocol_name;
|
||||
char *network_id;
|
||||
int num_auth_names;
|
||||
char **auth_names;
|
||||
int *num_indices_ret;
|
||||
int *indices_ret; /* in/out arg */
|
||||
|
||||
_IceGetPaValidAuthIndices (
|
||||
char *protocol_name,
|
||||
char *network_id,
|
||||
int num_auth_names,
|
||||
char **auth_names,
|
||||
int *num_indices_ret,
|
||||
int *indices_ret /* in/out arg */
|
||||
)
|
||||
{
|
||||
int index_ret;
|
||||
int i, j;
|
||||
|
||||
@ -28,14 +28,6 @@ Author: Ralph Mor, X Consortium
|
||||
******************************************************************************/
|
||||
/* $XFree86: xc/lib/ICE/globals.h,v 1.4 2001/12/14 19:53:35 dawes Exp $ */
|
||||
|
||||
extern void _IceDefaultErrorHandler ();
|
||||
extern void _IceDefaultIOErrorHandler ();
|
||||
|
||||
extern IcePoAuthStatus _IcePoMagicCookie1Proc ();
|
||||
extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
|
||||
|
||||
extern void _IceProcessCoreMessage ();
|
||||
|
||||
#ifndef __UNIXOS2__
|
||||
IceConn _IceConnectionObjs[256];
|
||||
char *_IceConnectionStrings[256];
|
||||
@ -51,14 +43,5 @@ int _IceLastMajorOpcode = 0;
|
||||
|
||||
int _IceAuthCount = 1;
|
||||
char *_IceAuthNames[] = {"MIT-MAGIC-COOKIE-1"};
|
||||
IcePoAuthProc _IcePoAuthProcs[] = {_IcePoMagicCookie1Proc};
|
||||
IcePaAuthProc _IcePaAuthProcs[] = {_IcePaMagicCookie1Proc};
|
||||
|
||||
int _IceVersionCount = 1;
|
||||
_IceVersion _IceVersions[] = {
|
||||
{IceProtoMajor, IceProtoMinor, _IceProcessCoreMessage}};
|
||||
|
||||
_IceWatchProc *_IceWatchProcs = NULL;
|
||||
|
||||
IceErrorHandler _IceErrorHandler = _IceDefaultErrorHandler;
|
||||
IceIOErrorHandler _IceIOErrorHandler = _IceDefaultIOErrorHandler;
|
||||
|
||||
@ -38,8 +38,6 @@ Author: Ralph Mor, X Consortium
|
||||
#include <time.h>
|
||||
#define Time_t time_t
|
||||
|
||||
static int binaryEqual (const char *a, const char *b, unsigned len);
|
||||
|
||||
static int was_called_state;
|
||||
|
||||
/*
|
||||
@ -49,10 +47,9 @@ static int was_called_state;
|
||||
|
||||
|
||||
char *
|
||||
IceGenerateMagicCookie (len)
|
||||
|
||||
int len;
|
||||
|
||||
IceGenerateMagicCookie (
|
||||
int len
|
||||
)
|
||||
{
|
||||
char *auth;
|
||||
long ldata[2];
|
||||
@ -94,19 +91,17 @@ int len;
|
||||
|
||||
|
||||
IcePoAuthStatus
|
||||
_IcePoMagicCookie1Proc (iceConn, authStatePtr, cleanUp, swap,
|
||||
authDataLen, authData, replyDataLenRet, replyDataRet, errorStringRet)
|
||||
|
||||
IceConn iceConn;
|
||||
IcePointer *authStatePtr;
|
||||
Bool cleanUp;
|
||||
Bool swap;
|
||||
int authDataLen;
|
||||
IcePointer authData;
|
||||
int *replyDataLenRet;
|
||||
IcePointer *replyDataRet;
|
||||
char **errorStringRet;
|
||||
|
||||
_IcePoMagicCookie1Proc (
|
||||
IceConn iceConn,
|
||||
IcePointer *authStatePtr,
|
||||
Bool cleanUp,
|
||||
Bool swap,
|
||||
int authDataLen,
|
||||
IcePointer authData,
|
||||
int *replyDataLenRet,
|
||||
IcePointer *replyDataRet,
|
||||
char **errorStringRet
|
||||
)
|
||||
{
|
||||
if (cleanUp)
|
||||
{
|
||||
@ -168,21 +163,20 @@ char **errorStringRet;
|
||||
}
|
||||
}
|
||||
|
||||
IcePoAuthProc _IcePoAuthProcs[] = {_IcePoMagicCookie1Proc};
|
||||
|
||||
|
||||
IcePaAuthStatus
|
||||
_IcePaMagicCookie1Proc (iceConn, authStatePtr, swap,
|
||||
authDataLen, authData, replyDataLenRet, replyDataRet, errorStringRet)
|
||||
|
||||
IceConn iceConn;
|
||||
IcePointer *authStatePtr;
|
||||
Bool swap;
|
||||
int authDataLen;
|
||||
IcePointer authData;
|
||||
int *replyDataLenRet;
|
||||
IcePointer *replyDataRet;
|
||||
char **errorStringRet;
|
||||
|
||||
_IcePaMagicCookie1Proc (
|
||||
IceConn iceConn,
|
||||
IcePointer *authStatePtr,
|
||||
Bool swap,
|
||||
int authDataLen,
|
||||
IcePointer authData,
|
||||
int *replyDataLenRet,
|
||||
IcePointer *replyDataRet,
|
||||
char **errorStringRet
|
||||
)
|
||||
{
|
||||
*errorStringRet = NULL;
|
||||
*replyDataLenRet = 0;
|
||||
@ -217,7 +211,7 @@ char **errorStringRet;
|
||||
IcePaAuthStatus stat;
|
||||
|
||||
if (authDataLen == length &&
|
||||
binaryEqual ((char *) authData, data, authDataLen))
|
||||
memcmp (authData, data, authDataLen) == 0)
|
||||
{
|
||||
stat = IcePaAuthAccepted;
|
||||
}
|
||||
@ -252,18 +246,4 @@ char **errorStringRet;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* local routines
|
||||
*/
|
||||
|
||||
static int
|
||||
binaryEqual (const char *a, const char *b, unsigned len)
|
||||
|
||||
{
|
||||
while (len--)
|
||||
if (*a++ != *b++)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
IcePaAuthProc _IcePaAuthProcs[] = {_IcePaMagicCookie1Proc};
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/*
|
||||
* $Id: icetrans.c,v 1.1.1.1 2006/11/25 16:45:58 matthieu Exp $
|
||||
*
|
||||
* Copyright © 2003 Keith Packard
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -26,8 +24,8 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#define ICE_t
|
||||
#define TRANS_CLIENT
|
||||
#define TRANS_SERVER
|
||||
#define ICE_t 1
|
||||
#define TRANS_CLIENT 1
|
||||
#define TRANS_SERVER 1
|
||||
|
||||
#include <X11/Xtrans/transport.c>
|
||||
|
||||
@ -37,13 +37,12 @@ Author: Ralph Mor, X Consortium
|
||||
|
||||
|
||||
Status
|
||||
IceListenForConnections (countRet, listenObjsRet, errorLength, errorStringRet)
|
||||
|
||||
int *countRet;
|
||||
IceListenObj **listenObjsRet;
|
||||
int errorLength;
|
||||
char *errorStringRet;
|
||||
|
||||
IceListenForConnections (
|
||||
int *countRet,
|
||||
IceListenObj **listenObjsRet,
|
||||
int errorLength,
|
||||
char *errorStringRet
|
||||
)
|
||||
{
|
||||
struct _IceListenObj *listenObjs;
|
||||
char *networkId;
|
||||
@ -161,10 +160,9 @@ char *errorStringRet;
|
||||
|
||||
|
||||
int
|
||||
IceGetListenConnectionNumber (listenObj)
|
||||
|
||||
IceListenObj listenObj;
|
||||
|
||||
IceGetListenConnectionNumber (
|
||||
IceListenObj listenObj
|
||||
)
|
||||
{
|
||||
return (_IceTransGetConnectionNumber (listenObj->trans_conn));
|
||||
}
|
||||
@ -172,10 +170,9 @@ IceListenObj listenObj;
|
||||
|
||||
|
||||
char *
|
||||
IceGetListenConnectionString (listenObj)
|
||||
|
||||
IceListenObj listenObj;
|
||||
|
||||
IceGetListenConnectionString (
|
||||
IceListenObj listenObj
|
||||
)
|
||||
{
|
||||
return strdup(listenObj->network_id);
|
||||
}
|
||||
@ -183,11 +180,10 @@ IceListenObj listenObj;
|
||||
|
||||
|
||||
char *
|
||||
IceComposeNetworkIdList (count, listenObjs)
|
||||
|
||||
int count;
|
||||
IceListenObj *listenObjs;
|
||||
|
||||
IceComposeNetworkIdList (
|
||||
int count,
|
||||
IceListenObj *listenObjs
|
||||
)
|
||||
{
|
||||
char *list;
|
||||
int len = 0;
|
||||
@ -241,11 +237,10 @@ IceListenObj *listenObjs;
|
||||
|
||||
|
||||
void
|
||||
IceFreeListenObjs (count, listenObjs)
|
||||
|
||||
int count;
|
||||
IceListenObj *listenObjs;
|
||||
|
||||
IceFreeListenObjs (
|
||||
int count,
|
||||
IceListenObj *listenObjs
|
||||
)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -268,11 +263,10 @@ IceListenObj *listenObjs;
|
||||
*/
|
||||
|
||||
void
|
||||
IceSetHostBasedAuthProc (listenObj, hostBasedAuthProc)
|
||||
|
||||
IceListenObj listenObj;
|
||||
IceHostBasedAuthProc hostBasedAuthProc;
|
||||
|
||||
IceSetHostBasedAuthProc (
|
||||
IceListenObj listenObj,
|
||||
IceHostBasedAuthProc hostBasedAuthProc
|
||||
)
|
||||
{
|
||||
listenObj->host_based_auth_proc = hostBasedAuthProc;
|
||||
}
|
||||
|
||||
@ -40,14 +40,13 @@ in this Software without prior written authorization from The Open Group.
|
||||
|
||||
|
||||
Status
|
||||
IceListenForWellKnownConnections (port, countRet, listenObjsRet, errorLength, errorStringRet)
|
||||
|
||||
char *port;
|
||||
int *countRet;
|
||||
IceListenObj **listenObjsRet;
|
||||
int errorLength;
|
||||
char *errorStringRet;
|
||||
|
||||
IceListenForWellKnownConnections (
|
||||
char *port,
|
||||
int *countRet,
|
||||
IceListenObj **listenObjsRet,
|
||||
int errorLength,
|
||||
char *errorStringRet
|
||||
)
|
||||
{
|
||||
struct _IceListenObj *listenObjs;
|
||||
char *networkId;
|
||||
|
||||
@ -40,28 +40,27 @@ Author: Ralph Mor, X Consortium
|
||||
|
||||
|
||||
Status
|
||||
IceInitThreads ()
|
||||
|
||||
IceInitThreads (
|
||||
void
|
||||
)
|
||||
{
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
IceAppLockConn (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceAppLockConn (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
IceLockConn (iceConn);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
IceAppUnlockConn (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceAppUnlockConn (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
IceUnlockConn (iceConn);
|
||||
}
|
||||
|
||||
@ -49,11 +49,10 @@ Author: Ralph Mor, X Consortium
|
||||
*/
|
||||
|
||||
char *
|
||||
IceAllocScratch (iceConn, size)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long size;
|
||||
|
||||
IceAllocScratch (
|
||||
IceConn iceConn,
|
||||
unsigned long size
|
||||
)
|
||||
{
|
||||
if (!iceConn->scratch || size > iceConn->scratch_size)
|
||||
{
|
||||
@ -74,10 +73,9 @@ unsigned long size;
|
||||
*/
|
||||
|
||||
int
|
||||
IceFlush (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceFlush (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
_IceWrite (iceConn,
|
||||
(unsigned long) (iceConn->outbufptr - iceConn->outbuf),
|
||||
@ -89,20 +87,18 @@ IceConn iceConn;
|
||||
|
||||
|
||||
int
|
||||
IceGetOutBufSize (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceGetOutBufSize (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (iceConn->outbufmax - iceConn->outbuf);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
IceGetInBufSize (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceGetInBufSize (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (iceConn->inbufmax - iceConn->inbuf);
|
||||
}
|
||||
@ -114,70 +110,63 @@ IceConn iceConn;
|
||||
*/
|
||||
|
||||
IceConnectStatus
|
||||
IceConnectionStatus (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceConnectionStatus (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (iceConn->connection_status);
|
||||
}
|
||||
|
||||
|
||||
char *
|
||||
IceVendor (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceVendor (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return strdup(iceConn->vendor);
|
||||
}
|
||||
|
||||
|
||||
char *
|
||||
IceRelease (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceRelease (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return strdup(iceConn->release);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
IceProtocolVersion (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceProtocolVersion (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (_IceVersions[iceConn->my_ice_version_index].major_version);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
IceProtocolRevision (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceProtocolRevision (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (_IceVersions[iceConn->my_ice_version_index].minor_version);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
IceConnectionNumber (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceConnectionNumber (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (_IceTransGetConnectionNumber (iceConn->trans_conn));
|
||||
}
|
||||
|
||||
|
||||
char *
|
||||
IceConnectionString (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceConnectionString (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
if (iceConn->connection_string)
|
||||
{
|
||||
@ -189,30 +178,27 @@ IceConn iceConn;
|
||||
|
||||
|
||||
unsigned long
|
||||
IceLastSentSequenceNumber (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceLastSentSequenceNumber (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (iceConn->send_sequence);
|
||||
}
|
||||
|
||||
|
||||
unsigned long
|
||||
IceLastReceivedSequenceNumber (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceLastReceivedSequenceNumber (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (iceConn->receive_sequence);
|
||||
}
|
||||
|
||||
|
||||
Bool
|
||||
IceSwapping (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceSwapping (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (iceConn->swap);
|
||||
}
|
||||
@ -227,12 +213,11 @@ IceConn iceConn;
|
||||
*/
|
||||
|
||||
Status
|
||||
_IceRead (iceConn, nbytes, ptr)
|
||||
|
||||
register IceConn iceConn;
|
||||
unsigned long nbytes;
|
||||
register char *ptr;
|
||||
|
||||
_IceRead (
|
||||
register IceConn iceConn,
|
||||
unsigned long nbytes,
|
||||
register char *ptr
|
||||
)
|
||||
{
|
||||
register unsigned long nleft;
|
||||
|
||||
@ -327,11 +312,10 @@ register char *ptr;
|
||||
*/
|
||||
|
||||
void
|
||||
_IceReadSkip (iceConn, nbytes)
|
||||
|
||||
register IceConn iceConn;
|
||||
register unsigned long nbytes;
|
||||
|
||||
_IceReadSkip (
|
||||
register IceConn iceConn,
|
||||
register unsigned long nbytes
|
||||
)
|
||||
{
|
||||
char temp[512];
|
||||
|
||||
@ -351,12 +335,11 @@ register unsigned long nbytes;
|
||||
*/
|
||||
|
||||
void
|
||||
_IceWrite (iceConn, nbytes, ptr)
|
||||
|
||||
register IceConn iceConn;
|
||||
unsigned long nbytes;
|
||||
register char *ptr;
|
||||
|
||||
_IceWrite (
|
||||
register IceConn iceConn,
|
||||
unsigned long nbytes,
|
||||
register char *ptr
|
||||
)
|
||||
{
|
||||
register unsigned long nleft;
|
||||
|
||||
@ -427,12 +410,11 @@ register char *ptr;
|
||||
|
||||
#ifdef WORD64
|
||||
|
||||
IceWriteData16 (iceConn, nbytes, data)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long nbytes;
|
||||
short *data;
|
||||
|
||||
IceWriteData16 (
|
||||
IceConn iceConn,
|
||||
unsigned long nbytes,
|
||||
short *data
|
||||
)
|
||||
{
|
||||
int numShorts = nbytes / 2;
|
||||
int index = 0;
|
||||
@ -458,12 +440,11 @@ short *data;
|
||||
}
|
||||
|
||||
|
||||
IceWriteData32 (iceConn, nbytes, data)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long nbytes;
|
||||
int *data;
|
||||
|
||||
IceWriteData32 (
|
||||
IceConn iceConn,
|
||||
unsigned long nbytes,
|
||||
int *data
|
||||
)
|
||||
{
|
||||
int numLongs = nbytes / 4;
|
||||
int index = 0;
|
||||
@ -489,25 +470,23 @@ int *data;
|
||||
}
|
||||
|
||||
|
||||
IceReadData16 (iceConn, swap, nbytes, data)
|
||||
|
||||
IceConn iceConn;
|
||||
Bool swap;
|
||||
unsigned long nbytes;
|
||||
short *data;
|
||||
|
||||
IceReadData16 (
|
||||
IceConn iceConn,
|
||||
Bool swap,
|
||||
unsigned long nbytes,
|
||||
short *data
|
||||
)
|
||||
{
|
||||
/* NOT IMPLEMENTED YET */
|
||||
}
|
||||
|
||||
|
||||
IceReadData32 (iceConn, swap, nbytes, data)
|
||||
|
||||
IceConn iceConn;
|
||||
Bool swap;
|
||||
unsigned long nbytes;
|
||||
int *data;
|
||||
|
||||
IceReadData32 (
|
||||
IceConn iceConn,
|
||||
Bool swap,
|
||||
unsigned long nbytes,
|
||||
int *data
|
||||
)
|
||||
{
|
||||
/* NOT IMPLEMENTED YET */
|
||||
}
|
||||
@ -517,12 +496,11 @@ int *data;
|
||||
|
||||
|
||||
void
|
||||
_IceAddOpcodeMapping (iceConn, hisOpcode, myOpcode)
|
||||
|
||||
IceConn iceConn;
|
||||
int hisOpcode;
|
||||
int myOpcode;
|
||||
|
||||
_IceAddOpcodeMapping (
|
||||
IceConn iceConn,
|
||||
int hisOpcode,
|
||||
int myOpcode
|
||||
)
|
||||
{
|
||||
if (hisOpcode <= 0 || hisOpcode > 255)
|
||||
{
|
||||
|
||||
@ -34,12 +34,11 @@ Author: Ralph Mor, X Consortium
|
||||
#include "ICElibint.h"
|
||||
|
||||
Status
|
||||
IcePing (iceConn, pingReplyProc, clientData)
|
||||
|
||||
IceConn iceConn;
|
||||
IcePingReplyProc pingReplyProc;
|
||||
IcePointer clientData;
|
||||
|
||||
IcePing (
|
||||
IceConn iceConn,
|
||||
IcePingReplyProc pingReplyProc,
|
||||
IcePointer clientData
|
||||
)
|
||||
{
|
||||
_IcePingWait *newping = (_IcePingWait *) malloc (sizeof (_IcePingWait));
|
||||
_IcePingWait *ptr = iceConn->ping_waits;
|
||||
|
||||
@ -124,12 +124,11 @@ Author: Ralph Mor, X Consortium
|
||||
*/
|
||||
|
||||
IceProcessMessagesStatus
|
||||
IceProcessMessages (iceConn, replyWait, replyReadyRet)
|
||||
|
||||
IceConn iceConn;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
Bool *replyReadyRet;
|
||||
|
||||
IceProcessMessages (
|
||||
IceConn iceConn,
|
||||
IceReplyWaitInfo *replyWait,
|
||||
Bool *replyReadyRet
|
||||
)
|
||||
{
|
||||
iceMsg *header;
|
||||
Bool replyReady = False;
|
||||
@ -390,13 +389,12 @@ Bool *replyReadyRet;
|
||||
|
||||
|
||||
static void
|
||||
AuthRequired (iceConn, authIndex, authDataLen, authData)
|
||||
|
||||
IceConn iceConn;
|
||||
int authIndex;
|
||||
int authDataLen;
|
||||
IcePointer authData;
|
||||
|
||||
AuthRequired (
|
||||
IceConn iceConn,
|
||||
int authIndex,
|
||||
int authDataLen,
|
||||
IcePointer authData
|
||||
)
|
||||
{
|
||||
iceAuthRequiredMsg *pMsg;
|
||||
|
||||
@ -418,12 +416,11 @@ IcePointer authData;
|
||||
|
||||
|
||||
static void
|
||||
AuthReply (iceConn, authDataLen, authData)
|
||||
|
||||
IceConn iceConn;
|
||||
int authDataLen;
|
||||
IcePointer authData;
|
||||
|
||||
AuthReply (
|
||||
IceConn iceConn,
|
||||
int authDataLen,
|
||||
IcePointer authData
|
||||
)
|
||||
{
|
||||
iceAuthReplyMsg *pMsg;
|
||||
|
||||
@ -444,12 +441,11 @@ IcePointer authData;
|
||||
|
||||
|
||||
static void
|
||||
AuthNextPhase (iceConn, authDataLen, authData)
|
||||
|
||||
IceConn iceConn;
|
||||
int authDataLen;
|
||||
IcePointer authData;
|
||||
|
||||
AuthNextPhase (
|
||||
IceConn iceConn,
|
||||
int authDataLen,
|
||||
IcePointer authData
|
||||
)
|
||||
{
|
||||
iceAuthNextPhaseMsg *pMsg;
|
||||
|
||||
@ -470,11 +466,10 @@ IcePointer authData;
|
||||
|
||||
|
||||
static void
|
||||
AcceptConnection (iceConn, versionIndex)
|
||||
|
||||
IceConn iceConn;
|
||||
int versionIndex;
|
||||
|
||||
AcceptConnection (
|
||||
IceConn iceConn,
|
||||
int versionIndex
|
||||
)
|
||||
{
|
||||
iceConnectionReplyMsg *pMsg;
|
||||
char *pData;
|
||||
@ -499,15 +494,14 @@ int versionIndex;
|
||||
|
||||
|
||||
static void
|
||||
AcceptProtocol (iceConn, hisOpcode, myOpcode, versionIndex, vendor, release)
|
||||
|
||||
IceConn iceConn;
|
||||
int hisOpcode;
|
||||
int myOpcode;
|
||||
int versionIndex;
|
||||
char *vendor;
|
||||
char *release;
|
||||
|
||||
AcceptProtocol (
|
||||
IceConn iceConn,
|
||||
int hisOpcode,
|
||||
int myOpcode,
|
||||
int versionIndex,
|
||||
char *vendor,
|
||||
char *release
|
||||
)
|
||||
{
|
||||
iceProtocolReplyMsg *pMsg;
|
||||
char *pData;
|
||||
@ -540,10 +534,9 @@ char *release;
|
||||
|
||||
|
||||
static void
|
||||
PingReply (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
PingReply (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
IceSimpleMessage (iceConn, 0, ICE_PingReply);
|
||||
IceFlush (iceConn);
|
||||
@ -552,13 +545,12 @@ IceConn iceConn;
|
||||
|
||||
|
||||
static Bool
|
||||
ProcessError (iceConn, length, swap, replyWait)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
Bool swap;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
|
||||
ProcessError (
|
||||
IceConn iceConn,
|
||||
unsigned long length,
|
||||
Bool swap,
|
||||
IceReplyWaitInfo *replyWait
|
||||
)
|
||||
{
|
||||
int invokeHandler = 0;
|
||||
Bool errorReturned = False;
|
||||
@ -822,12 +814,11 @@ IceReplyWaitInfo *replyWait;
|
||||
|
||||
|
||||
static int
|
||||
ProcessConnectionSetup (iceConn, length, swap)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
Bool swap;
|
||||
|
||||
ProcessConnectionSetup (
|
||||
IceConn iceConn,
|
||||
unsigned long length,
|
||||
Bool swap
|
||||
)
|
||||
{
|
||||
iceConnectionSetupMsg *message;
|
||||
int myVersionCount, hisVersionCount;
|
||||
@ -1077,13 +1068,12 @@ Bool swap;
|
||||
|
||||
|
||||
static Bool
|
||||
ProcessAuthRequired (iceConn, length, swap, replyWait)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
Bool swap;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
|
||||
ProcessAuthRequired (
|
||||
IceConn iceConn,
|
||||
unsigned long length,
|
||||
Bool swap,
|
||||
IceReplyWaitInfo *replyWait
|
||||
)
|
||||
{
|
||||
iceAuthRequiredMsg *message;
|
||||
int authDataLen;
|
||||
@ -1272,12 +1262,11 @@ IceReplyWaitInfo *replyWait;
|
||||
|
||||
|
||||
static int
|
||||
ProcessAuthReply (iceConn, length, swap)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
Bool swap;
|
||||
|
||||
ProcessAuthReply (
|
||||
IceConn iceConn,
|
||||
unsigned long length,
|
||||
Bool swap
|
||||
)
|
||||
{
|
||||
iceAuthReplyMsg *message;
|
||||
int replyDataLen;
|
||||
@ -1568,13 +1557,12 @@ Bool swap;
|
||||
|
||||
|
||||
static Bool
|
||||
ProcessAuthNextPhase (iceConn, length, swap, replyWait)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
Bool swap;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
|
||||
ProcessAuthNextPhase (
|
||||
IceConn iceConn,
|
||||
unsigned long length,
|
||||
Bool swap,
|
||||
IceReplyWaitInfo *replyWait
|
||||
)
|
||||
{
|
||||
iceAuthNextPhaseMsg *message;
|
||||
int authDataLen;
|
||||
@ -1701,13 +1689,12 @@ IceReplyWaitInfo *replyWait;
|
||||
|
||||
|
||||
static Bool
|
||||
ProcessConnectionReply (iceConn, length, swap, replyWait)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
Bool swap;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
|
||||
ProcessConnectionReply (
|
||||
IceConn iceConn,
|
||||
unsigned long length,
|
||||
Bool swap,
|
||||
IceReplyWaitInfo *replyWait
|
||||
)
|
||||
{
|
||||
iceConnectionReplyMsg *message;
|
||||
char *pData, *pStart, *pEnd;
|
||||
@ -1804,12 +1791,11 @@ IceReplyWaitInfo *replyWait;
|
||||
|
||||
|
||||
static int
|
||||
ProcessProtocolSetup (iceConn, length, swap)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
Bool swap;
|
||||
|
||||
ProcessProtocolSetup (
|
||||
IceConn iceConn,
|
||||
unsigned long length,
|
||||
Bool swap
|
||||
)
|
||||
{
|
||||
iceProtocolSetupMsg *message;
|
||||
_IcePaProtocol *myProtocol;
|
||||
@ -2202,13 +2188,12 @@ Bool swap;
|
||||
|
||||
|
||||
static Bool
|
||||
ProcessProtocolReply (iceConn, length, swap, replyWait)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
Bool swap;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
|
||||
ProcessProtocolReply (
|
||||
IceConn iceConn,
|
||||
unsigned long length,
|
||||
Bool swap,
|
||||
IceReplyWaitInfo *replyWait
|
||||
)
|
||||
{
|
||||
iceProtocolReplyMsg *message;
|
||||
char *pData, *pStart, *pEnd;
|
||||
@ -2317,11 +2302,10 @@ IceReplyWaitInfo *replyWait;
|
||||
|
||||
|
||||
static int
|
||||
ProcessPing (iceConn, length)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
|
||||
ProcessPing (
|
||||
IceConn iceConn,
|
||||
unsigned long length
|
||||
)
|
||||
{
|
||||
CHECK_SIZE_MATCH (iceConn, ICE_Ping,
|
||||
length, SIZEOF (icePingMsg), IceFatalToConnection, 0);
|
||||
@ -2334,11 +2318,10 @@ unsigned long length;
|
||||
|
||||
|
||||
static int
|
||||
ProcessPingReply (iceConn, length)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
|
||||
ProcessPingReply (
|
||||
IceConn iceConn,
|
||||
unsigned long length
|
||||
)
|
||||
{
|
||||
CHECK_SIZE_MATCH (iceConn, ICE_PingReply,
|
||||
length, SIZEOF (icePingReplyMsg), IceFatalToConnection, 0);
|
||||
@ -2364,12 +2347,11 @@ unsigned long length;
|
||||
|
||||
|
||||
static int
|
||||
ProcessWantToClose (iceConn, length, connectionClosedRet)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
Bool *connectionClosedRet;
|
||||
|
||||
ProcessWantToClose (
|
||||
IceConn iceConn,
|
||||
unsigned long length,
|
||||
Bool *connectionClosedRet
|
||||
)
|
||||
{
|
||||
*connectionClosedRet = False;
|
||||
|
||||
@ -2424,11 +2406,10 @@ Bool *connectionClosedRet;
|
||||
|
||||
|
||||
static int
|
||||
ProcessNoClose (iceConn, length)
|
||||
|
||||
IceConn iceConn;
|
||||
unsigned long length;
|
||||
|
||||
ProcessNoClose (
|
||||
IceConn iceConn,
|
||||
unsigned long length
|
||||
)
|
||||
{
|
||||
CHECK_SIZE_MATCH (iceConn, ICE_NoClose,
|
||||
length, SIZEOF (iceNoCloseMsg), IceFatalToConnection, 0);
|
||||
@ -2452,18 +2433,16 @@ unsigned long length;
|
||||
|
||||
|
||||
|
||||
void
|
||||
_IceProcessCoreMessage (iceConn, opcode, length, swap,
|
||||
replyWait, replyReadyRet, connectionClosedRet)
|
||||
|
||||
IceConn iceConn;
|
||||
int opcode;
|
||||
unsigned long length;
|
||||
Bool swap;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
Bool *replyReadyRet;
|
||||
Bool *connectionClosedRet;
|
||||
|
||||
static void
|
||||
_IceProcessCoreMessage (
|
||||
IceConn iceConn,
|
||||
int opcode,
|
||||
unsigned long length,
|
||||
Bool swap,
|
||||
IceReplyWaitInfo *replyWait,
|
||||
Bool *replyReadyRet,
|
||||
Bool *connectionClosedRet
|
||||
)
|
||||
{
|
||||
Bool replyReady = False;
|
||||
|
||||
@ -2542,3 +2521,7 @@ Bool *connectionClosedRet;
|
||||
*replyReadyRet = replyReady;
|
||||
}
|
||||
|
||||
int _IceVersionCount = 1;
|
||||
_IceVersion _IceVersions[] = {
|
||||
{IceProtoMajor, IceProtoMinor, _IceProcessCoreMessage}};
|
||||
|
||||
|
||||
@ -36,21 +36,18 @@ Author: Ralph Mor, X Consortium
|
||||
|
||||
|
||||
IceProtocolSetupStatus
|
||||
IceProtocolSetup (iceConn, myOpcode, clientData, mustAuthenticate,
|
||||
majorVersionRet, minorVersionRet, vendorRet, releaseRet,
|
||||
errorLength, errorStringRet)
|
||||
|
||||
IceConn iceConn;
|
||||
int myOpcode;
|
||||
IcePointer clientData;
|
||||
Bool mustAuthenticate;
|
||||
int *majorVersionRet;
|
||||
int *minorVersionRet;
|
||||
char **vendorRet;
|
||||
char **releaseRet;
|
||||
int errorLength;
|
||||
char *errorStringRet;
|
||||
|
||||
IceProtocolSetup (
|
||||
IceConn iceConn,
|
||||
int myOpcode,
|
||||
IcePointer clientData,
|
||||
Bool mustAuthenticate,
|
||||
int *majorVersionRet,
|
||||
int *minorVersionRet,
|
||||
char **vendorRet,
|
||||
char **releaseRet,
|
||||
int errorLength,
|
||||
char *errorStringRet
|
||||
)
|
||||
{
|
||||
iceProtocolSetupMsg *pMsg;
|
||||
char *pData;
|
||||
|
||||
@ -34,19 +34,17 @@ Author: Ralph Mor, X Consortium
|
||||
#include "ICElibint.h"
|
||||
|
||||
int
|
||||
IceRegisterForProtocolSetup (protocolName, vendor, release,
|
||||
versionCount, versionRecs, authCount, authNames, authProcs, IOErrorProc)
|
||||
|
||||
char *protocolName;
|
||||
char *vendor;
|
||||
char *release;
|
||||
int versionCount;
|
||||
IcePoVersionRec *versionRecs;
|
||||
int authCount;
|
||||
char **authNames;
|
||||
IcePoAuthProc *authProcs;
|
||||
IceIOErrorProc IOErrorProc;
|
||||
|
||||
IceRegisterForProtocolSetup (
|
||||
char *protocolName,
|
||||
char *vendor,
|
||||
char *release,
|
||||
int versionCount,
|
||||
IcePoVersionRec *versionRecs,
|
||||
int authCount,
|
||||
const char **authNames,
|
||||
IcePoAuthProc *authProcs,
|
||||
IceIOErrorProc IOErrorProc
|
||||
)
|
||||
{
|
||||
_IcePoProtocol *p;
|
||||
int opcodeRet, i;
|
||||
@ -133,24 +131,20 @@ IceIOErrorProc IOErrorProc;
|
||||
|
||||
|
||||
int
|
||||
IceRegisterForProtocolReply (protocolName, vendor, release,
|
||||
versionCount, versionRecs, authCount, authNames, authProcs,
|
||||
hostBasedAuthProc, protocolSetupProc, protocolActivateProc,
|
||||
IOErrorProc)
|
||||
|
||||
char *protocolName;
|
||||
char *vendor;
|
||||
char *release;
|
||||
int versionCount;
|
||||
IcePaVersionRec *versionRecs;
|
||||
int authCount;
|
||||
char **authNames;
|
||||
IcePaAuthProc *authProcs;
|
||||
IceHostBasedAuthProc hostBasedAuthProc;
|
||||
IceProtocolSetupProc protocolSetupProc;
|
||||
IceProtocolActivateProc protocolActivateProc;
|
||||
IceIOErrorProc IOErrorProc;
|
||||
|
||||
IceRegisterForProtocolReply (
|
||||
char *protocolName,
|
||||
char *vendor,
|
||||
char *release,
|
||||
int versionCount,
|
||||
IcePaVersionRec *versionRecs,
|
||||
int authCount,
|
||||
const char **authNames,
|
||||
IcePaAuthProc *authProcs,
|
||||
IceHostBasedAuthProc hostBasedAuthProc,
|
||||
IceProtocolSetupProc protocolSetupProc,
|
||||
IceProtocolActivateProc protocolActivateProc,
|
||||
IceIOErrorProc IOErrorProc
|
||||
)
|
||||
{
|
||||
_IcePaProtocol *p;
|
||||
int opcodeRet, i;
|
||||
|
||||
@ -35,11 +35,10 @@ Author: Ralph Mor, X Consortium
|
||||
|
||||
|
||||
void
|
||||
_IceAddReplyWait (iceConn, replyWait)
|
||||
|
||||
IceConn iceConn;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
|
||||
_IceAddReplyWait (
|
||||
IceConn iceConn,
|
||||
IceReplyWaitInfo *replyWait
|
||||
)
|
||||
{
|
||||
/*
|
||||
* Add this replyWait to the end of the list (only if the
|
||||
@ -77,11 +76,10 @@ IceReplyWaitInfo *replyWait;
|
||||
|
||||
|
||||
IceReplyWaitInfo *
|
||||
_IceSearchReplyWaits (iceConn, majorOpcode)
|
||||
|
||||
IceConn iceConn;
|
||||
int majorOpcode;
|
||||
|
||||
_IceSearchReplyWaits (
|
||||
IceConn iceConn,
|
||||
int majorOpcode
|
||||
)
|
||||
{
|
||||
/*
|
||||
* Return the first replyWait in the list with the given majorOpcode
|
||||
@ -101,11 +99,10 @@ int majorOpcode;
|
||||
|
||||
|
||||
void
|
||||
_IceSetReplyReady (iceConn, replyWait)
|
||||
|
||||
IceConn iceConn;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
|
||||
_IceSetReplyReady (
|
||||
IceConn iceConn,
|
||||
IceReplyWaitInfo *replyWait
|
||||
)
|
||||
{
|
||||
/*
|
||||
* The replyWait specified has a reply ready.
|
||||
@ -123,11 +120,10 @@ IceReplyWaitInfo *replyWait;
|
||||
|
||||
|
||||
Bool
|
||||
_IceCheckReplyReady (iceConn, replyWait)
|
||||
|
||||
IceConn iceConn;
|
||||
IceReplyWaitInfo *replyWait;
|
||||
|
||||
_IceCheckReplyReady (
|
||||
IceConn iceConn,
|
||||
IceReplyWaitInfo *replyWait
|
||||
)
|
||||
{
|
||||
_IceSavedReplyWait *savedReplyWait = iceConn->saved_reply_waits;
|
||||
_IceSavedReplyWait *prev = NULL;
|
||||
|
||||
@ -60,11 +60,10 @@ IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES] = {0};
|
||||
|
||||
|
||||
void
|
||||
IceSetPaAuthData (numEntries, entries)
|
||||
|
||||
int numEntries;
|
||||
IceAuthDataEntry *entries;
|
||||
|
||||
IceSetPaAuthData (
|
||||
int numEntries,
|
||||
IceAuthDataEntry *entries
|
||||
)
|
||||
{
|
||||
/*
|
||||
* _IcePaAuthDataEntries should really be a linked list.
|
||||
|
||||
@ -37,11 +37,10 @@ Author: Ralph Mor, X Consortium
|
||||
|
||||
|
||||
Status
|
||||
IceProtocolShutdown (iceConn, majorOpcode)
|
||||
|
||||
IceConn iceConn;
|
||||
int majorOpcode;
|
||||
|
||||
IceProtocolShutdown (
|
||||
IceConn iceConn,
|
||||
int majorOpcode
|
||||
)
|
||||
{
|
||||
if (iceConn->proto_ref_count == 0 || iceConn->process_msg_info == NULL ||
|
||||
majorOpcode < 1 || majorOpcode > _IceLastMajorOpcode)
|
||||
@ -87,11 +86,10 @@ int majorOpcode;
|
||||
|
||||
|
||||
void
|
||||
IceSetShutdownNegotiation (iceConn, negotiate)
|
||||
|
||||
IceConn iceConn;
|
||||
Bool negotiate;
|
||||
|
||||
IceSetShutdownNegotiation (
|
||||
IceConn iceConn,
|
||||
Bool negotiate
|
||||
)
|
||||
{
|
||||
iceConn->skip_want_to_close = negotiate ? False : True;
|
||||
}
|
||||
@ -99,10 +97,9 @@ Bool negotiate;
|
||||
|
||||
|
||||
Bool
|
||||
IceCheckShutdownNegotiation (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceCheckShutdownNegotiation (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
return (iceConn->skip_want_to_close ? False : True);
|
||||
}
|
||||
@ -110,10 +107,9 @@ IceConn iceConn;
|
||||
|
||||
|
||||
IceCloseStatus
|
||||
IceCloseConnection (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
IceCloseConnection (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
int refCountReachedZero;
|
||||
IceCloseStatus status;
|
||||
@ -253,10 +249,9 @@ IceConn iceConn;
|
||||
|
||||
|
||||
void
|
||||
_IceFreeConnection (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
_IceFreeConnection (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
if (iceConn->listen_obj == NULL)
|
||||
{
|
||||
|
||||
@ -35,11 +35,10 @@ Author: Ralph Mor, X Consortium
|
||||
|
||||
|
||||
Status
|
||||
IceAddConnectionWatch (watchProc, clientData)
|
||||
|
||||
IceWatchProc watchProc;
|
||||
IcePointer clientData;
|
||||
|
||||
IceAddConnectionWatch (
|
||||
IceWatchProc watchProc,
|
||||
IcePointer clientData
|
||||
)
|
||||
{
|
||||
/*
|
||||
* watchProc will be called each time an ICE connection is
|
||||
@ -94,11 +93,10 @@ IcePointer clientData;
|
||||
|
||||
|
||||
void
|
||||
IceRemoveConnectionWatch (watchProc, clientData)
|
||||
|
||||
IceWatchProc watchProc;
|
||||
IcePointer clientData;
|
||||
|
||||
IceRemoveConnectionWatch (
|
||||
IceWatchProc watchProc,
|
||||
IcePointer clientData
|
||||
)
|
||||
{
|
||||
_IceWatchProc *currWatchProc = _IceWatchProcs;
|
||||
_IceWatchProc *prevWatchProc = NULL;
|
||||
@ -135,10 +133,9 @@ IcePointer clientData;
|
||||
|
||||
|
||||
void
|
||||
_IceConnectionOpened (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
_IceConnectionOpened (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
_IceWatchProc *watchProc = _IceWatchProcs;
|
||||
|
||||
@ -170,10 +167,9 @@ IceConn iceConn;
|
||||
|
||||
|
||||
void
|
||||
_IceConnectionClosed (iceConn)
|
||||
|
||||
IceConn iceConn;
|
||||
|
||||
_IceConnectionClosed (
|
||||
IceConn iceConn
|
||||
)
|
||||
{
|
||||
_IceWatchProc *watchProc = _IceWatchProcs;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user