jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Revert back to using account_laddr API function.

Browse Source
This commit is contained in:
Juha Heinanen
2020-03-23 11:55:49 +02:00
parent 5448b6de7b
commit b9e4bd58bf
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/cpp/baresip.c
+10 -1
View File
@@ -68,6 +68,16 @@ static void ua_debug_log(struct ua *ua) {
} }
} }
static void account_debug_log(struct account *acc) {
char debug_buf[2048];
int l;
l = re_snprintf(&(debug_buf[0]), 2047, "%H", account_debug, acc);
if (l != -1) {
debug_buf[l] = '\0';
LOGD("%s\n", debug_buf);
}
}
static void ua_print_status_log(struct ua *ua) { static void ua_print_status_log(struct ua *ua) {
char debug_buf[2048]; char debug_buf[2048];
int l; int l;
@@ -533,7 +543,6 @@ Java_com_tutpro_baresip_BaresipService_baresipStart(JNIEnv *env, jobject instanc
goto out; goto out;
} }
LOGD("adding %u accounts", list_count(uag_list()));
char ua_buf[32]; char ua_buf[32];
struct ua *ua; struct ua *ua;
for (le = list_head(uag_list()); le != NULL; le = le->next) { for (le = list_head(uag_list()); le != NULL; le = le->next) {
app/src/main/kotlin/com/tutpro/baresip/Account.kt
+3 -5
View File
@@ -8,7 +8,7 @@ class Account(val accp: String) {
var displayName = account_display_name(accp) var displayName = account_display_name(accp)
val aor = account_aor(accp) val aor = account_aor(accp)
var laddr = "" var laddr = account_laddr(accp)
var authUser = account_auth_user(accp) var authUser = account_auth_user(accp)
var authPass = account_auth_pass(accp) var authPass = account_auth_pass(accp)
var outbound = ArrayList<String>() var outbound = ArrayList<String>()
@@ -60,8 +60,6 @@ class Account(val accp: String) {
} }
val extra = account_extra(accp) val extra = account_extra(accp)
laddr = Utils.paramValue(extra,"laddr").replace("#", ";")
if (laddr == "") laddr = aor
preferIPv6Media = Utils.paramValue(extra,"prefer_ipv6_media") == "yes" preferIPv6Media = Utils.paramValue(extra,"prefer_ipv6_media") == "yes"
answerMode = Utils.paramValue(extra,"answer_mode") answerMode = Utils.paramValue(extra,"answer_mode")
if (answerMode == "") answerMode = "manual" if (answerMode == "") answerMode = "manual"
@@ -116,7 +114,7 @@ class Account(val accp: String) {
res += ";ptime=20;regint=${regint};regq=0.5;pubint=0;call_transfer=yes" res += ";ptime=20;regint=${regint};regq=0.5;pubint=0;call_transfer=yes"
var extra = "laddr=" + laddr.replace(";", "#") var extra = ""
if (!callHistory) if (!callHistory)
extra += ";call_history=no" extra += ";call_history=no"
@@ -128,7 +126,7 @@ class Account(val accp: String) {
extra += ";prefer_ipv6_media=yes" extra += ";prefer_ipv6_media=yes"
if (extra != "") if (extra != "")
res += ";extra=\"" + extra + "\"" res += ";extra=\"" + extra.substringAfter(";") + "\""
return res return res
} }
app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+1 -3
View File
@@ -40,8 +40,7 @@ class AccountsActivity : AppCompatActivity() {
String.format(getString(R.string.account_exists), aor.split(":")[0])) String.format(getString(R.string.account_exists), aor.split(":")[0]))
} else { } else {
val laddr = "sip:$aor" val laddr = "sip:$aor"
val eladdr = laddr.replace(";", "#") val ua = UserAgent.uaAlloc("<$laddr>;stunserver=\"stun:stun.l.google.com:19302\";regq=0.5;pubint=0;regint=0")
val ua = UserAgent.uaAlloc("<$laddr>;stunserver=\"stun:stun.l.google.com:19302\";regq=0.5;pubint=0;regint=0;extra=\"laddr=$eladdr\"")
if (ua == null) { if (ua == null) {
Log.e("Baresip", "Failed to allocate UA for $aor") Log.e("Baresip", "Failed to allocate UA for $aor")
Utils.alertView(this, getString(R.string.notice), Utils.alertView(this, getString(R.string.notice),
@@ -67,7 +66,6 @@ class AccountsActivity : AppCompatActivity() {
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) { when (item.itemId) {