diff options
Diffstat (limited to 'pjsip/src/pjsua')
-rw-r--r-- | pjsip/src/pjsua/main.c | 181 | ||||
-rw-r--r-- | pjsip/src/pjsua/pjsua.h | 42 | ||||
-rw-r--r-- | pjsip/src/pjsua/pjsua_core.c | 12 | ||||
-rw-r--r-- | pjsip/src/pjsua/pjsua_inv.c | 775 |
4 files changed, 832 insertions, 178 deletions
diff --git a/pjsip/src/pjsua/main.c b/pjsip/src/pjsua/main.c index 467c5a5a..4068e77f 100644 --- a/pjsip/src/pjsua/main.c +++ b/pjsip/src/pjsua/main.c @@ -113,8 +113,8 @@ static void keystroke_help(void) pj_snprintf(reg_status, sizeof(reg_status), "%s (%.*s;expires=%d)", pjsip_get_status_text(pjsua.regc_last_code)->ptr, - (int)info.server_uri.slen, - info.server_uri.ptr, + (int)info.client_uri.slen, + info.client_uri.ptr, info.next_reg); } else { @@ -131,16 +131,16 @@ static void keystroke_help(void) puts("| Call Commands: | IM & Presence: | Misc: |"); puts("| | | |"); puts("| m Make new call | i Send IM | o Send OPTIONS |"); - puts("| a Answer call | s Subscribe presence | R (Re-)register |"); - puts("| h Hangup call | u Unsubscribe presence | r Unregister |"); - puts("| ] Select next dialog | t Toggle Online status | d Dump status |"); + puts("| a Answer call | s Subscribe presence | rr (Re-)register |"); + puts("| h Hangup call | u Unsubscribe presence | ru Unregister |"); + puts("| ] Select next dialog | t ToGgle Online status | d Dump status |"); puts("| [ Select previous dialog | | |"); - puts("+-----------------------------------------------------------------------------+"); - puts("| Conference Command |"); - puts("| cl List ports |"); - puts("| cc Connect port |"); - puts("| cd Disconnect port |"); - puts("+-----------------------------------------------------------------------------+"); + puts("| +--------------------------+-------------------+"); + puts("| H Hold call | Conference Command | |"); + puts("| v re-inVite (release hold) | cl List ports | |"); + puts("| x Xfer call | cc Connect port | |"); + puts("| | cd Disconnect port | |"); + puts("+------------------------------+--------------------------+-------------------+"); puts("| q QUIT |"); puts("+=============================================================================+"); printf(">>> "); @@ -283,7 +283,6 @@ static void ui_console_main(void) { char menuin[10]; char buf[128]; - pjsip_inv_session *inv; struct input_result result; //keystroke_help(); @@ -305,9 +304,9 @@ static void ui_console_main(void) if (result.nb_result == -1) puts("You can't do that with make call!"); else - pjsua_invite(pjsua.buddies[result.nb_result].uri.ptr, &inv); + pjsua_invite(pjsua.buddies[result.nb_result].uri.ptr, NULL); } else if (result.uri_result) - pjsua_invite(result.uri_result, &inv); + pjsua_invite(result.uri_result, NULL); break; @@ -353,43 +352,100 @@ static void ui_console_main(void) continue; } else { - pj_status_t status; - pjsip_tx_data *tdata; + pjsua_inv_hangup(inv_session, PJSIP_SC_DECLINE); + } + break; - status = pjsip_inv_end_session(inv_session->inv, - PJSIP_SC_DECLINE, NULL, &tdata); - if (status != PJ_SUCCESS) { - pjsua_perror(THIS_FILE, - "Failed to create end session message", - status); - continue; - } + case ']': + case '[': + /* + * Cycle next/prev dialog. + */ + if (menuin[0] == ']') { + inv_session = inv_session->next; + if (inv_session == &pjsua.inv_list) + inv_session = pjsua.inv_list.next; - status = pjsip_inv_send_msg(inv_session->inv, tdata, NULL); - if (status != PJ_SUCCESS) { - pjsua_perror(THIS_FILE, - "Failed to send end session message", - status); - continue; + } else { + inv_session = inv_session->prev; + if (inv_session == &pjsua.inv_list) + inv_session = pjsua.inv_list.prev; + } + + if (inv_session != &pjsua.inv_list) { + char url[PJSIP_MAX_URL_SIZE]; + int len; + + len = pjsip_uri_print(0, inv_session->inv->dlg->remote.info->uri, + url, sizeof(url)-1); + if (len < 1) { + pj_ansi_strcpy(url, "<uri is too long>"); + } else { + url[len] = '\0'; } + + PJ_LOG(3,(THIS_FILE,"Current dialog: %s", url)); + + } else { + PJ_LOG(3,(THIS_FILE,"No current dialog")); } break; - case ']': - inv_session = inv_session->next; - if (inv_session == &pjsua.inv_list) - inv_session = pjsua.inv_list.next; + case 'H': + /* + * Hold call. + */ + if (inv_session != &pjsua.inv_list) { + + pjsua_inv_set_hold(inv_session); + + } else { + PJ_LOG(3,(THIS_FILE, "No current call")); + } break; - case '[': - inv_session = inv_session->prev; - if (inv_session == &pjsua.inv_list) - inv_session = pjsua.inv_list.prev; + case 'v': + /* + * Send re-INVITE (to release hold, etc). + */ + if (inv_session != &pjsua.inv_list) { + + pjsua_inv_reinvite(inv_session); + + } else { + PJ_LOG(3,(THIS_FILE, "No current call")); + } + break; + + case 'x': + /* + * Transfer call. + */ + if (inv_session == &pjsua.inv_list) { + + PJ_LOG(3,(THIS_FILE, "No current call")); + + } else { + ui_input_url("Transfer to URL", buf, sizeof(buf), &result); + if (result.nb_result != NO_NB) { + if (result.nb_result == -1) + puts("You can't do that with transfer call!"); + else + pjsua_inv_xfer_call( inv_session, + pjsua.buddies[result.nb_result].uri.ptr); + + } else if (result.uri_result) { + pjsua_inv_xfer_call( inv_session, result.uri_result); + } + } break; case 's': case 'u': - ui_input_url("Subscribe presence of", buf, sizeof(buf), &result); + /* + * Subscribe/unsubscribe presence. + */ + ui_input_url("(un)Subscribe presence of", buf, sizeof(buf), &result); if (result.nb_result != NO_NB) { if (result.nb_result == -1) { unsigned i; @@ -402,19 +458,29 @@ static void ui_console_main(void) pjsua_pres_refresh(); } else if (result.uri_result) { - puts("Sorry, can only subscribe to buddy's presence, not arbitrary URL (for now)"); + puts("Sorry, can only subscribe to buddy's presence, " + "not arbitrary URL (for now)"); } break; - case 'R': - pjsua_regc_update(PJ_TRUE); - break; - case 'r': - pjsua_regc_update(PJ_FALSE); + switch (menuin[1]) { + case 'r': + /* + * Re-Register. + */ + pjsua_regc_update(PJ_TRUE); + break; + case 'u': + /* + * Unregister + */ + pjsua_regc_update(PJ_FALSE); + break; + } break; - + case 't': pjsua.online_status = !pjsua.online_status; pjsua_pres_refresh(); @@ -430,16 +496,31 @@ static void ui_console_main(void) { char src_port[10], dst_port[10]; pj_status_t status; + const char *src_title, *dst_title; - if (!simple_input("Connect src port #:", src_port, sizeof(src_port))) + conf_list(); + + src_title = (menuin[1]=='c'? + "Connect src port #": + "Disconnect src port #"); + dst_title = (menuin[1]=='c'? + "To dst port #": + "From dst port #"); + + if (!simple_input(src_title, src_port, sizeof(src_port))) break; - if (!simple_input("To dst port #:", dst_port, sizeof(dst_port))) + + if (!simple_input(dst_title, dst_port, sizeof(dst_port))) break; if (menuin[1]=='c') { - status = pjmedia_conf_connect_port(pjsua.mconf, atoi(src_port), atoi(dst_port)); + status = pjmedia_conf_connect_port(pjsua.mconf, + atoi(src_port), + atoi(dst_port)); } else { - status = pjmedia_conf_disconnect_port(pjsua.mconf, atoi(src_port), atoi(dst_port)); + status = pjmedia_conf_disconnect_port(pjsua.mconf, + atoi(src_port), + atoi(dst_port)); } if (status == PJ_SUCCESS) { puts("Success"); diff --git a/pjsip/src/pjsua/pjsua.h b/pjsip/src/pjsua/pjsua.h index 3afde354..e731b4e4 100644 --- a/pjsip/src/pjsua/pjsua.h +++ b/pjsip/src/pjsua/pjsua.h @@ -68,6 +68,8 @@ struct pjsua_inv_data pjmedia_session *session; /**< The media session. */ unsigned conf_slot; /**< Slot # in conference bridge. */ unsigned call_slot; /**< RTP media index in med_sock_use[] */ + pjsip_evsub *xfer_sub; /**< Xfer server subscription, if this + call was triggered by xfer. */ }; @@ -254,7 +256,7 @@ pj_status_t pjsua_destroy(void); * Make outgoing call. */ pj_status_t pjsua_invite(const char *cstr_dest_uri, - pjsip_inv_session **p_inv); + struct pjsua_inv_data **p_inv_data); /** @@ -264,6 +266,31 @@ pj_bool_t pjsua_inv_on_incoming(pjsip_rx_data *rdata); /** + * Hangup call. + */ +void pjsua_inv_hangup(struct pjsua_inv_data *inv_session, int code); + + +/** + * Put call on-hold. + */ +void pjsua_inv_set_hold(struct pjsua_inv_data *inv_session); + + +/** + * Send re-INVITE (to release hold). + */ +void pjsua_inv_reinvite(struct pjsua_inv_data *inv_session); + + +/** + * Transfer call. + */ +void pjsua_inv_xfer_call(struct pjsua_inv_data *inv_session, + const char *dest); + + +/** * Callback to be called by session when invite session's state has changed. */ void pjsua_inv_on_state_changed(pjsip_inv_session *inv, pjsip_event *e); @@ -283,6 +310,19 @@ void pjsua_inv_on_new_session(pjsip_inv_session *inv, pjsip_event *e); */ void pjsua_inv_on_media_update(pjsip_inv_session *inv, pj_status_t status); +/** + * Callback called when invite session received new offer. + */ +void pjsua_inv_on_rx_offer( pjsip_inv_session *inv, + const pjmedia_sdp_session *offer); + +/** + * Callback to receive transaction state inside invite session or dialog + * (e.g. REFER, MESSAGE). + */ +void pjsua_inv_on_tsx_state_changed(pjsip_inv_session *inv, + pjsip_transaction *tsx, + pjsip_event *e); /** * Terminate all calls. diff --git a/pjsip/src/pjsua/pjsua_core.c b/pjsip/src/pjsua/pjsua_core.c index 59386d13..1e81d91e 100644 --- a/pjsip/src/pjsua/pjsua_core.c +++ b/pjsip/src/pjsua/pjsua_core.c @@ -141,7 +141,7 @@ static pj_status_t init_sockets(pj_bool_t sip, enum { RTP_START_PORT = 4000, RTP_RANDOM_START = 2, - RTP_RETRY = 10 + RTP_RETRY = 20 }; enum { SIP_SOCK, @@ -392,6 +392,9 @@ static pj_status_t init_stack(void) inv_cb.on_state_changed = &pjsua_inv_on_state_changed; inv_cb.on_new_session = &pjsua_inv_on_new_session; inv_cb.on_media_update = &pjsua_inv_on_media_update; + inv_cb.on_rx_offer = &pjsua_inv_on_rx_offer; + inv_cb.on_tsx_state_changed = &pjsua_inv_on_tsx_state_changed; + /* Initialize invite session module: */ status = pjsip_inv_usage_init(pjsua.endpt, &pjsua.mod, &inv_cb); @@ -479,6 +482,9 @@ pj_status_t pjsua_init(void) pjsip_pres_init_module( pjsua.endpt, pjsip_evsub_instance()); + /* Init xfer/REFER module */ + + pjsip_xfer_init_module( pjsua.endpt ); /* Init pjsua presence handler: */ @@ -751,6 +757,10 @@ pj_status_t pjsua_destroy(void) PJ_LOG(4,(THIS_FILE, "Shutting down...")); busy_sleep(1000); + /* Destroy conference bridge. */ + if (pjsua.mconf) + pjmedia_conf_destroy(pjsua.mconf); + /* Shutdown pjmedia-codec: */ pjmedia_codec_deinit(); diff --git a/pjsip/src/pjsua/pjsua_inv.c b/pjsip/src/pjsua/pjsua_inv.c index 434d0c70..34bf651f 100644 --- a/pjsip/src/pjsua/pjsua_inv.c +++ b/pjsip/src/pjsua/pjsua_inv.c @@ -33,7 +33,7 @@ * Make outgoing call. */ pj_status_t pjsua_invite(const char *cstr_dest_uri, - pjsip_inv_session **p_inv) + struct pjsua_inv_data **p_inv_data) { pj_str_t dest_uri; pjsip_dialog *dlg; @@ -136,8 +136,8 @@ pj_status_t pjsua_invite(const char *cstr_dest_uri, /* Done. */ - - *p_inv = inv; + if (p_inv_data) + *p_inv_data = inv_data; return PJ_SUCCESS; @@ -158,127 +158,145 @@ pj_bool_t pjsua_inv_on_incoming(pjsip_rx_data *rdata) pjsip_dialog *dlg = pjsip_rdata_get_dlg(rdata); pjsip_transaction *tsx = pjsip_rdata_get_tsx(rdata); pjsip_msg *msg = rdata->msg_info.msg; + pjsip_tx_data *response = NULL; + unsigned options = 0; + pjsip_inv_session *inv; + struct pjsua_inv_data *inv_data; + pjmedia_sdp_session *answer; + int med_sk_index; + pj_status_t status; - /* - * Handle incoming INVITE outside dialog. + /* Don't want to handle anything but INVITE */ + if (msg->line.req.method.id != PJSIP_INVITE_METHOD) + return PJ_FALSE; + + /* Don't want to handle anything that's already associated with + * existing dialog or transaction. */ - if (dlg == NULL && tsx == NULL && - msg->line.req.method.id == PJSIP_INVITE_METHOD) - { - pj_status_t status; - pjsip_tx_data *response = NULL; - unsigned options = 0; + if (dlg || tsx) + return PJ_FALSE; - /* Verify that we can handle the request. */ - status = pjsip_inv_verify_request(rdata, &options, NULL, NULL, - pjsua.endpt, &response); - if (status != PJ_SUCCESS) { - /* - * No we can't handle the incoming INVITE request. - */ + /* Verify that we can handle the request. */ + status = pjsip_inv_verify_request(rdata, &options, NULL, NULL, + pjsua.endpt, &response); + if (status != PJ_SUCCESS) { - if (response) { - pjsip_response_addr res_addr; + /* + * No we can't handle the incoming INVITE request. + */ - pjsip_get_response_addr(response->pool, rdata, &res_addr); - pjsip_endpt_send_response(pjsua.endpt, &res_addr, response, + if (response) { + pjsip_response_addr res_addr; + + pjsip_get_response_addr(response->pool, rdata, &res_addr); + pjsip_endpt_send_response(pjsua.endpt, &res_addr, response, + NULL, NULL); + + } else { + + /* Respond with 500 (Internal Server Error) */ + pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL, NULL, NULL); + } - } else { + return PJ_TRUE; + } - /* Respond with 500 (Internal Server Error) */ - pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL, - NULL, NULL); - } - } else { - /* - * Yes we can handle the incoming INVITE request. - */ - pjsip_inv_session *inv; - struct pjsua_inv_data *inv_data; - pjmedia_sdp_session *answer; - int med_sk_index; + /* + * Yes we can handle the incoming INVITE request. + */ + /* Find free call slot. */ + for (med_sk_index=0; med_sk_index<PJSUA_MAX_CALLS; ++med_sk_index) { + if (!pjsua.med_sock_use[med_sk_index]) + break; + } - /* Find free socket. */ - for (med_sk_index=0; med_sk_index<PJSUA_MAX_CALLS; ++med_sk_index) { - if (!pjsua.med_sock_use[med_sk_index]) - break; - } + if (med_sk_index == PJSUA_MAX_CALLS) { + pjsip_endpt_respond_stateless(pjsua.endpt, rdata, + PJSIP_SC_BUSY_HERE, NULL, + NULL, NULL); + return PJ_TRUE; + } - if (med_sk_index == PJSUA_MAX_CALLS) { - PJ_LOG(3,(THIS_FILE, "Error: too many calls!")); - return PJ_TRUE; - } + pjsua.med_sock_use[med_sk_index] = 1; - pjsua.med_sock_use[med_sk_index] = 1; + /* Get media capability from media endpoint: */ - /* Get media capability from media endpoint: */ + status = pjmedia_endpt_create_sdp( pjsua.med_endpt, rdata->tp_info.pool, + 1, &pjsua.med_sock_info[med_sk_index], + &answer ); + if (status != PJ_SUCCESS) { + pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL, + NULL, NULL); - status = pjmedia_endpt_create_sdp( pjsua.med_endpt, rdata->tp_info.pool, - 1, &pjsua.med_sock_info[med_sk_index], - &answer ); - if (status != PJ_SUCCESS) { + /* Free call socket. */ + pjsua.med_sock_use[med_sk_index] = 0; + return PJ_TRUE; + } - pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL, - NULL, NULL); - pjsua.med_sock_use[med_sk_index] = 0; - return PJ_TRUE; - } + /* Create dialog: */ - /* Create dialog: */ + status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata, + &pjsua.contact_uri, &dlg); + if (status != PJ_SUCCESS) { + pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL, + NULL, NULL); - status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata, - &pjsua.contact_uri, &dlg); - if (status != PJ_SUCCESS) { - pjsua.med_sock_use[med_sk_index] = 0; - return PJ_TRUE; - } + /* Free call socket. */ + pjsua.med_sock_use[med_sk_index] = 0; + return PJ_TRUE; + } - /* Create invite session: */ + /* Create invite session: */ - status = pjsip_inv_create_uas( dlg, rdata, answer, 0, &inv); - if (status != PJ_SUCCESS) { + status = pjsip_inv_create_uas( dlg, rdata, answer, 0, &inv); + if (status != PJ_SUCCESS) { - status = pjsip_dlg_create_response( dlg, rdata, 500, NULL, - &response); - if (status == PJ_SUCCESS) - status = pjsip_dlg_send_response(dlg, - pjsip_rdata_get_tsx(rdata), - response); - pjsua.med_sock_use[med_sk_index] = 0; - return PJ_TRUE; + pjsip_dlg_respond(dlg, rdata, 500, NULL); - } + /* Free call socket. */ + pjsua.med_sock_use[med_sk_index] = 0; + + // TODO: Need to delete dialog + return PJ_TRUE; + } - /* Create and attach pjsua data to the dialog: */ + /* Create and attach pjsua data to the dialog: */ - inv_data = pj_pool_zalloc(dlg->pool, sizeof(struct pjsua_inv_data)); - inv_data->inv = inv; - inv_data->call_slot = inv_data->call_slot = med_sk_index; - dlg->mod_data[pjsua.mod.id] = inv_data; - inv->mod_data[pjsua.mod.id] = inv_data; + inv_data = pj_pool_zalloc(dlg->pool, sizeof(struct pjsua_inv_data)); + inv_data->inv = inv; + inv_data->call_slot = inv_data->call_slot = med_sk_index; + dlg->mod_data[pjsua.mod.id] = inv_data; + inv->mod_data[pjsua.mod.id] = inv_data; - pj_list_push_back(&pjsua.inv_list, inv_data); + pj_list_push_back(&pjsua.inv_list, inv_data); - /* Answer with 100 (using the dialog, not invite): */ + /* Answer with 100 (using the dialog, not invite): */ - status = pjsip_dlg_create_response(dlg, rdata, 100, NULL, &response); - if (status == PJ_SUCCESS) - status = pjsip_dlg_send_response(dlg, pjsip_rdata_get_tsx(rdata), response); - } + status = pjsip_dlg_create_response(dlg, rdata, 100, NULL, &response); + if (status != PJ_SUCCESS) { + + pjsip_dlg_respond(dlg, rdata, 500, NULL); - /* This INVITE request has been handled. */ - return PJ_TRUE; + /* Free call socket. */ + pjsua.med_sock_use[med_sk_index] = 0; + + // TODO: Need to delete dialog + + } else { + status = pjsip_dlg_send_response(dlg, pjsip_rdata_get_tsx(rdata), + response); } - return PJ_FALSE; + /* This INVITE request has been handled. */ + return PJ_TRUE; } @@ -288,12 +306,66 @@ pj_bool_t pjsua_inv_on_incoming(pjsip_rx_data *rdata) */ void pjsua_inv_on_state_changed(pjsip_inv_session *inv, pjsip_event *e) { + struct pjsua_inv_data *inv_data; + + inv_data = inv->dlg->mod_data[pjsua.mod.id]; + + /* If this is an outgoing INVITE that was created because of + * REFER/transfer, send NOTIFY to transferer. + */ + if (inv_data && inv_data->xfer_sub && e->type==PJSIP_EVENT_TSX_STATE) + { + int st_code = -1; + pjsip_evsub_state ev_state = PJSIP_EVSUB_STATE_ACTIVE; + + + switch (inv->state) { + case PJSIP_INV_STATE_NULL: + case PJSIP_INV_STATE_CALLING: + /* Do nothing */ + break; + + case PJSIP_INV_STATE_EARLY: + case PJSIP_INV_STATE_CONNECTING: + st_code = e->body.tsx_state.tsx->status_code; + ev_state = PJSIP_EVSUB_STATE_ACTIVE; + break; + + case PJSIP_INV_STATE_CONFIRMED: + /* When state is confirmed, send the final 200/OK and terminate + * subscription. + */ + st_code = e->body.tsx_state.tsx->status_code; + ev_state = PJSIP_EVSUB_STATE_TERMINATED; + break; + + case PJSIP_INV_STATE_DISCONNECTED: + st_code = e->body.tsx_state.tsx->status_code; + ev_state = PJSIP_EVSUB_STATE_TERMINATED; + break; + } + + if (st_code != -1) { + pjsip_tx_data *tdata; + pj_status_t status; + + status = pjsip_xfer_notify( inv_data->xfer_sub, + ev_state, st_code, + NULL, &tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create NOTIFY", status); + } else { + status = pjsip_xfer_send_request(inv_data->xfer_sub, tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to send NOTIFY", status); + } + } + } + } + /* Destroy media session when invite session is disconnected. */ if (inv->state == PJSIP_INV_STATE_DISCONNECTED) { - struct pjsua_inv_data *inv_data; - - inv_data = inv->dlg->mod_data[pjsua.mod.id]; pj_assert(inv_data != NULL); @@ -318,6 +390,158 @@ void pjsua_inv_on_state_changed(pjsip_inv_session *inv, pjsip_event *e) /* + * Callback called by event framework when the xfer subscription state + * has changed. + */ +static void xfer_on_evsub_state( pjsip_evsub *sub, pjsip_event *event) +{ + + PJ_UNUSED_ARG(event); + + /* + * We're only interested when subscription is terminated, to + * clear the xfer_sub member of the inv_data. + */ + if (pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_TERMINATED) { + struct pjsua_inv_data *inv_data; + + inv_data = pjsip_evsub_get_mod_data(sub, pjsua.mod.id); + if (!inv_data) + return; + + pjsip_evsub_set_mod_data(sub, pjsua.mod.id, NULL); + inv_data->xfer_sub = NULL; + + PJ_LOG(3,(THIS_FILE, "Xfer subscription terminated")); + } +} + + +/* + * Follow transfer (REFER) request. + */ +static void on_call_transfered( pjsip_inv_session *inv, + pjsip_rx_data *rdata ) +{ + pj_status_t status; + pjsip_tx_data *tdata; + struct pjsua_inv_data *inv_data; + const pj_str_t str_refer_to = { "Refer-To", 8}; + pjsip_generic_string_hdr *refer_to; + char *uri; + struct pjsip_evsub_user xfer_cb; + pjsip_evsub *sub; + + /* Find the Refer-To header */ + refer_to = (pjsip_generic_string_hdr*) + pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_refer_to, NULL); + + if (refer_to == NULL) { + /* Invalid Request. + * No Refer-To header! + */ + PJ_LOG(4,(THIS_FILE, "Received REFER without Refer-To header!")); + pjsip_dlg_respond( inv->dlg, rdata, 400, NULL); + return; + } + + PJ_LOG(3,(THIS_FILE, "Call to %.*s is being transfered to %.*s", + (int)inv->dlg->remote.info_str.slen, + inv->dlg->remote.info_str.ptr, + (int)refer_to->hvalue.slen, + refer_to->hvalue.ptr)); + + /* Init callback */ + pj_memset(&xfer_cb, 0, sizeof(xfer_cb)); + xfer_cb.on_evsub_state = &xfer_on_evsub_state; + + /* Create transferee event subscription */ + status = pjsip_xfer_create_uas( inv->dlg, &xfer_cb, rdata, &sub); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create xfer uas", status); + pjsip_dlg_respond( inv->dlg, rdata, 500, NULL); + return; + } + + /* Accept the REFER request, send 200 (OK). */ + pjsip_xfer_accept(sub, rdata, 200, NULL); + + /* Create initial NOTIFY request */ + status = pjsip_xfer_notify( sub, PJSIP_EVSUB_STATE_ACTIVE, + 100, NULL, &tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER", status); + return; + } + + /* Send initial NOTIFY request */ + status = pjsip_xfer_send_request( sub, tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to send NOTIFY to REFER", status); + return; + } + + /* We're cheating here. + * We need to get a null terminated string from a pj_str_t. + * So grab the pointer from the hvalue and NULL terminate it, knowing + * that the NULL position will be occupied by a newline. + */ + uri = refer_to->hvalue.ptr; + uri[refer_to->hvalue.slen] = '\0'; + + /* Now make the outgoing call. */ + status = pjsua_invite(uri, &inv_data); + if (status != PJ_SUCCESS) { + + /* Notify xferer about the error */ + status = pjsip_xfer_notify(sub, PJSIP_EVSUB_STATE_TERMINATED, + 500, NULL, &tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER", + status); + return; + } + status = pjsip_xfer_send_request(sub, tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to send NOTIFY to REFER", + status); + return; + } + return; + } + + /* Put the server subscription in inv_data. + * Subsequent state changed in pjsua_inv_on_state_changed() will be + * reported back to the server subscription. + */ + inv_data->xfer_sub = sub; + + /* Put the invite_data in the subscription. */ + pjsip_evsub_set_mod_data(sub, pjsua.mod.id, inv_data); +} + + +/* + * This callback is called when transaction state has changed in INVITE + * session. We use this to trap incoming REFER request. + */ +void pjsua_inv_on_tsx_state_changed(pjsip_inv_session *inv, + pjsip_transaction *tsx, + pjsip_event *e) +{ + if (tsx->role==PJSIP_ROLE_UAS && + tsx->state==PJSIP_TSX_STATE_TRYING && + pjsip_method_cmp(&tsx->method, &pjsip_refer_method)==0) + { + /* + * Incoming REFER request. + */ + on_call_transfered(inv, e->body.tsx_state.src.rdata); + } +} + + +/* * This callback is called by invite session framework when UAC session * has forked. */ @@ -331,6 +555,109 @@ void pjsua_inv_on_new_session(pjsip_inv_session *inv, pjsip_event *e) /* + * Create inactive SDP for call hold. + */ +static pj_status_t create_inactive_sdp(struct pjsua_inv_data *inv_session, + pjmedia_sdp_session **p_answer) +{ + pj_status_t status; + pjmedia_sdp_conn *conn; + pjmedia_sdp_attr *attr; + pjmedia_sdp_session *sdp; + + /* Create new offer */ + status = pjmedia_endpt_create_sdp(pjsua.med_endpt, pjsua.pool, 1, + &pjsua.med_sock_info[inv_session->call_slot], + &sdp); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create local SDP", status); + return status; + } + + /* Get SDP media connection line */ + conn = sdp->media[0]->conn; + if (!conn) + conn = sdp->conn; + + /* Modify address */ + conn->addr = pj_str("0.0.0.0"); + + /* Remove existing directions attributes */ + pjmedia_sdp_media_remove_all_attr(sdp->media[0], "sendrecv"); + pjmedia_sdp_media_remove_all_attr(sdp->media[0], "sendonly"); + pjmedia_sdp_media_remove_all_attr(sdp->media[0], "recvonly"); + pjmedia_sdp_media_remove_all_attr(sdp->media[0], "inactive"); + + /* Add inactive attribute */ + attr = pjmedia_sdp_attr_create(pjsua.pool, "inactive", NULL); + pjmedia_sdp_media_add_attr(sdp->media[0], attr); + + *p_answer = sdp; + + return status; +} + +/* + * Called when session received new offer. + */ +void pjsua_inv_on_rx_offer( pjsip_inv_session *inv, + const pjmedia_sdp_session *offer) +{ + struct pjsua_inv_data *inv_data; + pjmedia_sdp_conn *conn; + pjmedia_sdp_session *answer; + pj_bool_t is_remote_active; + pj_status_t status; + + inv_data = inv->dlg->mod_data[pjsua.mod.id]; + + /* + * See if remote is offering active media (i.e. not on-hold) + */ + is_remote_active = PJ_TRUE; + + conn = offer->media[0]->conn; + if (!conn) + conn = offer->conn; + + if (pj_strcmp2(&conn->addr, "0.0.0.0")==0 || + pj_strcmp2(&conn->addr, "0")==0) + { + is_remote_active = PJ_FALSE; + + } + else if (pjmedia_sdp_media_find_attr2(offer->media[0], "inactive", NULL)) + { + is_remote_active = PJ_FALSE; + } + + PJ_LOG(4,(THIS_FILE, "Received SDP offer, remote media is %s", + (is_remote_active ? "active" : "inactive"))); + + /* Supply candidate answer */ + if (is_remote_active) { + status = pjmedia_endpt_create_sdp( pjsua.med_endpt, inv->pool, 1, + &pjsua.med_sock_info[inv_data->call_slot], + &answer); + } else { + status = create_inactive_sdp( inv_data, &answer ); + } + + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create local SDP", status); + return; + } + + status = pjsip_inv_set_sdp_answer(inv, answer); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to set answer", status); + return; + } + +} + + +/* * Callback to be called when SDP offer/answer negotiation has just completed * in the session. This function will start/update media if negotiation * has succeeded. @@ -340,6 +667,9 @@ void pjsua_inv_on_media_update(pjsip_inv_session *inv, pj_status_t status) struct pjsua_inv_data *inv_data; const pjmedia_sdp_session *local_sdp; const pjmedia_sdp_session *remote_sdp; + pjmedia_port *media_port; + pj_str_t port_name; + char tmp[PJSIP_MAX_URL_SIZE]; if (status != PJ_SUCCESS) { @@ -380,52 +710,244 @@ void pjsua_inv_on_media_update(pjsip_inv_session *inv, pj_status_t status) /* Create new media session. * The media session is active immediately. */ + if (pjsua.null_audio) + return; + + status = pjmedia_session_create( pjsua.med_endpt, 1, + &pjsua.med_sock_info[inv_data->call_slot], + local_sdp, remote_sdp, + &inv_data->session ); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create media session", + status); + return; + } - if (!pjsua.null_audio) { - pjmedia_port *media_port; - pj_str_t port_name; - char tmp[PJSIP_MAX_URL_SIZE]; - status = pjmedia_session_create( pjsua.med_endpt, 1, - &pjsua.med_sock_info[inv_data->call_slot], - local_sdp, remote_sdp, - &inv_data->session ); - if (status != PJ_SUCCESS) { - pjsua_perror(THIS_FILE, "Unable to create media session", - status); - return; - } + /* Get the port interface of the first stream in the session. + * We need the port interface to add to the conference bridge. + */ + pjmedia_session_get_port(inv_data->session, 0, &media_port); - pjmedia_session_get_port(inv_data->session, 0, &media_port); - port_name.ptr = tmp; - port_name.slen = pjsip_uri_print(PJSIP_URI_IN_REQ_URI, - inv_data->inv->dlg->remote.info->uri, - tmp, sizeof(tmp)); - if (port_name.slen < 1) { - port_name = pj_str("call"); - } - status = pjmedia_conf_add_port( pjsua.mconf, inv->pool, - media_port, - &port_name, - &inv_data->conf_slot); - if (status != PJ_SUCCESS) { - pjsua_perror(THIS_FILE, "Unable to create conference slot", - status); - pjmedia_session_destroy(inv_data->session); - inv_data->session = NULL; - return; + /* + * Add the call to conference bridge. + */ + port_name.ptr = tmp; + port_name.slen = pjsip_uri_print(PJSIP_URI_IN_REQ_URI, + inv_data->inv->dlg->remote.info->uri, + tmp, sizeof(tmp)); + if (port_name.slen < 1) { + port_name = pj_str("call"); + } + status = pjmedia_conf_add_port( pjsua.mconf, inv->pool, + media_port, + &port_name, + &inv_data->conf_slot); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create conference slot", + status); + pjmedia_session_destroy(inv_data->session); + inv_data->session = NULL; + return; + } + + /* Connect new call to the sound device port (port zero) in the + * main conference bridge. + */ + pjmedia_conf_connect_port( pjsua.mconf, 0, inv_data->conf_slot); + pjmedia_conf_connect_port( pjsua.mconf, inv_data->conf_slot, 0); + + /* Done. */ + { + struct pjmedia_session_info sess_info; + char info[80]; + int info_len = 0; + unsigned i; + + pjmedia_session_get_info(inv_data->session, &sess_info); + for (i=0; i<sess_info.stream_cnt; ++i) { + int len; + const char *dir; + pjmedia_stream_info *strm_info = &sess_info.stream_info[i]; + + switch (strm_info->dir) { + case PJMEDIA_DIR_NONE: + dir = "inactive"; + break; + case PJMEDIA_DIR_ENCODING: + dir = "sendonly"; + break; + case PJMEDIA_DIR_DECODING: + dir = "recvonly"; + break; + case PJMEDIA_DIR_ENCODING_DECODING: + dir = "sendrecv"; + break; + default: + dir = "unknown"; + break; + } + len = pj_ansi_sprintf( info+info_len, + ", stream #%d: %.*s (%s)", i, + (int)strm_info->fmt.encoding_name.slen, + (int)strm_info->fmt.encoding_name.ptr, + dir); + if (len > 0) + info_len += len; } + PJ_LOG(3,(THIS_FILE,"Media started%s", info)); + } +} + + +/* + * Hangup call. + */ +void pjsua_inv_hangup(struct pjsua_inv_data *inv_session, int code) +{ + pj_status_t status; + pjsip_tx_data *tdata; + + status = pjsip_inv_end_session(inv_session->inv, + code, NULL, &tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, + "Failed to create end session message", + status); + return; + } + + status = pjsip_inv_send_msg(inv_session->inv, tdata, NULL); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, + "Failed to send end session message", + status); + return; + } +} + + +/* + * Put call on-Hold. + */ +void pjsua_inv_set_hold(struct pjsua_inv_data *inv_session) +{ + pjmedia_sdp_session *sdp; + pjsip_inv_session *inv = inv_session->inv; + pjsip_tx_data *tdata; + pj_status_t status; + + if (inv->state != PJSIP_INV_STATE_CONFIRMED) { + PJ_LOG(3,(THIS_FILE, "Can not hold call that is not confirmed")); + return; + } - pjmedia_conf_connect_port( pjsua.mconf, 0, inv_data->conf_slot); - pjmedia_conf_connect_port( pjsua.mconf, inv_data->conf_slot, 0); + status = create_inactive_sdp(inv_session, &sdp); + if (status != PJ_SUCCESS) + return; + + /* Send re-INVITE with new offer */ + status = pjsip_inv_reinvite( inv_session->inv, NULL, sdp, &tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create re-INVITE", status); + return; + } - PJ_LOG(3,(THIS_FILE,"Media has been started successfully")); + status = pjsip_inv_send_msg( inv_session->inv, tdata, NULL); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status); + return; } } /* + * re-INVITE. + */ +void pjsua_inv_reinvite(struct pjsua_inv_data *inv_session) +{ + pjmedia_sdp_session *sdp; + pjsip_tx_data *tdata; + pjsip_inv_session *inv = inv_session->inv; + pj_status_t status; + + + if (inv->state != PJSIP_INV_STATE_CONFIRMED) { + PJ_LOG(3,(THIS_FILE, "Can not re-INVITE call that is not confirmed")); + return; + } + + /* Create SDP */ + status = pjmedia_endpt_create_sdp( pjsua.med_endpt, inv->pool, 1, + &pjsua.med_sock_info[inv_session->call_slot], + &sdp); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", status); + return; + } + + /* Send re-INVITE with new offer */ + status = pjsip_inv_reinvite( inv_session->inv, NULL, sdp, &tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create re-INVITE", status); + return; + } + + status = pjsip_inv_send_msg( inv_session->inv, tdata, NULL); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status); + return; + } +} + + +/* + * Transfer call. + */ +void pjsua_inv_xfer_call(struct pjsua_inv_data *inv_session, + const char *dest) +{ + pjsip_evsub *sub; + pjsip_tx_data *tdata; + pj_str_t tmp; + pj_status_t status; + + + /* Create xfer client subscription. + * We're not interested in knowing the transfer result, so we + * put NULL as the callback. + */ + status = pjsip_xfer_create_uac(inv_session->inv->dlg, NULL, &sub); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create xfer", status); + return; + } + + /* + * Create REFER request. + */ + status = pjsip_xfer_initiate(sub, pj_cstr(&tmp, dest), &tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create REFER request", status); + return; + } + + /* Send. */ + status = pjsip_xfer_send_request(sub, tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to send REFER request", status); + return; + } + + /* For simplicity (that's what this program is intended to be!), + * leave the original invite session as it is. More advanced application + * may want to hold the INVITE, or terminate the invite, or whatever. + */ +} + + +/* * Terminate all calls. */ void pjsua_inv_shutdown() @@ -445,3 +967,4 @@ void pjsua_inv_shutdown() } } + |