Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp5290193ybl; Tue, 10 Dec 2019 03:41:57 -0800 (PST) X-Google-Smtp-Source: APXvYqzAcw4tuKRK1ejJ7Tj2SQQA4WSJjo4OVlEO/7ABAsMHyv++pjs3ydv8IJyPPumLZBVdKJ1f X-Received: by 2002:aca:ab85:: with SMTP id u127mr3455532oie.96.1575978117407; Tue, 10 Dec 2019 03:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575978117; cv=none; d=google.com; s=arc-20160816; b=j4RUdHBRMUMr65sVYElaLPduCtW8SlclSntrFhGaRX8Dx7T2fkhNLt1eUd0jIqHpLU GTirHjTkXXsE8QWk+NGrCM7rhs/v9YEv0nIss+aUzGSWYejA5cN1yhH6yCMdEaiPgy01 +NXjEGSfPsuS9/O2i+XOx7VJc3oQiFRtsaT+Ek2MWKyBfdxiGrAOnN7wO5mWOElf5wwl TKaQASzp119yK9Grg0hyRELn5qguOYZf/9y/Bs3o6p8bteo5Cqp0yD3LtfipSFaosx81 xNG/S6lJG687aR8jt3y2WJzwLYEq6J0SBtb0TWv67AZaYfkFEcmPVqLBtGcvXEH+NlpO QH1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:to:from; bh=Rn8WEwoePbnyr9qT7qIXjnJ+75bR+QEZHVXLqST4uzs=; b=DOhQAr1JeHXLHV21LDYRksE8JRQmctu1FGoSV0AIuJSUubvmAgqAq0vdj/gjXgykAq 3mlnLyYqWmEGg5PUnKOLqn5MJeItxlaXV+DIllnq753DRqlw02ww2emFgu72obCHVD09 FXz+DxtZ6wHDlbBWtOJmF3wGVAYNrhqmyRYKlFeV9fQIi9yZ438fgvRBhbfBsDM/qHFm gleYZ1mSObsY5S+ebawJYZRq6W3jK/NXE+GL85xz/4ETQGGEpohVetH2sOoNlSHe2X0z WEuDypRoAHhUe10R6W1fdHrxfbg58DekNRa/qi4HRjgHqypDPtg6GbmrzEYNSfOyJwfR X0/g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v25si1623911oth.136.2019.12.10.03.41.46; Tue, 10 Dec 2019 03:41:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727325AbfLJLl2 (ORCPT + 99 others); Tue, 10 Dec 2019 06:41:28 -0500 Received: from mga07.intel.com ([134.134.136.100]:28849 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727564AbfLJLl1 (ORCPT ); Tue, 10 Dec 2019 06:41:27 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Dec 2019 03:41:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,299,1571727600"; d="scan'208";a="210420817" Received: from unknown (HELO ajay-desktop.iind.intel.com) ([10.223.96.133]) by fmsmga008.fm.intel.com with ESMTP; 10 Dec 2019 03:41:26 -0800 From: Ajay Kishore To: linux-bluetooth@vger.kernel.org Subject: [PATCH 5/5] obexd: Handle MAP Event Report v1.1 and v1.2 Date: Tue, 10 Dec 2019 16:47:01 +0530 Message-Id: <1575976621-11019-5-git-send-email-ajay.kishore@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1575976621-11019-1-git-send-email-ajay.kishore@intel.com> References: <1575976621-11019-1-git-send-email-ajay.kishore@intel.com> Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Changes made to add handler function for the corresponding events mentioned in extended event reports 1.1 and 1.2. Signed-off-by: Ajay Kishore --- obexd/client/map-event.h | 8 +++++++- obexd/client/map.c | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/obexd/client/map-event.h b/obexd/client/map-event.h index 5414b26..c41bb67 100644 --- a/obexd/client/map-event.h +++ b/obexd/client/map-event.h @@ -32,7 +32,13 @@ enum map_event_type { MAP_ET_MEMORY_FULL, MAP_ET_MEMORY_AVAILABLE, MAP_ET_MESSAGE_DELETED, - MAP_ET_MESSAGE_SHIFT + MAP_ET_MESSAGE_SHIFT, + MAP_ET_READ_STATUS_CHANGED, + MAP_ET_MESSAGE_REMOVED, + MAP_ET_MESSAGE_EXTENDED_DATA_CHANGED, + MAP_ET_PARTICIPANT_PRESENCE_CHANGED, + MAP_ET_PARTICIPANT_CHAT_STATE_CHANGED, + MAP_ET_CONVERSATION_CHANGED }; struct map_event { diff --git a/obexd/client/map.c b/obexd/client/map.c index b65131a..b1b4b38 100644 --- a/obexd/client/map.c +++ b/obexd/client/map.c @@ -2550,6 +2550,17 @@ static void map_handle_folder_changed(struct map_data *map, "Folder"); } +static void map_handle_remove_message(struct map_data *map, + struct map_event *event) +{ + struct map_msg *msg; + + msg = g_hash_table_lookup(map->messages, &event->handle); + + if (msg) + g_hash_table_remove(map->messages, &event->handle); +} + static void map_handle_notification(struct map_event *event, void *user_data) { struct map_data *map = user_data; @@ -2582,6 +2593,19 @@ static void map_handle_notification(struct map_event *event, void *user_data) case MAP_ET_MESSAGE_SHIFT: map_handle_folder_changed(map, event, event->folder); break; + case MAP_ET_READ_STATUS_CHANGED: + map_handle_status_changed(map, event, "read"); + break; + case MAP_ET_MESSAGE_REMOVED: + map_handle_remove_message(map, event); + break; + case MAP_ET_MESSAGE_EXTENDED_DATA_CHANGED: + map_handle_status_changed(map, event, + "message-extended-data-changed"); + break; + case MAP_ET_PARTICIPANT_PRESENCE_CHANGED: + case MAP_ET_PARTICIPANT_CHAT_STATE_CHANGED: + case MAP_ET_CONVERSATION_CHANGED: case MAP_ET_MEMORY_FULL: case MAP_ET_MEMORY_AVAILABLE: default: -- 2.7.4