* #36737: switch back to svn repo, remove assert in sip_transaction.c
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.c b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.c
index 2521193..e7b66ff 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pjsua_app.c 4634 2013-10-23 09:29:35Z riza $ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -325,8 +325,8 @@
notif_st,
call_info.remote_info.ptr,
call_info.local_info.ptr,
- (app_config.use_cli?"c a":"a"),
- (app_config.use_cli?"c g":"h")));
+ (app_config.use_cli?"ca a":"a"),
+ (app_config.use_cli?"g":"h")));
}
}
@@ -847,7 +847,7 @@
return;
}
- body.ptr = mwi_info->rdata->msg_info.msg->body->data;
+ body.ptr = (char *)mwi_info->rdata->msg_info.msg->body->data;
body.slen = mwi_info->rdata->msg_info.msg->body->len;
PJ_LOG(3,(THIS_FILE, " Body:\n%.*s", (int)body.slen, body.ptr));
@@ -1077,33 +1077,35 @@
pj_status_t status;
status = pjsip_endpt_create_response(pjsua_get_pjsip_endpt(),
- rdata, 200, NULL, &tdata);
+ rdata, 200, NULL, &tdata);
if (status != PJ_SUCCESS)
return;
- exp = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_EXPIRES, NULL);
+ exp = (pjsip_expires_hdr *)pjsip_msg_find_hdr(rdata->msg_info.msg,
+ PJSIP_H_EXPIRES, NULL);
h = rdata->msg_info.msg->hdr.next;
while (h != &rdata->msg_info.msg->hdr) {
- if (h->type == PJSIP_H_CONTACT) {
- const pjsip_contact_hdr *c = (const pjsip_contact_hdr*)h;
- int e = c->expires;
+ if (h->type == PJSIP_H_CONTACT) {
+ const pjsip_contact_hdr *c = (const pjsip_contact_hdr*)h;
+ int e = c->expires;
- if (e < 0) {
- if (exp)
- e = exp->ivalue;
- else
- e = 3600;
- }
+ if (e < 0) {
+ if (exp)
+ e = exp->ivalue;
+ else
+ e = 3600;
+ }
- if (e > 0) {
- pjsip_contact_hdr *nc = pjsip_hdr_clone(tdata->pool, h);
- nc->expires = e;
- pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)nc);
- ++cnt;
- }
- }
- h = h->next;
+ if (e > 0) {
+ pjsip_contact_hdr *nc = (pjsip_contact_hdr *)pjsip_hdr_clone(
+ tdata->pool, h);
+ nc->expires = e;
+ pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)nc);
+ ++cnt;
+ }
+ }
+ h = h->next;
}
srv = pjsip_generic_string_hdr_create(tdata->pool, NULL, NULL);
@@ -1164,8 +1166,8 @@
cap_hdr = pjsip_endpt_get_capability(pjsua_get_pjsip_endpt(),
PJSIP_H_ALLOW, NULL);
if (cap_hdr) {
- pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool,
- cap_hdr));
+ pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *)pjsip_hdr_clone(
+ tdata->pool, cap_hdr));
}
}
@@ -1591,12 +1593,17 @@
/* Add local account */
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
- if (PJMEDIA_HAS_VIDEO) {
+
+ /* Adjust local account config based on pjsua app config */
+ {
pjsua_acc_config acc_cfg;
pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
app_config_init_video(&acc_cfg);
+ acc_cfg.rtp_cfg = app_config.rtp_cfg;
pjsua_acc_modify(aid, &acc_cfg);
}
+
//pjsua_acc_set_transport(aid, transport_id);
pjsua_acc_set_online_status(current_acc, PJ_TRUE);
@@ -1630,14 +1637,18 @@
/* Add local account */
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
- if (PJMEDIA_HAS_VIDEO) {
+
+ /* Adjust local account config based on pjsua app config */
+ {
pjsua_acc_config acc_cfg;
pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
app_config_init_video(&acc_cfg);
- if (app_config.ipv6)
- acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
+ acc_cfg.rtp_cfg = app_config.rtp_cfg;
+ acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
pjsua_acc_modify(aid, &acc_cfg);
}
+
//pjsua_acc_set_transport(aid, transport_id);
pjsua_acc_set_online_status(current_acc, PJ_TRUE);
@@ -1664,12 +1675,17 @@
/* Add local account */
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
- if (PJMEDIA_HAS_VIDEO) {
+
+ /* Adjust local account config based on pjsua app config */
+ {
pjsua_acc_config acc_cfg;
pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
app_config_init_video(&acc_cfg);
+ acc_cfg.rtp_cfg = app_config.rtp_cfg;
pjsua_acc_modify(aid, &acc_cfg);
}
+
pjsua_acc_set_online_status(current_acc, PJ_TRUE);
}
@@ -1689,14 +1705,18 @@
/* Add local account */
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
- if (PJMEDIA_HAS_VIDEO) {
+
+ /* Adjust local account config based on pjsua app config */
+ {
pjsua_acc_config acc_cfg;
pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
app_config_init_video(&acc_cfg);
- if (app_config.ipv6)
- acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
+ acc_cfg.rtp_cfg = app_config.rtp_cfg;
+ acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
pjsua_acc_modify(aid, &acc_cfg);
}
+
//pjsua_acc_set_transport(aid, transport_id);
pjsua_acc_set_online_status(current_acc, PJ_TRUE);
}
@@ -1724,12 +1744,17 @@
/* Add local account */
pjsua_acc_add_local(transport_id, PJ_FALSE, &acc_id);
- if (PJMEDIA_HAS_VIDEO) {
+
+ /* Adjust local account config based on pjsua app config */
+ {
pjsua_acc_config acc_cfg;
pjsua_acc_get_config(acc_id, tmp_pool, &acc_cfg);
+
app_config_init_video(&acc_cfg);
+ acc_cfg.rtp_cfg = app_config.rtp_cfg;
pjsua_acc_modify(acc_id, &acc_cfg);
}
+
pjsua_acc_set_online_status(acc_id, PJ_TRUE);
}
@@ -1748,14 +1773,18 @@
/* Add local account */
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
- if (PJMEDIA_HAS_VIDEO) {
+
+ /* Adjust local account config based on pjsua app config */
+ {
pjsua_acc_config acc_cfg;
pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
app_config_init_video(&acc_cfg);
- if (app_config.ipv6)
- acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
+ acc_cfg.rtp_cfg = app_config.rtp_cfg;
+ acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
pjsua_acc_modify(aid, &acc_cfg);
}
+
//pjsua_acc_set_transport(aid, transport_id);
pjsua_acc_set_online_status(current_acc, PJ_TRUE);
}