Break up skinny.conf into seperate sections for

devices and lines. (closes issue #13412) Reported by: wedhorn Patches: config-restruct-v4.diff uploaded by wedhorn (license 30) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@150426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
17 years ago · 59d9255977
parent 95ea0a5a70
commit 59d9255977
4 changed files with 782 additions and 503 deletions
--- a/6
+++ b/6
@ -10,6 +10,12 @@ SIP Changes
 * Added support for subscribing to a voice mailbox on a remote server and
   making the new/old message count available to local devices.

+Skinny Changes
+--------------
+ * The configuration file now holds seperate sections for devices and lines.
+   Please have a look at configs/skinny.conf.sample and change your skinny.conf
+   accordingly.
+
 Dialplan Functions
 ------------------
 * Added a new dialplan function, CURLOPT, which permits setting various
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@ -265,6 +265,10 @@ Configuration:
  to differentiate your variable from the append operator.  This potential
  conflict is unlikely, but is documented here to be thorough.

+* skinny.conf now has seperate sections for lines and devices.
+  Please have a look at configs/skinny.conf.sample and update
+  your skinny.conf.
+
 Manager:

 * Manager has been upgraded to version 1.1 with a lot of changes. 
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
--- a/configs/skinny.conf.sample
+++ b/configs/skinny.conf.sample
@ -63,10 +63,30 @@ keepalive=120
 ;jblog = no                  ; Enables jitterbuffer frame logging. Defaults to "no".
 ;-----------------------------------------------------------------------------------

-;----------------------------------- DEVICE OPTIONS --------------------------------
+
+[devices]
+;---------------------------------- DEVICES SECTION -------------------------------
+; Options set under [devices] apply to all devices unless explicitly set for a particular
+; device. The options that can be set under devices are specified in GENERAL DEVICE OPTIONS.
+; These options can also be set for each individual device as well as those under SPECIFIC
+; DEVICE OPTIONS.
+;
+; Each label below [devices] in [] is a new device with the specific options specified below
+; it. Config stop reading new devices when one of the following is found: [general], [lines]
+; or the end of skinny.conf.
+;
+; Where options are common to both lines and devices, the results typically take that of
+; the least permission. ie if a no is set for either line or device, the call will not be
+; able to use that permission
+;------------------------------- GENERAL DEVICE OPTIONS ----------------------------
 ;earlyrtp=1                  ; whether audio signalling should be provided by asterisk
-                             ; (earlyrtp=1) or device generated (earlyrtp=0). 
-                             ; defaults to earlyrtp=1
+;                            ; (earlyrtp=1) or device generated (earlyrtp=0). default=yes
+;transfer=1                  ; whether the device is allowed to transfer. default=yes
+;------------------------------ SPECIFIC DEVICE OPTIONS ----------------------------
+;device="SEPxxxxxxxxxxxx     ; id of the device. Must be set.
+;version=P002G204	     ; firmware version to be loaded. If this version is different
+;                            ; to the one on the device, the device will try to load this
+;                            ; version from the tftp server. Set to device firmware version.
 ;-----------------------------------------------------------------------------------

 ; Typical config for 12SP+
@ -75,8 +95,7 @@ keepalive=120
 ;version=P002G204	; Thanks critch
 ;context=did
 ;canreinvite=yes	; Allow media to go directly between two RTP endpoints.
-;line => 120		; Dial(Skinny/120@florian)
-
+;line=120		; Dial(Skinny/120@florian)

 ; Typical config for a 7910
 ;[duba]			; Device name
@ -84,6 +103,62 @@ keepalive=120
 ;version=P002F202	; Firmware version identifier
 ;host=192.168.1.144
 ;permit=192.168.0/24	; Optional, used for authentication
+;line=500
+
+
+; Typical config for a 7940 with dual 7914s
+;[support]
+;device=SEP0007EB463121
+;line=100
+;line=110
+;speeddial => 111,Jack Smith         ; Adds a speeddial button to a device.
+;speeddial => 112@hints,Bob Peterson ; When a context is specified, the speeddial watches a dialplan hint.
+;addon => 7914
+;addon => 7914
+
+[lines]
+;----------------------------------- LINES SECTION --------------------------------
+; Options set under [lines] apply to all lines unless explicitly set for a particular
+; device. The options that can be set under lines are specified in GENERAL LINE OPTIONS.
+; These options can also be set for each individual device as well as those under SPECIFIC
+; LINE OPTIONS.
+;
+; Each label below [lines] in [] is a new line with the specific options specified below
+; it. Config stops reading new lines when one of the following is found: [general], [devices]
+; or the end of skinny.conf.
+;
+; Where options are common to both lines and devices, the results typically take that of
+; the least permission. ie if a no is set for either line or device, the call will not be
+; able to use that permission
+;-------------------------------- GENERAL LINE OPTIONS -----------------------------
+;earlyrtp=1                  ; whether audio signalling should be provided by asterisk
+;                            ; (earlyrtp=1) or device generated (earlyrtp=0). default=yes
+;transfer=1                  ; whether the device is allowed to transfer. default=yes
+;context=default             ; context to use for this line.
+;------------------------------- SPECIFIC LINE OPTIONS -----------------------------
+;setvar=        	     ; allows for the setting of chanvars.
+;-----------------------------------------------------------------------------------
+
+;[100]
+;nat=yes
+;callerid="Customer Support" <810-234-1212>
+;mailbox=100
+;vmexten=8500			; Device level voicemailmain pilot number
+;regexten=100
+;context=inbound
+;linelabel="Support Line"	; Displays next to the line 
+				; button on 7940's and 7960s
+;[110]
+;callerid="John Chambers" <408-526-4000>
+;context=did
+;regexten=110
+;linelabel="John"
+;mailbox=110
+
+;[120]
+;Nothing set, so all the defaults are used
+
+;[500]
 ;nat=yes
 ;callerid="George W. Bush" <202-456-1414>
 ;setvar=CUSTID=5678	; Channel variable to be set for all calls from this device
@ -96,7 +171,6 @@ keepalive=120
 ;transfer=yes
 ;threewaycalling=yes
 ;context=default
-;line => 500		; Dial(Skinny/500@duba)
 ;mohinterpret=default	; This option specifies a default music on hold class to
 			; use when put on hold if the channel's moh class was not
 			; explicitly set with Set(CHANNEL(musicclass)=whatever) and
@ -104,26 +178,3 @@ keepalive=120
 ;mohsuggest=default	; This option specifies which music on hold class to suggest to the peer channel
 			; when this channel places the peer on hold. It may be specified globally or on
 			; a per-user or per-peer basis.
-
-; Typical config for a 7940 with dual 7914s
-;[support]
-;device=SEP0007EB463121
-;nat=yes
-;callerid="Customer Support" <810-234-1212>
-;mailbox=100
-;vmexten=8500			; Device level voicemailmain pilot number
-;regexten=100
-;context=inbound
-;linelabel="Support Line"	; Displays next to the line 
-				; button on 7940's and 7960s
-;line => 100
-;callerid="John Chambers" <408-526-4000>
-;context=did
-;regexten=110
-;linelabel="John"
-;mailbox=110
-;line => 110
-;speeddial => 111,Jack Smith         ; Adds a speeddial button to a device.
-;speeddial => 112@hints,Bob Peterson ; When a context is specified, the speeddial watches a dialplan hint.
-;addon => 7914
-;addon => 7914