diff options
author | Alfred E. Heggestad <aeh@db.org> | 2015-11-22 17:10:32 +0100 |
---|---|---|
committer | Alfred E. Heggestad <aeh@db.org> | 2015-11-22 17:10:32 +0100 |
commit | d4aa343472e0ea59e74907afa04a0afb07482d93 (patch) | |
tree | 455891257da0f6d73d31c6c29b98c799fb88d74f /modules/presence | |
parent | fe6edee8d7b76b98c41a3792c143a8656af46b52 (diff) |
ua: add event UA_EVENT_SHUTDOWN
- this event is sent when the uag is shutting down
- modules can subscribe to this event to check when the
shutdown sequence has started
- presence,mwi: add usage of SHUTDOWN event and add 500ms delay
fixes #30
https://github.com/alfredh/baresip/issues/30
Diffstat (limited to 'modules/presence')
-rw-r--r-- | modules/presence/presence.c | 27 | ||||
-rw-r--r-- | modules/presence/presence.h | 1 | ||||
-rw-r--r-- | modules/presence/subscriber.c | 47 |
3 files changed, 74 insertions, 1 deletions
diff --git a/modules/presence/presence.c b/modules/presence/presence.c index 8b706dc..fd31790 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -52,6 +52,21 @@ static const struct cmd cmdv[] = { }; +static void event_handler(struct ua *ua, enum ua_event ev, + struct call *call, const char *prm, void *arg) +{ + debug("presence: ua=%p got event %d (%s)\n", ua, ev, + uag_event_str(ev)); + + if (ev == UA_EVENT_SHUTDOWN) { + + publisher_close(); + notifier_close(); + subscriber_close_all(); + } +} + + static int module_init(void) { int err; @@ -68,12 +83,22 @@ static int module_init(void) if (err) return err; - return cmd_register(cmdv, ARRAY_SIZE(cmdv)); + err = cmd_register(cmdv, ARRAY_SIZE(cmdv)); + if (err) + return err; + + err = uag_event_register(event_handler, NULL); + if (err) + return err; + + return err; } static int module_close(void) { + uag_event_unregister(event_handler); + cmd_unregister(cmdv); publisher_close(); diff --git a/modules/presence/presence.h b/modules/presence/presence.h index 54fcaac..75d8e48 100644 --- a/modules/presence/presence.h +++ b/modules/presence/presence.h @@ -6,6 +6,7 @@ int subscriber_init(void); void subscriber_close(void); +void subscriber_close_all(void); int notifier_init(void); diff --git a/modules/presence/subscriber.c b/modules/presence/subscriber.c index 66c15a2..9cc84b1 100644 --- a/modules/presence/subscriber.c +++ b/modules/presence/subscriber.c @@ -24,6 +24,8 @@ struct presence { enum presence_status status; unsigned failc; struct contact *contact; + struct ua *ua; + bool shutdown; }; static struct list presencel; @@ -81,6 +83,9 @@ static void notify_handler(struct sip *sip, const struct sip_msg *msg, const struct sip_hdr *type_hdr, *length_hdr; struct pl pl; + if (pres->shutdown) + goto done; + pres->failc = 0; type_hdr = sip_msg_hdr(msg, SIP_HDR_CONTENT_TYPE); @@ -138,6 +143,9 @@ done: (void)sip_treply(NULL, sip, msg, 200, "OK"); contact_set_presence(pres->contact, status); + + if (pres->shutdown) + pres = mem_deref(pres); } @@ -177,10 +185,20 @@ static void destructor(void *arg) { struct presence *pres = arg; + debug("presence: subscriber destroyed\n"); + list_unlink(&pres->le); tmr_cancel(&pres->tmr); mem_deref(pres->contact); mem_deref(pres->sub); + mem_deref(pres->ua); +} + + +static void deref_handler(void *arg) +{ + struct mwi *mwi = arg; + mem_deref(mwi); } @@ -205,6 +223,9 @@ static int subscribe(struct presence *pres) return ENOENT; } + mem_deref(pres->ua); + pres->ua = mem_ref(ua); + pl_strcpy(&contact_addr(pres->contact)->auri, uri, sizeof(uri)); routev[0] = ua_outbound(ua); @@ -282,3 +303,29 @@ void subscriber_close(void) { list_flush(&presencel); } + + +void subscriber_close_all(void) +{ + struct le *le; + + info("presence: subscriber: closing %u subs\n", + list_count(&presencel)); + + le = presencel.head; + while (le) { + + struct presence *pres = le->data; + le = le->next; + + debug("presence: shutdown: sub=%p\n", pres->sub); + + pres->shutdown = true; + if (pres->sub) { + pres->sub = mem_deref(pres->sub); + tmr_start(&pres->tmr, 500, deref_handler, pres); + } + else + mem_deref(pres); + } +} |