diff options
Diffstat (limited to 'pjsip/src/pjsua-lib')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_im.c | 29 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_pres.c | 4 |
2 files changed, 29 insertions, 4 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_im.c b/pjsip/src/pjsua-lib/pjsua_im.c index f993ff90..065999fc 100644 --- a/pjsip/src/pjsua-lib/pjsua_im.c +++ b/pjsip/src/pjsua-lib/pjsua_im.c @@ -191,6 +191,21 @@ void pjsua_im_process_pager(int call_id, const pj_str_t *from, is_typing); } + if (pjsua_var.ua_cfg.cb.on_typing2) { + pjsua_acc_id acc_id; + + if (call_id == PJSUA_INVALID_ID) { + acc_id = pjsua_acc_find_for_incoming(rdata); + } else { + pjsua_call *call = &pjsua_var.calls[call_id]; + acc_id = call->acc_id; + } + + + (*pjsua_var.ua_cfg.cb.on_typing2)(call_id, from, to, &contact, + is_typing, rdata, acc_id); + } + } else { pj_str_t mime_type; char buf[256]; @@ -219,8 +234,18 @@ void pjsua_im_process_pager(int call_id, const pj_str_t *from, } if (pjsua_var.ua_cfg.cb.on_pager2) { + pjsua_acc_id acc_id; + + if (call_id == PJSUA_INVALID_ID) { + acc_id = pjsua_acc_find_for_incoming(rdata); + } else { + pjsua_call *call = &pjsua_var.calls[call_id]; + acc_id = call->acc_id; + } + (*pjsua_var.ua_cfg.cb.on_pager2)(call_id, from, to, &contact, - &mime_type, &text_body, rdata); + &mime_type, &text_body, rdata, + acc_id); } } } @@ -389,7 +414,7 @@ static void im_callback(void *token, pjsip_event *e) tsx->status_code, &tsx->status_text, tsx->last_tx, - rdata); + rdata, im_data->acc_id); } } } diff --git a/pjsip/src/pjsua-lib/pjsua_pres.c b/pjsip/src/pjsua-lib/pjsua_pres.c index 9763f930..c7a3ffc4 100644 --- a/pjsip/src/pjsua-lib/pjsua_pres.c +++ b/pjsip/src/pjsua-lib/pjsua_pres.c @@ -505,7 +505,7 @@ static void pres_evsub_on_srv_state( pjsip_evsub *sub, pjsip_event *event) uapres = (pjsua_srv_pres*) pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id); if (uapres) { - PJ_LOG(3,(THIS_FILE, "Server subscription to %s is %s", + PJ_LOG(4,(THIS_FILE, "Server subscription to %s is %s", uapres->remote, pjsip_evsub_get_state_name(sub))); if (pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_TERMINATED) { @@ -983,7 +983,7 @@ static void pjsua_evsub_on_state( pjsip_evsub *sub, pjsip_event *event) buddy = (pjsua_buddy*) pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id); if (buddy) { - PJ_LOG(3,(THIS_FILE, + PJ_LOG(4,(THIS_FILE, "Presence subscription to %.*s is %s", (int)pjsua_var.buddy[buddy->index].uri.slen, pjsua_var.buddy[buddy->index].uri.ptr, |