[gvfs] afp: use a separate request id counter for tickle requests

[Carl-Anton Ingmarsson <carlantoni src gnome org>]

commit dcb68914ca9464dc41af1e0f0262cd9582b3d4ec
Author: Carl-Anton Ingmarsson <ca ingmarsson gmail com>
Date:   Thu Aug 9 22:10:02 2012 +0200

    afp: use a separate request id counter for tickle requests

 daemon/gvfsafpconnection.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gvfsafpconnection.c b/daemon/gvfsafpconnection.c
index f4da0a8..4e059e7 100644
--- a/daemon/gvfsafpconnection.c
+++ b/daemon/gvfsafpconnection.c
@@ -634,6 +634,7 @@ struct _GVfsAfpConnectionPrivate
   volatile gint atomic_state;
   
   guint16 request_id;
+  guint16 tickle_id;
 
   guint32 kRequestQuanta;
   guint32 kServerReplayCacheSize;
@@ -835,6 +836,14 @@ get_request_id (GVfsAfpConnection *afp_connection)
   return priv->request_id++;
 }
 
+static guint16
+get_tickle_id (GVfsAfpConnection *afp_connection)
+{
+  GVfsAfpConnectionPrivate *priv = afp_connection->priv;
+
+  return priv->tickle_id++;
+}
+
 typedef struct
 {
   void         *buffer;
@@ -1374,7 +1383,7 @@ send_request_unlocked (GVfsAfpConnection *afp_connection)
     case REQUEST_TYPE_TICKLE:
       priv->write_dsi_header.flags = 0x00;
       priv->write_dsi_header.command = DSI_TICKLE;
-      priv->write_dsi_header.requestID = GUINT16_TO_BE (get_request_id (afp_connection));
+      priv->write_dsi_header.requestID = GUINT16_TO_BE (get_tickle_id (afp_connection));
       priv->write_dsi_header.writeOffset = 0;
       priv->write_dsi_header.totalDataLength = 0;
       priv->write_dsi_header.reserved = 0;