1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

Bring in few local changes from asterisk.

This commit is contained in:
Maxim Sobolev 2007-04-04 23:45:54 +00:00
parent 2857202720
commit 212d9d6b48
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=189240
2 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,25 @@
--- channels/chan_sip.c.orig Wed Apr 4 12:59:02 2007
+++ channels/chan_sip.c Wed Apr 4 13:08:42 2007
@@ -3711,6 +3711,8 @@
opbx_mutex_unlock(&i->lock);
fmt = opbx_best_codec(tmp->nativeformats);
+ pbx_builtin_setvar_helper(tmp, "SIP_CODEC_USED", opbx_getformatname(fmt));
+
if (title)
snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%04x", title, thread_safe_opbx_random() & 0xffff);
else if (strchr(i->fromdomain, ':'))
@@ -11450,6 +11452,13 @@
username = p->authname;
secret = p->peersecret;
md5secret = p->peermd5secret;
+ }
+ /* No authentication. Try to get auth info from channel vars */
+ if (opbx_strlen_zero(username))
+ {
+ username = pbx_builtin_getvar_helper(p->owner, "SIP_AUTH_NAME");
+ secret = pbx_builtin_getvar_helper(p->owner, "SIP_AUTH_SECRET");
+ md5secret = pbx_builtin_getvar_helper(p->owner, "SIP_AUTH_MD5SECRET");
}
if (opbx_strlen_zero(username)) /* We have no authentication */
return -1;

View File

@ -0,0 +1,10 @@
--- configs/Makefile.in.orig Wed Apr 4 14:42:16 2007
+++ configs/Makefile.in Wed Apr 4 14:42:37 2007
@@ -742,6 +742,7 @@
for samplefile in $(SAMPLES); \
do \
configfile=`basename $${samplefile} .sample`; \
+ $(INSTALL) -m 0640 $${samplefile} $(DESTDIR)${opbxconfdir}/$${samplefile}; \
if test ! -f $(DESTDIR)${opbxconfdir}/$${configfile}; \
then \
$(INSTALL) -m 0640 $${samplefile} $(DESTDIR)${opbxconfdir}/$${configfile}; \