[Astlinux-commits] SF.net SVN: astlinux:[7177] branches/1.0/package/phoneprov-tools

[<abe...@us...>]

Revision: 7177
          http://sourceforge.net/p/astlinux/code/7177
Author:   abelbeck
Date:     2015-08-04 21:37:45 +0000 (Tue, 04 Aug 2015)
Log Message:
-----------
phoneprov-tools, add a 'sip_driver' column to the SQL table to indicate sip vs. pjsip for each template

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/templates/gxp1400.conf
    branches/1.0/package/phoneprov-tools/templates/snom320.conf
    branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
    branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
    branches/1.0/package/phoneprov-tools/templates/yealink.conf

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2015-08-04 21:37:45 UTC (rev 7177)
@@ -167,7 +167,8 @@
   'mac_addr' TEXT DEFAULT '',
   'template' TEXT DEFAULT '',
   'model' TEXT DEFAULT '',
-  'vendor' TEXT DEFAULT ''
+  'vendor' TEXT DEFAULT '',
+  'sip_driver' TEXT DEFAULT ''
 );
 EOF
 }
@@ -186,7 +187,8 @@
 'mac_addr',
 'template',
 'model',
-'vendor'
+'vendor',
+'sip_driver'
 )
 VALUES (
 '${EXT[$i]}',
@@ -196,7 +198,8 @@
 '${mac_addr}',
 '${template}',
 '${model}',
-'${vendor}'
+'${vendor}',
+'${sip_driver}'
 );"
     fi
   done
@@ -387,6 +390,12 @@
 else
   sql_enable="$(echo "$sql_enable" | tr '[:upper:]' '[:lower:]')"
 fi
+sip_driver="$(extract_var sip_driver)"
+if [ -z "$sip_driver" ]; then
+  sip_driver="sip"
+else
+  sip_driver="$(echo "$sip_driver" | tr '[:upper:]' '[:lower:]')"
+fi
 
 # Special case to initialize dialplan and sip output files
 if [ "$ext" = "init" -o "$ext" = "init-dialplan" -o "$ext" = "init-sip" ]; then

Modified: branches/1.0/package/phoneprov-tools/templates/gxp1400.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/gxp1400.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/gxp1400.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -36,6 +36,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries:
 # Exten-intern

Modified: branches/1.0/package/phoneprov-tools/templates/snom320.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/snom320.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/snom320.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -28,6 +28,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries
 [dialplan]

Modified: branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -29,6 +29,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries
 [dialplan]

Modified: branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -30,6 +30,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries
 [dialplan]

Modified: branches/1.0/package/phoneprov-tools/templates/yealink.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink.conf	2015-08-03 22:34:50 UTC (rev 7176)
+++ branches/1.0/package/phoneprov-tools/templates/yealink.conf	2015-08-04 21:37:45 UTC (rev 7177)
@@ -30,6 +30,7 @@
 sip_file=astlinux-phoneprov-sip.conf
 
 sql_enable=yes
+sip_driver=sip
 
 # Dialplan File entries
 [dialplan]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.