Merge outgoing MSN support + Remote Party ID for SIP (bug #1841) with cleanups

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3253 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/modem.conf.sample

@@ -64,6 +64,12 @@ mode=immediate
 ;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.)

configs/sip.conf.sample

@@ -57,6 +57,7 @@ srvlookup=yes			; Enable DNS SRV lookups on outbound calls
 				; 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 @@ srvlookup=yes			; Enable DNS SRV lookups on outbound calls
 ; allow                       allow
 ; disallow                    disallow
 ; insecure                    insecure
+; trustrpid                   trustrpid
 ; callerid
 ; accountcode
 ; amaflags