git:master: modules/acc: renamed module param reason_from_reason_hf => reason_from_hf - sr-dev

31 May 2014

Module: sip-router
Branch: master
Commit: 6214fe8702626a4d9edc1ca45e3cd657ee8093ee
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6214fe87...
Author: Juha Heinanen jh@tutpro.com
Committer: Juha Heinanen jh@tutpro.com
Date:   Sat May 31 19:38:30 2014 +0300
modules/acc: renamed module param reason_from_reason_hf => reason_from_hf
- as per Daniel's suggestion
---
modules/acc/README            |   14 +++++++-------
 modules/acc/acc_logic.c       |    2 +-
 modules/acc/acc_mod.c         |    4 ++--
 modules/acc/acc_mod.h         |    2 +-
 modules/acc/doc/acc_admin.xml |    8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/acc/README b/modules/acc/README
index 8316b52..cea7651 100644
--- a/modules/acc/README
+++ b/modules/acc/README
@@ -131,7 +131,7 @@ Sven Knoblich
               6.48. time_attr (str)
               6.49. time_exten (str)
               6.50. time_format (str)
-              6.51. reason_from_reason_hf (int)
+              6.51. reason_from_hf (int)
7. Functions
@@ -194,7 +194,7 @@ Sven Knoblich
    1.48. time_attr example
    1.49. time_exten example
    1.50. time_format example
-   1.51. reason_from_reason_hf
+   1.51. reason_from_hf
    1.52. acc_log_request usage
    1.53. acc_db_request usage
    1.54. acc_rad_request usage
@@ -293,7 +293,7 @@ Chapter 1. Admin Guide
         6.48. time_attr (str)
         6.49. time_exten (str)
         6.50. time_format (str)
-        6.51. reason_from_reason_hf (int)
+        6.51. reason_from_hf (int)
7. Functions
@@ -708,7 +708,7 @@ $dlg_var(callee) = $avp(callee); #callee='C'
    6.48. time_attr (str)
    6.49. time_exten (str)
    6.50. time_format (str)
-   6.51. reason_from_reason_hf (int)
+   6.51. reason_from_hf (int)
6.1. early_media (integer)
@@ -1354,7 +1354,7 @@ modparam("acc", "time_exten", "micorsecs")
 modparam("acc", "time_format", "%Y/%m/%d %H:%M:%S")
 ...
-6.51. reason_from_reason_hf (int)
+6.51. reason_from_hf (int)
Tells where to take sip_reason from. If value is 0, sip_reason is taken
    from status line. Otherwise, sip_reason is taken from Reason header
@@ -1362,9 +1362,9 @@ modparam("acc", "time_format", "%Y/%m/%d %H:%M:%S")
Default value is 0.
-   Example 1.51. reason_from_reason_hf
+   Example 1.51. reason_from_hf
 ...
-modparam("acc", "reason_from_reason_hf", 1)
+modparam("acc", "reason_from_hf", 1)
 ...
7. Functions
diff --git a/modules/acc/acc_logic.c b/modules/acc/acc_logic.c
index 452e171..93bf5c1 100644
--- a/modules/acc/acc_logic.c
+++ b/modules/acc/acc_logic.c
@@ -147,7 +147,7 @@ static inline void env_set_code_status( int code, struct sip_msg *reply)
    } else {
    	acc_env.code_s = reply->first_line.u.reply.status;
    	hf = NULL;
-	        if (reason_from_reason_hf) {
+	        if (reason_from_hf) {
    		/* TODO: take reason from all Reason headers */
    		if(parse_headers(reply, HDR_EOH_F, 0) < 0) {
    			LM_ERR("error parsing headers\n");
diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c
index 347e054..6544f35 100644
--- a/modules/acc/acc_mod.c
+++ b/modules/acc/acc_mod.c
@@ -110,7 +110,7 @@ static char* leg_info_str = 0;	/*!< multi call-leg support */
 struct acc_extra *leg_info = 0;
 int acc_prepare_flag = -1; /*!< should the request be prepared for later acc */
 char *acc_time_format = "%Y-%m-%d %H:%M:%S";
-int reason_from_reason_hf = 0; /*!< assign reason from reason hf if present */
+int reason_from_hf = 0; /*!< assign reason from reason hf if present */
/* ----- time mode variables ------- */
 /*! \name AccTimeModeVariables  Time Mode Variables */
@@ -259,7 +259,7 @@ static param_export_t params[] = {
    {"multi_leg_info",          STR_PARAM, &leg_info_str            },
    {"detect_direction",        INT_PARAM, &detect_direction        },
    {"acc_prepare_flag",        INT_PARAM, &acc_prepare_flag        },
-	{"reason_from_reason_hf",   INT_PARAM, &reason_from_reason_hf   },
+	{"reason_from_hf",          INT_PARAM, &reason_from_hf          },
    /* syslog specific */
    {"log_flag",             INT_PARAM, &log_flag             },
    {"log_missed_flag",      INT_PARAM, &log_missed_flag      },
diff --git a/modules/acc/acc_mod.h b/modules/acc/acc_mod.h
index 68911dc..2f5f815 100644
--- a/modules/acc/acc_mod.h
+++ b/modules/acc/acc_mod.h
@@ -50,7 +50,7 @@ extern int failed_transaction_flag;
 extern unsigned short failed_filter[];
 extern int detect_direction;
 extern int acc_prepare_flag;
-extern int reason_from_reason_hf;
+extern int reason_from_hf;
extern int log_facility;
 extern int log_level;
diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml
index b0a1217..887f953 100644
--- a/modules/acc/doc/acc_admin.xml
+++ b/modules/acc/doc/acc_admin.xml
@@ -1479,8 +1479,8 @@ modparam("acc", "time_format", "%Y/%m/%d %H:%M:%S")
 </programlisting>
    	</example>
    </section>
-	<section id="acc.p.reason_from_reason_hf">
-		<title><varname>reason_from_reason_hf</varname> (int)</title>
+	<section id="acc.p.reason_from_hf">
+		<title><varname>reason_from_hf</varname> (int)</title>
    	<para>
    	Tells where to take sip_reason from.  If value is 0,
    	sip_reason is taken from status line.  Otherwise, sip_reason
@@ -1491,10 +1491,10 @@ modparam("acc", "time_format", "%Y/%m/%d %H:%M:%S")
    	Default value is 0.
    	</para>
    	<example>
-		<title>reason_from_reason_hf</title>
+		<title>reason_from_hf</title>
    	<programlisting format="linespecific">
 ...
-modparam("acc", "reason_from_reason_hf", 1)
+modparam("acc", "reason_from_hf", 1)
 ...
 </programlisting>
    	</example>

    