TT#36304 fix kamailio-config-tests after migration to stateful lb

- the hop-by-hop ACK is now generated by the LB and not relayed so it does not
  have any P-NGCP-Src-* headers and Contact
- remove pause before ACK that was causing retransmission
- REFER method used to be filtered from Allow on messages coming from proxy or
  sbc but not those coming from UA. it makes sense to do it everywhere I think
- in invite_retrans the retransmission is now absorbed on lb so there is one
  message less in proxy logs and other message numbers are shifted forward by one

Change-Id: If6e05368fe72df7636dff43d18572eff821f16c4
changes/49/22449/4
Andrew Pogrebennyk 7 years ago
parent cdf506b822
commit 98afa193e5

@ -15,9 +15,4 @@ sip_in:
- 'To: <sip:testuser1003@spce.test>;tag=' - 'To: <sip:testuser1003@spce.test>;tag='
- 'Max-Forwards: 69' - 'Max-Forwards: 69'
- 'Content-Length: 0' - 'Content-Length: 0'
- 'P-NGCP-Src-Ip: 127.126.0.1'
- 'P-NGCP-Src-Port: \d+'
- 'P-NGCP-Src-Proto: udp'
- 'P-NGCP-Src-Af: 4'
- 'P-Sock-Info: udp:127.0.0.1:5060'
sip_out: [] sip_out: []

@ -10,16 +10,10 @@ flow:
- start|ROUTE_LOCAL: - start|ROUTE_LOCAL:
- return|ROUTE_LOCAL: - return|ROUTE_LOCAL:
sip_in: sip_in:
- '^ACK sip:testuser1003@spce.test:5060 SIP/2.0' - '^ACK sip:testuser1003@spce.test'
- 'From: <sip:testuser1002@spce.test>;tag=' - 'From: <sip:testuser1002@spce.test>;tag='
- 'To: <sip:testuser1003@spce.test>;tag=' - 'To: <sip:testuser1003@spce.test>;tag='
- 'CSeq: 2 ACK' - 'CSeq: 2 ACK'
- 'Contact: sip:testuser1002@127.126.0.1:\d+'
- 'Max-Forwards: 69' - 'Max-Forwards: 69'
- 'Content-Length: 0' - 'Content-Length: 0'
- 'P-NGCP-Src-Ip: 127.126.0.1'
- 'P-NGCP-Src-Port: \d+'
- 'P-NGCP-Src-Proto: udp'
- 'P-NGCP-Src-Af: 4'
- 'P-Sock-Info: udp:127.0.0.1:5060'
sip_out: [] sip_out: []

@ -37,5 +37,4 @@ sip_out:
'CSeq: 2 INVITE', 'CSeq: 2 INVITE',
'From: <sip:testuser1002@', 'From: <sip:testuser1002@',
'To: <sip:testuser1003@', 'To: <sip:testuser1003@',
'Allow: .*REFER.*',
] ]

@ -31,8 +31,6 @@
<recv response="407" rtd="2" auth="true"/> <recv response="407" rtd="2" auth="true"/>
<pause milliseconds="500"/>
<send> <send>
<![CDATA[ <![CDATA[

@ -1,30 +1,39 @@
flow: flow:
- start|DEFAULT_ROUTE: - start|REPLY_ROUTE_NAT:
- start|ROUTE_ENTRY: - start|ROUTE_ENTRY:
- return|ROUTE_ENTRY: - return|ROUTE_ENTRY:
- start|ROUTE_NET_INFO: - start|ROUTE_PREPARE_UA:
- return|ROUTE_NET_INFO: - return|ROUTE_PREPARE_UA:
- start|ROUTE_PRX_REQUEST: - start|REPLY_ROUTE_RTPENGINE:
- start|ROUTE_INITVARS: - return|REPLY_ROUTE_RTPENGINE:
- return|ROUTE_INITVARS: - start|ROUTE_EXIT:
- start|ROUTE_INVITE: - start|ROUTE_RUNTIME:
- return|ROUTE_INVITE: - return|ROUTE_RUNTIME:
- start|dialog:start:
- return|dialog:start:
$avp(lua_dlg_profile): [
"accountout:[% customer_test.id %]",
"userout:[% spce_test.testuser1002.uuid %]",
"account:[% customer_test.id %]",
"user:[% spce_test.testuser1002.uuid %]",
"totalaccountout:[% customer_test.id %]",
"totaluserout:[% spce_test.testuser1002.uuid %]",
"totalaccount:[% customer_test.id %]",
"totaluser:[% spce_test.testuser1002.uuid %]",
"local",
"totalaccount:[% customer_test.id %]",
"totaluser:[% spce_test.testuser1003.uuid %]",
"total",
"account:[% customer_test.id %]",
"user:[% spce_test.testuser1003.uuid %]"
]
- return|dialog:start:
sip_in: sip_in:
- '^INVITE' - '^SIP/2.0 200 OK'
- 'Contact: sip:testuser1002@'
- 'To: <sip:testuser1003@'
- 'CSeq: 2 INVITE' - 'CSeq: 2 INVITE'
- 'Max-Forwards: 69'
- 'Content-Type: application/sdp'
sip_out: sip_out:
- [ - [
'^SIP/2.0 100 Trying', '^SIP/2.0 200 OK',
'CSeq: 2 INVITE',
'From: <sip:testuser1002@',
'To: <sip:testuser1003@'
]
- [
'^SIP/2.0 180 Ringing',
'CSeq: 2 INVITE', 'CSeq: 2 INVITE',
'From: <sip:testuser1002@', 'From: <sip:testuser1002@',
'To: <sip:testuser1003@' 'To: <sip:testuser1003@'

@ -1,40 +1,35 @@
flow: flow:
- start|REPLY_ROUTE_NAT: - start|DEFAULT_ROUTE:
- start|ROUTE_ENTRY: - start|ROUTE_ENTRY:
- return|ROUTE_ENTRY: - return|ROUTE_ENTRY:
- start|ROUTE_NET_INFO:
- return|ROUTE_NET_INFO:
- start|ROUTE_PRX_REQUEST:
- start|ROUTE_INITVARS:
- return|ROUTE_INITVARS:
- start|ROUTE_PREPARE_UA: - start|ROUTE_PREPARE_UA:
- return|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA:
- start|REPLY_ROUTE_RTPENGINE: - start|ROUTE_RESTORE_CLUSTERSET:
- return|REPLY_ROUTE_RTPENGINE: - return|ROUTE_RESTORE_CLUSTERSET:
- start|ROUTE_WITHINDLG_RTPENGINE:
- return|ROUTE_WITHINDLG_RTPENGINE:
- start|ROUTE_OUTBOUND:
- start|DEFAULT_SEND:
- exit|DEFAULT_SEND:
- exit|DEFAULT_SEND:
- start|ROUTE_EXIT: - start|ROUTE_EXIT:
- start|ROUTE_RUNTIME: - start|ROUTE_RUNTIME:
- return|ROUTE_RUNTIME: - return|ROUTE_RUNTIME:
- start|dialog:start: - exit|ROUTE_EXIT:
- return|dialog:start:
$avp(lua_dlg_profile): [
"accountout:[% customer_test.id %]",
"userout:[% spce_test.testuser1002.uuid %]",
"account:[% customer_test.id %]",
"user:[% spce_test.testuser1002.uuid %]",
"totalaccountout:[% customer_test.id %]",
"totaluserout:[% spce_test.testuser1002.uuid %]",
"totalaccount:[% customer_test.id %]",
"totaluser:[% spce_test.testuser1002.uuid %]",
"local",
"totalaccount:[% customer_test.id %]",
"totaluser:[% spce_test.testuser1003.uuid %]",
"total",
"account:[% customer_test.id %]",
"user:[% spce_test.testuser1003.uuid %]"
]
- return|dialog:start:
sip_in: sip_in:
- '^SIP/2.0 200 OK' - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
- 'CSeq: 2 INVITE' - 'CSeq: 2 ACK'
- 'From: <sip:testuser1002@'
- 'To: <sip:testuser1003@'
sip_out: sip_out:
- [ - [
'^SIP/2.0 200 OK', '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
'CSeq: 2 INVITE', 'CSeq: 2 ACK',
'From: <sip:testuser1002@', 'From: <sip:4311002@',
'To: <sip:testuser1003@' 'To: <sip:testuser1003@'
] ]

@ -7,12 +7,16 @@ flow:
- start|ROUTE_PRX_REQUEST: - start|ROUTE_PRX_REQUEST:
- start|ROUTE_INITVARS: - start|ROUTE_INITVARS:
- return|ROUTE_INITVARS: - return|ROUTE_INITVARS:
- start|ROUTE_PREPARE_UA: - start|dialog:end:
- return|ROUTE_PREPARE_UA: - return|dialog:end:
$avp(lua_dlg_profile): None
- return|dialog:end:
- start|ROUTE_STOP_RTPPROXY:
- start|ROUTE_RESTORE_CLUSTERSET: - start|ROUTE_RESTORE_CLUSTERSET:
- return|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET:
- start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_STOP_RTPPROXY:
- return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_PREPARE_UA:
- return|ROUTE_PREPARE_UA:
- start|ROUTE_OUTBOUND: - start|ROUTE_OUTBOUND:
- start|DEFAULT_SEND: - start|DEFAULT_SEND:
- exit|DEFAULT_SEND: - exit|DEFAULT_SEND:
@ -22,14 +26,28 @@ flow:
- return|ROUTE_RUNTIME: - return|ROUTE_RUNTIME:
- exit|ROUTE_EXIT: - exit|ROUTE_EXIT:
sip_in: sip_in:
- '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
- 'CSeq: 2 ACK' - 'Contact: sip:testuser1002@'
- 'CSeq: 3 BYE'
- 'Max-Forwards: 69'
- 'Content-Length: 0'
- 'From: <sip:testuser1002@' - 'From: <sip:testuser1002@'
- 'To: <sip:testuser1003@' - 'To: <sip:testuser1003@'
sip_out: sip_out:
- [ - [
'^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0', '^SIP/2.0 100 Trying',
'CSeq: 2 ACK', 'CSeq: 3 BYE',
'Content-Length: 0',
'From: <sip:testuser1002@',
'To: <sip:testuser1003@'
]
- [
'^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
'Contact: sip:testuser1002@',
'CSeq: 3 BYE',
'Max-Forwards: 68',
'Content-Length: 0',
'From: <sip:4311002@', 'From: <sip:4311002@',
'To: <sip:testuser1003@' 'To: <sip:testuser1003@'
] ]

@ -1,53 +1,24 @@
flow: flow:
- start|DEFAULT_ROUTE: - start|REPLY_ROUTE_NAT:
- start|ROUTE_ENTRY: - start|ROUTE_ENTRY:
- return|ROUTE_ENTRY: - return|ROUTE_ENTRY:
- start|ROUTE_NET_INFO:
- return|ROUTE_NET_INFO:
- start|ROUTE_PRX_REQUEST:
- start|ROUTE_INITVARS:
- return|ROUTE_INITVARS:
- start|dialog:end:
- return|dialog:end:
$avp(lua_dlg_profile): None
- return|dialog:end:
- start|ROUTE_STOP_RTPPROXY:
- start|ROUTE_RESTORE_CLUSTERSET:
- return|ROUTE_RESTORE_CLUSTERSET:
- return|ROUTE_STOP_RTPPROXY:
- start|ROUTE_PREPARE_UA: - start|ROUTE_PREPARE_UA:
- return|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA:
- start|ROUTE_OUTBOUND:
- start|DEFAULT_SEND:
- exit|DEFAULT_SEND:
- exit|DEFAULT_SEND:
- start|ROUTE_EXIT: - start|ROUTE_EXIT:
- start|ROUTE_RUNTIME: - start|ROUTE_RUNTIME:
- return|ROUTE_RUNTIME: - return|ROUTE_RUNTIME:
- exit|ROUTE_EXIT: - exit|ROUTE_EXIT:
sip_in: sip_in:
- '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - '^SIP/2.0 200 OK'
- 'Contact: sip:testuser1002@'
- 'CSeq: 3 BYE' - 'CSeq: 3 BYE'
- 'Max-Forwards: 69'
- 'Content-Length: 0' - 'Content-Length: 0'
- 'From: <sip:testuser1002@' - 'From: <sip:4311002@'
- 'To: <sip:testuser1003@' - 'To: <sip:testuser1003@'
sip_out: sip_out:
- [ - [
'^SIP/2.0 100 Trying', '^SIP/2.0 200 OK',
'CSeq: 3 BYE', 'CSeq: 3 BYE',
'Content-Length: 0', 'Content-Length: 0',
'From: <sip:testuser1002@', 'From: <sip:testuser1002@',
'To: <sip:testuser1003@' 'To: <sip:testuser1003@'
] ]
- [
'^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
'Contact: sip:testuser1002@',
'CSeq: 3 BYE',
'Max-Forwards: 68',
'Content-Length: 0',
'From: <sip:4311002@',
'To: <sip:testuser1003@'
]

@ -1,24 +0,0 @@
flow:
- start|REPLY_ROUTE_NAT:
- start|ROUTE_ENTRY:
- return|ROUTE_ENTRY:
- start|ROUTE_PREPARE_UA:
- return|ROUTE_PREPARE_UA:
- start|ROUTE_EXIT:
- start|ROUTE_RUNTIME:
- return|ROUTE_RUNTIME:
- exit|ROUTE_EXIT:
sip_in:
- '^SIP/2.0 200 OK'
- 'CSeq: 3 BYE'
- 'Content-Length: 0'
- 'From: <sip:4311002@'
- 'To: <sip:testuser1003@'
sip_out:
- [
'^SIP/2.0 200 OK',
'CSeq: 3 BYE',
'Content-Length: 0',
'From: <sip:testuser1002@',
'To: <sip:testuser1003@'
]

@ -31,8 +31,6 @@
<recv response="407" rtd="2" auth="true"/> <recv response="407" rtd="2" auth="true"/>
<pause milliseconds="500"/>
<send> <send>
<![CDATA[ <![CDATA[

@ -16,9 +16,4 @@ sip_in:
- 'CSeq: 2 ACK' - 'CSeq: 2 ACK'
- 'Max-Forwards: 69' - 'Max-Forwards: 69'
- 'Content-Length: 0' - 'Content-Length: 0'
- 'P-NGCP-Src-Ip: 127.126.0.1'
- 'P-NGCP-Src-Port: \d+'
- 'P-NGCP-Src-Proto: udp'
- 'P-NGCP-Src-Af: 4'
- 'P-Sock-Info: udp:127.0.0.1:5060'
sip_out: [] sip_out: []

@ -14,12 +14,6 @@ sip_in:
- 'From: <sip:testuser1002@' - 'From: <sip:testuser1002@'
- 'To: <sip:43999100@' - 'To: <sip:43999100@'
- 'CSeq: 2 ACK' - 'CSeq: 2 ACK'
- 'Contact: sip:testuser1002@127.126.0.1:\d+'
- 'Max-Forwards: 69' - 'Max-Forwards: 69'
- 'Content-Length:\s+0' - 'Content-Length:\s+0'
- 'P-NGCP-Src-Ip: 127.126.0.1'
- 'P-NGCP-Src-Port: \d+'
- 'P-NGCP-Src-Proto: udp'
- 'P-NGCP-Src-Af: 4'
- 'P-Sock-Info: udp:127.0.0.1:5060'
sip_out: [] sip_out: []

@ -16,8 +16,4 @@ sip_in:
- 'CSeq: 2 ACK' - 'CSeq: 2 ACK'
- 'Max-Forwards: 69' - 'Max-Forwards: 69'
- 'Content-Length:\s+0' - 'Content-Length:\s+0'
- 'P-NGCP-Src-Port: \d+'
- 'P-NGCP-Src-Proto: udp'
- 'P-NGCP-Src-Af: 4'
- 'P-Sock-Info: udp:127.0.0.1:5060'
sip_out: [] sip_out: []

@ -14,12 +14,6 @@ sip_in:
- 'From: <sip:testuser1002@' - 'From: <sip:testuser1002@'
- 'To: <sip:43999300@' - 'To: <sip:43999300@'
- 'CSeq: 2 ACK' - 'CSeq: 2 ACK'
- 'Contact: sip:testuser1002@127.126.0.3:\d+'
- 'Max-Forwards: 69' - 'Max-Forwards: 69'
- 'Content-Length:\s+0' - 'Content-Length:\s+0'
- 'P-NGCP-Src-Ip: 127.126.0.3'
- 'P-NGCP-Src-Port: \d+'
- 'P-NGCP-Src-Proto: udp'
- 'P-NGCP-Src-Af: 4'
- 'P-Sock-Info: udp:127.0.0.1:5060'
sip_out: [] sip_out: []

Loading…
Cancel
Save