Skip to content

Commit 1768d65

Browse files
committed
menuconfig templates: Fix nat_uac_test() flags; Load a TLS module
1 parent ea8771d commit 1768d65

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

examples/nathelper.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ route{
104104
# in Contact (may fail if line-folding is used); also,
105105
# the received test should, if completed, should check all
106106
# vias for rpesence of received
107-
if (nat_uac_test(3)) {
107+
if (nat_uac_test("diff-ip-src-via,private-contact")) {
108108
# Allow RR-ed requests, as these may indicate that
109109
# a NAT-enabled proxy takes care of it; unless it is
110110
# a REGISTER
@@ -222,7 +222,7 @@ onreply_route[reply_handler] {
222222
rtpproxy_answer();
223223
# otherwise, is it a transaction behind a NAT and we did not
224224
# know at time of request processing ? (RFC1918 contacts)
225-
} else if (nat_uac_test(1)) {
225+
} else if (nat_uac_test("private-contact")) {
226226
fix_nated_contact();
227227
};
228228
}

menuconfig/configs/opensips_loadbalancer.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ loadmodule "proto_udp.so"
138138

139139
ifelse(ENABLE_TCP, `yes', `loadmodule "proto_tcp.so"' , `')
140140
ifelse(ENABLE_TLS, `yes', `loadmodule "proto_tls.so"
141+
loadmodule "tls_wolfssl.so"
141142
loadmodule "tls_mgm.so"
142143
modparam("tls_mgm","server_domain", "default")
143144
modparam("tls_mgm","match_ip_address", "[default]*")

menuconfig/configs/opensips_residential.m4

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,9 @@ loadmodule "mi_http.so"
185185

186186
',`')dnl
187187
loadmodule "proto_udp.so"
188-
ifelse(ENABLE_TCP, `yes', `loadmodule "proto_tcp.so"' , `')dnl
188+
ifelse(ENABLE_TCP, `yes', `loadmodule "proto_tcp.so"' , `')
189189
ifelse(ENABLE_TLS, `yes', `loadmodule "proto_tls.so"
190+
loadmodule "tls_wolfssl.so"
190191
loadmodule "tls_mgm.so"
191192
modparam("tls_mgm","server_domain", "default")
192193
modparam("tls_mgm","match_ip_address", "[default]*")
@@ -207,7 +208,7 @@ ifelse(USE_NAT,`yes',`
207208
# initial NAT handling; detect if the request comes from behind a NAT
208209
# and apply contact fixing
209210
force_rport();
210-
if (nat_uac_test(23)) {
211+
if (nat_uac_test("diff-port-src-via,private-via,diff-ip-src-via,private-contact")) {
211212
if (is_method("REGISTER")) {
212213
fix_nated_register();
213214
setbflag("NAT");
@@ -501,7 +502,7 @@ branch_route[per_branch_ops] {
501502

502503

503504
onreply_route[handle_nat] {
504-
ifelse(USE_NAT,`yes',`if (nat_uac_test(1))
505+
ifelse(USE_NAT,`yes',`if (nat_uac_test("private-contact"))
505506
fix_nated_contact();
506507
if ( isflagset("NAT") && has_body("application/sdp") )
507508
rtpproxy_answer("ro");',`')

menuconfig/configs/opensips_trunking.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ loadmodule "proto_udp.so"
134134

135135
ifelse(ENABLE_TCP, `yes', `loadmodule "proto_tcp.so"' , `')
136136
ifelse(ENABLE_TLS, `yes', `loadmodule "proto_tls.so"
137+
loadmodule "tls_wolfssl.so"
137138
loadmodule "tls_mgm.so"
138139
modparam("tls_mgm","server_domain", "default")
139140
modparam("tls_mgm","match_ip_address", "[default]*")

0 commit comments

Comments
 (0)