MT#7319 fix invite_concurrent_max and invite_concurrent_max_per_account

mr3.4
Andrew Pogrebennyk 12 years ago
parent b4cd401d0a
commit 1218f3ecf4

@ -19,11 +19,6 @@ flow:
- start|ROUTE_CLEAR_CALLER_PREF:
- end|ROUTE_CLEAR_CALLER_PREF:
- end|ROUTE_LOAD_CALLER_PREF:
$xavp(caller_real_prefs[0]=>concurrent_max[*]): [1]
$xavp(caller_real_prefs[0]=>concurrent_max_out[*]): None
$xavp(caller_real_prefs[0]=>concurrent_max_per_account[*]): None
$xavp(caller_real_prefs[0]=>concurrent_max_per_account_out[*]): None
$avp(size): [0]
- start|ROUTE_GET_CALLER_CLI:
- end|ROUTE_GET_CALLER_CLI:
- start|ROUTE_GET_FORWARDER_CLI:
@ -51,6 +46,11 @@ flow:
- start|ROUTE_BLOCK_IN:
- end|ROUTE_BLOCK_IN:
- end|ROUTE_LOAD_CALLEE_PREF:
$xavp(callee_real_prefs[0]=>concurrent_max[*]): [1]
$xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None
$xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): None
$xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None
$avp(size): [1]
- start|ROUTE_CHECK_PBX:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_INT:
@ -61,7 +61,6 @@ flow:
- end|ROUTE_ACC_CALLEE:
- start|ROUTE_SET_CALLER_DIALOG:
- end|ROUTE_SET_CALLER_DIALOG:
$avp(size): [1]
- start|BRANCH_ROUTE_SBC:
- start|ROUTE_BRANCH_ACC_RTP:
- end|ROUTE_BRANCH_ACC_RTP:

@ -15,7 +15,7 @@ flow:
sip_in:
- '^INVITE'
- 'Contact: sip:testuser1004@'
- 'To: <sip:testuser1002@'
- 'To: <sip:testuser1003@'
- 'CSeq: 1 INVITE'
- 'Max-Forwards: 69'
- 'Content-Type: application/sdp'
@ -24,11 +24,11 @@ sip_out:
'^SIP/2.0 100 Trying',
'CSeq: 1 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@'
'To: <sip:testuser1003@'
]
- [
'^SIP/2.0 407 Proxy Authentication Required',
'CSeq: 1 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@'
'To: <sip:testuser1003@'
]

@ -43,12 +43,6 @@ flow:
- start|ROUTE_BLOCK_OUT:
- end|ROUTE_BLOCK_OUT:
- start|ROUTE_LOAD_CALLEE_PREF:
- start|ROUTE_BLOCK_IN:
- end|ROUTE_BLOCK_IN:
- end|ROUTE_LOAD_CALLEE_PREF:
- start|ROUTE_CHECK_PBX:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_INT:
- start|ROUTE_ACC_FAILURE:
$xavp(callee_real_prefs[0]=>concurrent_max[*]): [1]
$xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None
@ -65,7 +59,7 @@ flow:
- end|ROUTE_ADD_CALLINFO_REPLY:
- exit|ROUTE_EARLY_REJECT:
sip_in:
- '^INVITE sip:testuser1002@'
- '^INVITE sip:testuser1003@'
- 'Contact: sip:testuser1004@'
- 'CSeq: 2 INVITE'
- 'Max-Forwards: 69'
@ -76,18 +70,18 @@ sip_out:
'^SIP/2.0 100 Trying',
'CSeq: 2 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@'
'To: <sip:testuser1003@'
]
- [
'^SIP/2.0 101 Connecting',
'CSeq: 2 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@'
'To: <sip:testuser1003@'
]
- [
'^SIP/2.0 486 Busy',
'CSeq: 2 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@',
'To: <sip:testuser1003@',
'P-NGCP-Authorization: testuser1004@'
]

@ -1,2 +1,2 @@
testuser1002@spce.test:
testuser1003@spce.test:
concurrent_max: 1

@ -7,10 +7,10 @@
<send start_rtd="1" start_rtd="2">
<![CDATA[
INVITE sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0] SIP/2.0
INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
Call-ID: [call_id]
CSeq: 1 INVITE
Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
@ -38,10 +38,10 @@
<send>
<![CDATA[
ACK sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]:[remote_port] SIP/2.0
ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
[last_Via:]
From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>[peer_tag_param]
To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
@ -56,10 +56,10 @@
<send start_rtd="3">
<![CDATA[
INVITE sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0] SIP/2.0
INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
Call-ID: [call_id]
CSeq: 2 INVITE
Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
@ -92,7 +92,7 @@
ACK [next_url] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>[peer_tag_param]
To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
Call-ID: [call_id]
[routes]
CSeq: 2 ACK

@ -19,11 +19,6 @@ flow:
- start|ROUTE_CLEAR_CALLER_PREF:
- end|ROUTE_CLEAR_CALLER_PREF:
- end|ROUTE_LOAD_CALLER_PREF:
$xavp(caller_real_prefs[0]=>concurrent_max[*]): None
$xavp(caller_real_prefs[0]=>concurrent_max_out[*]): None
$xavp(caller_real_prefs[0]=>concurrent_max_per_account[*]): [1]
$xavp(caller_real_prefs[0]=>concurrent_max_per_account_out[*]): None
$avp(size): [0]
- start|ROUTE_GET_CALLER_CLI:
- end|ROUTE_GET_CALLER_CLI:
- start|ROUTE_GET_FORWARDER_CLI:
@ -48,12 +43,14 @@ flow:
- start|ROUTE_BLOCK_OUT:
- end|ROUTE_BLOCK_OUT:
- start|ROUTE_LOAD_CALLEE_PREF:
- start|ROUTE_SET_CALLER_DIALOG:
- end|ROUTE_SET_CALLER_DIALOG:
$avp(size): [1]
- start|ROUTE_BLOCK_IN:
- end|ROUTE_BLOCK_IN:
- end|ROUTE_LOAD_CALLEE_PREF:
$xavp(callee_real_prefs[0]=>concurrent_max[*]): None
$xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None
$xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): [2]
$xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None
$avp(size): [1]
- start|ROUTE_CHECK_PBX:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_INT:
@ -62,6 +59,8 @@ flow:
- end|ROUTE_ACC_CALLER:
- start|ROUTE_ACC_CALLEE:
- end|ROUTE_ACC_CALLEE:
- start|ROUTE_SET_CALLER_DIALOG:
- end|ROUTE_SET_CALLER_DIALOG:
- start|BRANCH_ROUTE_SBC:
- start|ROUTE_BRANCH_ACC_RTP:
- end|ROUTE_BRANCH_ACC_RTP:

@ -14,8 +14,8 @@ flow:
- exit|ROUTE_AUTH:
sip_in:
- '^INVITE'
- 'Contact: sip:testuser1004@'
- 'To: <sip:testuser1002@'
- 'Contact: sip:testuser1002@'
- 'To: <sip:testuser1004@'
- 'CSeq: 1 INVITE'
- 'Max-Forwards: 69'
- 'Content-Type: application/sdp'
@ -23,12 +23,12 @@ sip_out:
- [
'^SIP/2.0 100 Trying',
'CSeq: 1 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@'
'From: <sip:testuser1002@',
'To: <sip:testuser1004@'
]
- [
'^SIP/2.0 407 Proxy Authentication Required',
'CSeq: 1 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@'
'From: <sip:testuser1002@',
'To: <sip:testuser1004@'
]

@ -43,14 +43,12 @@ flow:
- start|ROUTE_BLOCK_OUT:
- end|ROUTE_BLOCK_OUT:
- start|ROUTE_LOAD_CALLEE_PREF:
- start|ROUTE_SET_CALLER_DIALOG:
- end|ROUTE_SET_CALLER_DIALOG:
- start|ROUTE_ACC_FAILURE:
$xavp(callee_real_prefs[0]=>concurrent_max[*]): None
$xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None
$xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): [1]
$xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): [2]
$xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None
$avp(size): [4]
$avp(size): [3]
- start|ROUTE_ACC_CALLER:
- end|ROUTE_ACC_CALLER:
- start|ROUTE_ACC_CALLEE:
@ -61,29 +59,29 @@ flow:
- end|ROUTE_ADD_CALLINFO_REPLY:
- exit|ROUTE_EARLY_REJECT:
sip_in:
- '^INVITE sip:testuser1002@'
- 'Contact: sip:testuser1004@'
- '^INVITE sip:testuser1004@'
- 'Contact: sip:testuser1002@'
- 'CSeq: 2 INVITE'
- 'Max-Forwards: 69'
- 'Content-Type: application/sdp'
- 'Proxy-Authorization: Digest username="testuser1004"'
- 'Proxy-Authorization: Digest username="testuser1002"'
sip_out:
- [
'^SIP/2.0 100 Trying',
'CSeq: 2 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@'
'From: <sip:testuser1002@',
'To: <sip:testuser1004@'
]
- [
'^SIP/2.0 101 Connecting',
'CSeq: 2 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@'
'From: <sip:testuser1002@',
'To: <sip:testuser1004@'
]
- [
'^SIP/2.0 486 Busy',
'CSeq: 2 INVITE',
'From: <sip:testuser1004@',
'To: <sip:testuser1002@',
'P-NGCP-Authorization: testuser1004@'
'From: <sip:testuser1002@',
'To: <sip:testuser1004@',
'P-NGCP-Authorization: testuser1002@'
]

@ -0,0 +1,4 @@
testuser1003@spce.test:
concurrent_max_per_account: 2
testuser1004@spce.test:
concurrent_max_per_account: 2

@ -29,9 +29,9 @@
<recv response="100" rtd="1" optional="true">
</recv>
<recv response="407" rtd="2" auth="true"/>
<send>
<![CDATA[
@ -112,8 +112,8 @@
<exec play_pcap_audio="scenarios/media181sec.pcap"/>
</action>
</nop>
<pause milliseconds="1500"/>
<pause milliseconds="1000"/>
<send start_rtd="4">
<![CDATA[
@ -131,7 +131,7 @@
]]>
</send>
<recv response="100" optional="true">
</recv>

@ -20,7 +20,7 @@
]]>
</send>
<pause milliseconds="500"/>
<pause milliseconds="500"/>
<send>
<![CDATA[
@ -70,7 +70,7 @@
]]>
</send>
<ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
<CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>

@ -7,13 +7,13 @@
<send start_rtd="1" start_rtd="2">
<![CDATA[
INVITE sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0] SIP/2.0
INVITE sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
Call-ID: [call_id]
CSeq: 1 INVITE
Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
Max-Forwards: 70
Content-Type: application/sdp
Content-Length: [len]
@ -38,13 +38,13 @@
<send>
<![CDATA[
ACK sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]:[remote_port] SIP/2.0
ACK sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]:[remote_port] SIP/2.0
[last_Via:]
From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>[peer_tag_param]
From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
Call-ID: [call_id]
CSeq: 1 ACK
Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
Max-Forwards: 70
Content-Length: 0
@ -56,15 +56,15 @@
<send start_rtd="3">
<![CDATA[
INVITE sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0] SIP/2.0
INVITE sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
Call-ID: [call_id]
CSeq: 2 INVITE
Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
Max-Forwards: 70
[field2 file="callee.csv" line=1]
[field1 file="caller.csv"]
Content-Type: application/sdp
Content-Length: [len]
@ -91,12 +91,12 @@
ACK [next_url] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>[peer_tag_param]
From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
Call-ID: [call_id]
[routes]
CSeq: 2 ACK
Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
Max-Forwards: 70
Content-Length: 0

@ -59,9 +59,9 @@ flow:
- start|ROUTE_ACC_CALLEE:
- end|ROUTE_ACC_CALLEE:
- end|ROUTE_ACC_CF:
- start|ROUTE_EXECUTE_CF_LOOP:
- start|ROUTE_SET_CALLER_DIALOG:
- end|ROUTE_SET_CALLER_DIALOG:
- start|ROUTE_EXECUTE_CF_LOOP:
- start|BRANCH_ROUTE_FWD_LOOP:
- start|ROUTE_ADD_CALLINFO:
- end|ROUTE_ADD_CALLINFO:

@ -1,2 +0,0 @@
testuser1002@spce.test:
concurrent_max_per_account: 1
Loading…
Cancel
Save