diff options
| author | tick <tick@99fdad57-331a-0410-800a-d7fa5415bdb3> | 2007-11-20 04:17:35 +0000 |
|---|---|---|
| committer | tick <tick@99fdad57-331a-0410-800a-d7fa5415bdb3> | 2007-11-20 04:17:35 +0000 |
| commit | 6ad8e1931d2df52ff173e4b83a5c3c0e1812b931 (patch) | |
| tree | 48dc9cbaf6e424eb8ee818873623498b20fc8a53 /src | |
| parent | 5e9fde8743d4d3d733303bef99e20000c0769148 (diff) | |
[gsmd] Adding atcmd_terminate_matching (remove from the queues any command whose .ctx matches given)(Andrzej Zaborowski)
git-svn-id: http://svn.openmoko.org/trunk/src/target/gsm@3447 99fdad57-331a-0410-800a-d7fa5415bdb3
Diffstat (limited to 'src')
| -rw-r--r-- | src/gsmd/atcmd.c | 27 | ||||
| -rw-r--r-- | src/gsmd/usock.c | 4 |
2 files changed, 30 insertions, 1 deletions
diff --git a/src/gsmd/atcmd.c b/src/gsmd/atcmd.c index 747000b..2b5825a 100644 --- a/src/gsmd/atcmd.c +++ b/src/gsmd/atcmd.c @@ -719,3 +719,30 @@ int atcmd_init(struct gsmd *g, int sockfd) return gsmd_register_fd(&g->gfd_uart); } + +/* remove from the queues any command whose .ctx matches given */ +int atcmd_terminate_matching(struct gsmd *g, void *ctx) +{ + int num = 0; + struct gsmd_atcmd *cmd, *pos; + + llist_for_each_entry_safe(cmd, pos, &g->busy_atcmds, list) + if (cmd->ctx == ctx) { + cmd->ret = -ESHUTDOWN; + cmd->cb(cmd, cmd->ctx, "ERROR"); + cmd->cb = NULL; + cmd->ctx = NULL; + num ++; + } + + llist_for_each_entry_safe(cmd, pos, &g->pending_atcmds, list) + if (cmd->ctx == ctx) { + llist_del(&cmd->list); + cmd->ret = -ESHUTDOWN; + cmd->cb(cmd, cmd->ctx, "ERROR"); + talloc_free(cmd); + num ++; + } + + return num; +} diff --git a/src/gsmd/usock.c b/src/gsmd/usock.c index 6b29125..3dc74d3 100644 --- a/src/gsmd/usock.c +++ b/src/gsmd/usock.c @@ -1205,9 +1205,11 @@ static int gsmd_usock_user_cb(int fd, unsigned int what, void *data) /* EOF, this client has just vanished */ gsmd_unregister_fd(&gu->gfd); close(fd); + /* finish pending atcmd's from this client thus + * destroying references to the user structure. */ + atcmd_terminate_matching(gu->gsmd, gu); /* destroy whole user structure */ llist_del(&gu->list); - /* FIXME: delete busy ucmds from finished_ucmds */ talloc_free(gu); return 0; } else if (rcvlen < 0) |