Merged silc_1_0_branch to trunk.

[silc.git] / lib / silccore / silcpacket.h

diff --git a/lib/silccore/silcpacket.h b/lib/silccore/silcpacket.h
index 7d62a3b4210b754cada5dda1c3e50499ecad33ec..2288208323e7bf60c369ebb2ab4ea094325bf092 100644 (file)
--- a/lib/silccore/silcpacket.h
+++ b/lib/silccore/silcpacket.h
@@ -332,10 +332,10 @@ typedef bool (*SilcPacketParserCallback)(SilcPacketParserContext
  *
  * SOURCE
  */
-#define SILC_PACKET_LENGTH(__packet, __ret_truelen, __ret_paddedlen)   \
-do {                                                                   \
-  SILC_GET16_MSB((__ret_truelen), (__packet)->data);                   \
-  (__ret_paddedlen) = (__ret_truelen) + (__packet)->data[4];           \
+#define SILC_PACKET_LENGTH(__packetdata, __ret_truelen, __ret_paddedlen) \
+do {                                                                    \
+  SILC_GET16_MSB((__ret_truelen), (__packetdata));                      \
+  (__ret_paddedlen) = (__ret_truelen) + (SilcUInt8)(__packetdata)[4];   \
 } while(0)
 /***/
 
@@ -375,12 +375,12 @@ do {                                                                      \
  *
  * SOURCE
  */
-#define SILC_PACKET_PADLEN(__packetlen, __blocklen, __padlen)             \
-do {                                                                      \
-  __padlen = (SILC_PACKET_DEFAULT_PADLEN - (__packetlen) %                \
-             ((__blocklen) ? (__blocklen) : SILC_PACKET_DEFAULT_PADLEN)); \
-  if (__padlen < 8)                                                       \
-    __padlen = ((__blocklen) ? (__blocklen) : SILC_PACKET_DEFAULT_PADLEN); \
+#define SILC_PACKET_PADLEN(__packetlen, __blocklen, __padlen)              \
+do {                                                                       \
+  __padlen = (SILC_PACKET_DEFAULT_PADLEN - (__packetlen) %                 \
+             ((__blocklen) ? (__blocklen) : SILC_PACKET_DEFAULT_PADLEN));  \
+  if (__padlen < 8)                                                        \
+    __padlen += ((__blocklen) ? (__blocklen) : SILC_PACKET_DEFAULT_PADLEN); \
 } while(0)
 /***/
 
@@ -536,6 +536,7 @@ int silc_packet_receive(SilcSocketConnection sock);
  *    bool silc_packet_receive_process(SilcSocketConnection sock,
  *                                     bool local_is_router,
  *                                     SilcCipher cipher, SilcHmac hmac,
+ *                                     SilcUInt32 sequence,
  *                                     SilcPacketParserCallback parser,
  *                                     void *parser_context);
  *