[Asterisk-cvs] asterisk/configs modem.conf.sample,1.7,1.8 sip.conf.sample,1.31,1.32

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/configs
In directory mongoose.digium.com:/tmp/cvs-serv9964/configs

Modified Files:
	modem.conf.sample sip.conf.sample 
Log Message:
Merge outgoing MSN support + Remote Party ID for SIP (bug #1841) with cleanups


Index: modem.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/modem.conf.sample,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- modem.conf.sample	24 May 2004 15:09:34 -0000	1.7
+++ modem.conf.sample	21 Jun 2004 04:29:50 -0000	1.8
@@ -64,6 +64,12 @@
 ;incomingmsn=50780020,50780021,50780022
 ;device => /dev/ttyI2
 ;
+; If set, only these numbers are allowed to be set as A number
+; when making an outbound call. callerid is used to set A
+; number.
+;outgoingmsn=50780023,50780024
+;
+;
 ; two other devices, which are in group '1' and are used when an
 ; outgoing dial used: exten => s,1,Dial,Modem/g1:1234|60|r
 ; (we do not need more outgoing devices, since ISDN2 has only 2 channels.)

Index: sip.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/sip.conf.sample,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- sip.conf.sample	17 Jun 2004 00:09:41 -0000	1.31
+++ sip.conf.sample	21 Jun 2004 04:29:50 -0000	1.32
@@ -57,6 +57,7 @@
 				; when we're not on hold
 ;rtpholdtimeout=300		; Terminate call if 300 seconds of no RTP activity
 				; when we're on hold (must be > rtptimeout)
+;trustrpid = no			; If Remote-Party-ID should be trusted
 ;useragent=Asterisk PBX		; Allows you to change the user agent string
 
 ; Asterisk can register as a SIP user agent to a SIP proxy (provider)
@@ -121,6 +122,7 @@
 ; allow                       allow
 ; disallow                    disallow
 ; insecure                    insecure
+; trustrpid                   trustrpid
 ; callerid
 ; accountcode
 ; amaflags