Module: sems
Branch: master
Commit: 38b98b26049524290e66840e03bb422d62606534
URL:    
http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=38b98b26049524290e66840e03bb422d62606534

Author: Peter Lemenkov <[email protected]>
Committer: Peter Lemenkov <[email protected]>
Date:   Tue Nov 29 22:36:32 2011 +0400

Sync conf-files with cmake templates

Signed-off-by: Peter Lemenkov <[email protected]>

---

 apps/reg_agent/etc/reg_agent.conf.cmake        |    3 ++
 apps/sbc/etc/auth_b2b.sbcprofile.conf.cmake    |    5 ++++
 apps/sbc/etc/call_timer.sbcprofile.conf.cmake  |   31 +++++------------------
 apps/sbc/etc/codecfilter.sbcprofile.conf.cmake |   28 ++-------------------
 apps/sbc/etc/prepaid.sbcprofile.conf.cmake     |   29 +++++-----------------
 apps/sbc/etc/sst_b2b.sbcprofile.conf.cmake     |    8 ++++++
 apps/sbc/etc/transparent.sbcprofile.conf.cmake |   16 ++++++++++++
 apps/voicemail/etc/voicemail.conf.cmake        |    2 +-
 apps/xmlrpc2di/etc/xmlrpc2di.conf.cmake        |    2 +-
 9 files changed, 51 insertions(+), 73 deletions(-)

diff --git a/apps/reg_agent/etc/reg_agent.conf.cmake 
b/apps/reg_agent/etc/reg_agent.conf.cmake
index 3262a6a..e9ce4ca 100644
--- a/apps/reg_agent/etc/reg_agent.conf.cmake
+++ b/apps/reg_agent/etc/reg_agent.conf.cmake
@@ -15,6 +15,8 @@
 #auth_user=myuser
 # optional (defaults to resolved by domain):
 #proxy=sip.mydomain.net:5060
+# optional (default to <user>@<publicip/localip>):
+#contact=sip:[email protected]
 
 #
 # For multiple registrations add more entries
@@ -26,6 +28,7 @@
 #display_name1=xyz
 #auth_user1=xyz
 #proxy1=sip.iptel.org:5060
+#contact1=sip:[email protected]
 
 #domain2=iptel.org
 #user2=xyz
diff --git a/apps/sbc/etc/auth_b2b.sbcprofile.conf.cmake 
b/apps/sbc/etc/auth_b2b.sbcprofile.conf.cmake
index 169f1a8..be6a6c8 100644
--- a/apps/sbc/etc/auth_b2b.sbcprofile.conf.cmake
+++ b/apps/sbc/etc/auth_b2b.sbcprofile.conf.cmake
@@ -31,6 +31,11 @@ enable_auth=yes
 auth_user=$P(u)
 auth_pwd=$P(p)
 
+## authentication for A (caller) leg:
+#enable_aleg_auth=yes
+#auth_aleg_user=$P(au)
+#auth_aleg_pwd=$P(ap)
+
 header_filter=blacklist
 header_list=P-App-Param,P-App-Name
 message_filter=transparent
diff --git a/apps/sbc/etc/call_timer.sbcprofile.conf.cmake 
b/apps/sbc/etc/call_timer.sbcprofile.conf.cmake
index ba6e63a..72b4a21 100644
--- a/apps/sbc/etc/call_timer.sbcprofile.conf.cmake
+++ b/apps/sbc/etc/call_timer.sbcprofile.conf.cmake
@@ -29,11 +29,15 @@
 #message_list=
 
 ## call timer
-enable_call_timer=yes
+call_control=call_timer
+
+# module cc_call_timer
+call_timer_module=cc_call_timer
 # maximum call time in seconds.
 # take the timer value from "t" parameter of P-App-Param,
 # e.g. P-App-Param: t=120
-call_timer=$P(t)
+call_timer_timer=$P(t)
+
 #
 # Kamailio/sip-router script: 
 #  remove_hf("P-App-Param");
@@ -41,25 +45,4 @@ call_timer=$P(t)
 #  t_relay_to_udp("10.0.0.3","5070");
 #
 #For a static value, set it like this
-#call_timer=120
-
-## prepaid
-#enable_prepaid=yes
-#prepaid_accmodule=cc_acc
-#prepaid_uuid=$H(P-Caller-Uuid)
-#prepaid_acc_dest=$H(P-Acc-Dest)
-
-## authentication:
-#enable_auth=yes
-#auth_user=$P(u)
-#auth_pwd=$P(p)
-
-## session timer:
-#enable_session_timer=yes
-# if session_expires is not configured here,
-# the values from sbc.conf are used, or the
-# default values
-#session_expires=120
-#minimum_timer=90
-#session_refresh_method=UPDATE_FALLBACK_INVITE
-#accept_501_reply=yes
+#call_timer=120
\ No newline at end of file
diff --git a/apps/sbc/etc/codecfilter.sbcprofile.conf.cmake 
b/apps/sbc/etc/codecfilter.sbcprofile.conf.cmake
index 2f5878b..d480d51 100644
--- a/apps/sbc/etc/codecfilter.sbcprofile.conf.cmake
+++ b/apps/sbc/etc/codecfilter.sbcprofile.conf.cmake
@@ -29,28 +29,6 @@
 sdp_filter=whitelist
 sdpfilter_list=g729,g723,ilbc,speex,gsm,amr
 
-## authentication:
-#enable_auth=yes
-#auth_user=$P(u)
-#auth_pwd=$P(p)
-
-## call timer
-#enable_call_timer=yes
-#call_timer=60
-# or, e.g.: call_timer=$P(t)
-
-## prepaid
-#enable_prepaid=yes
-#prepaid_accmodule=cc_acc
-#prepaid_uuid=$H(P-Caller-Uuid)
-#prepaid_acc_dest=$H(P-Acc-Dest)
-
-## session timer:
-#enable_session_timer=yes
-# if session_expires is not configured here,
-# the values from sbc.conf are used, or the
-# default values
-#session_expires=120
-#minimum_timer=90
-#session_refresh_method=UPDATE_FALLBACK_INVITE
-#accept_501_reply=yes
+# anonymize SDP or not (u, s, o lines)
+#
+#sdp_anonymize=yes
diff --git a/apps/sbc/etc/prepaid.sbcprofile.conf.cmake 
b/apps/sbc/etc/prepaid.sbcprofile.conf.cmake
index 33b2b15..4cef8d4 100644
--- a/apps/sbc/etc/prepaid.sbcprofile.conf.cmake
+++ b/apps/sbc/etc/prepaid.sbcprofile.conf.cmake
@@ -6,7 +6,7 @@
 # This application is known from the sw_prepaid_sip app.
 # See the explanation below.
 
-RURI=$H(P-Proxy);sw_prepaid
+RURI=$H(P-Proxy);cc_prepaid
 #From=$f
 To=<$H(P-R-Uri)>
 
@@ -26,17 +26,18 @@ To=<$H(P-R-Uri)>
 #message_list=
 
 ## prepaid
-enable_prepaid=yes
-prepaid_accmodule=cc_acc
+call_control=prepaid
+prepaid_module=cc_prepaid
 prepaid_uuid=$H(P-Caller-Uuid)
 prepaid_acc_dest=$H(P-Acc-Dest)
 
 ## call timer
-#enable_call_timer=yes
+#call_control=prepaid;timer
 # maximum call time in seconds.
 # take the timer value from "t" parameter of P-App-Param,
 # e.g. P-App-Param: t=120
-#call_timer=$P(t)
+#timer_module=cc_call_timer
+#timer_timer=$P(t)
 #
 # Kamailio/sip-router script: 
 #  remove_hf("P-App-Param");
@@ -44,23 +45,7 @@ prepaid_acc_dest=$H(P-Acc-Dest)
 #  t_relay_to_udp("10.0.0.3","5070");
 #
 #For a static value, set it like this
-#call_timer=120
-
-## authentication:
-#enable_auth=yes
-#auth_user=$P(u)
-#auth_pwd=$P(p)
-
-## session timer:
-#enable_session_timer=yes
-# if session_expires is not configured here,
-# the values from sbc.conf are used, or the
-# default values
-#session_expires=120
-#minimum_timer=90
-#session_refresh_method=UPDATE_FALLBACK_INVITE
-#accept_501_reply=yes
-
+#timer_timeout=120
 
 #######################################################################
 #######################################################################
diff --git a/apps/sbc/etc/sst_b2b.sbcprofile.conf.cmake 
b/apps/sbc/etc/sst_b2b.sbcprofile.conf.cmake
index c2bd87e..683bbbe 100644
--- a/apps/sbc/etc/sst_b2b.sbcprofile.conf.cmake
+++ b/apps/sbc/etc/sst_b2b.sbcprofile.conf.cmake
@@ -51,6 +51,14 @@ enable_session_timer=yes
 #session_refresh_method=UPDATE_FALLBACK_INVITE
 #accept_501_reply=yes
 
+#separate SST configuration for A (caller) leg:
+#enable_aleg_session_timer=$H(P-Enable-A-SST)
+#aleg_session_expires=$H(P-A-SST-Timer)
+#aleg_minimum_timer=90
+#aleg_maximum_timer=900
+#aleg_session_refresh_method=UPDATE_FALLBACK_INVITE
+#aleg_accept_501_reply=yes
+
 #
 #This application can be routed through for achieving 
 #two things: 
diff --git a/apps/sbc/etc/transparent.sbcprofile.conf.cmake 
b/apps/sbc/etc/transparent.sbcprofile.conf.cmake
index 3356b07..bd014e1 100644
--- a/apps/sbc/etc/transparent.sbcprofile.conf.cmake
+++ b/apps/sbc/etc/transparent.sbcprofile.conf.cmake
@@ -7,6 +7,8 @@
 #From=$f
 #To=$t
 
+#Contact=<sip:$Ri>
+
 #Call-ID
 #Call-ID=$ci_leg2
 
@@ -38,6 +40,7 @@
 #message_list=
 #sdp_filter=whitelist
 #sdpfilter_list=g729,g723,ilbc,speex,gsm,amr
+#sdp_anonymize=yes
 
 ## append extra headers
 #append_headers="P-Source-IP: $si\r\nP-Source-Port: $sp\r\n"
@@ -51,6 +54,11 @@
 #auth_user=$P(u)
 #auth_pwd=$P(p)
 
+## authentication for A (caller) leg:
+#enable_aleg_auth=yes
+#auth_aleg_user=$P(au)
+#auth_aleg_pwd=$P(ap)
+
 ## call timer
 #enable_call_timer=yes
 #call_timer=60
@@ -72,6 +80,14 @@
 #session_refresh_method=UPDATE_FALLBACK_INVITE
 #accept_501_reply=yes
 
+##separate SST configuration for A (caller) leg, optional:
+#enable_aleg_session_timer=yes
+#aleg_session_expires=120
+#aleg_minimum_timer=90
+#aleg_maximum_timer=900
+#aleg_session_refresh_method=UPDATE_FALLBACK_INVITE
+#aleg_accept_501_reply=yes
+
 ## refuse call
 # refuse all calls with <code> <reason>
 #refuse_with="404 Not Found"
diff --git a/apps/voicemail/etc/voicemail.conf.cmake 
b/apps/voicemail/etc/voicemail.conf.cmake
index cee18d6..3316547 100644
--- a/apps/voicemail/etc/voicemail.conf.cmake
+++ b/apps/voicemail/etc/voicemail.conf.cmake
@@ -67,7 +67,7 @@ max_record_time=30
 #
 # Default:
 #  try_personal_greeting=no
-
+try_personal_greeting=yes
 
 #
 # These settings are needed if you keep audio and template files in MySQL 
database:
diff --git a/apps/xmlrpc2di/etc/xmlrpc2di.conf.cmake 
b/apps/xmlrpc2di/etc/xmlrpc2di.conf.cmake
index 3916d4a..93fa4eb 100644
--- a/apps/xmlrpc2di/etc/xmlrpc2di.conf.cmake
+++ b/apps/xmlrpc2di/etc/xmlrpc2di.conf.cmake
@@ -5,7 +5,6 @@
 # port to bind XMLRPC server to 
 xmlrpc_port=8090
 
-
 # run multi-threaded server? 
 # Default: yes
 # 
@@ -25,6 +24,7 @@ xmlrpc_port=8090
 # export under their proper function names
 # defaults to: none
 # direct_export=di_dial;registrar_client
+direct_export=sbc
 
 # run the XMLRPC server at all (default: yes)
 #

_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev

Reply via email to