moved voip line checks to sip show registry for voip lines, as sip show peers didn...

git-svn-id: https://svn.code.sf.net/p/freetel/code@115 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/easy-asterisk-gui/set_voiplines.pl b/easy-asterisk-gui/set_voiplines.pl
index 30a76be520692630b8c6fc4c910afea8d41291a4..89c435d4149df1f4b6dd667c7cc68a653f984383 100755 (executable)
--- a/easy-asterisk-gui/set_voiplines.pl
+++ b/easy-asterisk-gui/set_voiplines.pl
@@ -67,6 +67,9 @@ while (<SIP>) {
            if (/^user=/) {
                print "user=$user\n";
            }
+           if (/^username=/) {
+               print "username=$user\n";
+           }
            elsif (/^fromuser=/) {
                print "fromuser=$user\n";
            }

diff --git a/easy-asterisk-gui/sip.conf b/easy-asterisk-gui/sip.conf
index ec78ce78f5d0169361cf0ca61d1d5f9eb3ac6ff5..9ee3f209dbdcb5a5eb7417b4e77b9ddbea0381ee 100644 (file)
--- a/easy-asterisk-gui/sip.conf
+++ b/easy-asterisk-gui/sip.conf
@@ -153,7 +153,7 @@ srvlookup=yes                       ; Enable DNS SRV lookups on outbound calls
 
 ; register easy-asterisk voip line providers here
 
-;register => user@voip ; easy-asterisk - do not change this comment
+register => user@generic ; easy-asterisk - do not change this comment
 ;register => user@oeg ; easy-asterisk - do not change this comment
 
 ;----------------------------------------- NAT SUPPORT ------------------------
@@ -451,7 +451,6 @@ srvlookup=yes                       ; Enable DNS SRV lookups on outbound calls
 type=friend
 context=default
 host=dynamic
-user=6011
 secret=6011
 canreinvite=no
 callerid=6011
@@ -463,7 +462,6 @@ qualify=yes
 type=friend
 context=default
 host=dynamic
-user=6012
 secret=6012
 canreinvite=no
 callerid=6012
@@ -474,7 +472,6 @@ allow=ulaw,g729
 type=friend
 context=default
 host=dynamic
-user=6013
 secret=6013
 canreinvite=no
 callerid=6013
@@ -485,7 +482,6 @@ allow=ulaw,g729
 type=friend
 context=default
 host=dynamic
-user=6014
 secret=6014
 canreinvite=no
 callerid=6014
@@ -496,7 +492,6 @@ allow=ulaw,g729
 type=friend
 context=default
 host=dynamic
-user=6015
 secret=6015
 canreinvite=no
 callerid=6015
@@ -507,7 +502,6 @@ allow=ulaw,g729
 type=friend
 context=default
 host=dynamic
-user=6016
 secret=6016
 canreinvite=no
 callerid=6016
@@ -518,7 +512,6 @@ allow=ulaw,g729
 type=friend
 context=default
 host=dynamic
-user=6017
 secret=6017
 canreinvite=no
 callerid=6017
@@ -529,7 +522,6 @@ allow=ulaw,g729
 type=friend
 context=default
 host=dynamic
-user=6018
 secret=6018
 canreinvite=no
 callerid=6018
@@ -538,10 +530,10 @@ allow=ulaw,g729
 
 ; Pre-configured easy-asterisk SIP trunks
 
-[voip] ; "Generic" easy-asterisk do not remove this comment
+[generic] ; "Generic" easy-asterisk do not remove this comment
 type=friend
 context=default
-user=user
+username=user
 secret=password
 host=192.168.1.28
 canreinvite=no
@@ -552,7 +544,7 @@ qualify=yes
 ;[oeg] ; "OEG" easy-asterisk do not remove this comment
 ;host=voip.oeg.com.au
 ;secret=pass
-;user=your user number
+;username=your user number
 ;fromdomain=voip.oeg.com.au
 ;fromuser=your user number
 ;insecure=port,invite

diff --git a/easy-asterisk-gui/voiplines.pl b/easy-asterisk-gui/voiplines.pl
index 240e7f6b6c030ee87f969df41820e762e76c1217..78c6f81e60510547cea507843be366d833965146 100755 (executable)
--- a/easy-asterisk-gui/voiplines.pl
+++ b/easy-asterisk-gui/voiplines.pl
@@ -50,6 +50,9 @@ while (<SIP>) {
        if (/^;*user=(.*)/) {
            $user{$provider} = $1;
        }
+       if (/^;*username=(.*)/) {
+           $user{$provider} = $1;
+       }
        if (/^;*secret=(.*)/) {
            $pass{$provider} = $1;
        }
@@ -66,19 +69,14 @@ close SIP;
 # sipshowpeers.txt needs to be generated before calling this perl
 # script
 
-my %voip = (); # SIP trunks status keyed on sip.conf stanza names 
+my %voip = (); # SIP trunks status keyed on sip.conf stanza name/username
                # if no entry we can't see SIP trunk
 
-open SIP, "sipshowpeers.txt";
+open SIP, "sipshowregistry.txt";
 while (<SIP>) { 
-    if (/^(\S*).*(OK)/) {
+    if (/^(.*):.*(Registered)/) {
         $voip{$1} = $2;
        print "'$1' '$2' $voip{$1}\n";
-       $e = $1;
-       if (/\s([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
-           $ipad{$e} = $1;
-           #print "'$1'\n";
-       }
     }
 }
 
@@ -122,7 +120,10 @@ print "</select></td></tr>\n";
 print "<tr $tt_user><td>User:</td><td><input type=\"text\" name=\"user\" id=\"user\" value=\"$user{$provider_current}\"></td></tr>\n";
 print "<tr $tt_pass><td>Password:</td><td><input type=\"password\" name=\"pass\" id=\"pass\" value=\"$pass{$provider_current}\"></td></tr>\n";
 print "<tr $tt_host><td>Host:</td><td><input type=\"text\" name=\"host\" id=\"host\" value=\"$host{$provider_current}\"></td></tr>\n";
-if ($voip{$stanza{$provider_current}} eq "OK") {
+
+print "\nXXX $provider_current $stanza{$provider_current} $voip{$stanza{$provider_current}}\n";
+
+if ($voip{$stanza{$provider_current}} eq "Registered") {
     $icon = "<img src=\"tick.png\" alt=\"OK\" />";
 }
 else {

diff --git a/easy-asterisk-gui/voiplines.sh b/easy-asterisk-gui/voiplines.sh
index 6891eac98f4a1bb0f967949d1e5c673e1ff0af37..071408e314f08bbe16ec354faf34e954f604f0cc 100644 (file)
--- a/easy-asterisk-gui/voiplines.sh
+++ b/easy-asterisk-gui/voiplines.sh
@@ -15,9 +15,9 @@ if [ $? -eq 1 ]; then
     exit
 fi
 
-# See if we have can reach the VOIP Line host
+# See if we have can reach the VOIP Line provider
 
-asterisk "-rx sip show peers" 2>/dev/null > sipshowpeers.txt
+asterisk "-rx sip show registry" 2>/dev/null > sipshowregistry.txt
 
 # Construct the web page -------------------------------