ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added PJSIP support for Asterisk 16

Browse Source 
git-svn-id: svn://192.168.202.10@3505 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2021-08-27 14:36:09 +00:00
parent 736e238a3d
commit 77aa33a477
15 changed files with 844 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/bin/AST_update_AMI2.pl
+7 -4
View File
@@ -17,6 +17,7 @@
# 190121-1505 - Added RA_USER_PHONE On-Hook CID to solve last RINGAGENT issues
# 201119-2119 - Fix for time logging inserts/updates to database
# 210315-1045 - Populate the CIDname in live_sip_channels/live_channels tables, Issue #1255
# 210827-0930 - Added PJSIP compatibility
#
# constants
@@ -770,6 +771,7 @@ sub process_channels
$extension = $channel_ref->{'ApplicationData'};
$extension =~ s/^SIP\///gi; # remove "SIP/" from the beginning
$extension =~ s/^PJSIP\///gi; # remove "PJSIP/" from the beginning
$extension =~ s/-\S+$//gi; # remove everything after a -
$extension =~ s/\|.*//gi; # remove everything after the |
$extension =~ s/,.*//gi; # remove everything after the ,
@@ -779,7 +781,7 @@ sub process_channels
{$CIDnameSQL =~ substr($CIDnameSQL,0,30);}
# make sure the channel is a channel type we care about
if ( $channel_ref->{'Channel'} =~ /^IAX2|^SIP|^Local|^DAHDI/)
if ( $channel_ref->{'Channel'} =~ /^IAX2|^SIP|^Local|^DAHDI|^PJSIP/)
{
# assume all channels are trunks then check if they are not
$line_type = 'TRUNK';
@@ -810,16 +812,17 @@ sub process_channels
$counts->{'clients'}++;
}
}
elsif ($channel_ref->{'Channel'} =~ /^SIP/)
elsif (($channel_ref->{'Channel'} =~ /^SIP/) || ($channel_ref->{'Channel'} =~ /^PJSIP/))
{
# clean up the channel to get the extension
$channel_match =~ s/-\S+$//gi;
$channel_match =~ s/^SIP\///gi;
$channel_match =~ s/^PJSIP\///gi;
$channel_match =~ s/\*/\\\*/gi;
# if the channels extension is in phones
# and it is and SIP phone then it is a client
if ( ( exists ( $phones_ref->{ $channel_match } ) ) && ( $phones_ref->{ $channel_match }->{'protocol'} eq 'SIP' ) )
if ( ( exists ( $phones_ref->{ $channel_match } ) ) && ( ( $phones_ref->{ $channel_match }->{'protocol'} eq 'SIP' ) || ( $phones_ref->{ $channel_match }->{'protocol'} eq 'PJSIP' )) )
{
$line_type = 'CLIENT';
$counts->{'sip'}++;
@@ -1289,7 +1292,7 @@ sub get_phones_settings
$zap_phones++;
$zap_phone_list .= "$key|";
}
elsif ( $phones_ref->{$key}->{'protocol'} eq 'SIP' )
elsif (( $phones_ref->{$key}->{'protocol'} eq 'SIP' ) || ( $phones_ref->{$key}->{'protocol'} eq 'PJSIP' ))
{
$sip_phones++;
$sip_phone_list .= "$key|";