summaryrefslogtreecommitdiff
path: root/src/process.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/src/process.c b/src/process.c
index 0fdd92b..f9f9938 100644
--- a/src/process.c
+++ b/src/process.c
@@ -526,10 +526,15 @@ AcceptConnection (
pMsg->versionIndex = versionIndex;
- STORE_STRING (pData, IceVendorString);
- STORE_STRING (pData, IceReleaseString);
+ if (pData != NULL) {
+ STORE_STRING (pData, IceVendorString);
+ STORE_STRING (pData, IceReleaseString);
- IceFlush (iceConn);
+ IceFlush (iceConn);
+ } else {
+ SEND_STRING (iceConn, IceVendorString);
+ SEND_STRING (iceConn, IceReleaseString);
+ }
iceConn->connection_status = IceConnectAccepted;
}
@@ -559,10 +564,15 @@ AcceptProtocol (
pMsg->protocolOpcode = myOpcode;
pMsg->versionIndex = versionIndex;
- STORE_STRING (pData, vendor);
- STORE_STRING (pData, release);
+ if (pData != NULL) {
+ STORE_STRING (pData, vendor);
+ STORE_STRING (pData, release);
- IceFlush (iceConn);
+ IceFlush (iceConn);
+ } else {
+ SEND_STRING (iceConn, vendor);
+ SEND_STRING (iceConn, release);
+ }
/*
@@ -2555,4 +2565,3 @@ _IceProcessCoreMessage (
const int _IceVersionCount = 1;
const _IceVersion _IceVersions[] = {
{IceProtoMajor, IceProtoMinor, _IceProcessCoreMessage}};
-