From 51d500c4d2fc23c63caf79530268ea9c587e3e95 Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Sun, 16 May 2010 23:31:16 +0200 Subject: [PATCH] filetransfer: fixes after previous commits --- src/core/sipe-ft.c | 6 ++---- src/purple/purple-ft.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/sipe-ft.c b/src/core/sipe-ft.c index 5bc604c4..6f222035 100644 --- a/src/core/sipe-ft.c +++ b/src/core/sipe-ft.c @@ -262,7 +262,6 @@ void sipe_core_ft_deallocate(struct sipe_file_transfer *ft) g_hash_table_remove(ft_private->sipe_private->filetransfers, ft_private->invitation_cookie); - sipe_ft_deallocate(ft); } void sipe_core_ft_cancel(struct sipe_file_transfer *ft) @@ -411,7 +410,6 @@ gboolean sipe_core_ft_incoming_stop(struct sipe_file_transfer *ft) static const guchar BYE[] = "BYE 16777989\r\n"; const gsize BUFFER_SIZE = 50; const gsize MAC_OFFSET = 4; - const gsize CRLF_LEN = 2; struct sipe_file_transfer_private *ft_private = SIPE_FILE_TRANSFER_PRIVATE; gchar buffer[BUFFER_SIZE]; @@ -430,14 +428,14 @@ gboolean sipe_core_ft_incoming_stop(struct sipe_file_transfer *ft) } mac_len = strlen(buffer); - if (mac_len < (MAC_OFFSET + CRLF_LEN)) { + if (mac_len < (MAC_OFFSET)) { raise_ft_error_and_cancel(ft_private, _("Received MAC is corrupted")); return FALSE; } /* Check MAC */ - mac = g_strndup(buffer + MAC_OFFSET, mac_len - MAC_OFFSET - CRLF_LEN); + mac = g_strndup(buffer + MAC_OFFSET, mac_len - MAC_OFFSET); mac1 = sipe_hmac_finalize(ft_private->hmac_context); if (!sipe_strequal(mac, mac1)) { g_free(mac1); diff --git a/src/purple/purple-ft.c b/src/purple/purple-ft.c index 3b75d24d..85d9df46 100644 --- a/src/purple/purple-ft.c +++ b/src/purple/purple-ft.c @@ -220,7 +220,7 @@ sipe_ft_outgoing_start(PurpleXfer *xfer) static void sipe_ft_outgoing_stop(PurpleXfer *xfer) { - if (sipe_core_ft_incoming_stop(PURPLE_XFER_TO_SIPE_FILE_TRANSFER)) { + if (sipe_core_ft_outgoing_stop(PURPLE_XFER_TO_SIPE_FILE_TRANSFER)) { /* We're done with this transfer */ sipe_ft_free_xfer_struct(xfer); } -- 2.11.4.GIT