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

diff --git a/mini-asterisk-gui2/etc/asterisk/sip.conf b/mini-asterisk-gui2/etc/asterisk/sip.conf
index 9e26b377cb77241c5f13ae99b18f74c3cf10df80..43aa9c03593ed4e432922fa6ec58b920ef943b9b 100644 (file)
--- a/mini-asterisk-gui2/etc/asterisk/sip.conf
+++ b/mini-asterisk-gui2/etc/asterisk/sip.conf
@@ -784,30 +784,30 @@ qualify=yes
 
 ; Pre-configured mini-asterisk SIP trunks
 
-;[usersipnat]               ; sip-nat-mini-asterisk do not remove this comment
+;[usersipnat]               ; sipnat-mini-asterisk do not remove this comment
 ; You reach your ITSP via a NAT router (most common)
-;type=friend             ; sip-nat-mini-asterisk do not remove this comment
-;context=default         ; sip-nat-mini-asterisk do not remove this comment
-;username=usernat        ; sip-nat-mini-asterisk do not remove this comment
-;secret=passwordnat      ; sip-nat-mini-asterisk do not remove this comment
-;host=hostnat            ; sip-nat-mini-asterisk do not remove this comment
-;canreinvite=no          ; sip-nat-mini-asterisk do not remove this comment
-;disallow=all            ; sip-nat-mini-asterisk do not remove this comment
-;allow=ulaw,alaw         ; sip-nat-mini-asterisk do not remove this comment
-;qualify=yes             ; sip-nat-mini-asterisk do not remove this comment
-;nat=yes                 ; sip-nat-mini-asterisk do not remove this comment
-
-;[usersip]          ; sip-mini-asterisk do not remove this comment
+;type=friend             ; sipnat-mini-asterisk do not remove this comment
+;context=default         ; sipnat-mini-asterisk do not remove this comment
+;username=usernat        ; sipnat-mini-asterisk do not remove this comment
+;secret=passwordnat      ; sipnat-mini-asterisk do not remove this comment
+;host=hostnat            ; sipnat-mini-asterisk do not remove this comment
+;canreinvite=no          ; sipnat-mini-asterisk do not remove this comment
+;disallow=all            ; sipnat-mini-asterisk do not remove this comment
+;allow=ulaw,alaw         ; sipnat-mini-asterisk do not remove this comment
+;qualify=yes             ; sipnat-mini-asterisk do not remove this comment
+;nat=yes                 ; sipnat-mini-asterisk do not remove this comment
+
+;[usersipnormal]          ; sipnormal-mini-asterisk do not remove this comment
 ; No NAT router between your Phone system and your ITSP
-;type=friend        ; sip-mini-asterisk do not remove this comment
-;context=default    ; sip-mini-asterisk do not remove this comment
-;username=usersip   ; sip-mini-asterisk do not remove this comment
-;secret=passwordsip ; sip-mini-asterisk do not remove this comment
-;host=hostsip       ; sip-mini-asterisk do not remove this comment
-;canreinvite=no     ; sip-mini-asterisk do not remove this comment
-;disallow=all       ; sip-mini-asterisk do not remove this comment
-;allow=ulaw,alaw    ; sip-mini-asterisk do not remove this comment
-;qualify=yes        ; sip-mini-asterisk do not remove this comment
+;type=friend        ; sipnormal-mini-asterisk do not remove this comment
+;context=default    ; sipnormal-mini-asterisk do not remove this comment
+;username=usersip   ; sipnormal-mini-asterisk do not remove this comment
+;secret=passwordsip ; sipnormal-mini-asterisk do not remove this comment
+;host=hostsip       ; sipnormal-mini-asterisk do not remove this comment
+;canreinvite=no     ; sipnormal-mini-asterisk do not remove this comment
+;disallow=all       ; sipnormal-mini-asterisk do not remove this comment
+;allow=ulaw,alaw    ; sipnormal-mini-asterisk do not remove this comment
+;qualify=yes        ; sipnormal-mini-asterisk do not remove this comment
 
 ;[userjazmin]                     ; jazmin-mini-asterisk do not remove this comment
 ; <a href="http://www.jazmin.com.au/">Jazmin</a> are a South Australian ITSP

diff --git a/mini-asterisk-gui2/voiplines.js b/mini-asterisk-gui2/voiplines.js
index 813189e01e677e7a6e63a7060b43b1e3e969f000..04080f5968fd4d65484913d1064b8cca8908aa24 100644 (file)
--- a/mini-asterisk-gui2/voiplines.js
+++ b/mini-asterisk-gui2/voiplines.js
@@ -150,7 +150,7 @@ function uncommenttrunkReturn(doc,status) {
        );
        //  2.2 update sip trunk details  ... user pw host
 
-       //          username=usersip                     username=trev
+       //          username=usersipnormal                     username=trev
        //          secret=passwordsip                   secret=password
        //          host=hostsip                         host=192.168.1.30
        
@@ -271,7 +271,7 @@ function changeProvider() {
                document.getElementById('host').value = "192.168.1.28";
                document.getElementById('pass').value = "xxxxxx";
                document.getElementById('info').textContent = "You reach your ITSP via a NAT router ...the most common setup";
-       } else if (selection == "sip" ) {
+       } else if (selection == "sipnormal" ) {
            // fill sip
                document.getElementById('user').value = "trev";
                document.getElementById('host').value = "192.168.1.30";