This reverts commit bc1cf60f970c572ecaddf1ea154834d0e41d292e.
... | ... |
@@ -2022,14 +2022,13 @@ modparam("rtpengine", "control_cmd_tos", 144) |
2022 | 2022 |
<title><varname>hash_algo</varname> (integer)</title> |
2023 | 2023 |
<para> |
2024 | 2024 |
Hashing algorithm to be used in node selection algorithm. Now there are 2 possibilities: legacy |
2025 |
- algorithm - 0(very basic hash over callid), SHA1 - 1(apply sha1 over the callid and calculate hash) or |
|
2026 |
- CRC32 - 2(calculate crc32 sum over the callid). |
|
2025 |
+ algorithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). |
|
2027 | 2026 |
</para> |
2028 | 2027 |
<para> |
2029 | 2028 |
Default value is 0, legacy algorithm. |
2030 | 2029 |
</para> |
2031 | 2030 |
<para> |
2032 |
- The values not falling into the range <quote>0-2</quote> are ignored. |
|
2031 |
+ The values not falling into the range <quote>0-1</quote> are ignored. |
|
2033 | 2032 |
</para> |
2034 | 2033 |
<example> |
2035 | 2034 |
<title>Set <varname>control_cmd_tos</varname> parameter</title> |
... | ... |
@@ -2037,9 +2036,6 @@ modparam("rtpengine", "control_cmd_tos", 144) |
2037 | 2036 |
... |
2038 | 2037 |
### use SHA1 instead of legacy algorithm |
2039 | 2038 |
modparam("rtpengine", "hash_algo", 1) |
2040 |
- |
|
2041 |
-### use CRC32 instead of legacy algorithm |
|
2042 |
-modparam("rtpengine", "hash_algo", 2) |
|
2043 | 2039 |
... |
2044 | 2040 |
</programlisting> |
2045 | 2041 |
</example> |
... | ... |
@@ -2974,9 +2974,6 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** |
2974 | 2974 |
} |
2975 | 2975 |
|
2976 | 2976 |
break; |
2977 |
- case RTP_HASH_CRC32_CALLID: |
|
2978 |
- crc32_uint(&callid, &sum); |
|
2979 |
- goto retry; |
|
2980 | 2977 |
default: |
2981 | 2978 |
LM_ERR("unknown hashing algo %d\n", hash_algo); |
2982 | 2979 |
return NULL; |
... | ... |
@@ -2994,7 +2991,6 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** |
2994 | 2991 |
} |
2995 | 2992 |
|
2996 | 2993 |
retry: |
2997 |
- LM_DBG("sum is = %u\n", sum); |
|
2998 | 2994 |
weight_sum = 0; |
2999 | 2995 |
|
3000 | 2996 |
lock_get(active_rtpp_set->rset_lock); |
... | ... |
@@ -103,6 +103,6 @@ extern str rtpp_url_col; |
103 | 103 |
extern str rtpp_weight_col; |
104 | 104 |
extern str rtpp_disabled_col; |
105 | 105 |
|
106 |
-enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID, RTP_HASH_CRC32_CALLID }; |
|
106 |
+enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; |
|
107 | 107 |
|
108 | 108 |
#endif |