From: Santiago Carot-Nemesio <sancane@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Santiago Carot-Nemesio <sancane@gmail.com>
Subject: [PATCH 49/60] Restore state in MCL whenever an error takes place.
Date: Thu, 22 Jul 2010 10:58:06 +0200 [thread overview]
Message-ID: <1279789097-2420-1-git-send-email-sancane@gmail.com> (raw)
In-Reply-To: <1279789001-4587-30-git-send-email-santoscadenas@gmail.com>
---
mcap/mcap.c | 55 +++++++++++++++++++++++--------------------------------
1 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/mcap/mcap.c b/mcap/mcap.c
index 434d50f..e8a93a1 100644
--- a/mcap/mcap.c
+++ b/mcap/mcap.c
@@ -241,8 +241,7 @@ static gint cmp_mdl_state(gconstpointer a, gconstpointer b)
return 1;
}
-static void mcap_notify_error(struct mcap_mcl *mcl, GError *err,
- gboolean restore)
+static void mcap_notify_error(struct mcap_mcl *mcl, GError *err)
{
struct mcap_mdl_op_cb *con = mcl->priv_data;
struct mcap_mdl *mdl;
@@ -254,44 +253,36 @@ static void mcap_notify_error(struct mcap_mcl *mcl, GError *err,
switch (mcl->lcmd[0]){
case MCAP_MD_CREATE_MDL_REQ:
- if (restore) {
- st = MDL_WAITING;
- l = g_slist_find_custom(mcl->mdls, &st, cmp_mdl_state);
- mdl = l->data;
- mcl->mdls = g_slist_remove(mcl->mdls, mdl);
- g_free(mdl);
- update_mcl_state(mcl);
- }
+ st = MDL_WAITING;
+ l = g_slist_find_custom(mcl->mdls, &st, cmp_mdl_state);
+ mdl = l->data;
+ mcl->mdls = g_slist_remove(mcl->mdls, mdl);
+ g_free(mdl);
+ update_mcl_state(mcl);
con->cb.op_conf(NULL, 0, err, con->user_data);
break;
case MCAP_MD_ABORT_MDL_REQ:
- if (restore) {
- st = MDL_WAITING;
- l = g_slist_find_custom(mcl->mdls, &st, cmp_mdl_state);
- shutdown_mdl(l->data);
- update_mcl_state(mcl);
- }
+ st = MDL_WAITING;
+ l = g_slist_find_custom(mcl->mdls, &st, cmp_mdl_state);
+ shutdown_mdl(l->data);
+ update_mcl_state(mcl);
con->cb.del(err, con->user_data);
break;
case MCAP_MD_DELETE_MDL_REQ:
- if (restore) {
- for (l = mcl->mdls; l; l = l->next) {
- mdl = l->data;
- if (mdl->state == MDL_DELETING)
- mdl->state = (mdl->dc) ? MDL_CONNECTED :
+ for (l = mcl->mdls; l; l = l->next) {
+ mdl = l->data;
+ if (mdl->state == MDL_DELETING)
+ mdl->state = (mdl->dc) ? MDL_CONNECTED :
MDL_CLOSED;
- }
- update_mcl_state(mcl);
}
+ update_mcl_state(mcl);
con->cb.del(err, con->user_data);
break;
case MCAP_MD_RECONNECT_MDL_REQ:
- if (restore) {
- st = MDL_WAITING;
- l = g_slist_find_custom(mcl->mdls, &st, cmp_mdl_state);
- shutdown_mdl(l->data);
- update_mcl_state(mcl);
- }
+ st = MDL_WAITING;
+ l = g_slist_find_custom(mcl->mdls, &st, cmp_mdl_state);
+ shutdown_mdl(l->data);
+ update_mcl_state(mcl);
con->cb.op(NULL, err, con->user_data);
break;
}
@@ -446,7 +437,7 @@ static gboolean wait_response_timer(gpointer data)
g_set_error(&gerr, MCAP_ERROR, MCAP_ERROR_FAILED,
"Timeout waiting response");
- mcap_notify_error(mcl, gerr, FALSE);
+ mcap_notify_error(mcl, gerr);
g_error_free(gerr);
mcl->ms->mcl_disconnected_cb(mcl, mcl->ms->user_data);
@@ -1551,7 +1542,7 @@ static void proc_cmd(struct mcap_mcl *mcl, uint8_t *cmd, uint32_t len)
mcl->req = MCL_AVAILABLE;
g_set_error(&gerr, MCAP_ERROR, MCAP_ERROR_REQ_IGNORED,
"Initiator sent a request with more priority");
- mcap_notify_error(mcl, gerr, TRUE);
+ mcap_notify_error(mcl, gerr);
return;
}
proc_response(mcl, cmd, len);
@@ -1665,7 +1656,7 @@ fail:
/* notify error in pending callback */
g_set_error(&gerr, MCAP_ERROR, MCAP_ERROR_MCL_CLOSED,
"MCL closed");
- mcap_notify_error(mcl, gerr, TRUE);
+ mcap_notify_error(mcl, gerr);
g_error_free(gerr);
}
mcl->ms->mcl_disconnected_cb(mcl, mcl->ms->user_data);
--
1.6.3.3
next prev parent reply other threads:[~2010-07-22 8:58 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-22 8:51 MCAP Patches Santiago Carot-Nemesio
2010-07-22 8:51 ` [PATCH 01/60] Initial support for MCAP Santiago Carot-Nemesio
2010-07-22 8:51 ` [PATCH 02/60] Initial work to create MCAP instances Santiago Carot-Nemesio
2010-07-22 8:51 ` [PATCH 03/60] Initial work to process incomming connection of MCLs Santiago Carot-Nemesio
2010-07-22 8:51 ` [PATCH 04/60] Process events over Control Channels Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 05/60] Save and restore state of MCLs Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 06/60] Release MCAP instances Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 07/60] Process md_create_mdl_req in CONNECTED state Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 08/60] Process md_reconnect_mdl_req " Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 09/60] Process md_delete_mdl_req " Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 10/60] Process md_abort_mdl_req in PENDING state Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 11/60] Process commands in ACTIVE state Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 12/60] Managing connection of Data Channels Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 13/60] Enable connect operation to a remote MCAP instances Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 14/60] Implement set callbacks operation over MCLs Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 15/60] Implement function to send md_create_mdl_req Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 16/60] Implement function to send md_reconnect_mdl_req Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 17/60] Implement function to send md_delete_mdl_req Santiago Carot-Nemesio
2010-07-22 8:52 ` [PATCH 18/60] Implement function to send md_abort_mdl_req Santiago Carot-Nemesio
2010-07-22 8:56 ` [PATCH 19/60] Process response to std. op. codes Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 20/60] Process md_create_mdl_rsp Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 21/60] Process md_reconnect_mdl_rsp Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 22/60] Process md_abort_mdl_rsp Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 23/60] Process md_delete_mdl_rsp Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 24/60] Enable connection of Data Channel with remote MCAP instances Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 25/60] Initial support for clock synchronization protocol Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 26/60] Free memory when a unref operation happens over a cached MCL Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 27/60] Fix wrong response code rejecting reconnections Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 28/60] Solve a non initialized memory segmentation fault Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 29/60] Fix missed state transition in MCAP Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 30/60] Fix missed state transition in MCAP on reconnections Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 31/60] Fix MCAP bug processing responses Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 32/60] Fix MCL transitions when responses are not success Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 33/60] Change error messagge Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 34/60] Add macro to get minimum command length for respones Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 35/60] Remove magic number to check commands of 5 Bytes Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 36/60] Set MDL to closed when abort operation takes place Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 37/60] Remove MDL when delete operation fails with INVALID_MDL response code Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 38/60] Don't delete aborted MDLS Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 39/60] Fix double memory free on simultaneus deletion of MDLs Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 40/60] Fix memory leak when double deletion happens and response code isn't SUCCESS Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 41/60] Solve a bug when both sides request a creation of data channel with the same mdlid Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 42/60] Move assignment of data channel configuration Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 43/60] Acceptor should not resend commands Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 44/60] Restore state after INITIATOR ignore a request Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 45/60] Fix double reconnection problem using the same mdlid Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 46/60] Process received command in base to previous request sent Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 47/60] Random generation of first mdlid used as based to create data channels Jose Antonio Santos Cadenas
2010-07-22 8:56 ` [PATCH 48/60] Notify MCL closed when there is a pending callback Jose Antonio Santos Cadenas
2010-07-22 8:58 ` Santiago Carot-Nemesio [this message]
2010-07-22 8:58 ` [PATCH 50/60] Check control channel before calling to g_io_channel_unix_get_fd Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 51/60] Change name for callback used to report status of delete and abort operations Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 52/60] Avoid double insertion of the same MDL in an MCL Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 53/60] Send error response when an unknown command is received Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 54/60] Set MDL state to closed when a connection failed Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 55/60] Change the get_addres function to match with other bluez functions Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 56/60] Use a generic function to send commands with variable parameters Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 57/60] Set Gerror at the end of the output paremeters list Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 58/60] Return a proper UNIX error instead of -1 in mcap_mdl_get_fd Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 59/60] Remove "req" word from MCAP API Santiago Carot-Nemesio
2010-07-22 8:58 ` [PATCH 60/60] Change variable name for MCAP Instances Santiago Carot-Nemesio
2010-07-22 23:37 ` [PATCH 29/60] Fix missed state transition in MCAP Gustavo F. Padovan
2010-07-22 23:40 ` Gustavo F. Padovan
2010-07-22 23:31 ` [PATCH 27/60] Fix wrong response code rejecting reconnections Gustavo F. Padovan
2010-07-23 0:09 ` [PATCH 19/60] Process response to std. op. codes Gustavo F. Padovan
2010-07-23 0:07 ` [PATCH 18/60] Implement function to send md_abort_mdl_req Gustavo F. Padovan
2010-07-23 9:24 ` Santiago Carot-Nemesio
2010-07-23 18:07 ` Gustavo F. Padovan
2010-07-22 23:47 ` [PATCH 16/60] Implement function to send md_reconnect_mdl_req Gustavo F. Padovan
2010-07-23 9:49 ` Santiago Carot-Nemesio
2010-07-23 9:58 ` Johan Hedberg
2010-07-23 10:31 ` Luiz Augusto von Dentz
2010-07-23 10:44 ` José Antonio Santos Cadenas
2010-07-23 11:30 ` Elvis Pfützenreuter
2010-07-23 17:17 ` Santiago Carot-Nemesio
2010-07-23 18:05 ` Gustavo F. Padovan
2010-07-23 18:01 ` Gustavo F. Padovan
2010-07-22 23:54 ` [PATCH 12/60] Managing connection of Data Channels Gustavo F. Padovan
2010-07-23 9:23 ` Santiago Carot-Nemesio
2010-07-22 23:50 ` [PATCH 10/60] Process md_abort_mdl_req in PENDING state Gustavo F. Padovan
2010-07-23 8:00 ` Santiago Carot-Nemesio
2010-07-22 23:36 ` MCAP Patches Gustavo F. Padovan
2010-07-23 8:25 ` José Antonio Santos Cadenas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1279789097-2420-1-git-send-email-sancane@gmail.com \
--to=sancane@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).