Commit 329c432e authored by Pekka Pessi's avatar Pekka Pessi

Renumbered test cases, state transitions in nua.docs and test_nua.c.

darcs-hash:20051130121954-65a35-41dc2cbac95199cc7d688f57c1a730ed4dfef8b4.gz
parent 5c9981ee
...@@ -984,7 +984,7 @@ not include the extensions like @b 100rel or @b UPDATE. ...@@ -984,7 +984,7 @@ not include the extensions like @b 100rel or @b UPDATE.
| |
V V
+------------+ +------------+
| |---------------------------------------+ | |-----------------------------(6a)-----+
| |----+ | | |----+ |
+------| CALLING | (7a) nua_cancel/CANCEL | +------| CALLING | (7a) nua_cancel/CANCEL |
| | |<---+ | | | |<---+ |
...@@ -995,14 +995,14 @@ not include the extensions like @b 100rel or @b UPDATE. ...@@ -995,14 +995,14 @@ not include the extensions like @b 100rel or @b UPDATE.
| | | | | |
| V | | V |
| +------------+ | | +------------+ |
| | |-------------------------------------->| | | |-----------------------------(6b)---->|
| | |----+ | | | |----+ |
| | PROCEEDING | (7b) nua_cancel/CANCEL | | | PROCEEDING | (7b) nua_cancel/CANCEL |
| | |<---+ | | | |<---+ |
| | |----------------------+ | | | |----------------------+ |
| +------------+ | | | +------------+ | |
| | | | | | | |
(3b) 2XX/- (3a) 2XX/- | (6) [3456]XX/ACK (3a) 2XX/- (3b) 2XX/- | (6) [3456]XX/ACK
| | | | | | | |
| V | | | V | |
| + - - - - - -+ | | | + - - - - - -+ | |
...@@ -1033,7 +1033,7 @@ not include the extensions like @b 100rel or @b UPDATE. ...@@ -1033,7 +1033,7 @@ not include the extensions like @b 100rel or @b UPDATE.
| | | |
V | V |
+------------+ | +------------+ |
| TERMINATED |<--------------------------------------+ | TERMINATED |<-------------------------------------+
+------------+ +------------+
@endcode @endcode
...@@ -1071,7 +1071,7 @@ follows: ...@@ -1071,7 +1071,7 @@ follows:
announcements about call progress using the early media session. announcements about call progress using the early media session.
</td></tr> </td></tr>
<tr><td>C3a</td> <tr><td>C3a</td>
<td>proceeding</td><td rowspan="2">2XX</td> <td>calling</td><td rowspan="2">2XX</td>
<td rowspan="2">-</td><td rowspan="2">completing</td> <td rowspan="2">-</td><td rowspan="2">completing</td>
<td rowspan="2">Save answer</td> <td rowspan="2">Save answer</td>
<td rowspan="2"> <td rowspan="2">
...@@ -1084,7 +1084,7 @@ follows: ...@@ -1084,7 +1084,7 @@ follows:
proceeds immediately to next state transition. proceeds immediately to next state transition.
</td></tr> </td></tr>
<tr><td>C3b</td> <tr><td>C3b</td>
<td>calling</td></tr> <td>proceeding</td></tr>
<tr><td>C4</td> <tr><td>C4</td>
<td>completing</td> <td>completing</td>
<td>nua_ack() or<br>@ref NUTAG_AUTOACK() "auto-ack" </td> <td>nua_ack() or<br>@ref NUTAG_AUTOACK() "auto-ack" </td>
...@@ -1189,7 +1189,7 @@ not include the extensions like @b 100rel or @b UPDATE. ...@@ -1189,7 +1189,7 @@ not include the extensions like @b 100rel or @b UPDATE.
| | +----------| | | : | | +----------| | | :
| | | +------------+ | : | | | +------------+ | :
| nua_respond/ | | | : | nua_respond/ | | | :
(6) /[3456]XX | nua_respond/2XX (3a) (3b) : (6) /[3456]XX | nua_respond/2XX (3b) (3a) :
| | | | | : | | | | | :
| | | V V V | | | V V V
| | | +-------------+ | | | +-------------+
...@@ -1269,7 +1269,7 @@ follows: ...@@ -1269,7 +1269,7 @@ follows:
180 Ringing immediately after receiving INVITE and enters @b early state. 180 Ringing immediately after receiving INVITE and enters @b early state.
</td></tr> </td></tr>
<tr><td>S3a</td> <!-- transition --> <tr><td>S3a</td> <!-- transition -->
<td>early</td> <!-- previous state --> <td>received</td> <!-- previous state -->
<td rowspan=2>nua_respond()</td> <!-- input --> <td rowspan=2>nua_respond()</td> <!-- input -->
<td rowspan=2>2XX</td> <!-- output --> <td rowspan=2>2XX</td> <!-- output -->
<td rowspan=3>completed</td> <!-- next state --> <td rowspan=3>completed</td> <!-- next state -->
...@@ -1281,7 +1281,7 @@ follows: ...@@ -1281,7 +1281,7 @@ follows:
should be included in the 2XX response. should be included in the 2XX response.
</td></tr> </td></tr>
<tr><td>S3b</td> <!-- transition --> <tr><td>S3b</td> <!-- transition -->
<td>received</td> <!-- previous state --> <td>early</td> <!-- previous state -->
</td></tr> </td></tr>
<tr><td>S3c</td> <!-- transition --> <tr><td>S3c</td> <!-- transition -->
<td>init</td> <!-- previous state --> <td>init</td> <!-- previous state -->
......
...@@ -3544,6 +3544,9 @@ ua_invite2(nua_t *nua, nua_handle_t *nh, nua_event_t e, int restarted, ...@@ -3544,6 +3544,9 @@ ua_invite2(nua_t *nua, nua_handle_t *nh, nua_event_t e, int restarted,
char const *what; char const *what;
if (ss->ss_state == nua_callstate_terminated)
ss->ss_state = nua_callstate_init;
du = dialog_usage_add(nh, nh->nh_ds, nua_session_usage, NULL); du = dialog_usage_add(nh, nh->nh_ds, nua_session_usage, NULL);
what = nua_500_error; /* Internal error */ what = nua_500_error; /* Internal error */
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment