Mercurial > pidgin.yaz

diff src/protocols/zephyr/ZSendPkt.c @ 2419:7ba69b8e0de5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 2432] Salvatore Valente says this is better. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Wed, 03 Oct 2001 19:38:28 +0000
parents 424a40f12a6c
children 08ce2a94d9c7
line wrap: on
line diff
--- a/src/protocols/zephyr/ZSendPkt.c	Wed Oct 03 18:13:50 2001 +0000
+++ b/src/protocols/zephyr/ZSendPkt.c	Wed Oct 03 19:38:28 2001 +0000
@@ -20,7 +20,7 @@
 #include <internal.h>
 #include <sys/socket.h>
 
-static int wait_for_ack();
+static int wait_for_hmack();
 
 Code_t ZSendPacket(packet, len, waitforack)
     char *packet;
@@ -53,7 +53,7 @@
     if ((retval = ZParseNotice(packet, len, &notice)) != ZERR_NONE)
 	return (retval);
     
-    retval = Z_WaitForNotice (&acknotice, wait_for_ack, &notice.z_uid,
+    retval = Z_WaitForNotice (&acknotice, wait_for_hmack, &notice.z_uid,
 			      HM_TIMEOUT);
     if (retval == ETIMEDOUT)
       return ZERR_HMDEAD;
@@ -62,12 +62,9 @@
     return retval;
 }
 
-static int wait_for_ack(notice, uid)
+static int wait_for_hmack(notice, uid)
     ZNotice_t *notice;
     ZUnique_Id_t *uid;
 {
-  return (ZCompareUID(&notice->z_uid, uid) &&
-	  (notice->z_kind == HMACK     ||
-	   notice->z_kind == SERVACK   ||
-	   notice->z_kind == CLIENTACK ));
+    return (notice->z_kind == HMACK && ZCompareUID(&notice->z_uid, uid));
 }